diff --git a/src/components/DesignForm/aceDrawer.vue b/src/components/DesignForm/aceDrawer.vue
index 6eb6e27..b57d9f2 100644
--- a/src/components/DesignForm/aceDrawer.vue
+++ b/src/components/DesignForm/aceDrawer.vue
@@ -3,347 +3,390 @@
 @ 时间: 2023-07-19 08:39:34
 @ 备注: 抽屉
 -->
-<script lang='ts' setup>
-import { ref, nextTick, watch, onMounted, onUnmounted } from 'vue'
-import { aceEdit } from '@/api/DesignForm/utils'  
-import { treeStruct } from '@/api/DesignForm/type' 
+<script lang="ts" setup>
+import { ref, nextTick, watch, onMounted, onUnmounted } from "vue";
+import { aceEdit } from "@/api/DesignForm/utils";
+import { treeStruct } from "@/api/DesignForm/type";
 
 const props = withDefaults(
-    defineProps<{
-		data?:object
-		modelValue: boolean
-		// eslint-disable-next-line vue/require-default-prop
-		title?: string
-		direction?: 'rtl' | 'ltr'
-		content: string
-		id?: string
-		// eslint-disable-next-line vue/require-default-prop
-		codeType?: string
-		data?: object
-    }>(),
-    {
-		id: 'editJson',
-		content: '',
-		direction: 'ltr'
-    }
-)
-
-
+  defineProps<{
+    data?: object;
+    modelValue: boolean;
+    // eslint-disable-next-line vue/require-default-prop
+    title?: string;
+    direction?: "rtl" | "ltr";
+    content: string;
+    id?: string;
+    // eslint-disable-next-line vue/require-default-prop
+    codeType?: string;
+    data?: object;
+  }>(),
+  {
+    id: "editJson",
+    content: "",
+    direction: "ltr",
+  }
+);
 
 const emits = defineEmits<{
-    (e: 'beforeClose'): void
-    (e: 'confirm', content: string): void
-	(e: 'confirmTree', content: string): void
-    (e: 'update:modelValue', val: boolean): void
-}>()
-const editor = ref<any>({})
-const visible = ref(false)
+  (e: "beforeClose"): void;
+  (e: "confirm", content: string): void;
+  (e: "confirmTree", content: string): void;
+  (e: "update:modelValue", val: boolean): void;
+}>();
+const editor = ref<any>({});
+const visible = ref(false);
 
-const treeSelectAry = reactive<treeStruct[]>([])			//树形数据
-const editTitleFormRef = ref(ElForm);	//编辑表单
+// const treeSelectAry = ref<treeStruct[]>(props.data.content ? props.data.content : []); //树形数据
+const editTitleFormRef = ref(ElForm); //编辑表单
 const editTitleInfoRef = ref(ElForm);
-let jibuqi = 0				//计步器计算最大值
-const isTopHeader = ref(false) //是否为添加顶级树脂
-const guodu =  ref<treeStruct>({})		//数据中转使用
-const addIsShow = ref(false)			//添加数据	
+let jibuqi = 0; //计步器计算最大值
+const isTopHeader = ref(false); //是否为添加顶级树脂
+const guodu = ref<treeStruct>({}); //数据中转使用
+const addIsShow = ref(false); //添加数据
 const treeSelectTitle = reactive<treeStruct>({
-	value: "1",
-	label: ""
-})	//编辑表格结构及数据
-const butLoad = ref(false)			//按钮状态
+  value: "1",
+  label: "",
+}); //编辑表格结构及数据
+const butLoad = ref(false); //按钮状态
 /**
  * 表单验证规则
  */
 const editTitleRules = reactive({
-	label: [{ required: true, message: "请输入名称", trigger: "blur" }],	
+  label: [{ required: true, message: "请输入名称", trigger: "blur" }],
+});
+
+const treeSelectAry = computed({
+  get() {
+    return props.data.content ? props.data.content : [];
+  },
+  set(val: treeStruct[]) {
+    // emits("confirmTree", val);
+    return val;
+  },
 });
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-12-02 11:22:18
+@ 功能: 递归查数
+*/
+const jiShuDiGui = (val: []) => {
+  if (!Array.isArray(val)) return (jibuqi = 0);
+  val.forEach((item: any) => {
+    jibuqi++;
+    console.log("递归查数", jibuqi);
+    if (item.children && item.children.length > 0) {
+      jiShuDiGui(item.children);
+    }
+  });
+};
+
+watch(
+  () => visible,
+  (val: booble) => {
+    jiShuDiGui(props.data.content);
+  },
+  { deep: true }
+);
+
 watch(
-    () => props.modelValue,
-    (val: boolean) => {
-		visible.value = val
-		if (val) {
-			initEditor()
-		}
+  () => props.modelValue,
+  (val: boolean) => {
+    visible.value = val;
+    if (val) {
+      initEditor();
     }
-)
+  }
+);
 const initEditor = () => {
-    nextTick(() => {
-      	editor.value = aceEdit(props.content, props.id, props.codeType)
-    })
-}
+  nextTick(() => {
+    editor.value = aceEdit(props.content, props.id, props.codeType);
+  });
+};
 const dialogConfirm = () => {
-    const editVal = editor.value.getValue()
-    emits('confirm', editVal)
-}
+  const editVal = editor.value.getValue();
+  emits("confirm", editVal);
+};
 const drawerBeforeClose = () => {
-    emits('update:modelValue', false)
-    emits('beforeClose')
-	treeSelectAry=[]
-}
-onMounted(() => {})
+  emits("update:modelValue", false);
+  emits("beforeClose");
+  treeSelectAry.value = [];
+};
+onMounted(() => {});
 onUnmounted(() => {
-    if (Object.keys(editor.value).length !== 0) {
-		editor.value.destroy()
-		editor.value.container.remove()
-    }
-})
+  if (Object.keys(editor.value).length !== 0) {
+    editor.value.destroy();
+    editor.value.container.remove();
+  }
+});
 
 /**
 @ 作者: 秦东
 @ 时间: 2024-09-27 16:03:26
 @ 功能: 打开添加弹窗
 */
-const pickAdd = (val:treeStruct) => {
-	guodu.value = val
-	isTopHeader.value = false
-	addIsShow.value = true
-}
+const pickAdd = (val: treeStruct) => {
+  guodu.value = val;
+  isTopHeader.value = false;
+  addIsShow.value = true;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-09-27 16:06:41
 @ 功能: 关闭弹窗
 */
 const pickAddClose = () => {
-	guodu.value  = {}
-	treeSelectTitle.label = ""
-	addIsShow.value = false
-	butLoad.value = false
-	editTitleFormRef.value.resetFields();
-}
+  guodu.value = {};
+  treeSelectTitle.label = "";
+  addIsShow.value = false;
+  butLoad.value = false;
+  editTitleFormRef.value.resetFields();
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-09-27 16:09:53
 @ 功能: 添加顶级分类
 */
 const addTopClass = () => {
-	isTopHeader.value = true
-	addIsShow.value = true
-}
+  isTopHeader.value = true;
+  addIsShow.value = true;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-09-27 16:10:27
 @ 功能: 确定添加分类
 */
 const pickIsTrue = () => {
-	butLoad.value = true
-	editTitleFormRef.value.validate((isValid: boolean) => {
-		if(isValid){
-			jibuqi++
-			if(isTopHeader.value){
-				treeSelectAry.push({
-					value: jibuqi,
-					label: treeSelectTitle.label,
-					children: []
-				})
-			}else{
-				if(guodu.value.children){
-					guodu.value.children.push({
-						value: jibuqi,
-						label: treeSelectTitle.label,
-						children: []
-					})
-				}else{
-					guodu.value.children=[
-						{
-							value: jibuqi,
-							label: treeSelectTitle.label,
-							children: []
-						}
-					]
-				}
-			}
-			
-			pickAddClose()
-		}else{
-			butLoad.value = false
-		}
-	})
-}
+  butLoad.value = true;
+  editTitleFormRef.value.validate((isValid: boolean) => {
+    if (isValid) {
+      jibuqi++;
+      if (isTopHeader.value) {
+        treeSelectAry.value.push({
+          value: jibuqi,
+          label: treeSelectTitle.label,
+          children: [],
+        });
+      } else {
+        if (guodu.value.children) {
+          guodu.value.children.push({
+            value: jibuqi,
+            label: treeSelectTitle.label,
+            children: [],
+          });
+        } else {
+          guodu.value.children = [
+            {
+              value: jibuqi,
+              label: treeSelectTitle.label,
+              children: [],
+            },
+          ];
+        }
+      }
+
+      pickAddClose();
+    } else {
+      butLoad.value = false;
+    }
+  });
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-09-27 08:38:35
 @ 功能: 回填主表值
 */
 const dialogConfirmTree = () => {
+  // let drawer = ({
+  // 	visible: false,
+  // 	type: '',
+  // 	title: '',
+  // 	codeType: '',
+  // 	direction: undefined, //弹出方向rtl / ltr
+  // 	callback: ''
+  // })
+  // let opt = new Array
+  // treeSelectAry.forEach((item:treeStruct) => {
+  // 	opt.push({
+  // 		value: item.value,
+  // 		label: item.label,
+  // 		children: item.children
+  // 	})
+  // })
 
-	// let drawer = ({
-	// 	visible: false,
-	// 	type: '',
-	// 	title: '',
-	// 	codeType: '',
-	// 	direction: undefined, //弹出方向rtl / ltr
-	// 	callback: ''
-	// })
-	// let opt = new Array
-	// treeSelectAry.forEach((item:treeStruct) => {
-	// 	opt.push({
-	// 		value: item.value,
-	// 		label: item.label,
-	// 		children: item.children
-	// 	})
-	// })
-	
-	// emits('confirm', treeSelectAry)
-	emits('confirmTree', treeSelectAry)
-	drawerBeforeClose()
-}
+  // emits('confirm', treeSelectAry)
+  console.log("回填主表值", treeSelectAry.value);
+  emits("confirmTree", treeSelectAry.value, props.data.type);
+  drawerBeforeClose();
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-09-27 13:51:31
 @ 功能: 删除指定节点数据
 */
-const pickDel = (val:treeStruct) => {
-	console.log("要删除得节点-->",val.value)
-	delDiGui(treeSelectAry,val)
-		console.log("删除指定节点数据---结果-->",treeSelectAry)
-}
+const pickDel = (val: treeStruct) => {
+  console.log("要删除得节点-->", val.value);
+  delDiGui(treeSelectAry, val);
+  console.log("删除指定节点数据---结果-->", treeSelectAry);
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-09-27 14:13:23
 @ 功能: 执行递归删除
 */
-const delDiGui = (tree: treeStruct[],val:treeStruct) => {
-	for (let i = 0; i < tree.length; i++) {
-        const node = tree[i];
-        if (node.value == val.value) {
-            tree.splice(i, 1);
-            return;
-        }
-        if (Array.isArray(node.children) && node.children.length) {
-            return delDiGui(node.children, val);
-        }
+const delDiGui = (tree: treeStruct[], val: treeStruct) => {
+  for (let i = 0; i < tree.length; i++) {
+    const node = tree[i];
+    if (node.value == val.value) {
+      tree.splice(i, 1);
+      return;
     }
-}
-const edisIsShow = ref(false)
-const butLoadEdit = ref(false)
+    if (Array.isArray(node.children) && node.children.length) {
+      return delDiGui(node.children, val);
+    }
+  }
+};
+const edisIsShow = ref(false);
+const butLoadEdit = ref(false);
 /**
 @ 作者: 秦东
 @ 时间: 2024-09-29 13:29:17
 @ 功能: 编辑级联舒体
 */
-const pickEdis = (val:treeStruct) => {
-	guodu.value  = val
-	treeSelectTitle.label = val.label
-	edisIsShow.value = true
-}
+const pickEdis = (val: treeStruct) => {
+  guodu.value = val;
+  treeSelectTitle.label = val.label;
+  edisIsShow.value = true;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-09-29 13:33:51
 @ 功能: 关闭编辑窗体
 */
 const pickEditClose = () => {
-	guodu.value  = {}
-	treeSelectTitle.label = ""
-	edisIsShow.value = false
-	butLoadEdit.value = false
-	editTitleInfoRef.value.resetFields();
-}
+  guodu.value = {};
+  treeSelectTitle.label = "";
+  edisIsShow.value = false;
+  butLoadEdit.value = false;
+  editTitleInfoRef.value.resetFields();
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-09-29 13:36:30
 @ 功能: 确定修改
 */
 const pickEditIsTrue = () => {
-	butLoadEdit.value = true
-	editTitleInfoRef.value.validate((isValid: boolean) => {
-		if(isValid){
-			guodu.value.label   = treeSelectTitle.label
-			pickEditClose()
-		}else{
-			butLoad.value = false
-		}
-	})
-}
+  butLoadEdit.value = true;
+  editTitleInfoRef.value.validate((isValid: boolean) => {
+    if (isValid) {
+      guodu.value.label = treeSelectTitle.label;
+      pickEditClose();
+    } else {
+      butLoad.value = false;
+    }
+  });
+};
 </script>
 <template>
-	<el-drawer
-		v-model="visible"
-		size="60%"
-		:title="title"
-		:direction="direction as any"
-		class="ace-dialog"
-		:append-to-body="true"
-		:before-close="drawerBeforeClose"
-	>
-		<template #header>
-			<div v-html="title"></div>
-		</template>
-		<div v-if="['cascader', 'treeSelect'].includes(props.data.type)">
-			<el-table
-				:data="treeSelectAry"
-				row-key="value"
-				default-expand-all
-			>
-				<el-table-column prop="label" label="名称" />
-				<el-table-column  label="操作" width="200" align="center">
-					<template #header>
-						<el-button type="success" @click="addTopClass">添加顶级分类</el-button>
-					</template>
-					<template #default="scope">
-						<el-button-group>
-							<el-button text type="success" @click="pickAdd(scope.row)">添加</el-button>
-							<el-button text type="warning" @click="pickEdis(scope.row)">修改</el-button>
-							<el-button text type="danger" @click="pickDel(scope.row)">删除</el-button>
-						</el-button-group>
-					</template>
-				</el-table-column>
-			</el-table>
-		</div>
-		<div  v-else :id="id"></div>
-		<div class="dialog-footer">
-			<el-button v-if="['cascader', 'treeSelect'].includes(props.data.type)" type="primary" size="small" @click="dialogConfirmTree">
-				确定
-			</el-button>
-			<el-button v-else  type="primary" size="small" @click="dialogConfirm">
-				确定
-			</el-button>
-		</div>
-
-		<el-dialog
-			v-model="addIsShow"
-			title="编辑"
-			width="500"
-			:before-close="pickAddClose"
-		>
-			<el-form ref="editTitleFormRef" :rules="editTitleRules" :model="treeSelectTitle" label-width="auto" style="max-width: 600px">
-				<el-form-item label="名称：" prop="label">
-					<el-input v-model="treeSelectTitle.label" />
-				</el-form-item>
-			</el-form>
-			<template #footer>
-				<div class="dialog-footer">
-					<el-button @click="pickAddClose">取消</el-button>
-					<el-button v-loading="butLoad" type="primary" @click="pickIsTrue">确定</el-button>
-				</div>
-			</template>
-		</el-dialog>
-
-
+  <el-drawer
+    v-model="visible"
+    size="60%"
+    :title="title"
+    :direction="direction as any"
+    class="ace-dialog"
+    :append-to-body="true"
+    :before-close="drawerBeforeClose"
+  >
+    <template #header>
+      <div v-html="title"></div>
+    </template>
+    <div v-if="['cascader', 'treeSelect'].includes(props.data.type)">
+      <el-table :data="treeSelectAry" row-key="value" default-expand-all>
+        <el-table-column prop="label" label="名称" />
+        <el-table-column label="操作" width="200" align="center">
+          <template #header>
+            <el-button type="success" @click="addTopClass">添加顶级分类</el-button>
+          </template>
+          <template #default="scope">
+            <el-button-group>
+              <el-button text type="success" @click="pickAdd(scope.row)">添加</el-button>
+              <el-button text type="warning" @click="pickEdis(scope.row)">修改</el-button>
+              <el-button text type="danger" @click="pickDel(scope.row)">删除</el-button>
+            </el-button-group>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div v-else :id="id"></div>
+    <div class="dialog-footer">
+      <el-button
+        v-if="['cascader', 'treeSelect'].includes(props.data.type)"
+        type="primary"
+        size="small"
+        @click="dialogConfirmTree"
+      >
+        确定
+      </el-button>
+      <el-button v-else type="primary" size="small" @click="dialogConfirm">
+        确定
+      </el-button>
+    </div>
 
-		<el-dialog
-			v-model="edisIsShow"
-			title="编辑"
-			width="500"
-			:before-close="pickEditClose"
-		>
-			<el-form ref="editTitleInfoRef" :rules="editTitleRules" :model="treeSelectTitle" label-width="auto" style="max-width: 600px">
-				<el-form-item label="名称：" prop="label">
-					<el-input v-model="treeSelectTitle.label" />
-				</el-form-item>
-			</el-form>
-			<template #footer>
-				<div class="dialog-footer">
-					<el-button @click="pickEditClose">取消</el-button>
-					<el-button v-loading="butLoadEdit" type="primary" @click="pickEditIsTrue">确定</el-button>
-				</div>
-			</template>
-		</el-dialog>
+    <el-dialog v-model="addIsShow" title="编辑" width="500" :before-close="pickAddClose">
+      <el-form
+        ref="editTitleFormRef"
+        :rules="editTitleRules"
+        :model="treeSelectTitle"
+        label-width="auto"
+        style="max-width: 600px"
+      >
+        <el-form-item label="名称：" prop="label">
+          <el-input v-model="treeSelectTitle.label" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="pickAddClose">取消</el-button>
+          <el-button v-loading="butLoad" type="primary" @click="pickIsTrue"
+            >确定</el-button
+          >
+        </div>
+      </template>
+    </el-dialog>
 
-	</el-drawer>
+    <el-dialog
+      v-model="edisIsShow"
+      title="编辑"
+      width="500"
+      :before-close="pickEditClose"
+    >
+      <el-form
+        ref="editTitleInfoRef"
+        :rules="editTitleRules"
+        :model="treeSelectTitle"
+        label-width="auto"
+        style="max-width: 600px"
+      >
+        <el-form-item label="名称：" prop="label">
+          <el-input v-model="treeSelectTitle.label" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="pickEditClose">取消</el-button>
+          <el-button v-loading="butLoadEdit" type="primary" @click="pickEditIsTrue"
+            >确定</el-button
+          >
+        </div>
+      </template>
+    </el-dialog>
+  </el-drawer>
 </template>
-<style  lang='scss' scoped>
-#editJson, #editJsonCopy {
-    width: 100%;
-    height: calc(100vh - 90px);
+<style lang="scss" scoped>
+#editJson,
+#editJsonCopy {
+  width: 100%;
+  height: calc(100vh - 90px);
 }
 </style>
diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue
index 248f952..f75a530 100644
--- a/src/components/DesignForm/app/index.vue
+++ b/src/components/DesignForm/app/index.vue
@@ -113,6 +113,7 @@ const emits = defineEmits<{
   (e: "selectionChange", row: any): void;
   (e: "btnClick", btn: any, row?: any): void; // 列表上面及表格列表里添加删除按钮事件
 }>();
+const loadData = ref(false);
 const operState = ref<number>(1); //操作状态	1：新增；2：重新发起；3：申请修改；4：提交审批;5:普通表单修改
 const idList = ref<string[]>([]);
 const designStore = useDesignFormStore();
@@ -271,7 +272,7 @@ const selectionChange = (row: any) => {
 @ 功能: 获取表格头内容
 */
 const columnsFilter = computed(() => {
-  // console.log("props.data判断是否有标题",props.data)
+  console.log("props.data判断是否有标题", props.data);
   if (!state.columnsCheck?.length) {
     // console.log("props.data判断是否有标题",props.data)
     return props.data.columns;
@@ -631,6 +632,60 @@ const judjeRadio = (val: any, options: any[]) => {
   }
   return val;
 };
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-11-29 13:46:36
+@ 功能: 获取级联选择值
+*/
+const judjeCascader = (val: any[], options: any[]) => {
+  if (val.length < 0) return "";
+  let valAry = stringToObj(val);
+  console.log("获取级联选择值", stringToObj(val), val.length, options);
+  if (!Array.isArray(valAry)) return "";
+  let title = "";
+  valAry.forEach((item: any) => {
+    // console.log("item", item);
+
+    console.log(item + "=============:", item, diGuiJilian(item, options));
+    if (title == "") {
+      title = title + diGuiJilian(item, options);
+    } else {
+      title = title + " / " + diGuiJilian(item, options);
+    }
+  });
+  return title;
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-11-29 13:57:04
+@ 功能: 递归查询数据
+*/
+const diGuiJilian = (val: any, options: any[]) => {
+  if (!Array.isArray(options)) return "";
+  let dataVal = "";
+  options.forEach((item: any) => {
+    if (item.value == val) {
+      // console.log(val + "=======递归查询数据======:", item.value, item.label);
+      dataVal = item.label;
+      // return dataVal;
+      // return item.label;
+    }
+
+    if (item.children && item.children.length > 0) {
+      // console.log(
+      //   val + "=======递归查询数据====1==:",
+      //   item.children,
+      //   item.children.length
+      // );
+      let gdVal = diGuiJilian(val, item.children);
+      if (gdVal != "") {
+        dataVal = gdVal;
+      }
+    }
+  });
+  return dataVal;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-02 14:49:40
@@ -1091,6 +1146,7 @@ const transformOption = (val: string | number, type?: string) => {
           :data="tableDataList"
           @selection-change="selectionChange"
           table-layout="fixed"
+          v-loading="state.loading"
         >
           <template v-for="item in columnsFilter" :key="item.id || item.label">
             <el-table-column
@@ -1245,6 +1301,9 @@ const transformOption = (val: string | number, type?: string) => {
                 <!-- {{scope.row[scope.column.property]}}{{item}} -->
                 {{ scope.row[scope.column.property] }}
               </template>
+              <template v-if="item.fieldClass == 'cascader'" #default="scope">
+                {{ judjeCascader(scope.row[scope.column.property], item.options) }}
+              </template>
               <template v-if="item.fieldClass == 'radio'" #default="scope">
                 <!-- {{scope.row[scope.column.property]}}{{item}} -->
                 {{ judjeRadio(scope.row[scope.column.property], item.options) }}
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 1d439ad..158eff9 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -3,136 +3,134 @@
 @ 时间: 2024-06-13 08:43:17
 @ 备注: 表单控件（app）专用
 -->
-<script lang='ts' setup>
-import { reactive, computed, toRefs, ref, watch, inject } from 'vue'
-import { getRequest } from '@/api/DesignForm'
-import { useDesignFormStore } from '@/store/DesignForm/designForm'
-import validate from './validate'
-import validateText from './validateText'
-import validateInt from './validateInt'
-import { ValidateTextTypes } from '@/components/DesignForm/validateText'
-import { ElMessage } from 'element-plus'
-import { formatNumber } from '@/api/DesignForm/utils'
-import { PublicAtrr } from '@/api/DesignForm/types'
-    
-import { chineseToPinyin,customerFormGroupList } from '@/api/DesignForm/requestapi'
-import request from '@/utils/request';
-    
-    //数学计算公式编辑器
-import MathFormula from '@/components/DesignForm/math/mathFormula.vue'
-    
-import { uploadUrl } from '@/api/DesignForm'
-import { UploadFilled } from '@element-plus/icons-vue'
-import { UploadFile, UploadFiles } from 'element-plus/es/components/upload/src/upload';
-import type Node from 'element-plus/es/components/tree/src/model/node'
-    //样式布局
-import LayoutPage from '@/components/DesignForm/layoutPage/index.vue'
-
-import { Plus } from '@element-plus/icons-vue'
-
-import Draggable from 'vuedraggable-es'
-
-
-	
-    
-    
-const props = withDefaults(			//接收父级参数
-        defineProps<{
-          	formData: any
-          	formList: any
-          	formConfig: any
-          	formOtherData: any
-          	customerformid: number | string,
-		  	formInfo: any,
-			isEdit: boolean,
-			formField: any[],
-        }>(),
-        {
-          formConfig: () => {
-            return {}
-          },
-		  isEdit: () =>{
-			return false;
-		  },
-		  formField: () =>{
-			return [];
-		  },
-          formOtherData: () => {
-            // 其他不需要保存在formData里的数据
-            return {}
-          }
-        }
-)
-const mathBoxShow = ref(false)
-    //注册自定义事件
+<script lang="ts" setup>
+import { reactive, computed, toRefs, ref, watch, inject } from "vue";
+import { getRequest } from "@/api/DesignForm";
+import { useDesignFormStore } from "@/store/DesignForm/designForm";
+import validate from "./validate";
+import validateText from "./validateText";
+import validateInt from "./validateInt";
+import { ValidateTextTypes } from "@/components/DesignForm/validateText";
+import { ElMessage } from "element-plus";
+import { formatNumber } from "@/api/DesignForm/utils";
+import { PublicAtrr } from "@/api/DesignForm/types";
+
+import { chineseToPinyin, customerFormGroupList } from "@/api/DesignForm/requestapi";
+import request from "@/utils/request";
+
+//数学计算公式编辑器
+import MathFormula from "@/components/DesignForm/math/mathFormula.vue";
+
+import { uploadUrl } from "@/api/DesignForm";
+import { UploadFilled } from "@element-plus/icons-vue";
+import { UploadFile, UploadFiles } from "element-plus/es/components/upload/src/upload";
+import type Node from "element-plus/es/components/tree/src/model/node";
+//样式布局
+import LayoutPage from "@/components/DesignForm/layoutPage/index.vue";
+
+import { Plus } from "@element-plus/icons-vue";
+
+import Draggable from "vuedraggable-es";
+
+const props = withDefaults(
+  //接收父级参数
+  defineProps<{
+    formData: any;
+    formList: any;
+    formConfig: any;
+    formOtherData: any;
+    customerformid: number | string;
+    formInfo: any;
+    isEdit: boolean;
+    formField: any[];
+  }>(),
+  {
+    formConfig: () => {
+      return {};
+    },
+    isEdit: () => {
+      return false;
+    },
+    formField: () => {
+      return [];
+    },
+    formOtherData: () => {
+      // 其他不需要保存在formData里的数据
+      return {};
+    },
+  }
+);
+const mathBoxShow = ref(false);
+//注册自定义事件
 const emits = defineEmits<{
-        (e: 'openDialog', data: any): void
-        (e: 'update:formOtherData', data: any): void
-        (e: 'videoMsgChange', data: VideoMsg): void
-        (e: 'formNameChange', data: any): void
-        //(e: 'update:formData', data: any): void
-        //(e: 'update:formConfig', data: any): void
-}>()
-const { formConfig, formData } = toRefs(props)
-const store = useDesignFormStore() as any
+  (e: "openDialog", data: any): void;
+  (e: "update:formOtherData", data: any): void;
+  (e: "videoMsgChange", data: VideoMsg): void;
+  (e: "formNameChange", data: any): void;
+  //(e: 'update:formData', data: any): void
+  //(e: 'update:formConfig', data: any): void
+}>();
+const { formConfig, formData } = toRefs(props);
+const store = useDesignFormStore() as any;
 const controlData = computed(() => {
-        // console.log("注册自定义事件----------------->",props.formInfo)
-        // console.log("注册自定义事件--------1--------->",store.controlAttr)
-		// console.log("注册自定义事件---------3-------->",controlData.value.customRules)
-        return store.controlAttr
-})
-    //获取组件样式Demo
+  // console.log("注册自定义事件----------------->",props.formInfo)
+  // console.log("注册自定义事件--------1--------->",store.controlAttr)
+  // console.log("注册自定义事件---------3-------->",controlData.value.customRules)
+  return store.controlAttr;
+});
+//获取组件样式Demo
 const controlDataStyls = computed(() => {
-        return store.controlAttr.styles
-})
-    
-const dataSourceOption = ref([])
-const designType = inject('formDesignType')
+  return store.controlAttr.styles;
+});
+
+const dataSourceOption = ref([]);
+const designType = inject("formDesignType");
 const state = reactive({
-        dataSourceList: [],
-        customRulesList: [
-            ...validate,
-            {
-                type: 'rules',
-                label: '自定义正则'
-            },
-            {
-                type: 'methods',
-                label: '自定义方法'
-            }
-        ], // 自定义校验规则
-        isSearch: designType === 'search',
-        tooltip: {
-            css: '当前表单应用页的样式，类似于.vue文件中的style scoped中的样式',
-            dict: '数据字典，用于匹配多选组、下拉选择等，提供动态获取Options接口字典数据，一般不设置，从接口dict获取。json格式："sex":{"0":"男","1":"女"}',
-            rules:
-                "可参考UI组件表单校验，<a href='https://element-plus.gitee.io/zh-CN/component/form.html#%E8%A1%A8%E5%8D%95%E6%A0%A1%E9%AA%8C' target='_blank' style='color:red'>详情点击</a>",
-            props: '可添加当前组件所有prop属性及事件方法'
-        },
-        tabsName: 'second',
-        numberRulesList:[
-            {
-                type: 'time',
-                label: '时间',
-                msg:'请选择时间格式'
-            },
-            {
-                type: 'text',
-                label: '自定义字符',
-                msg:'请输入自定义字符'
-            },
-            {
-                type: 'serialnumber',
-                label: '流水序号',
-                msg:'流水号起始值'
-            },
-            {
-                type: 'randomnumber',
-                label: '随机数',
-                msg:'请输入随机数位数'
-            }
-        ]
-})
+  dataSourceList: [],
+  customRulesList: [
+    ...validate,
+    {
+      type: "rules",
+      label: "自定义正则",
+    },
+    {
+      type: "methods",
+      label: "自定义方法",
+    },
+  ], // 自定义校验规则
+  isSearch: designType === "search",
+  tooltip: {
+    css: "当前表单应用页的样式，类似于.vue文件中的style scoped中的样式",
+    dict:
+      '数据字典，用于匹配多选组、下拉选择等，提供动态获取Options接口字典数据，一般不设置，从接口dict获取。json格式："sex":{"0":"男","1":"女"}',
+    rules:
+      "可参考UI组件表单校验，<a href='https://element-plus.gitee.io/zh-CN/component/form.html#%E8%A1%A8%E5%8D%95%E6%A0%A1%E9%AA%8C' target='_blank' style='color:red'>详情点击</a>",
+    props: "可添加当前组件所有prop属性及事件方法",
+  },
+  tabsName: "second",
+  numberRulesList: [
+    {
+      type: "time",
+      label: "时间",
+      msg: "请选择时间格式",
+    },
+    {
+      type: "text",
+      label: "自定义字符",
+      msg: "请输入自定义字符",
+    },
+    {
+      type: "serialnumber",
+      label: "流水序号",
+      msg: "流水号起始值",
+    },
+    {
+      type: "randomnumber",
+      label: "随机数",
+      msg: "请输入随机数位数",
+    },
+  ],
+});
 
 /**
 @ 作者: 秦东
@@ -140,94 +138,88 @@ const state = reactive({
 @ 功能: 必填
 */
 const ValidateText = reactive<ValidateTextTypes>({
-	type: 'required',
-	label: '必填',
-	regExp: /^\s*$/,
-	message: '必填项',
-	checkbox: false
-})
+  type: "required",
+  label: "必填",
+  regExp: /^\s*$/,
+  message: "必填项",
+  checkbox: false,
+});
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-14 08:41:02
 @ 功能: 单选校验
 */
-const radioVerify = reactive<ValidateTextTypes>({})
-
-
-const textUinrVerfy = reactive([
-	...validateText
-])
-const numberUinrVerfy = reactive([
-	...validateInt
-])
+const radioVerify = reactive<ValidateTextTypes>({});
 
+const textUinrVerfy = reactive([...validateText]);
+const numberUinrVerfy = reactive([...validateInt]);
 
 const formAttr = computed(() => {
-	const isSearch = state.isSearch
-        return [
-            {
-                label: '表单名称',
-                placeholder: '用于保存的表单名称',
-                value: props.formOtherData.formName,
-                key: 'formName',
-                hide: isSearch
-            },
-            {
-                label: '数据源',
-                placeholder: '请选择数据源',
-                value: formatNumber(props.formOtherData.source),
-                type: 'select',
-                options: dataSourceOption.value,
-                key: 'source',
-                hide: isSearch || !dataSourceOption.value?.length,
-                clearable: true
-            },
-            {
-                label: '表单标识',
-                value: formData.value.name,
-                placeholder: '表单唯一标识，可为空',
-                key: 'name',
-                hide: isSearch
-            }
-            // {
-            // 	label: '表单标签宽度',
-            // 	value: formData.value.labelWidth,
-            // 	placeholder: '表单label宽，如180px',
-            // 	key: 'labelWidth'
-            // },
-            // {
-            // 	label: '表单样式名称',
-            // 	value: formData.value.class,
-            // 	placeholder: '额外添加的表单class类名',
-            // 	key: 'class',
-            // 	type: 'select',
-            // 	options: [
-            // 		{ label: '无样式', value: '',name:'',id:'' },
-            // 		{ label: '每行两列', value: 'form-row-2',name:'',id:'' },
-            // 		{ label: '每行三列', value: 'form-row-3',name:'',id:'' },
-            // 		{ label: '每行四列', value: 'form-row-4',name:'',id:'' }
-            // 	],
-            // 	hide: isSearch,
-            // 	clearable: true
-            // },
-            // {
-            // 	label: '字段名后添加冒号',
-            // 	value: formData.value.showColon,
-            // 	key: 'showColon',
-            // 	type: 'switch'
-            // },
-            // {
-            // 	label: '组件尺寸',
-            // 	value: formData.value.size,
-            // 	type: 'select',
-            // 	key: 'size',
-            // 	options: [
-            // 		{ label: 'large', value: 'large',name:'',id:'' },
-            // 		{ label: 'default', value: 'default',name:'',id:'' },
-            // 		{ label: 'small', value: 'small',name:'',id:'' }
-            // 	]
-            // }
-            /*{
+  const isSearch = state.isSearch;
+  return [
+    {
+      label: "表单名称",
+      placeholder: "用于保存的表单名称",
+      value: props.formOtherData.formName,
+      key: "formName",
+      hide: isSearch,
+    },
+    {
+      label: "数据源",
+      placeholder: "请选择数据源",
+      value: formatNumber(props.formOtherData.source),
+      type: "select",
+      options: dataSourceOption.value,
+      key: "source",
+      hide: isSearch || !dataSourceOption.value?.length,
+      clearable: true,
+    },
+    {
+      label: "表单标识",
+      value: formData.value.name,
+      placeholder: "表单唯一标识，可为空",
+      key: "name",
+      hide: isSearch,
+    },
+    // {
+    // 	label: '表单标签宽度',
+    // 	value: formData.value.labelWidth,
+    // 	placeholder: '表单label宽，如180px',
+    // 	key: 'labelWidth'
+    // },
+    // {
+    // 	label: '表单样式名称',
+    // 	value: formData.value.class,
+    // 	placeholder: '额外添加的表单class类名',
+    // 	key: 'class',
+    // 	type: 'select',
+    // 	options: [
+    // 		{ label: '无样式', value: '',name:'',id:'' },
+    // 		{ label: '每行两列', value: 'form-row-2',name:'',id:'' },
+    // 		{ label: '每行三列', value: 'form-row-3',name:'',id:'' },
+    // 		{ label: '每行四列', value: 'form-row-4',name:'',id:'' }
+    // 	],
+    // 	hide: isSearch,
+    // 	clearable: true
+    // },
+    // {
+    // 	label: '字段名后添加冒号',
+    // 	value: formData.value.showColon,
+    // 	key: 'showColon',
+    // 	type: 'switch'
+    // },
+    // {
+    // 	label: '组件尺寸',
+    // 	value: formData.value.size,
+    // 	type: 'select',
+    // 	key: 'size',
+    // 	options: [
+    // 		{ label: 'large', value: 'large',name:'',id:'' },
+    // 		{ label: 'default', value: 'default',name:'',id:'' },
+    // 		{ label: 'small', value: 'small',name:'',id:'' }
+    // 	]
+    // }
+    /*{
                 label: '筛选条件展开/收起',
                 value: formConfig.value.expand,
                 type: 'switch',
@@ -235,535 +227,544 @@ const formAttr = computed(() => {
                 key: 'expand',
                 hide: !isSearch
             }*/
-        ]
-})
+  ];
+});
 const attrList = computed(() => {
-    // console.log("controlData.value-1-->",controlData.value)
-    if (Object.keys(controlData.value).length) {
-        const {
-            control = {},
-            type,
-            name,
-            config = {},
-            item = {},
-            attr = {},
-            selectvalue = "default",
-            mathFormula = {},
-			unitName
-        }: { control: any;type:any;name:any;item:any;attr:any; config: any,selectvalue:any,mathFormula:any,unitName:any } = controlData.value
-        // console.log("controlData.value--->",controlData.value)
-        // console.log("controlData.value-1-->",unitName)
-        let columnIndex = false // 是否显示序号列
-        if (type === 'table') {
-            // 表格时处理
-            const list = controlData.value && controlData.value.list
-            if (list && list.length > 0) {
-                columnIndex = list[0].type === 'index'
-            }
+  // console.log("controlData.value-1-->",controlData.value)
+  if (Object.keys(controlData.value).length) {
+    const {
+      control = {},
+      type,
+      name,
+      config = {},
+      item = {},
+      attr = {},
+      selectvalue = "default",
+      mathFormula = {},
+      unitName,
+    }: {
+      control: any;
+      type: any;
+      name: any;
+      item: any;
+      attr: any;
+      config: any;
+      selectvalue: any;
+      mathFormula: any;
+      unitName: any;
+    } = controlData.value;
+    // console.log("controlData.value--->",controlData.value)
+    // console.log("controlData.value-1-->",unitName)
+    let columnIndex = false; // 是否显示序号列
+    if (type === "table") {
+      // 表格时处理
+      const list = controlData.value && controlData.value.list;
+      if (list && list.length > 0) {
+        columnIndex = list[0].type === "index";
+      }
+    }
+    //判断校验规则
+    // console.log("判断校验规则--->",typeof(controlData.value.customRules))
+    if (typeof controlData.value.customRules == "object") {
+      if (Array.isArray(controlData.value.customRules)) {
+        let otherPick = [];
+        controlData.value.customRules.forEach((item: any) => {
+          // console.log("判断校验规则-1-->",item)
+          if (item.type == ValidateText.type) {
+            ValidateText.checkbox = true;
+          } else {
+            otherPick.push(item);
+          }
+        });
+        if (otherPick.length > 0) {
+          otherPick.forEach((item: any) => {
+            radioVerify.type = item.type;
+            radioVerify.label = item.label;
+            radioVerify.regExp = item.regExp;
+            radioVerify.message = item.message;
+            radioVerify.checkbox = true;
+          });
         }
-		//判断校验规则
-		// console.log("判断校验规则--->",typeof(controlData.value.customRules))
-		if(typeof(controlData.value.customRules)=="object"){
-			if(Array.isArray(controlData.value.customRules)){
-				let otherPick = []
-				controlData.value.customRules.forEach((item:any)=>{
-					// console.log("判断校验规则-1-->",item)
-					if(item.type == ValidateText.type){
-						ValidateText.checkbox = true
-					}else{
-						otherPick.push(item)
-					}
-				})
-				if(otherPick.length > 0){
-					otherPick.forEach((item:any)=>{
-						radioVerify.type = item.type
-						radioVerify.label = item.label
-						radioVerify.regExp = item.regExp
-						radioVerify.message = item.message
-						radioVerify.checkbox = true
-					});
-				}
-			}
-		}else{
-			ValidateText.checkbox = false
-			radioVerify.type = ""
-		}
-            
-        	const temp =reactive<PublicAtrr[]>([
-				{
-                    label: '标签名称',
-                    value: item.label,
-                    path: 'item.label',
-                    vHide: [
-                        'table',
-                        'grid',
-                        'tabs',
-                        'title',
-                        'gridChild',
-                        'div',
-                        'inputSlot',
-                        'flex',
-                        'button',
-                        'txt'
-                    ],
-                    eventName: 'labelNameVal'
-                },
-				{
-                    label: '组件类型',
-                    value: unitName,
-                    placeholder: '组件类型',
-                    path: 'unitName'
-                },
-                // {
-                //     label: '自定义Class',
-                //     value: config.className,
-                //     placeholder: '样式类名',
-                //     path: 'config.className'
-                // },
-                {
-                    label: '字段标识',
-                    value: name,
-                    type:
-                        Object.keys(state.dataSourceList).length > 0 ? 'select' : 'text',
-                    placeholder: '字段唯一标识，对应数据库',
-                    dict: state.dataSourceList,
-                    path: 'name',
-                    vHide: [
-                        'grid',
-                        'tabs',
-                        'card',
-                        'title',
-                        'gridChild',
-                        'tableColumn',
-                        'divider',
-                        'txt',
-                        'div',
-                        'button'
-                    ],
-                    eventName: 'filedNameKey'
-                },
-                {
-                    label: '占位内容',
-                    value: control.placeholder,
-                    placeholder: 'placeholder',
-                    path: 'control.placeholder',
-                    vShow: [
-                        'password',
-                        'input',
-                        'textarea',
-                        'select',
-                        'date',
-                        'number',
-                        'datePicker',
-                        'tinymce',
-                        'timePicker',
-                        'treeSelect',
-						'digitpage'
-                    ]
-                },
-				{
-                    label: '帮助信息',
-                    value: config.help,
-                    path: 'config.help',
-                    vHide: [
-                        'table',
-                        'grid',
-                        'tabs',
-                        'gridChild',
-                        'divider',
-                        'div',
-                        'inputSlot',
-                        'flex',
-                        'button',
-                        'txt'
-                    ]
-                },
-                {
-                    label: '按钮类型',
-                    value: control.type,
-                    path: 'control.type',
-                    type: 'select',
-                    dict: {
-                        primary: 'primary',
-                        success: 'success',
-                        info: 'info',
-                        warning: 'warning',
-                        danger: 'danger'
-                    },
-                    vShow: ['button'],
-                    clearable: true
-                },
-                {
-                    label: '按钮名称',
-                    value: control.label,
-                    path: 'control.label',
-                    vShow: ['button']
-                },
-                {
-                    label: '按钮事件',
-                    value: control.key,
-                    path: 'control.key',
-                    type: 'select',
-                    dict: {
-                        submit: '提交表单',
-                        reset: '重置表单',
-                        cancel: '取消返回',
-                        none: '无动作(自定义)'
-                    },
-                    vShow: ['button']
-                },
-                {
-                    label: '对齐方式',
-                    value: config.textAlign,
-                    path: 'config.textAlign',
-                    type: 'select',
-                    dict: {
-                        left: 'left',
-                        right: 'right',
-                        center: 'center'
-                    },
-                    vShow: ['button', 'div']
-                },
-                
-                {
-                    label: '隐藏标签',
-                    value: item.showLabel,
-                    path: 'item.showLabel',
-                    type: 'switch',
-                    vHide: [
-                        'table',
-                        'grid',
-                        'tabs',
-                        'title',
-                        'gridChild',
-                        'divider',
-                        'card',
-                        'div',
-                        'inputSlot',
-                        'flex',
-                        'button',
-                        'txt'
-                    ]
-                },
-                
-                {
-                    label: '表单栅格',
-                    value: config.span,
-                    placeholder: '表单区域栅格宽，0为自动宽',
-                    path: 'config.span',
-                    vHide: ['gridChild'],
-                    isNum: true
-                },
-                /*{
+      }
+    } else {
+      ValidateText.checkbox = false;
+      radioVerify.type = "";
+    }
+
+    const temp = reactive<PublicAtrr[]>([
+      {
+        label: "标签名称",
+        value: item.label,
+        path: "item.label",
+        vHide: [
+          "table",
+          "grid",
+          "tabs",
+          "title",
+          "gridChild",
+          "div",
+          "inputSlot",
+          "flex",
+          "button",
+          "txt",
+        ],
+        eventName: "labelNameVal",
+      },
+      {
+        label: "组件类型",
+        value: unitName,
+        placeholder: "组件类型",
+        path: "unitName",
+      },
+      // {
+      //     label: '自定义Class',
+      //     value: config.className,
+      //     placeholder: '样式类名',
+      //     path: 'config.className'
+      // },
+      {
+        label: "字段标识",
+        value: name,
+        type: Object.keys(state.dataSourceList).length > 0 ? "select" : "text",
+        placeholder: "字段唯一标识，对应数据库",
+        dict: state.dataSourceList,
+        path: "name",
+        vHide: [
+          "grid",
+          "tabs",
+          "card",
+          "title",
+          "gridChild",
+          "tableColumn",
+          "divider",
+          "txt",
+          "div",
+          "button",
+        ],
+        eventName: "filedNameKey",
+      },
+      {
+        label: "占位内容",
+        value: control.placeholder,
+        placeholder: "placeholder",
+        path: "control.placeholder",
+        vShow: [
+          "password",
+          "input",
+          "textarea",
+          "select",
+          "date",
+          "number",
+          "datePicker",
+          "tinymce",
+          "timePicker",
+          "treeSelect",
+          "digitpage",
+        ],
+      },
+      {
+        label: "帮助信息",
+        value: config.help,
+        path: "config.help",
+        vHide: [
+          "table",
+          "grid",
+          "tabs",
+          "gridChild",
+          "divider",
+          "div",
+          "inputSlot",
+          "flex",
+          "button",
+          "txt",
+        ],
+      },
+      {
+        label: "按钮类型",
+        value: control.type,
+        path: "control.type",
+        type: "select",
+        dict: {
+          primary: "primary",
+          success: "success",
+          info: "info",
+          warning: "warning",
+          danger: "danger",
+        },
+        vShow: ["button"],
+        clearable: true,
+      },
+      {
+        label: "按钮名称",
+        value: control.label,
+        path: "control.label",
+        vShow: ["button"],
+      },
+      {
+        label: "按钮事件",
+        value: control.key,
+        path: "control.key",
+        type: "select",
+        dict: {
+          submit: "提交表单",
+          reset: "重置表单",
+          cancel: "取消返回",
+          none: "无动作(自定义)",
+        },
+        vShow: ["button"],
+      },
+      {
+        label: "对齐方式",
+        value: config.textAlign,
+        path: "config.textAlign",
+        type: "select",
+        dict: {
+          left: "left",
+          right: "right",
+          center: "center",
+        },
+        vShow: ["button", "div"],
+      },
+
+      {
+        label: "隐藏标签",
+        value: item.showLabel,
+        path: "item.showLabel",
+        type: "switch",
+        vHide: [
+          "table",
+          "grid",
+          "tabs",
+          "title",
+          "gridChild",
+          "divider",
+          "card",
+          "div",
+          "inputSlot",
+          "flex",
+          "button",
+          "txt",
+        ],
+      },
+
+      {
+        label: "表单栅格",
+        value: config.span,
+        placeholder: "表单区域栅格宽，0为自动宽",
+        path: "config.span",
+        vHide: ["gridChild"],
+        isNum: true,
+      },
+      /*{
                 label: '行类样式',
                 value: config.inline,
                 type: 'switch',
                 path: 'config.inline',
                 vShow: ['div']
                 },*/
-                {
-                    label: '文本值',
-                    value: control.modelValue,
-                    placeholder: '支持html',
-                    path: 'control.modelValue',
-                    vShow: ['txt'],
-                    inputStyle: 'textarea'
-                },
-                {
-                    label: '设为密码',
-                    value: type,
-                    type: 'select',
-                    dict: { input: '文本', password: '密码' },
-                    path: 'type',
-                    vShow: ['input', 'password'],
-                    vIf: state.isSearch // 搜索模式下隐藏 为true
-                },
-                {
-                    label: '文本域高度',
-                    value: control.rows,
-                    placeholder: '输入框行数',
-                    path: 'control.rows',
-                    vShow: ['textarea'],
-                    isNum: true
-                },
-                {
-                    label: '前缀',
-                    value: config.prepend,
-                    placeholder: '文本前缀',
-                    path: 'config.prepend',
-                    vShow: ['input', 'password']
-                },
-                {
-                    label: '后缀',
-                    value: config.append,
-                    placeholder: '文本后缀',
-                    path: 'config.append',
-                    vShow: ['input', 'password']
-                },
-                // {
-                //     label: '状态打开时的值',
-                //     value: control.activeValue,
-                //     placeholder: '状态打开时的值',
-                //     path: 'control.activeValue',
-                //     vShow: ['switch'],
-                //     isNum: true
-                // },
-                // {
-                //     label: '状态关闭时的值',
-                //     value: control.inactiveValue,
-                //     placeholder: '状态关闭时的值',
-                //     path: 'control.inactiveValue',
-                //     vShow: ['switch'],
-                //     isNum: true
-                // },
-                // {
-                //   label: '转换格式化值',
-                //   value: config.transform,
-                //   path: 'config.transform',
-                //   type: 'switch',
-                //   vShow: [
-                //     'checkbox',
-                //     'select',
-                //     'switch',
-                //     'cascader',
-                //     'slider',
-                //     'table',
-                //     'flex',
-                //     'treeSelect'
-                //   ]
-                // },
-                {
-                    label: '增加按钮文案',
-                    value: config.addBtnText,
-                    path: 'config.addBtnText',
-                    type: 'text',
-                    vShow: ['flex', 'table']
-                },
-                {
-                    label: '删除按钮文案',
-                    value: config.delBtnText,
-                    path: 'config.delBtnText',
-                    type: 'text',
-                    vShow: ['flex', 'table']
-                },
-                {
-                    label: '是否多选',
-                    value: control.multiple,
-                    path: 'control.multiple',
-                    type: 'switch',
-                    vShow: ['select', 'treeSelect'],
-                    eventName: 'selectMultiple'
-                },
-                {
-                    label: '可清空',
-                    value: control.clearable,
-                    path: 'control.clearable',
-                    type: 'switch',
-                    vShow: ['select']
-                },
-                // {
-                //     label: '是否禁用',
-                //     value: control.disabled,
-                //     path: 'control.disabled',
-                //     type: 'switch',
-                //     vShow: [
-                //         'input',
-                //         'password',
-                //         'textarea',
-                //         'radio',
-                //         'checkbox',
-                //         'select',
-                //         'date',
-                //         'switch',
-                //         'number',
-                //         'cascader',
-                //         'upload',
-                //         'rate',
-                //         'tinymce',
-                //         'treeSelect'
-                //     ],
-                //     vIf: state.isSearch
-                // },
-                // {
-                //     label: '是否禁用编辑',
-                //     value: config.editDisabled,
-                //     path: 'config.editDisabled',
-                //     type: 'switch',
-                //     vShow: [
-                //         'input',
-                //         'password',
-                //         'textarea',
-                //         'radio',
-                //         'checkbox',
-                //         'select',
-                //         'date',
-                //         'switch',
-                //         'number',
-                //         'cascader',
-                //         'upload',
-                //         'treeSelect',
-                //         'table',
-                //         'flex'
-                //     ],
-                //     vIf: state.isSearch
-                // },
-                // {
-                //     label: '添加页隐藏',
-                //     value: config.disabledAdd,
-                //     path: 'config.disabledAdd',
-                //     type: 'switch',
-                //     vIf: state.isSearch,
-                //     vHide: ['inputSlot']
-                // },
-                // {
-                //     label: '编辑页隐藏',
-                //     value: config.disabledEdit,
-                //     path: 'config.disabledEdit',
-                //     type: 'switch',
-                //     vIf: state.isSearch,
-                //     vHide: ['inputSlot']
-                // },
-                // {
-                //     label: '详情页隐藏',
-                //     value: config.disabledDetail,
-                //     path: 'config.disabledDetail',
-                //     type: 'switch',
-                //     vIf: state.isSearch,
-                //     vHide: ['inputSlot']
-                // },
-                {
-                    label: '设为Input输入框的前/后缀',
-                    value: type === 'inputSlot',
-                    path: '',
-                    type: 'switch',
-                    vShow: ['select', 'inputSlot'],
-                    eventName: 'setInputSlot'
-                },
-                {
-                    label: '标题',
-                    value: control.modelValue,
-                    path: 'control.modelValue',
-                    vShow: ['title']
-                },
-                {
-                    label: '占据的列数span',
-                    value: attr.span,
-                    path: 'attr.span',
-                    vShow: ['gridChild'],
-                    eventName: 'formatNumber',
-                    isNum: true
-                },
-                {
-                    label: '左侧的间隔格数offset',
-                    value: attr.offset,
-                    path: 'attr.offset',
-                    vShow: ['gridChild'],
-                    eventName: 'formatNumber',
-                    isNum: true
-                },
-                {
-                    label: '向右移动格数push',
-                    value: attr.push,
-                    path: 'attr.push',
-                    vShow: ['gridChild'],
-                    eventName: 'formatNumber',
-                    isNum: true
-                },
-                {
-                    label: '向左移动格数pull',
-                    value: attr.pull,
-                    path: 'attr.pull',
-                    vShow: ['gridChild'],
-                    eventName: 'formatNumber',
-                    isNum: true
-                },
-                {
-                    label: '序号列',
-                    value: columnIndex,
-                    type: 'switch',
-                    vShow: ['table'],
-                    eventName: 'tableColumn1'
-                },
-                /*{
+      {
+        label: "文本值",
+        value: control.modelValue,
+        placeholder: "支持html",
+        path: "control.modelValue",
+        vShow: ["txt"],
+        inputStyle: "textarea",
+      },
+      {
+        label: "设为密码",
+        value: type,
+        type: "select",
+        dict: { input: "文本", password: "密码" },
+        path: "type",
+        vShow: ["input", "password"],
+        vIf: state.isSearch, // 搜索模式下隐藏 为true
+      },
+      {
+        label: "文本域高度",
+        value: control.rows,
+        placeholder: "输入框行数",
+        path: "control.rows",
+        vShow: ["textarea"],
+        isNum: true,
+      },
+      {
+        label: "前缀",
+        value: config.prepend,
+        placeholder: "文本前缀",
+        path: "config.prepend",
+        vShow: ["input", "password"],
+      },
+      {
+        label: "后缀",
+        value: config.append,
+        placeholder: "文本后缀",
+        path: "config.append",
+        vShow: ["input", "password"],
+      },
+      // {
+      //     label: '状态打开时的值',
+      //     value: control.activeValue,
+      //     placeholder: '状态打开时的值',
+      //     path: 'control.activeValue',
+      //     vShow: ['switch'],
+      //     isNum: true
+      // },
+      // {
+      //     label: '状态关闭时的值',
+      //     value: control.inactiveValue,
+      //     placeholder: '状态关闭时的值',
+      //     path: 'control.inactiveValue',
+      //     vShow: ['switch'],
+      //     isNum: true
+      // },
+      // {
+      //   label: '转换格式化值',
+      //   value: config.transform,
+      //   path: 'config.transform',
+      //   type: 'switch',
+      //   vShow: [
+      //     'checkbox',
+      //     'select',
+      //     'switch',
+      //     'cascader',
+      //     'slider',
+      //     'table',
+      //     'flex',
+      //     'treeSelect'
+      //   ]
+      // },
+      {
+        label: "增加按钮文案",
+        value: config.addBtnText,
+        path: "config.addBtnText",
+        type: "text",
+        vShow: ["flex", "table"],
+      },
+      {
+        label: "删除按钮文案",
+        value: config.delBtnText,
+        path: "config.delBtnText",
+        type: "text",
+        vShow: ["flex", "table"],
+      },
+      {
+        label: "是否多选",
+        value: control.multiple,
+        path: "control.multiple",
+        type: "switch",
+        vShow: ["select", "treeSelect"],
+        eventName: "selectMultiple",
+      },
+      {
+        label: "可清空",
+        value: control.clearable,
+        path: "control.clearable",
+        type: "switch",
+        vShow: ["select"],
+      },
+      // {
+      //     label: '是否禁用',
+      //     value: control.disabled,
+      //     path: 'control.disabled',
+      //     type: 'switch',
+      //     vShow: [
+      //         'input',
+      //         'password',
+      //         'textarea',
+      //         'radio',
+      //         'checkbox',
+      //         'select',
+      //         'date',
+      //         'switch',
+      //         'number',
+      //         'cascader',
+      //         'upload',
+      //         'rate',
+      //         'tinymce',
+      //         'treeSelect'
+      //     ],
+      //     vIf: state.isSearch
+      // },
+      // {
+      //     label: '是否禁用编辑',
+      //     value: config.editDisabled,
+      //     path: 'config.editDisabled',
+      //     type: 'switch',
+      //     vShow: [
+      //         'input',
+      //         'password',
+      //         'textarea',
+      //         'radio',
+      //         'checkbox',
+      //         'select',
+      //         'date',
+      //         'switch',
+      //         'number',
+      //         'cascader',
+      //         'upload',
+      //         'treeSelect',
+      //         'table',
+      //         'flex'
+      //     ],
+      //     vIf: state.isSearch
+      // },
+      // {
+      //     label: '添加页隐藏',
+      //     value: config.disabledAdd,
+      //     path: 'config.disabledAdd',
+      //     type: 'switch',
+      //     vIf: state.isSearch,
+      //     vHide: ['inputSlot']
+      // },
+      // {
+      //     label: '编辑页隐藏',
+      //     value: config.disabledEdit,
+      //     path: 'config.disabledEdit',
+      //     type: 'switch',
+      //     vIf: state.isSearch,
+      //     vHide: ['inputSlot']
+      // },
+      // {
+      //     label: '详情页隐藏',
+      //     value: config.disabledDetail,
+      //     path: 'config.disabledDetail',
+      //     type: 'switch',
+      //     vIf: state.isSearch,
+      //     vHide: ['inputSlot']
+      // },
+      {
+        label: "设为Input输入框的前/后缀",
+        value: type === "inputSlot",
+        path: "",
+        type: "switch",
+        vShow: ["select", "inputSlot"],
+        eventName: "setInputSlot",
+      },
+      {
+        label: "标题",
+        value: control.modelValue,
+        path: "control.modelValue",
+        vShow: ["title"],
+      },
+      {
+        label: "占据的列数span",
+        value: attr.span,
+        path: "attr.span",
+        vShow: ["gridChild"],
+        eventName: "formatNumber",
+        isNum: true,
+      },
+      {
+        label: "左侧的间隔格数offset",
+        value: attr.offset,
+        path: "attr.offset",
+        vShow: ["gridChild"],
+        eventName: "formatNumber",
+        isNum: true,
+      },
+      {
+        label: "向右移动格数push",
+        value: attr.push,
+        path: "attr.push",
+        vShow: ["gridChild"],
+        eventName: "formatNumber",
+        isNum: true,
+      },
+      {
+        label: "向左移动格数pull",
+        value: attr.pull,
+        path: "attr.pull",
+        vShow: ["gridChild"],
+        eventName: "formatNumber",
+        isNum: true,
+      },
+      {
+        label: "序号列",
+        value: columnIndex,
+        type: "switch",
+        vShow: ["table"],
+        eventName: "tableColumn1",
+      },
+      /*{
                     label: '操作列',
                     value: columnOperate,
                     type: 'switch',
                     vShow: ['table'],
                     eventName: 'tableColumn2'
                 },*/
-                {
-                    label: '组件名',
-                    value: config.componentName,
-                    placeholder: '全局注册的组件名称',
-                    path: 'config.componentName',
-                    vShow: ['component']
-                },
-                {
-					label: '关联表单',
-					value: config.associatedForms,
-					path: 'config.associatedForms',
-					type: 'associatedForms_form',
-					vIf: state.isSearch,
-					vShow: ['associatedForms']
-				},
-				{
-					label: '隐藏条件',
-					value: config.associatedForms,
-					path: 'config.associatedForms',
-					type: 'associatedForms_hide',
-					vIf: state.isSearch,
-					vShow: ['associatedForms']
-				},
-                {
-					label: '数据范围',
-					value: config.associatedForms,
-					path: 'config.associatedForms',
-					type: 'associatedForms_dataRange',
-					vIf: state.isSearch,
-					vShow: ['associatedForms']
-				},
-                {
-					label: '数据填充规则',
-					value: config.associatedForms,
-					path: 'config.associatedForms',
-					type: 'associatedForms_FillRoles',
-					vIf: state.isSearch,
-					vShow: ['associatedForms']
-				},
-                {
-                    label: '轮播图设置',
-                    value: config.carousel,
-                    path: 'config.carousel',
-                    type: 'carousel',
-                    vIf: state.isSearch,
-                    vShow: ['lowcodeCarsusel']
-                },
-
-				{
-					label: '穿梭框名',
-					value: config.transfer,
-					path: 'config.transfer',
-					type: 'transfer_name',
-					vIf: state.isSearch,
-					vShow: ['lowcodeTransfer']
-				},
-				{
-					label: '选项数据源',
-					value: config.transfer,
-					path: 'config.transfer',
-					type: 'transfer_options_datasource',
-					vIf: state.isSearch,
-					vShow: ['lowcodeTransfer']
-				},
-                {
-                    label: '上传视频',
-                    value: config.uploadvideo,
-                    path: 'config.uploadvideo',
-                    type: 'uploadvideo_url',
-                    vIf: state.isSearch,
-                    vShow: ['videoUpAndPlay']
-                },
-				/* {
+      {
+        label: "组件名",
+        value: config.componentName,
+        placeholder: "全局注册的组件名称",
+        path: "config.componentName",
+        vShow: ["component"],
+      },
+      {
+        label: "关联表单",
+        value: config.associatedForms,
+        path: "config.associatedForms",
+        type: "associatedForms_form",
+        vIf: state.isSearch,
+        vShow: ["associatedForms"],
+      },
+      {
+        label: "隐藏条件",
+        value: config.associatedForms,
+        path: "config.associatedForms",
+        type: "associatedForms_hide",
+        vIf: state.isSearch,
+        vShow: ["associatedForms"],
+      },
+      {
+        label: "数据范围",
+        value: config.associatedForms,
+        path: "config.associatedForms",
+        type: "associatedForms_dataRange",
+        vIf: state.isSearch,
+        vShow: ["associatedForms"],
+      },
+      {
+        label: "数据填充规则",
+        value: config.associatedForms,
+        path: "config.associatedForms",
+        type: "associatedForms_FillRoles",
+        vIf: state.isSearch,
+        vShow: ["associatedForms"],
+      },
+      {
+        label: "轮播图设置",
+        value: config.carousel,
+        path: "config.carousel",
+        type: "carousel",
+        vIf: state.isSearch,
+        vShow: ["lowcodeCarsusel"],
+      },
+
+      {
+        label: "穿梭框名",
+        value: config.transfer,
+        path: "config.transfer",
+        type: "transfer_name",
+        vIf: state.isSearch,
+        vShow: ["lowcodeTransfer"],
+      },
+      {
+        label: "选项数据源",
+        value: config.transfer,
+        path: "config.transfer",
+        type: "transfer_options_datasource",
+        vIf: state.isSearch,
+        vShow: ["lowcodeTransfer"],
+      },
+      {
+        label: "上传视频",
+        value: config.uploadvideo,
+        path: "config.uploadvideo",
+        type: "uploadvideo_url",
+        vIf: state.isSearch,
+        vShow: ["videoUpAndPlay"],
+      },
+      /* {
 					label: '上传图片',
 					value: config.lowcodeImage,
 					path: 'config.lowcodeImage',
@@ -819,15 +820,15 @@ const attrList = computed(() => {
 					vIf: state.isSearch,
 					vShow: ['lowcodeImage']
 				}, */
-				// {
-				// 	label: '内外四边距',
-				// 	value: config.lowcodeImage,
-				// 	path: 'config.lowcodeImage',
-				// 	type: 'lowcodeImage_marginAndPadding',
-				// 	vIf: state.isSearch,
-				// 	vShow: ['lowcodeImage']
-				// },
-                /* {
+      // {
+      // 	label: '内外四边距',
+      // 	value: config.lowcodeImage,
+      // 	path: 'config.lowcodeImage',
+      // 	type: 'lowcodeImage_marginAndPadding',
+      // 	vIf: state.isSearch,
+      // 	vShow: ['lowcodeImage']
+      // },
+      /* {
                     label: '上传视频封面',
                     value: config.uploadvideo,
                     path: 'config.uploadvideo',
@@ -835,2414 +836,2499 @@ const attrList = computed(() => {
                     vIf: state.isSearch,
                     vShow: ['videoUpAndPlay']
                 }, */
-                {
-                    label: '视频宽度(像素)',
-                    value: config.uploadvideo,
-                    path: 'config.uploadvideo',
-                    type: 'uploadvideo_width',
-                    vIf: state.isSearch,
-                    vShow: ['videoUpAndPlay']
-                },
-                {
-                    label: '视频高度(像素)',
-                    value: config.uploadvideo,
-                    path: 'config.uploadvideo',
-                    type: 'uploadvideo_height',
-                    vIf: state.isSearch,
-                    vShow: ['videoUpAndPlay']
-                },
-                {
-                    label: '视频自动播放',
-                    value: config.uploadvideo,
-                    path: 'config.uploadvideo',
-                    type: 'uploadvideo_autoPlay',
-                    vIf: state.isSearch,
-                    vShow: ['videoUpAndPlay']
-                },
-                {
-                    label: '视频循环播放',
-                    value: config.uploadvideo,
-                    path: 'config.uploadvideo',
-                    type: 'uploadvideo_loopPlay',
-                    vIf: state.isSearch,
-                    vShow: ['videoUpAndPlay']
-                },
-                {
-                    label: '上传地址',
-                    value: control.action,
-                    placeholder: '图片/文件上传地址,可不填有默认值',
-                    path: 'control.action',
-                    vShow: ['upload']
-                },
-                {
-                    label: '文件字段名',
-                    value: control.name,
-                    placeholder: '上传的文件字段名,默认file',
-                    path: 'control.name',
-                    vShow: ['upload']
-                },
-                {
-                    label: '列表类型',
-                    value: control.listType,
-                    type: 'select',
-                    dict: {
-                        text: 'text',
-                        picture: 'picture',
-                        'picture-card': 'picture-card'
-                    },
-                    path: 'control.listType',
-                    vShow: ['upload']
-                },
-                {
-                    label: '提示文字',
-                    value: config.tip,
-                    placeholder: '提示说明文字',
-                    path: 'config.tip',
-                    vShow: ['upload']
-                },
-                {
-                    label: '按钮文本',
-                    value: config.btnText,
-                    placeholder: '上传按钮文本',
-                    path: 'config.btnText',
-                    vShow: ['upload']
-                },
-                {
-                    label: '分割线方向',
-                    type: 'select',
-                    dict: { horizontal: 'horizontal', vertical: 'vertical' },
-                    placeholder: '分割线方向，默认horizontal',
-                    value: control.direction,
-                    path: 'control.direction',
-                    vShow: ['divider']
-                },
-                {
-                    label: '分隔符样式',
-                    placeholder: '分隔符样式，默认solid',
-                    value: control.borderStyle,
-                    path: 'control.borderStyle',
-                    vShow: ['divider']
-                },
-                {
-                    label: '文字方位',
-                    type: 'select',
-                    dict: { left: 'left', right: 'right', center: 'center' },
-                    value: control.contentPosition,
-                    path: 'control.contentPosition',
-                    vShow: ['divider']
-                },
-                {
-                    label: '最小值',
-                    value: control.min,
-                    path: 'control.min',
-                    vShow: ['slider'],
-                    eventName: 'formatNumber',
-                    isNum: true
-                },
-                {
-                    label: '最大值',
-                    value: control.max,
-                    path: 'control.max',
-                    vShow: ['rate', 'slider'],
-                    eventName: 'formatNumber',
-                    isNum: true
-                },
-                {
-                    label: '步长',
-                    value: control.step,
-                    path: 'control.step',
-                    vShow: ['slider'],
-                    eventName: 'formatNumber',
-                    isNum: true
-                },
-                {
-                    label: '显示类型',
-                    value: control.type,
-                    path: 'control.type',
-                    vShow: ['datePicker'],
-                    type: 'select',
-                    placeholder: '显示类型',
-                    dict: {
-                        year: '年',
-						month: '月',
-						date: '日期',
-						datetime: '日期+时间',
-						week: '周',
-						datetimerange: '开始日期时间至结束日期时间',
-						daterange: '开始日期至结束日期',
-						monthrange: '开始月至结束月'
-                    }
-                },
-                {
-                    label: '时间格式',
-                    value: control.format,
-                    path: 'control.format',
-                    vShow: ['datePicker', 'timePicker'],
-                    placeholder: '显示在输入框中的格式'
-                },
-                {
-                    label: 'color-format',
-                    value: control.colorFormat,
-                    path: 'control.colorFormat',
-                    type: 'select',
-                    placeholder: '写入 v-model 的颜色的格式',
-                    dict: { hsl: 'hsl', hsv: 'hsv', hex: 'hex', rgb: 'rgb' },
-                    vShow: ['colorPicker']
-                },
-                {
-                    label: '文本高度',
-                    value: control.height,
-                    path: 'control.height',
-                    placeholder: '文本高度(预览查看效果)',
-                    vShow: ['tinymce']
-                },
-                {
-                    label: '文本宽度',
-                    value: control.width,
-                    path: 'control.width',
-                    placeholder: '文本宽度(预览查看效果)',
-                    vShow: ['tinymce']
-                },
-                {
-                    label: '图片上传地址',
-                    value: control.imgUrl,
-                    path: 'control.imgUrl',
-                    placeholder: '图片上传地址',
-                    vShow: ['tinymce']
-                },
-                {
-                    label: '附件上传地址',
-                    value: control.blobUrl,
-                    path: 'control.blobUrl',
-                    placeholder: '附件上传地址',
-                    vShow: ['tinymce']
-                },
-                {
-                    label: '显示模式',
-                    value: config.style,
-                    path: 'config.style',
-                    placeholder: '显示风格(预览查看效果)',
-                    type: 'select',
-                    dict: { default: 'default', simple: 'simple' },
-                    vShow: ['tinymce']
-                },
-                {
-                    label: '默认值',
-                    value: control.mathsValue,
-                    selectvalue: selectvalue,
-                    path: 'control.mathsValue',
-                    placeholder: '显示风格(预览查看效果)',
-                    type: 'digitpage',
-                    dict: { default: '自定义', simple: '编辑公式' },
-                    vShow: ['digitpage'],
-                    control:control
-                }
-        ])
-            // 过滤显示对应的值
-        return temp.filter((item: any) => {
-			// console.log("过滤显示对应的值--->",item)
-			// console.log("过滤显示对应的值-1-->",type)
-                let hasFilter = true
-                if (item.vShow) {
-                    hasFilter = item.vShow.includes(type)
-                }
-                if (item.vHide) {
-                    hasFilter = !item.vHide.includes(type)
-                }
-                if (item.vIf) {
-                // 不显示vif＝true的
-                    hasFilter = false
-                }
-                return hasFilter
-        })
-    } else {
-    	return []
-    }
-})
+      {
+        label: "视频宽度(像素)",
+        value: config.uploadvideo,
+        path: "config.uploadvideo",
+        type: "uploadvideo_width",
+        vIf: state.isSearch,
+        vShow: ["videoUpAndPlay"],
+      },
+      {
+        label: "视频高度(像素)",
+        value: config.uploadvideo,
+        path: "config.uploadvideo",
+        type: "uploadvideo_height",
+        vIf: state.isSearch,
+        vShow: ["videoUpAndPlay"],
+      },
+      {
+        label: "视频自动播放",
+        value: config.uploadvideo,
+        path: "config.uploadvideo",
+        type: "uploadvideo_autoPlay",
+        vIf: state.isSearch,
+        vShow: ["videoUpAndPlay"],
+      },
+      {
+        label: "视频循环播放",
+        value: config.uploadvideo,
+        path: "config.uploadvideo",
+        type: "uploadvideo_loopPlay",
+        vIf: state.isSearch,
+        vShow: ["videoUpAndPlay"],
+      },
+      {
+        label: "上传地址",
+        value: control.action,
+        placeholder: "图片/文件上传地址,可不填有默认值",
+        path: "control.action",
+        vShow: ["upload"],
+      },
+      {
+        label: "文件字段名",
+        value: control.name,
+        placeholder: "上传的文件字段名,默认file",
+        path: "control.name",
+        vShow: ["upload"],
+      },
+      {
+        label: "列表类型",
+        value: control.listType,
+        type: "select",
+        dict: {
+          text: "text",
+          picture: "picture",
+          "picture-card": "picture-card",
+        },
+        path: "control.listType",
+        vShow: ["upload"],
+      },
+      {
+        label: "提示文字",
+        value: config.tip,
+        placeholder: "提示说明文字",
+        path: "config.tip",
+        vShow: ["upload"],
+      },
+      {
+        label: "按钮文本",
+        value: config.btnText,
+        placeholder: "上传按钮文本",
+        path: "config.btnText",
+        vShow: ["upload"],
+      },
+      {
+        label: "分割线方向",
+        type: "select",
+        dict: { horizontal: "horizontal", vertical: "vertical" },
+        placeholder: "分割线方向，默认horizontal",
+        value: control.direction,
+        path: "control.direction",
+        vShow: ["divider"],
+      },
+      {
+        label: "分隔符样式",
+        placeholder: "分隔符样式，默认solid",
+        value: control.borderStyle,
+        path: "control.borderStyle",
+        vShow: ["divider"],
+      },
+      {
+        label: "文字方位",
+        type: "select",
+        dict: { left: "left", right: "right", center: "center" },
+        value: control.contentPosition,
+        path: "control.contentPosition",
+        vShow: ["divider"],
+      },
+      {
+        label: "最小值",
+        value: control.min,
+        path: "control.min",
+        vShow: ["slider"],
+        eventName: "formatNumber",
+        isNum: true,
+      },
+      {
+        label: "最大值",
+        value: control.max,
+        path: "control.max",
+        vShow: ["rate", "slider"],
+        eventName: "formatNumber",
+        isNum: true,
+      },
+      {
+        label: "步长",
+        value: control.step,
+        path: "control.step",
+        vShow: ["slider"],
+        eventName: "formatNumber",
+        isNum: true,
+      },
+      {
+        label: "显示类型",
+        value: control.type,
+        path: "control.type",
+        vShow: ["datePicker"],
+        type: "select",
+        placeholder: "显示类型",
+        dict: {
+          year: "年",
+          month: "月",
+          date: "日期",
+          datetime: "日期+时间",
+          week: "周",
+          datetimerange: "开始日期时间至结束日期时间",
+          daterange: "开始日期至结束日期",
+          monthrange: "开始月至结束月",
+        },
+      },
+      {
+        label: "时间格式",
+        value: control.format,
+        path: "control.format",
+        vShow: ["datePicker", "timePicker"],
+        placeholder: "显示在输入框中的格式",
+      },
+      {
+        label: "color-format",
+        value: control.colorFormat,
+        path: "control.colorFormat",
+        type: "select",
+        placeholder: "写入 v-model 的颜色的格式",
+        dict: { hsl: "hsl", hsv: "hsv", hex: "hex", rgb: "rgb" },
+        vShow: ["colorPicker"],
+      },
+      {
+        label: "文本高度",
+        value: control.height,
+        path: "control.height",
+        placeholder: "文本高度(预览查看效果)",
+        vShow: ["tinymce"],
+      },
+      {
+        label: "文本宽度",
+        value: control.width,
+        path: "control.width",
+        placeholder: "文本宽度(预览查看效果)",
+        vShow: ["tinymce"],
+      },
+      {
+        label: "图片上传地址",
+        value: control.imgUrl,
+        path: "control.imgUrl",
+        placeholder: "图片上传地址",
+        vShow: ["tinymce"],
+      },
+      {
+        label: "附件上传地址",
+        value: control.blobUrl,
+        path: "control.blobUrl",
+        placeholder: "附件上传地址",
+        vShow: ["tinymce"],
+      },
+      {
+        label: "显示模式",
+        value: config.style,
+        path: "config.style",
+        placeholder: "显示风格(预览查看效果)",
+        type: "select",
+        dict: { default: "default", simple: "simple" },
+        vShow: ["tinymce"],
+      },
+      {
+        label: "默认值",
+        value: control.mathsValue,
+        selectvalue: selectvalue,
+        path: "control.mathsValue",
+        placeholder: "显示风格(预览查看效果)",
+        type: "digitpage",
+        dict: { default: "自定义", simple: "编辑公式" },
+        vShow: ["digitpage"],
+        control: control,
+      },
+    ]);
+    // 过滤显示对应的值
+    return temp.filter((item: any) => {
+      // console.log("过滤显示对应的值--->",item)
+      // console.log("过滤显示对应的值-1-->",type)
+      let hasFilter = true;
+      if (item.vShow) {
+        hasFilter = item.vShow.includes(type);
+      }
+      if (item.vHide) {
+        hasFilter = !item.vHide.includes(type);
+      }
+      if (item.vIf) {
+        // 不显示vif＝true的
+        hasFilter = false;
+      }
+      return hasFilter;
+    });
+  } else {
+    return [];
+  }
+});
 
 watch(
-    () => store.activeKey,
-    (val: string) => {
-        if (val) {
-            // 有值时自动跳到第一项
-            state.tabsName = 'first'
-            cssIsShouw(attrList)
-        }
+  () => store.activeKey,
+  (val: string) => {
+    if (val) {
+      // 有值时自动跳到第一项
+      state.tabsName = "first";
+      cssIsShouw(attrList);
     }
-)
-    
-const fileSignAry = reactive<any>([])
+  }
+);
+
+const fileSignAry = reactive<any>([]);
 const controlChange = (obj: any, val: any) => {
-        
-        // console.log("字段编辑--1--》",obj)
-        // console.log("字段编辑--2--》",obj.eventName)
-        // console.log("字段编辑--3--》",val)
-        // console.log("字段编辑--4--》",controlData.value)
-        // console.log("字段编辑--5--》",obj.path)
-        
-        // select多选属性，
-        switch (obj.eventName) {
-            case 'selectMultiple':
-                if (val) {
-                    // 多选，将值改为数组
-                    controlData.value.control.modelValue = []
-                } else {
-                    // 单选
-                    controlData.value.control.modelValue = ''
-                }
-                break
-            case 'tableColumn1':
-                tableColumnAdd(val)
-                break
-            case 'formatNumber':
-                val = parseInt(val) // 将值转数值
-                break
-            case 'filedNameKey':
-                // 选择字段标识时，同时修改显示标题
-                // 根据value找key
-                if (obj.type === 'select') {
-                    state.dataSourceList.forEach((item: any) => {
-                        if (item.name === val) {
-                            if (controlData.value.item) {
-                                controlData.value.item.label = item.label
-                            }
-                            controlData.value.name = item.label
-                        }
-                    })
-                }
-                break
-            case 'setInputSlot':
-                if (val) {
-                    // 将类型改为inputSlot
-                    controlData.value.type = 'inputSlot'
-                    ElMessage.success(
-                        `请在对应的Input输入框属性前后缀设置key:${controlData.value.name}`
-                    )
+  console.log("字段编辑--1--》", obj);
+  console.log("字段编辑--2--》", obj.eventName);
+  console.log("字段编辑--3--》", val);
+  console.log("字段编辑--4--》", controlData.value);
+  console.log("字段编辑--5--》", obj.path);
+
+  // select多选属性，
+  switch (obj.eventName) {
+    case "selectMultiple":
+      if (val) {
+        // 多选，将值改为数组
+        controlData.value.control.modelValue = [];
+      } else {
+        // 单选
+        controlData.value.control.modelValue = "";
+      }
+      break;
+    case "tableColumn1":
+      tableColumnAdd(val);
+      break;
+    case "formatNumber":
+      val = parseInt(val); // 将值转数值
+      break;
+    case "filedNameKey":
+      // 选择字段标识时，同时修改显示标题
+      // 根据value找key
+      if (obj.type === "select") {
+        state.dataSourceList.forEach((item: any) => {
+          if (item.name === val) {
+            if (controlData.value.item) {
+              controlData.value.item.label = item.label;
+            }
+            controlData.value.name = item.label;
+          }
+        });
+      }
+      break;
+    case "setInputSlot":
+      if (val) {
+        // 将类型改为inputSlot
+        controlData.value.type = "inputSlot";
+        ElMessage.success(
+          `请在对应的Input输入框属性前后缀设置key:${controlData.value.name}`
+        );
+      } else {
+        controlData.value.type = "select";
+      }
+      // 这里会报错Cannot set properties of null (setting 'checked')
+      // 因value:type===inputSlot，这里使用了v-model，影响不大暂不处理
+      break;
+    case "labelNameVal":
+      if (val != "") {
+        let ary = ["founder", "founderTime", "editTime", "owner", "deptOrg"];
+        if (!ary.includes(controlData.value.type)) {
+          if (
+            Array.isArray(props.formField) &&
+            !props.formField.includes(controlData.value.name)
+          ) {
+            chineseToPinyin({
+              title: val,
+              types: 8,
+              connector: "",
+              formJson: JSON.stringify(props.formInfo),
+            }).then((data: any) => {
+              if (data.code == 0) {
+                if (data.data != "") {
+                  if (!fileSignAry.includes(data.data)) {
+                    controlData.value.name = data.data;
+                    fileSignAry.push(data.data);
+                  } else {
+                    let isEnd = true;
+                    do {
+                      let titleVal = data.data + Rand(10000000, 99999999);
+                      if (!fileSignAry.includes(titleVal)) {
+                        controlData.value.name = titleVal;
+                        fileSignAry.push(titleVal);
+                        isEnd = false;
+                      }
+                    } while (isEnd);
+                  }
                 } else {
-                    controlData.value.type = 'select'
-                }
-                // 这里会报错Cannot set properties of null (setting 'checked')
-                // 因value:type===inputSlot，这里使用了v-model，影响不大暂不处理
-                break
-            case 'labelNameVal':
-                if(val != ""){
-					let ary = ["founder","founderTime","editTime","owner","deptOrg"]
-					if (!ary.includes(controlData.value.type)){
-						if(Array.isArray(props.formField) && !props.formField.includes(controlData.value.name)){
-							chineseToPinyin({title:val,types:8,connector:"",formJson:JSON.stringify(props.formInfo)})
-								.then((data:any)=>{
-									if(data.code == 0){
-										if(data.data != ""){
-											if(!fileSignAry.includes(data.data)){
-												controlData.value.name = data.data
-												fileSignAry.push(data.data)
-											}else{
-												let isEnd = true;
-												do{
-													let titleVal = data.data + Rand(10000000,99999999)
-													if(!fileSignAry.includes(titleVal)){
-														controlData.value.name = titleVal;
-														fileSignAry.push(titleVal);
-														isEnd=false;
-													}
-												}while(isEnd);
-											}
-										}else{
-											if(!fileSignAry.includes(val)){
-												controlData.value.name = val 
-												fileSignAry.push(val)
-											}else{
-												let titleVal = val + Rand(10000000,99999999)
-												if(!fileSignAry.includes(titleVal)){
-													controlData.value.name = titleVal;
-													fileSignAry.push(titleVal);
-												}
-											}
-											
-										}
-										
-									}
-								})
-						}
-					}
-                	// chineseToPinyin({title:val,types:8,connector:"",formJson:JSON.stringify(props.formInfo)})
-                    // .then((data:any)=>{
-                    //     if(data.code == 0){
-                    //         if(data.data != ""){
-                    //             if(!fileSignAry.includes(data.data)){
-                    //                 controlData.value.name = data.data
-                    //                 fileSignAry.push(data.data)
-                    //             }else{
-                    //                 let isEnd = true;
-                    //                 do{
-                    //                     let titleVal = data.data + Rand(10000000,99999999)
-                    //                     if(!fileSignAry.includes(titleVal)){
-                    //                         controlData.value.name = titleVal;
-                    //                         fileSignAry.push(titleVal);
-                    //                         isEnd=false;
-                    //                     }
-                    //                 }while(isEnd);
-                    //             }
-                    //         }else{
-                    //             if(!fileSignAry.includes(val)){
-                    //                 controlData.value.name = val 
-                    //                 fileSignAry.push(val)
-                    //             }else{
-                    //                 let titleVal = val + Rand(10000000,99999999)
-                    //                 if(!fileSignAry.includes(titleVal)){
-                    //                     controlData.value.name = titleVal;
-                    //                     fileSignAry.push(titleVal);
-                    //                 }
-                    //             }
-                                
-                    //         }
-                            
-                    //     }
-                    // })
+                  if (!fileSignAry.includes(val)) {
+                    controlData.value.name = val;
+                    fileSignAry.push(val);
+                  } else {
+                    let titleVal = val + Rand(10000000, 99999999);
+                    if (!fileSignAry.includes(titleVal)) {
+                      controlData.value.name = titleVal;
+                      fileSignAry.push(titleVal);
+                    }
+                  }
                 }
-                
-                // console.log("字段编辑--fileSignAry--》",fileSignAry)
-                break
-        }
-        if (obj.path) {
-        const newVal = obj.isNum ? formatNumber(val) : val // 类型为数字时转整数
-            obj.path && getPropByPath(controlData.value, obj.path, newVal)
+              }
+            });
+          }
         }
+        // chineseToPinyin({title:val,types:8,connector:"",formJson:JSON.stringify(props.formInfo)})
+        // .then((data:any)=>{
+        //     if(data.code == 0){
+        //         if(data.data != ""){
+        //             if(!fileSignAry.includes(data.data)){
+        //                 controlData.value.name = data.data
+        //                 fileSignAry.push(data.data)
+        //             }else{
+        //                 let isEnd = true;
+        //                 do{
+        //                     let titleVal = data.data + Rand(10000000,99999999)
+        //                     if(!fileSignAry.includes(titleVal)){
+        //                         controlData.value.name = titleVal;
+        //                         fileSignAry.push(titleVal);
+        //                         isEnd=false;
+        //                     }
+        //                 }while(isEnd);
+        //             }
+        //         }else{
+        //             if(!fileSignAry.includes(val)){
+        //                 controlData.value.name = val
+        //                 fileSignAry.push(val)
+        //             }else{
+        //                 let titleVal = val + Rand(10000000,99999999)
+        //                 if(!fileSignAry.includes(titleVal)){
+        //                     controlData.value.name = titleVal;
+        //                     fileSignAry.push(titleVal);
+        //                 }
+        //             }
+
+        //         }
+
+        //     }
+        // })
+      }
+
+      // console.log("字段编辑--fileSignAry--》",fileSignAry)
+      break;
+  }
+  if (obj.path) {
+    const newVal = obj.isNum ? formatNumber(val) : val; // 类型为数字时转整数
+    obj.path && getPropByPath(controlData.value, obj.path, newVal);
+  }
 
+  //liwenxuan		关联选项设置	修复bug:当字段标识改变时，关联选项设置的字段标识未同步更改  start
 
-        //liwenxuan		关联选项设置	修复bug:当字段标识改变时，关联选项设置的字段标识未同步更改  start
-
-        emits('formNameChange',val);
-        //liwenxuan		关联选项设置	修复bug:当字段标识改变时，关联选项设置的字段标识未同步更改  end
-
-    }
+  emits("formNameChange", val);
+  //liwenxuan		关联选项设置	修复bug:当字段标识改变时，关联选项设置的字段标识未同步更改  end
+};
 
-    /** 
-    * 获取非负整数随机数 
-    * @param Min 最小整数  
-    * @param Max 最大整数 
-    * @returns 随机数 
-    */
+/**
+ * 获取非负整数随机数
+ * @param Min 最小整数
+ * @param Max 最大整数
+ * @returns 随机数
+ */
 const Rand = (Min: number, Max: number) => {
-        switch (Min) {
-            case 0: return Math.round(Math.random() * Max);
-            case 1: return Math.ceil(Math.random() * Max);
-            default: return Math.round(Math.random() * (Max - Min) + Min);
-        }
-    }
-    // 修改指定路径下的值
+  switch (Min) {
+    case 0:
+      return Math.round(Math.random() * Max);
+    case 1:
+      return Math.ceil(Math.random() * Max);
+    default:
+      return Math.round(Math.random() * (Max - Min) + Min);
+  }
+};
+// 修改指定路径下的值
 const getPropByPath = (obj: any, path: string, val: any) => {
-        let tempObj = obj
-    const keyArr = path.split('.')
-        let i = 0
-        for (i; i < keyArr.length - 1; i++) {
-        const key = keyArr[i]
-            if (key in tempObj) {
-                tempObj = tempObj[key]
-            } else {
-                throw new Error(`${key} is undefined`)
-                // break
-            }
-        }
-    const key = keyArr[i]
-    const value = tempObj[keyArr[i]]
-        // 检查最后一级是否存在
-        /*if (!(key in tempObj)) {
+  let tempObj = obj;
+  const keyArr = path.split(".");
+  let i = 0;
+  for (i; i < keyArr.length - 1; i++) {
+    const key = keyArr[i];
+    if (key in tempObj) {
+      tempObj = tempObj[key];
+    } else {
+      throw new Error(`${key} is undefined`);
+      // break
+    }
+  }
+  const key = keyArr[i];
+  const value = tempObj[keyArr[i]];
+  // 检查最后一级是否存在
+  /*if (!(key in tempObj)) {
             throw new Error(`${key} is undefined`)
         }*/
-        if (val !== undefined) {
-              tempObj[key] = val
-        }
-        return {
-            obj: tempObj,
-            key: key,
-            value: value
-        }
-    }
-    // 属性设置相关结束
-
-    
-
-    //关联表单数据填充时无法获取当前表单新增且保存的字段，只有关闭重启后方能获取----bug修改
-    //穿梭框编辑固定选项时，修改的节点无法立即预览到，需保存后退出重进才能预览到修改后的----bug修改
-
-    const showAssociatedFormsFillRole = ref(true)
-
-    const saveRefreshFormControlAttr = () => {
-        getAssociatedFormsCurrentFieldTree1()
-        showAssociatedFormsFillRole.value = false;
-         // 等待一个短时间的延迟，确保组件卸载完成
-        setTimeout(() => {
-            showAssociatedFormsFillRole.value = true;
-        }, 200);
-    };
-
-    // 多选固定选项删除
+  if (val !== undefined) {
+    tempObj[key] = val;
+  }
+  return {
+    obj: tempObj,
+    key: key,
+    value: value,
+  };
+};
+// 属性设置相关结束
+
+//关联表单数据填充时无法获取当前表单新增且保存的字段，只有关闭重启后方能获取----bug修改
+//穿梭框编辑固定选项时，修改的节点无法立即预览到，需保存后退出重进才能预览到修改后的----bug修改
+
+const showAssociatedFormsFillRole = ref(true);
+
+const saveRefreshFormControlAttr = () => {
+  getAssociatedFormsCurrentFieldTree1();
+  showAssociatedFormsFillRole.value = false;
+  // 等待一个短时间的延迟，确保组件卸载完成
+  setTimeout(() => {
+    showAssociatedFormsFillRole.value = true;
+  }, 200);
+};
+
+// 多选固定选项删除
 const delSelectOption = (index: number, type?: string) => {
-        //liwenxuan 20240508 checkbox 删除选项时提醒  start
-        let delflag = true
-        let breakFlag = 0
-        if((controlData.value.type === 'checkbox'||controlData.value.type === 'radio'||controlData.value.type === 'select')&& controlData.value.config.optionsType==0){
-            //多选删除时,当前index并不是索引而是value,需找出选择的多选框实际的索引作为index    liwenxuan     多选选择框选项拖动功能 20240815 start 
-            for(let i = 0;i<controlData.value.options.length;i++){
-                if(controlData.value.options[i].value==index){
-                    index = i
-                    break
-                }
-            }
-            //多选删除时,当前index并不是索引而是value,需找出选择的多选框实际的索引作为index     liwenxuan    多选选择框选项拖动功能 20240815 end
-            if(controlData.value.type === 'checkbox'){
-                for(var i = 0;i < controlData.value.control.glxxszForCheckBox.length;i ++){
-                    if(breakFlag>0){
-                        break
-                    }
-                    for(var j = 0; j < controlData.value.control.glxxszForCheckBox[i].selectedOptions.length; j++){
-                        if(controlData.value.control.glxxszForCheckBox[i].selectedOptions[j] === controlData.value.options[index].value){
-                            let del =confirm("您本次删除的选项已在关联选项设置中有所配置，相关关联选项设置将被删除，是否确定删除？");
-                            if (del==true){
-                                breakFlag++
-                                break
-                            }else{
-                                delflag = false
-                                breakFlag++
-                                break
-                            }
-                        }
-                    }
-
-                    
-                }
-            }
-            
+  //liwenxuan 20240508 checkbox 删除选项时提醒  start
+  let delflag = true;
+  let breakFlag = 0;
+  if (
+    (controlData.value.type === "checkbox" ||
+      controlData.value.type === "radio" ||
+      controlData.value.type === "select") &&
+    controlData.value.config.optionsType == 0
+  ) {
+    //多选删除时,当前index并不是索引而是value,需找出选择的多选框实际的索引作为index    liwenxuan     多选选择框选项拖动功能 20240815 start
+    for (let i = 0; i < controlData.value.options.length; i++) {
+      if (controlData.value.options[i].value == index) {
+        index = i;
+        break;
+      }
+    }
+    //多选删除时,当前index并不是索引而是value,需找出选择的多选框实际的索引作为index     liwenxuan    多选选择框选项拖动功能 20240815 end
+    if (controlData.value.type === "checkbox") {
+      for (var i = 0; i < controlData.value.control.glxxszForCheckBox.length; i++) {
+        if (breakFlag > 0) {
+          break;
         }
-        if(delflag === true){
-            //删除相关关联选项设置
-            if(controlData.value.type === 'checkbox'){
-            const todelArr:any = []     
-                for(var i = 0;i < controlData.value.control.glxxszForCheckBox.length;i ++){
-                    for(var j = 0; j < controlData.value.control.glxxszForCheckBox[i].selectedOptions.length; j++){
-                        if(controlData.value.control.glxxszForCheckBox[i].selectedOptions[j] === controlData.value.options[index].value){
-                            todelArr.push(controlData.value.control.glxxszForCheckBox[i].id)
-                        }
-                    }
-                }
-                for(var i = 0;i < todelArr.length;i++){
-                    controlData.value.control.glxxszForCheckBox = controlData.value.control.glxxszForCheckBox.filter((item: { id: any }) => item.id != todelArr[i])
-                }
-            }
-            //liwenxuan 20240508 checkbox 删除选项时提醒  end
-            if (type === 'tabs' ) {
-                    controlData.value.columns.splice(index, 1)
+        for (
+          var j = 0;
+          j < controlData.value.control.glxxszForCheckBox[i].selectedOptions.length;
+          j++
+        ) {
+          if (
+            controlData.value.control.glxxszForCheckBox[i].selectedOptions[j] ===
+            controlData.value.options[index].value
+          ) {
+            let del = confirm(
+              "您本次删除的选项已在关联选项设置中有所配置，相关关联选项设置将被删除，是否确定删除？"
+            );
+            if (del == true) {
+              breakFlag++;
+              break;
             } else {
-                    controlData.value.options.splice(index, 1)
+              delflag = false;
+              breakFlag++;
+              break;
             }
+          }
         }
-        
+      }
     }
-    // 多选固定选项增加
-const addSelectOption = (type: any) => {
-
-
-        if (controlData.value.type === 'cascader') {
-            // 级联时打开弹窗口
-            openAttrDialog('cascader',"级联选择器")
-        } else if (controlData.value.type === 'treeSelect') {
-              openAttrDialog('treeSelect', '编辑组件下拉选项数据')
-        } else {
-            if (type === 'tabs') {
-                controlData.value.columns.push({
-                label: '标签名称',
-                list: []
-                })
-            } else {
-				let maxVal = 1;
-				if(controlData.value.options && controlData.value.options.length > 0){
-					controlData.value.options.forEach((item:any)=>{
-						if(item.value >= maxVal){
-							maxVal = item.value
-						}
-					})
-					maxVal = maxVal*1 + 1
-				}
-                controlData.value.options.push({
-					label: '',
-					value: maxVal.toString()
-                })
-            }
+  }
+  if (delflag === true) {
+    //删除相关关联选项设置
+    if (controlData.value.type === "checkbox") {
+      const todelArr: any = [];
+      for (var i = 0; i < controlData.value.control.glxxszForCheckBox.length; i++) {
+        for (
+          var j = 0;
+          j < controlData.value.control.glxxszForCheckBox[i].selectedOptions.length;
+          j++
+        ) {
+          if (
+            controlData.value.control.glxxszForCheckBox[i].selectedOptions[j] ===
+            controlData.value.options[index].value
+          ) {
+            todelArr.push(controlData.value.control.glxxszForCheckBox[i].id);
+          }
         }
+      }
+      for (var i = 0; i < todelArr.length; i++) {
+        controlData.value.control.glxxszForCheckBox = controlData.value.control.glxxszForCheckBox.filter(
+          (item: { id: any }) => item.id != todelArr[i]
+        );
+      }
     }
-    // 更多属性弹窗
-const openAttrDialog = (type?: string, tooltip?: string) => {
-        let editData = controlData.value.control
-        if (controlData.value.type === 'button') {
-            // 按钮组件编辑属性
-            editData = controlData.value.config
-            type = 'button'
-        }
-        switch (type) {
-            case 'treeSelect':
-                editData = controlData.value.control.data
-                break
-            case 'cascader':
-                editData = controlData.value.options
-                break
-            case 'optionsParams': // 选项请求附加参数
-                editData = controlData.value.config.beforeRequest
-                // params.codeType = 'json'
-                break
-            case 'optionsResult':
-                editData = controlData.value.config.afterResponse
-                break
-        }
-    const emitsParams = {
-            content: editData,
-            title: tooltip,
-            type: type,
-            direction: 'ltr',
-            callback: (result: any) => {
-                switch (type) {
-                case 'treeSelect':
-                    controlData.value.control.data = result
-                    break
-                case 'cascader':
-                    controlData.value.options = result
-                    break
-                case 'optionsParams':
-                    controlData.value.config.beforeRequest = result
-                    break
-                case 'optionsResult':
-                    controlData.value.config.afterResponse = result
-                    break
-                case 'button':
-                    controlData.value.config = result
-                    break
-                default:
-                    controlData.value.control = {}
-                    Object.assign(controlData.value.control, result)
-                }
-            }
-        }
-        emits('openDialog', emitsParams)
+    //liwenxuan 20240508 checkbox 删除选项时提醒  end
+    if (type === "tabs") {
+      controlData.value.columns.splice(index, 1);
+    } else {
+      controlData.value.options.splice(index, 1);
     }
-    // 必填校验
-const requiredChange = (val: any) => {
-        if (!controlData.value.item?.rules) {
-              controlData.value.item.rules = []
-        }
-        if (val) {
-            controlData.value.item.rules.push({
-                required: true,
-                message: '必填项',
-                trigger: 'change'
-            })
-        } else {
-              controlData.value.item.rules.splice(0, 1)
-        }
+  }
+};
+// 多选固定选项增加
+const addSelectOption = (type: any) => {
+  if (controlData.value.type === "cascader") {
+    // 级联时打开弹窗口
+    openAttrDialog("cascader", "级联选择器");
+  } else if (controlData.value.type === "treeSelect") {
+    openAttrDialog("treeSelect", "编辑组件下拉选项数据");
+  } else {
+    if (type === "tabs") {
+      controlData.value.columns.push({
+        label: "标签名称",
+        list: [],
+      });
+    } else {
+      let maxVal = 1;
+      if (controlData.value.options && controlData.value.options.length > 0) {
+        controlData.value.options.forEach((item: any) => {
+          if (item.value >= maxVal) {
+            maxVal = item.value;
+          }
+        });
+        maxVal = maxVal * 1 + 1;
+      }
+      controlData.value.options.push({
+        label: "",
+        value: maxVal.toString(),
+      });
     }
-    // 添加校验规则
+  }
+};
+// 更多属性弹窗
+const openAttrDialog = (type?: string, tooltip?: string) => {
+  let editData = controlData.value.control;
+  if (controlData.value.type === "button") {
+    // 按钮组件编辑属性
+    editData = controlData.value.config;
+    type = "button";
+  }
+  console.log("更多属性弹窗", controlData.value);
+  switch (type) {
+    case "treeSelect":
+      console.log("更多属性弹窗", controlData.value.control.data);
+      editData = controlData.value.control.data;
+
+      break;
+    case "cascader":
+      console.log("更多属性级联", controlData.value.options);
+      editData = controlData.value.options;
+      break;
+    case "optionsParams": // 选项请求附加参数
+      editData = controlData.value.config.beforeRequest;
+      // params.codeType = 'json'
+      break;
+    case "optionsResult":
+      editData = controlData.value.config.afterResponse;
+      break;
+  }
+  const emitsParams = {
+    content: editData,
+    title: tooltip,
+    type: type,
+    direction: "ltr",
+    callback: (result: any) => {
+      switch (type) {
+        case "treeSelect":
+          console.log("更多属性弹窗会写数据：", result);
+          controlData.value.control.data = result;
+          console.log(
+            "更多属性弹窗会写数据-----1------>：",
+            controlData.value.control.data
+          );
+          break;
+        case "cascader":
+          controlData.value.options = result;
+          break;
+        case "optionsParams":
+          controlData.value.config.beforeRequest = result;
+          break;
+        case "optionsResult":
+          controlData.value.config.afterResponse = result;
+          break;
+        case "button":
+          controlData.value.config = result;
+          break;
+        default:
+          controlData.value.control = {};
+          Object.assign(controlData.value.control, result);
+      }
+    },
+  };
+  emits("openDialog", emitsParams);
+};
+// 必填校验
+const requiredChange = (val: any) => {
+  if (!controlData.value.item?.rules) {
+    controlData.value.item.rules = [];
+  }
+  if (val) {
+    controlData.value.item.rules.push({
+      required: true,
+      message: "必填项",
+      trigger: "change",
+    });
+  } else {
+    controlData.value.item.rules.splice(0, 1);
+  }
+};
+// 添加校验规则
 const addRules = (tooltip: string) => {
-        if (!controlData.value.item?.rules) {
-              controlData.value.item.rules = []
-        }
-    const params = {
-            content: controlData.value.item?.rules,
-            title: tooltip,
-            direction: 'ltr',
-            callback: (result: any) => {
-                Object.assign(controlData.value.item.rules, result)
-            }
-        }
-        emits('openDialog', params)
-    }
-    // 根据不同类型判断是否显示当前属性
+  if (!controlData.value.item?.rules) {
+    controlData.value.item.rules = [];
+  }
+  const params = {
+    content: controlData.value.item?.rules,
+    title: tooltip,
+    direction: "ltr",
+    callback: (result: any) => {
+      Object.assign(controlData.value.item.rules, result);
+    },
+  };
+  emits("openDialog", params);
+};
+// 根据不同类型判断是否显示当前属性
 const showHide = (type: string[], show?: boolean) => {
-        // show=true 条件成立显示，false符合条件隐藏
-        if (
-            (type && type.length === 0) ||
-            Object.keys(controlData.value).length === 0
-        ) {
-              return false
-        }
-    const index = type.indexOf(controlData.value.type)
-        return show ? index !== -1 : index === -1
-    }
-    // 子表时添加序号和操作列
+  // show=true 条件成立显示，false符合条件隐藏
+  if ((type && type.length === 0) || Object.keys(controlData.value).length === 0) {
+    return false;
+  }
+  const index = type.indexOf(controlData.value.type);
+  return show ? index !== -1 : index === -1;
+};
+// 子表时添加序号和操作列
 const tableColumnAdd = (val: string) => {
-    const item = {
-            name: 'index',
-            type: 'index',
-            item: {
-                label: '序号'
-            },
-            control: {},
-            config: {}
-        }
-        if (val) {
-              controlData.value.list.unshift(item)
-        } else {
-              controlData.value.list.splice(0, 1)
-        }
-    }
-    // 校验规则必填勾选设置，存在校验规则时勾选
+  const item = {
+    name: "index",
+    type: "index",
+    item: {
+      label: "序号",
+    },
+    control: {},
+    config: {},
+  };
+  if (val) {
+    controlData.value.list.unshift(item);
+  } else {
+    controlData.value.list.splice(0, 1);
+  }
+};
+// 校验规则必填勾选设置，存在校验规则时勾选
 const checkboxRequired = computed(() => {
-    const val = controlData.value && controlData.value.item?.rules
-	// console.log("校验规则必填勾选设置",val && val.length > 0)
-		if(val && val.length > 0){
-			return true
-		}else{
-			return false
-		}
-        // return val && val.length > 0
-    })
-    // 快速添加一条校验规则
+  const val = controlData.value && controlData.value.item?.rules;
+  // console.log("校验规则必填勾选设置",val && val.length > 0)
+  if (val && val.length > 0) {
+    return true;
+  } else {
+    return false;
+  }
+  // return val && val.length > 0
+});
+// 快速添加一条校验规则
 const addRulesFast = () => {
-        if (!controlData.value.customRules) {
-              controlData.value.customRules = []
-        }
-        controlData.value.customRules.push({
-            type: 'required',
-            message: '必填项',
-            trigger: 'blur'
-        })
-    }
-    // 删除一条校验规则
+  if (!controlData.value.customRules) {
+    controlData.value.customRules = [];
+  }
+  controlData.value.customRules.push({
+    type: "required",
+    message: "必填项",
+    trigger: "blur",
+  });
+};
+// 删除一条校验规则
 const delAddRules = (index: number) => {
-        controlData.value.customRules &&
-        controlData.value.customRules.splice(index, 1)
-    }
-    
-    //添加一条编码规则
+  controlData.value.customRules && controlData.value.customRules.splice(index, 1);
+};
+
+//添加一条编码规则
 const addNumRules = () => {
-        if (!controlData.value.config.customRules) {
-            controlData.value.config.customRules = []
-        }
-        controlData.value.config.customRules.push({
-            type:'time',
-            rule:"YYYYMMDD"
-        })
-    }
-    //删除一条编码规则
+  if (!controlData.value.config.customRules) {
+    controlData.value.config.customRules = [];
+  }
+  controlData.value.config.customRules.push({
+    type: "time",
+    rule: "YYYYMMDD",
+  });
+};
+//删除一条编码规则
 const delNumRules = (index: number) => {
-        controlData.value.config.customRules &&
-        controlData.value.config.customRules.splice(index, 1)
-    }
-    
-    // 编辑表单样式
+  controlData.value.config.customRules &&
+    controlData.value.config.customRules.splice(index, 1);
+};
+
+// 编辑表单样式
 const editFormStyle = (tooltip: string) => {
-        emits('openDialog', {
-            codeType: 'css',
-            direction: 'ltr',
-            type: 'css',
-            title: tooltip
-        })
-    }
+  emits("openDialog", {
+    codeType: "css",
+    direction: "ltr",
+    type: "css",
+    title: tooltip,
+  });
+};
 const editFormDict = (tooltip: string) => {
-        emits('openDialog', {
-            type: 'dict',
-            direction: 'ltr',
-            codeType: 'json',
-            title: tooltip
-        })
-    }
-     // 根据选定数据源获取表单字段
- const getFormFieldBySource = (id?: string) => {
-        if (state.isSearch) {
-            // 搜索设计这里不需要数据源
-            return
-        }
-    const source = id
-        if (source) {
-            getRequest('sourceById', { id: source })
-                .then(res => {
-                    // console.log(res)
-                const tableData = res.data.result?.tableData
-                    if (tableData && tableData.length) {
-                        state.dataSourceList = tableData.filter(
-                        (item: any) => item.enterable
-                        )
-                    }
-                })
-                .catch(res => {
-                    // console.log(res)
-                })
+  emits("openDialog", {
+    type: "dict",
+    direction: "ltr",
+    codeType: "json",
+    title: tooltip,
+  });
+};
+// 根据选定数据源获取表单字段
+const getFormFieldBySource = (id?: string) => {
+  if (state.isSearch) {
+    // 搜索设计这里不需要数据源
+    return;
+  }
+  const source = id;
+  if (source) {
+    getRequest("sourceById", { id: source })
+      .then((res) => {
+        // console.log(res)
+        const tableData = res.data.result?.tableData;
+        if (tableData && tableData.length) {
+          state.dataSourceList = tableData.filter((item: any) => item.enterable);
         }
-    }
+      })
+      .catch((res) => {
+        // console.log(res)
+      });
+  }
+};
 const getDataSource = () => {
-        // 获取数据源，表单设计才加载，搜索设置不需要
-        if (!state.isSearch) {
-            // getRequest('sourceList').then((res: any) => {
-            // 	dataSourceOption.value = res.data.list
-            // 	//dataSourceOption.value.unshift({ name: '无', id: '' })
-            // })
-        }
-    }
-    // 表单属性修改
+  // 获取数据源，表单设计才加载，搜索设置不需要
+  if (!state.isSearch) {
+    // getRequest('sourceList').then((res: any) => {
+    // 	dataSourceOption.value = res.data.list
+    // 	//dataSourceOption.value.unshift({ name: '无', id: '' })
+    // })
+  }
+};
+// 表单属性修改
 const formAttrChange = (obj: any, val?: any) => {
-        // console.log("表单属性修改--->",obj,val,{ [obj.key]: obj.value })
-        if (obj.key === 'source') {
-            getFormFieldBySource(obj.value) // 改变了数据源了，重新请求数据
-            // 清空设计区已选择的组件，再一次选择时字段标识才会变
-            store.setActiveKey('')
-            store.setControlAttr({})
-        }
-        if (['formName', 'source'].includes(obj.key)) {
-            emits(
-                'update:formOtherData',
-                Object.assign(props.formOtherData, { [obj.key]: obj.value })
-            )
-            formData.value[obj.key] = obj.value
-              return
-        }
-        if (obj.path === 'config') {
-              formConfig.value[obj.key] = obj.value || val
-        } else {
-              formData.value[obj.key] = obj.value
-        }
-    }
-    // 返回选项配置提示
+  // console.log("表单属性修改--->",obj,val,{ [obj.key]: obj.value })
+  if (obj.key === "source") {
+    getFormFieldBySource(obj.value); // 改变了数据源了，重新请求数据
+    // 清空设计区已选择的组件，再一次选择时字段标识才会变
+    store.setActiveKey("");
+    store.setControlAttr({});
+  }
+  if (["formName", "source"].includes(obj.key)) {
+    emits(
+      "update:formOtherData",
+      Object.assign(props.formOtherData, { [obj.key]: obj.value })
+    );
+    formData.value[obj.key] = obj.value;
+    return;
+  }
+  if (obj.path === "config") {
+    formConfig.value[obj.key] = obj.value || val;
+  } else {
+    formData.value[obj.key] = obj.value;
+  }
+};
+// 返回选项配置提示
 const getOptionPlaceholder = (type: number) => {
-        switch (type) {
-            case 1:
-                return '数据源接口URL,可带参数'
-            case 2:
-                return '字典key，默认为字段标识'
-        }
-        return ''
-    }
-    // 快速添加校验规则改变时，填写默认的校验提示信息
+  switch (type) {
+    case 1:
+      return "数据源接口URL,可带参数";
+    case 2:
+      return "字典key，默认为字段标识";
+  }
+  return "";
+};
+// 快速添加校验规则改变时，填写默认的校验提示信息
 const rulesSelectChange = (item: any, val: string) => {
-    const filter = validate.filter(item => item.type === val)
-        if (filter && filter.length) {
-              item.message = filter[0].message
-        }
-    }
+  const filter = validate.filter((item) => item.type === val);
+  if (filter && filter.length) {
+    item.message = filter[0].message;
+  }
+};
 const rulesSelectNumChange = (item: any, val: string) => {
-        // console.log("快速添加校验规则改变时",item,val)
-    const filter = state.numberRulesList.filter(item => item.type === val)
-        if (filter && filter.length) {
-              item.message = filter[0].msg
-            if(val == "time") {
-                item.rule = "YYYYMMDD"
-            }else{
-                item.rule = ""
-            }
-        }
+  // console.log("快速添加校验规则改变时",item,val)
+  const filter = state.numberRulesList.filter((item) => item.type === val);
+  if (filter && filter.length) {
+    item.message = filter[0].msg;
+    if (val == "time") {
+      item.rule = "YYYYMMDD";
+    } else {
+      item.rule = "";
     }
-    // options动态选项数据源请求时
+  }
+};
+// options动态选项数据源请求时
 const optionsEvent = (type: string, tooltip?: string) => {
-        openAttrDialog(type, tooltip)
-    }
+  openAttrDialog(type, tooltip);
+};
 const eventClick = (type: string, tooltip?: string) => {
-        emits('openDialog', { type: type, title: tooltip, direction: 'ltr' })
-    }
-    getDataSource()
-    defineExpose({ getFormFieldBySource,saveRefreshFormControlAttr })
-    //判断输入框是否可写
-const isNotWrite = (val:any) =>{
-        // console.log("判断输入框是否可写--->",val,props.customerformid)
-        if(val.key === "name" && props.customerformid != ""){
-            return true
-        }
-        return false
-    }
-const isNotWriteWord = (val:any) =>{
-	// console.log("isNotWriteWord---->",val)
-	// console.log("isNotWriteWord--formField-->",props.formField)
-	if(val.eventName === "filedNameKey" && props.customerformid != "" && props.formField && Array.isArray(props.formField) && props.formField.includes(val.value) ){
-		// if(props.formField.includes(val.value)){
-			return true
-		// }
-		
-	}
-	return false
-}    
-const unitInfo = ref<any>()
-const formListmap = ref<any>()
-const subUnit = ref<any>()
-    //默认值处理
-const digitPageSub = (val:any,envt:any) => {
-        console.log("默认值处理--->",val,envt,props.formData)
-    
-        // console.log("默认值处理-1-->",props.formList)
-        // console.log("默认值处理-2-->",props.formConfig)
-        // console.log("默认值处理--3->",props.formOtherData)
-        // console.log("默认值处理--4->",props.customerformid)
-        // console.log("默认值处理--5->",controlData.value)
-        // console.log("默认值处理-6-->",val)
-		// console.log("默认值处理-7-->",mathBoxShow)
-		// console.log("默认值处理-8-->",attrList.value)
-        subUnit.value = val
-        controlData.value.selectvalue = envt
-        formListmap.value = props.formList
-        if(envt == "simple"){
-            unitInfo.value = attrList.value
-            mathBoxShow.value = true
-			val.control.modelValue = ""
-        }else{
-			unitInfo.value = ""
-            mathBoxShow.value = false
-		}
-    }
-const openMathDialog = (val:any) => {
-        subUnit.value = val
-        formListmap.value = props.formList
-        unitInfo.value = attrList.value
-        mathBoxShow.value = true
-    }
-    //返回值处理
-const updataDigit = (key:string,val:any) => {
-    
-        // console.log("默认值处理-1-->",props.formList)
-        // console.log("默认值处理-2-->",props.formConfig)
-        // console.log("默认值处理--3->",props.formOtherData)
-        // console.log("默认值处理--4->",val)
-        formConfig.value[key] = {
-            mathsFormula:val.mathsFormula,
-            takingMethod:val.takingMethod,
-            digit:val.digit
-        }
-        // console.log("返回值处理--->",formConfig.value)
-        attrList.value.forEach((item:any)=>{
-            // console.log("返回值处理--1->",item)
-            if(item.type == "digitpage"){
-                item.control.mathFormula = {
-                    formulaHtml:val.formulaHtml,
-                    mathsString:val.mathsString,
-                    mathsFormula:val.mathsFormula,
-                    takingMethod:val.takingMethod,
-                    digit:val.digit
-                }
-            }
-        })
-        // console.log("默认值处理-5-->",props.formConfig)
-    }
-    
-    
-    //liwenxuan 20240108 vidioupload  start
-    
-import { VideoMsg } from '@/api/DesignForm/types'
-import { genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
-    
-    //更改已上传的视频:el-upload中设置 limit 和 on-exceed 可以在选中时自动替换上一个文件。
-const upload = ref<UploadInstance>()
-    
-const handleExceed: UploadProps['onExceed'] = (files) => {
-      upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-      file.uid = genFileId()
-      upload.value!.handleStart(file)
+  emits("openDialog", { type: type, title: tooltip, direction: "ltr" });
+};
+getDataSource();
+defineExpose({ getFormFieldBySource, saveRefreshFormControlAttr });
+//判断输入框是否可写
+const isNotWrite = (val: any) => {
+  // console.log("判断输入框是否可写--->",val,props.customerformid)
+  if (val.key === "name" && props.customerformid != "") {
+    return true;
+  }
+  return false;
+};
+const isNotWriteWord = (val: any) => {
+  // console.log("isNotWriteWord---->",val)
+  // console.log("isNotWriteWord--formField-->",props.formField)
+  if (
+    val.eventName === "filedNameKey" &&
+    props.customerformid != "" &&
+    props.formField &&
+    Array.isArray(props.formField) &&
+    props.formField.includes(val.value)
+  ) {
+    // if(props.formField.includes(val.value)){
+    return true;
+    // }
+  }
+  return false;
+};
+const unitInfo = ref<any>();
+const formListmap = ref<any>();
+const subUnit = ref<any>();
+//默认值处理
+const digitPageSub = (val: any, envt: any) => {
+  console.log("默认值处理--->", val, envt, props.formData);
+
+  // console.log("默认值处理-1-->",props.formList)
+  // console.log("默认值处理-2-->",props.formConfig)
+  // console.log("默认值处理--3->",props.formOtherData)
+  // console.log("默认值处理--4->",props.customerformid)
+  // console.log("默认值处理--5->",controlData.value)
+  // console.log("默认值处理-6-->",val)
+  // console.log("默认值处理-7-->",mathBoxShow)
+  // console.log("默认值处理-8-->",attrList.value)
+  subUnit.value = val;
+  controlData.value.selectvalue = envt;
+  formListmap.value = props.formList;
+  if (envt == "simple") {
+    unitInfo.value = attrList.value;
+    mathBoxShow.value = true;
+    val.control.modelValue = "";
+  } else {
+    unitInfo.value = "";
+    mathBoxShow.value = false;
+  }
+};
+const openMathDialog = (val: any) => {
+  subUnit.value = val;
+  formListmap.value = props.formList;
+  unitInfo.value = attrList.value;
+  mathBoxShow.value = true;
+};
+//返回值处理
+const updataDigit = (key: string, val: any) => {
+  // console.log("默认值处理-1-->",props.formList)
+  // console.log("默认值处理-2-->",props.formConfig)
+  // console.log("默认值处理--3->",props.formOtherData)
+  // console.log("默认值处理--4->",val)
+  formConfig.value[key] = {
+    mathsFormula: val.mathsFormula,
+    takingMethod: val.takingMethod,
+    digit: val.digit,
+  };
+  // console.log("返回值处理--->",formConfig.value)
+  attrList.value.forEach((item: any) => {
+    // console.log("返回值处理--1->",item)
+    if (item.type == "digitpage") {
+      item.control.mathFormula = {
+        formulaHtml: val.formulaHtml,
+        mathsString: val.mathsString,
+        mathsFormula: val.mathsFormula,
+        takingMethod: val.takingMethod,
+        digit: val.digit,
+      };
     }
-    //每个视频上传控件对应一个videoMsg[videoIndex]
+  });
+  // console.log("默认值处理-5-->",props.formConfig)
+};
+
+//liwenxuan 20240108 vidioupload  start
+
+import { VideoMsg } from "@/api/DesignForm/types";
+import { genFileId } from "element-plus";
+import type { UploadInstance, UploadProps, UploadRawFile } from "element-plus";
+
+//更改已上传的视频:el-upload中设置 limit 和 on-exceed 可以在选中时自动替换上一个文件。
+const upload = ref<UploadInstance>();
+
+const handleExceed: UploadProps["onExceed"] = (files) => {
+  upload.value!.clearFiles();
+  const file = files[0] as UploadRawFile;
+  file.uid = genFileId();
+  upload.value!.handleStart(file);
+};
+//每个视频上传控件对应一个videoMsg[videoIndex]
 const videoIndex = ref(0);
-    
-    //上传成功钩子
-    function videoUploadOk(response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) {
-    const { control = {} } : { control: any } = controlData.value
-        control.videoMsg[videoIndex.value].url = response.data.url;
-        control.videoMsg[videoIndex.value].videoReady = true;
-        control.videoMsg[videoIndex.value].CreatedAt = response.data.CreatedAt;
-        control.videoMsg[videoIndex.value].UpdatedAt = response.data.UpdatedAt;
-        control.videoMsg[videoIndex.value].fileSize = response.data.fileSize;
-        control.videoMsg[videoIndex.value].id = response.data.id;
-        control.videoMsg[videoIndex.value].key = response.data.key;
-        control.videoMsg[videoIndex.value].name = response.data.name;
-        control.videoMsg[videoIndex.value].physicspath = response.data.physicspath;
-        control.videoMsg[videoIndex.value].size = response.data.size;
-        control.videoMsg[videoIndex.value].tag = response.data.tag;
-        control.videoMsg[videoIndex.value].type = response.data.type;
-    }
-    
-    //删除钩子 禁止删除
-    function beforeRemove(){
-        return false;
-    }
-    
-    //上传失败钩子
-    function videoUploadErr(error: Error, uploadFile: UploadFile, uploadFiles: UploadFiles){
-        alert("上传失败,请重试")
-        // console.log("上传失败"+error);
-    }
-    
-    //liwenxuan 20240108 vidioupload  end
-    
-    
-    
-    
-    //liwenxuan 20240111 carousel  start
-    
-import { Delete } from '@element-plus/icons-vue'
-import { CarsuselConfig } from '@/api/DesignForm/types'
-import errimg from '@/assets/404_images/untilUploadImg.png'
+
+//上传成功钩子
+function videoUploadOk(response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) {
+  const { control = {} }: { control: any } = controlData.value;
+  control.videoMsg[videoIndex.value].url = response.data.url;
+  control.videoMsg[videoIndex.value].videoReady = true;
+  control.videoMsg[videoIndex.value].CreatedAt = response.data.CreatedAt;
+  control.videoMsg[videoIndex.value].UpdatedAt = response.data.UpdatedAt;
+  control.videoMsg[videoIndex.value].fileSize = response.data.fileSize;
+  control.videoMsg[videoIndex.value].id = response.data.id;
+  control.videoMsg[videoIndex.value].key = response.data.key;
+  control.videoMsg[videoIndex.value].name = response.data.name;
+  control.videoMsg[videoIndex.value].physicspath = response.data.physicspath;
+  control.videoMsg[videoIndex.value].size = response.data.size;
+  control.videoMsg[videoIndex.value].tag = response.data.tag;
+  control.videoMsg[videoIndex.value].type = response.data.type;
+}
+
+//删除钩子 禁止删除
+function beforeRemove() {
+  return false;
+}
+
+//上传失败钩子
+function videoUploadErr(error: Error, uploadFile: UploadFile, uploadFiles: UploadFiles) {
+  alert("上传失败,请重试");
+  // console.log("上传失败"+error);
+}
+
+//liwenxuan 20240108 vidioupload  end
+
+//liwenxuan 20240111 carousel  start
+
+import { Delete } from "@element-plus/icons-vue";
+import { CarsuselConfig } from "@/api/DesignForm/types";
+import errimg from "@/assets/404_images/untilUploadImg.png";
 import { v4 as uuidv4 } from "uuid";
-    
-    //轮播图设置弹窗显示控制
-const dialogTableVisible = ref(false)
-    //穿梭框设置弹窗显示控制
-const transferDialogTableVisible = ref(false)
-    
-    //图片展示显示控制
-const showImagePreview = ref(false)
 
+//轮播图设置弹窗显示控制
+const dialogTableVisible = ref(false);
+//穿梭框设置弹窗显示控制
+const transferDialogTableVisible = ref(false);
 
-const currentAsfChangeCount = ref(0)
-    
-    //最近点击的上传按钮对应的imgId
-    let currentUploadImgid = "";
-    
-    //刚拖拽视频组件时,初始化imgid监听designForm.activeKey,变化时,如果controlData.value.type=='lowcodeCarsusel',就遍历轮播图数组把imgid=''的都生成uuid
-    watch(()=>store.activeKey, (newVal) => {
-        
-        //啊啊啊啊
-        if(controlData.value.type==='lowcodeCarsusel'){
-        const carsuselConfigData:CarsuselConfig[] = controlData.value.control.carsuselConfigArr
-            carsuselConfigData.forEach(element => {
-                // console.log(element)
-                if(element.imgId==''){
-                    // console.log("初始化imgid")
-                    let onlyNumber = uuidv4().replaceAll('-','').toString();   //获取唯一编码
-                    element.imgId = onlyNumber;
-                }
-            });
-        }else if(controlData.value.type==='associatedForms'){
-            currentAsfChangeCount.value = 0
-            //alert(1)
-            /* if(controlData.value.item.label){
+//图片展示显示控制
+const showImagePreview = ref(false);
+
+const currentAsfChangeCount = ref(0);
+
+//最近点击的上传按钮对应的imgId
+let currentUploadImgid = "";
+
+//刚拖拽视频组件时,初始化imgid监听designForm.activeKey,变化时,如果controlData.value.type=='lowcodeCarsusel',就遍历轮播图数组把imgid=''的都生成uuid
+watch(
+  () => store.activeKey,
+  (newVal) => {
+    //啊啊啊啊
+    if (controlData.value.type === "lowcodeCarsusel") {
+      const carsuselConfigData: CarsuselConfig[] =
+        controlData.value.control.carsuselConfigArr;
+      carsuselConfigData.forEach((element) => {
+        // console.log(element)
+        if (element.imgId == "") {
+          // console.log("初始化imgid")
+          let onlyNumber = uuidv4().replaceAll("-", "").toString(); //获取唯一编码
+          element.imgId = onlyNumber;
+        }
+      });
+    } else if (controlData.value.type === "associatedForms") {
+      currentAsfChangeCount.value = 0;
+      //alert(1)
+      /* if(controlData.value.item.label){
 
             }else{
                 controlData.value.item.label = "关联表单"
             }
             controlData.value.item.showLabel = true */
-            //console.log(controlData.value.control.fillRoles.master)
-            if(controlData.value.control.fillRoles&&controlData.value.control.fillRoles.master.length==0){
-                controlData.value.control.fillRoles.master = [
-						{
-							leftValue: '',
-							rightValue: '',
-							id: '',
-						}
-					]
-            }
-            if(controlData.value.control.fillRoles&&controlData.value.control.fillRoles.child.length==0){
-                controlData.value.control.fillRoles.child = [
-								{
-									id: '',
-									asfChildTableKey: '',
-									filterCondition:{
-										conditionHtml: '',
-										conditionHtmlCopy: '',
-										gongShi:{
-											formulaHtml:'',
-											mathsFormula:'',
-											mathsString:'',
-										},
-									},
-									childRoles:[]
-								},
-							]
-            }
-            controlData.value.control.fillRoles.master[0].id = uuidv4().replaceAll('-','').toString();
-            controlData.value.control.fillRoles.child[0].id = uuidv4().replaceAll('-','').toString();
-        }
-        //实现关联表单设置可选字段中没有当前字段效果    start
-        // console.log(controlData.value.name)
-        resDataForGlxxszExceptself1 = JSON.parse(JSON.stringify(resDataForGlxxszExceptself));
-        // console.log(resDataForGlxxszExceptself1)
-        
-        for(let i = 0;i<resDataForGlxxszExceptself1.length;i++){
-            let strArr:[string] = resDataForGlxxszExceptself1[i].id.split(":")
-            // console.log(strArr)
-            let str = strArr[strArr.length-1]
-            // console.log(str)
-            if(str==newVal){
-                resDataForGlxxszExceptself1.splice(i, 1); // 将使后面的元素依次前移，数组长度减1
-                i--; // 如果不减，将漏掉一个元素
-            }
-        }
-        // console.log(resDataForGlxxszExceptself1)
-        if(getAssociatedFormsCurrentFieldTreeData && getAssociatedFormsCurrentFieldTreeData.treeAttrs && getAssociatedFormsCurrentFieldTreeData.treeAttrs!=undefined){
-            associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value = [{
-                id: 'rootid_'+getAssociatedFormsCurrentFieldTreeData.label,
-                //label: '当前表单',
-                label: '当前表单-'+getAssociatedFormsCurrentFieldTreeData.treeAttrs.show,
-                children: resDataForGlxxszExceptself1,
-                treeAttrs: getAssociatedFormsCurrentFieldTreeData.treeAttrs,//
-            }]
-        }
-        
-        
-        //associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value.children = [...resDataForGlxxszExceptself1]
-        //实现关联表单设置可选字段中没有当前字段效果    end
-    })
-    //轮播图图片上传成功钩子
-    function carouselImgUploadSuccess(response: any, uploadFile: UploadFile, uploadFiles: UploadFiles){
-    const carsuselConfigData:CarsuselConfig[] = controlData.value.control.carsuselConfigArr
-            carsuselConfigData.forEach(element => {
-                if(element.imgId==currentUploadImgid){
-                    element.imgUrl=response.data.url
-                    element.uploadFlag=true
-                }
-            });
-        
-    }
-    
-    //轮播图所有已上传的图片的url,点击略缩图展示大图用
-const carouselImgUrlList = computed(() => {
-    const list:string[] = [];
-    const carsuselConfigData:CarsuselConfig[] = store.controlAttr.control.carsuselConfigArr
-        carsuselConfigData.forEach(element => {
-            if(element.uploadFlag===true){
-                list.push(element.imgUrl)
-            }
-        });
-        return list;
-    })
-    
-    //轮播图设置table
-    function createRow(clickedRow:any){
-    const newRow:CarsuselConfig = {
-            uploadFlag:false,
-            imgId:'',
-            imgSort:1,
-            imgUrl: '',
-            link: ''
-        }
-        let onlyNumber = uuidv4().replaceAll('-','').toString();   //获取唯一编码
-        newRow.imgId = onlyNumber;
-    const nextSort:number = clickedRow.sort+1;
-        newRow.imgSort = nextSort;
-        controlData.value.control.carsuselConfigArr.push(newRow)
-    }
-    
-    function deleteRow(clickedRow:any){
-        //alert('删除一行')
-    const carsuselConfigData:CarsuselConfig[] = controlData.value.control.carsuselConfigArr
-        for (var i = 0; i < carsuselConfigData.length; i++) {
-            if(carsuselConfigData[i].imgId===clickedRow.imgId){
-                carsuselConfigData.splice(i, 1);
-                i--; // 如果不减，将漏掉一个元素
-            }
-        }
-    }
-    
-    //关闭大图展示
-const closePreview = () => {
-        showImagePreview.value = false
+      //console.log(controlData.value.control.fillRoles.master)
+      if (
+        controlData.value.control.fillRoles &&
+        controlData.value.control.fillRoles.master.length == 0
+      ) {
+        controlData.value.control.fillRoles.master = [
+          {
+            leftValue: "",
+            rightValue: "",
+            id: "",
+          },
+        ];
+      }
+      if (
+        controlData.value.control.fillRoles &&
+        controlData.value.control.fillRoles.child.length == 0
+      ) {
+        controlData.value.control.fillRoles.child = [
+          {
+            id: "",
+            asfChildTableKey: "",
+            filterCondition: {
+              conditionHtml: "",
+              conditionHtmlCopy: "",
+              gongShi: {
+                formulaHtml: "",
+                mathsFormula: "",
+                mathsString: "",
+              },
+            },
+            childRoles: [],
+          },
+        ];
+      }
+      controlData.value.control.fillRoles.master[0].id = uuidv4()
+        .replaceAll("-", "")
+        .toString();
+      controlData.value.control.fillRoles.child[0].id = uuidv4()
+        .replaceAll("-", "")
+        .toString();
     }
-    
-    //开启大图展示
-const handlePreview = (index: number, row: any) => {
-        showImagePreview.value = true
+    //实现关联表单设置可选字段中没有当前字段效果    start
+    // console.log(controlData.value.name)
+    resDataForGlxxszExceptself1 = JSON.parse(JSON.stringify(resDataForGlxxszExceptself));
+    // console.log(resDataForGlxxszExceptself1)
+
+    for (let i = 0; i < resDataForGlxxszExceptself1.length; i++) {
+      let strArr: [string] = resDataForGlxxszExceptself1[i].id.split(":");
+      // console.log(strArr)
+      let str = strArr[strArr.length - 1];
+      // console.log(str)
+      if (str == newVal) {
+        resDataForGlxxszExceptself1.splice(i, 1); // 将使后面的元素依次前移，数组长度减1
+        i--; // 如果不减，将漏掉一个元素
+      }
     }
-    
-const changeCurrentUploadImgid = (clickedRow:any) => {
-        currentUploadImgid = clickedRow.imgId
+    // console.log(resDataForGlxxszExceptself1)
+    if (
+      getAssociatedFormsCurrentFieldTreeData &&
+      getAssociatedFormsCurrentFieldTreeData.treeAttrs &&
+      getAssociatedFormsCurrentFieldTreeData.treeAttrs != undefined
+    ) {
+      associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value = [
+        {
+          id: "rootid_" + getAssociatedFormsCurrentFieldTreeData.label,
+          //label: '当前表单',
+          label: "当前表单-" + getAssociatedFormsCurrentFieldTreeData.treeAttrs.show,
+          children: resDataForGlxxszExceptself1,
+          treeAttrs: getAssociatedFormsCurrentFieldTreeData.treeAttrs, //
+        },
+      ];
     }
-	const showModeSelectOptions = [
-	{
-		value: '自定义像素值',
-		label: '自定义像素值',
-	},
-	{
-		value: '自定义占父容器比例',
-		label: '自定义占父容器比例',
-	},
-]
 
-const floatSelectOptions = [
-	{
-		value: 'left',
-		label: '左',
-	},
-	{
-		value: 'right',
-		label: '右',
-	},
-]
-
-
-const dataSource = ref<Tree[]>([]) 
-interface Tree {
-	id?: string
-	label: string
-	disabled?: boolean
-	children?: Tree[]
-	parentId?: string
-	[key: string]: any
+    //associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value.children = [...resDataForGlxxszExceptself1]
+    //实现关联表单设置可选字段中没有当前字段效果    end
+  }
+);
+//轮播图图片上传成功钩子
+function carouselImgUploadSuccess(
+  response: any,
+  uploadFile: UploadFile,
+  uploadFiles: UploadFiles
+) {
+  const carsuselConfigData: CarsuselConfig[] =
+    controlData.value.control.carsuselConfigArr;
+  carsuselConfigData.forEach((element) => {
+    if (element.imgId == currentUploadImgid) {
+      element.imgUrl = response.data.url;
+      element.uploadFlag = true;
+    }
+  });
 }
 
+//轮播图所有已上传的图片的url,点击略缩图展示大图用
+const carouselImgUrlList = computed(() => {
+  const list: string[] = [];
+  const carsuselConfigData: CarsuselConfig[] =
+    store.controlAttr.control.carsuselConfigArr;
+  carsuselConfigData.forEach((element) => {
+    if (element.uploadFlag === true) {
+      list.push(element.imgUrl);
+    }
+  });
+  return list;
+});
 
-const addRootNode = () => {
-	let onlyNumber = uuidv4().replaceAll('-','').toString();   
-	controlData.value.control.fixedOptions.push({
-		id: onlyNumber,
-        label: '新根节点',
-		disabled: false,
-		children: [],
-	}) 
-}
-
-const append = (data: Tree) => {
-	let onlyNumber = uuidv4().replaceAll('-','').toString();   
-	const newChild = { id: onlyNumber, label: '新节点', disabled:false,children: [] }
-	if (!data.children) {
-		data.children = []
-	}
-	data.children.push(newChild)
-	dataSource.value = [...dataSource.value]
+//轮播图设置table
+function createRow(clickedRow: any) {
+  const newRow: CarsuselConfig = {
+    uploadFlag: false,
+    imgId: "",
+    imgSort: 1,
+    imgUrl: "",
+    link: "",
+  };
+  let onlyNumber = uuidv4().replaceAll("-", "").toString(); //获取唯一编码
+  newRow.imgId = onlyNumber;
+  const nextSort: number = clickedRow.sort + 1;
+  newRow.imgSort = nextSort;
+  controlData.value.control.carsuselConfigArr.push(newRow);
 }
 
-const remove = (node: Node, data: Tree) => {
-	let really = confirm("确认删除吗?\n将删除本节点与本节点的所有子孙节点!");
-	if(really){
-		const parent = node.parent
-		const children: Tree[] = parent.data.children || parent.data
-		const index = children.findIndex((d) => d.id === data.id)
-		children.splice(index, 1)
-		dataSource.value = [...dataSource.value]
-	}
-	
+function deleteRow(clickedRow: any) {
+  //alert('删除一行')
+  const carsuselConfigData: CarsuselConfig[] =
+    controlData.value.control.carsuselConfigArr;
+  for (var i = 0; i < carsuselConfigData.length; i++) {
+    if (carsuselConfigData[i].imgId === clickedRow.imgId) {
+      carsuselConfigData.splice(i, 1);
+      i--; // 如果不减，将漏掉一个元素
+    }
+  }
 }
 
+//关闭大图展示
+const closePreview = () => {
+  showImagePreview.value = false;
+};
 
+//开启大图展示
+const handlePreview = (index: number, row: any) => {
+  showImagePreview.value = true;
+};
+
+const changeCurrentUploadImgid = (clickedRow: any) => {
+  currentUploadImgid = clickedRow.imgId;
+};
+const showModeSelectOptions = [
+  {
+    value: "自定义像素值",
+    label: "自定义像素值",
+  },
+  {
+    value: "自定义占父容器比例",
+    label: "自定义占父容器比例",
+  },
+];
 
-const changeLabel = (node:Node,data:Tree) =>{
-	let favDrink = prompt("请输入:");
-	if(favDrink!=null && favDrink.length>0){
-		const parent = node.parent
-		const children: Tree[] = parent.data.children || parent.data
-		const index = children.findIndex((d) => d.id === data.id)
-		children[index].label = favDrink
-		dataSource.value = [...dataSource.value]
-	}
-	
-	
-}
-
-const setNodeEnable = (node:Node,data:Tree) =>{
-	const parent = node.parent
-	const children: Tree[] = parent.data.children || parent.data
-	const index = children.findIndex((d) => d.id === data.id)
-	children[index].disabled = !children[index].disabled
-	dataSource.value = [...dataSource.value]
-	
+const floatSelectOptions = [
+  {
+    value: "left",
+    label: "左",
+  },
+  {
+    value: "right",
+    label: "右",
+  },
+];
+
+const dataSource = ref<Tree[]>([]);
+interface Tree {
+  id?: string;
+  label: string;
+  disabled?: boolean;
+  children?: Tree[];
+  parentId?: string;
+  [key: string]: any;
 }
 
+const addRootNode = () => {
+  let onlyNumber = uuidv4().replaceAll("-", "").toString();
+  controlData.value.control.fixedOptions.push({
+    id: onlyNumber,
+    label: "新根节点",
+    disabled: false,
+    children: [],
+  });
+};
 
+const append = (data: Tree) => {
+  let onlyNumber = uuidv4().replaceAll("-", "").toString();
+  const newChild = { id: onlyNumber, label: "新节点", disabled: false, children: [] };
+  if (!data.children) {
+    data.children = [];
+  }
+  data.children.push(newChild);
+  dataSource.value = [...dataSource.value];
+};
 
+const remove = (node: Node, data: Tree) => {
+  let really = confirm("确认删除吗?\n将删除本节点与本节点的所有子孙节点!");
+  if (really) {
+    const parent = node.parent;
+    const children: Tree[] = parent.data.children || parent.data;
+    const index = children.findIndex((d) => d.id === data.id);
+    children.splice(index, 1);
+    dataSource.value = [...dataSource.value];
+  }
+};
+
+const changeLabel = (node: Node, data: Tree) => {
+  let favDrink = prompt("请输入:");
+  if (favDrink != null && favDrink.length > 0) {
+    const parent = node.parent;
+    const children: Tree[] = parent.data.children || parent.data;
+    const index = children.findIndex((d) => d.id === data.id);
+    children[index].label = favDrink;
+    dataSource.value = [...dataSource.value];
+  }
+};
 
-
-
+const setNodeEnable = (node: Node, data: Tree) => {
+  const parent = node.parent;
+  const children: Tree[] = parent.data.children || parent.data;
+  const index = children.findIndex((d) => d.id === data.id);
+  children[index].disabled = !children[index].disabled;
+  dataSource.value = [...dataSource.value];
+};
 
 //图片上传成功钩子
-function lowcodeImageUploadSuccess(response: any, uploadFile: UploadFile, uploadFiles: UploadFiles){
-	const element = controlData.value.control
-	element.imgUrl=response.data.url
-	element.uploadFlag=true
+function lowcodeImageUploadSuccess(
+  response: any,
+  uploadFile: UploadFile,
+  uploadFiles: UploadFiles
+) {
+  const element = controlData.value.control;
+  element.imgUrl = response.data.url;
+  element.uploadFlag = true;
 }
 
 //
 const transferDataSourceOptions = [
-	{
-		value: '数据源',
-		label: '数据源',
-	},
-	{
-		value: '固定选项',
-		label: '固定选项',
-	},
-]
+  {
+    value: "数据源",
+    label: "数据源",
+  },
+  {
+    value: "固定选项",
+    label: "固定选项",
+  },
+];
 
 //const radio = ref(controlData.value.control.fit)
 
 //liwenxuan20240313 lowcodeImage end
 
-
-//liwenxuan20240403 associatedForms start 
-import AssociatedFormsTinyace from '@/widget/associatedforms/associatedFormsTinyace.vue'
-import AssociatedFormsTinyaceRange from '@/widget/associatedforms/associatedFormsTinyaceRange.vue'
-import AssociatedFormsFillRole from '@/widget/associatedforms/associatedFormsFillRole.vue'
-import AssociatedFormsChildFillRole from '@/widget/associatedforms/associatedFormsChildFillRole.vue'
+//liwenxuan20240403 associatedForms start
+import AssociatedFormsTinyace from "@/widget/associatedforms/associatedFormsTinyace.vue";
+import AssociatedFormsTinyaceRange from "@/widget/associatedforms/associatedFormsTinyaceRange.vue";
+import AssociatedFormsFillRole from "@/widget/associatedforms/associatedFormsFillRole.vue";
+import AssociatedFormsChildFillRole from "@/widget/associatedforms/associatedFormsChildFillRole.vue";
 
 const treeDefaultProps = {
-	children: 'children',
-	label: 'label',
-}
+  children: "children",
+  label: "label",
+};
 //拿到子组件AssociatedFormsTinyace的实例
 const aft = ref();
 const aftRange = ref();
 
 function getAssociatedFormsCurrentFieldTree() {
-
-        return request({ 
-            url: '/javasys/lowCode/AssociatedForms/getFieldTree',
-            method: 'post',
-			data: {
-				//cfid:'13'
-                cfid:props.customerformid
-			},
-        });
+  return request({
+    url: "/javasys/lowCode/AssociatedForms/getFieldTree",
+    method: "post",
+    data: {
+      //cfid:'13'
+      cfid: props.customerformid,
+    },
+  });
 }
 
 function getAssociatedFormsOrgAndManTree() {
-        return request({
-            url: '/javasys/lowCode/transfer/getOrgAndManTree',
-            method: 'post',
-        });
+  return request({
+    url: "/javasys/lowCode/transfer/getOrgAndManTree",
+    method: "post",
+  });
 }
 
 function getCustomerFormList() {
-        return request({
-            url: '/javasys/lowCode/AssociatedForms/getCustomerFormList',
-            method: 'post',
-        });
+  return request({
+    url: "/javasys/lowCode/AssociatedForms/getCustomerFormList",
+    method: "post",
+  });
 }
 function getAssociatedFormsRoleTree() {
-        return request({
-            url: '/javasys/lowCode/AssociatedForms/getRoleList',
-            method: 'post',
-        });
+  return request({
+    url: "/javasys/lowCode/AssociatedForms/getRoleList",
+    method: "post",
+  });
 }
 
 function getAsfasfFieldTree() {
-    return request({ 
-        url: '/javasys/lowCode/AssociatedForms/getFieldTree',
-        method: 'post',
-        data: {
-            //cfid:'13'
-            cfid:controlData.value.control.formid
-        },
-    });
+  return request({
+    url: "/javasys/lowCode/AssociatedForms/getFieldTree",
+    method: "post",
+    data: {
+      //cfid:'13'
+      cfid: controlData.value.control.formid,
+    },
+  });
 }
 
 function getAsfasfFieldTreeOptionsValue3() {
-    return request({ 
-        url: '/javasys/lowCode/AssociatedForms/getFieldTree',
-        method: 'post',
-        data: {
-            //cfid:'13'
-            cfid:controlData.value.control.optionsValue3Formid
-        },
-    });
+  return request({
+    url: "/javasys/lowCode/AssociatedForms/getFieldTree",
+    method: "post",
+    data: {
+      //cfid:'13'
+      cfid: controlData.value.control.optionsValue3Formid,
+    },
+  });
 }
 
 //
-const asfasfFieldTree = ref<Tree[]>()
-
-const asfasfMasterFieldTree = ref<Tree[]>()
-
-const asfasfChildTableList = ref<Tree[]>()
+const asfasfFieldTree = ref<Tree[]>();
 
-const asfasfChildTableFields = ref<Tree[]>()
+const asfasfMasterFieldTree = ref<Tree[]>();
 
-const asfasfFieldTreeOptionsValue3 = ref<Tree[]>()
+const asfasfChildTableList = ref<Tree[]>();
 
-let currentChildTableCount = 0
+const asfasfChildTableFields = ref<Tree[]>();
 
-function removeFirstNumElements(arr: string | any[],num:number) {
-    if (arr.length < num) {
-        return [];
-    }
-    return arr.slice(num);
-}
+const asfasfFieldTreeOptionsValue3 = ref<Tree[]>();
 
-function formidChanged(){
+let currentChildTableCount = 0;
 
-    //需设置关联关联表单的表单
-    controlData.value.control.glbbddbd=formData.value.name
-    if(controlData.value.control.formid===''){
-
-    }else{
-        getAsfasfFieldTree().then(({ data }) => {
-            
-            if(data.id==="cfid为空"){
-                //alert("cfid为空")
-            }else{
-                let resData = ref(data.children)
-                let dataExceptChild = JSON.parse(JSON.stringify(data.children))
-                let dataOnlyChild = JSON.parse(JSON.stringify(data.children))
-                let dataOnlyChild1 = JSON.parse(JSON.stringify(data.children))
-                dataExceptChild = dataExceptChild.filter((obj: { type: string }) => obj.type!== 'table');
-                //console.log(dataExceptChild)
-                dataExceptChild = removeFirstNumElements(dataExceptChild,8);
-                dataOnlyChild = dataOnlyChild.filter((obj: { type: string }) => obj.type== 'table');
-                dataOnlyChild1 = dataOnlyChild1.filter((obj: { type: string }) => obj.type== 'table');
-                //console.log(dataOnlyChild1)
-                dataOnlyChild1.forEach((element: any) => {
-                    element.children = removeFirstNumElements(element.children,6);
-                });
-                /* console.log(dataOnlyChild1)
-                console.log(dataOnlyChild) */
-                for(let m = 0;m<dataOnlyChild.length;m++){
-                    dataOnlyChild[m].children = []
-                }
-                let resDataExceptChild = ref(dataExceptChild)
-                let resDataOnlyChild = ref(dataOnlyChild)
-                let resDataOnlyChild1 = ref(dataOnlyChild1)
-                //console.log(resDataOnlyChild1.value)
-                //console.log(resDataOnlyChild.value)
-                let childTableCount = 0
-                for(let n = 0;n<resDataOnlyChild.value.length;n++){
-                    //console.log(resDataOnlyChild.value[n])
-                    resDataOnlyChild.value[n].disabled=false
-                    childTableCount++
-                }
-                //console.log(childTableCount)
-                currentChildTableCount = childTableCount
-                asfasfFieldTree.value = [{
-                    id: 'rootid_'+data.label,
-                    label: '关联的表单-'+data.label,
-                    children: [...resData.value],
-                    treeAttrs: data.treeAttrs,
-                    disabled:true,
-                }]
-                asfasfMasterFieldTree.value = [{
-                    id: 'rootid_'+data.label,
-                    label: '关联的表单-'+data.label,
-                    children: [...resDataExceptChild.value],
-                    treeAttrs: data.treeAttrs,
-                    disabled:true,
-                }]
-                asfasfChildTableList.value = [{
-                    id: 'rootid_'+data.label,
-                    label: '关联的表单-'+data.label,
-                    children: [...resDataOnlyChild.value],
-                    treeAttrs: data.treeAttrs,
-                    disabled:true,
-                }]
-                asfasfChildTableFields.value = [{
-                    id: 'rootid_'+data.label,
-                    label: '关联的表单-'+data.label,
-                    children: [...resDataOnlyChild1.value],
-                    treeAttrs: data.treeAttrs,
-                    disabled:true,
-                }]
-            }
-            controlData.value.control.asfasfLabel = data.label
-        });
-    }
-    
+function removeFirstNumElements(arr: string | any[], num: number) {
+  if (arr.length < num) {
+    return [];
+  }
+  return arr.slice(num);
 }
 
-function formidChangedOptionsValue3(){
-    if(controlData.value.control.optionsValue3Formid===''){
-
-    }else{
-        getAsfasfFieldTreeOptionsValue3().then(({ data }) => {
-            
-            if(data.id==="cfid为空"){
-                //alert("cfid为空")
-            }else{
-
-                if(data.treeAttrs.onlyToShowTableId==""){//当前选中的是主表
-                    let resData = ref(data.children)
-                    //let rootid_ = data.value.label
-                    asfasfFieldTreeOptionsValue3.value = [{
-                        id: 'rootid_'+data.label,
-                        label: '关联的表单-'+data.label,
-                        children: [...resData.value],
-                        treeAttrs: data.treeAttrs,
-                    }]
-                }else{//当前选中的是子表
-                    let resData = ref(data.children)
-                    resData.value = resData.value.filter((item: { children: null }) => item.children != null)
-                    let arr = JSON.parse(JSON.stringify(resData.value));
-                    arr = arr.filter( (item: { label: any }) => item.label == data.treeAttrs.onlyToShowTableId )
-                
-                    arr = arr[0].children
-                    // console.log(arr)
-                    asfasfFieldTreeOptionsValue3.value = [{
-                        id: 'rootid_'+data.label,
-                        label: '关联的表单-'+data.label,
-                        children: [...arr],
-                        treeAttrs: data.treeAttrs,
-                    }]
-                    
-                    
-                }
-                let optionsValue3Formid = controlData.value.control.optionsValue3Formid
-                let str_optionsValue3Formid = optionsValue3Formid.split(":")[0]
-                let optionsValue3Field = controlData.value.control.optionsValue3Field
-                let str_optionsValue3Field = optionsValue3Field.split(":")[1]
-                //alert(str_optionsValue3Field)
-                if(typeof(str_optionsValue3Field)!='undefined'){
-                    if(str_optionsValue3Formid!=str_optionsValue3Field){
-                        controlData.value.control.optionsValue3Field = ""
-                    }else{
-                        if(optionsValue3Formid.includes(":zibiaoid-")){
-                            let zibiaoid = optionsValue3Formid.split(":zibiaoid-")[1]
-                            if(!optionsValue3Field.includes(zibiaoid)){
-                                controlData.value.control.optionsValue3Field = ""
-                            }
-                        }
-                    }
-
-                    
-                }
-                
-                
-            }
-            
-        });
-    }
-}
-let currentFormChildTableFieldsForFillRole = ref<Tree[]>()
-let associatedFormsCurrentFormFieldTree = ref<Tree[]>()
-let associatedFormsCurrentFormFieldTree1 = ref<Tree[]>()
-let associatedFormsCurrentFormFieldTreeNoTable = ref<Tree[]>()
-let associatedFormsCurrentFormFieldTreeForGlxxsz = ref<Tree[]>()
-let associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf = ref<Tree[]>()
-let resDataForGlxxszExceptself: any[] = []
-let resDataForGlxxszExceptself1: any[] = []
-let getAssociatedFormsCurrentFieldTreeData:any
-getAssociatedFormsCurrentFieldTree1()
-function getAssociatedFormsCurrentFieldTree1(){
-getAssociatedFormsCurrentFieldTree().then(({ data }) => {
-    // console.log(data)
-    getAssociatedFormsCurrentFieldTreeData = JSON.parse(JSON.stringify(data))
-    // console.log(getAssociatedFormsCurrentFieldTreeData)
-    if(data.id==="cfid为空"||data.id==="masterTable为null"){
-        
+function formidChanged() {
+  //需设置关联关联表单的表单
+  controlData.value.control.glbbddbd = formData.value.name;
+  if (controlData.value.control.formid === "") {
+  } else {
+    getAsfasfFieldTree().then(({ data }) => {
+      if (data.id === "cfid为空") {
         //alert("cfid为空")
-    }else{
-        
-        let resData = ref(data.children)
-        let resDataExceptSystemFields = JSON.parse(JSON.stringify(data.children))
-        let currentFormChildTableFields = JSON.parse(JSON.stringify(data.children))
-        let resDataNoTable = JSON.parse(JSON.stringify(data.children))
-        
-        resDataExceptSystemFields = removeFirstNumElements(resDataExceptSystemFields,8)
-        resDataExceptSystemFields.forEach((element: any)  => {
-            if(element.type=="table"){
-                //console.log(element)
-                element.children = removeFirstNumElements(element.children,6)
-            }
+      } else {
+        let resData = ref(data.children);
+        let dataExceptChild = JSON.parse(JSON.stringify(data.children));
+        let dataOnlyChild = JSON.parse(JSON.stringify(data.children));
+        let dataOnlyChild1 = JSON.parse(JSON.stringify(data.children));
+        dataExceptChild = dataExceptChild.filter(
+          (obj: { type: string }) => obj.type !== "table"
+        );
+        //console.log(dataExceptChild)
+        dataExceptChild = removeFirstNumElements(dataExceptChild, 8);
+        dataOnlyChild = dataOnlyChild.filter(
+          (obj: { type: string }) => obj.type == "table"
+        );
+        dataOnlyChild1 = dataOnlyChild1.filter(
+          (obj: { type: string }) => obj.type == "table"
+        );
+        //console.log(dataOnlyChild1)
+        dataOnlyChild1.forEach((element: any) => {
+          element.children = removeFirstNumElements(element.children, 6);
         });
-        //在此组装当前表单子表字段数据
-        currentFormChildTableFields = currentFormChildTableFields.filter( (item: { type: string }) => item.type == "table" )
-        currentFormChildTableFields.forEach((element: any) => {
-            element.children = removeFirstNumElements(element.children,6)
-        });
-        
-        associatedFormsCurrentFormFieldTree.value = [{
-            id: 'rootid_'+data.label,
-            label: '当前表单-'+data.treeAttrs.show,
+        /* console.log(dataOnlyChild1)
+                console.log(dataOnlyChild) */
+        for (let m = 0; m < dataOnlyChild.length; m++) {
+          dataOnlyChild[m].children = [];
+        }
+        let resDataExceptChild = ref(dataExceptChild);
+        let resDataOnlyChild = ref(dataOnlyChild);
+        let resDataOnlyChild1 = ref(dataOnlyChild1);
+        //console.log(resDataOnlyChild1.value)
+        //console.log(resDataOnlyChild.value)
+        let childTableCount = 0;
+        for (let n = 0; n < resDataOnlyChild.value.length; n++) {
+          //console.log(resDataOnlyChild.value[n])
+          resDataOnlyChild.value[n].disabled = false;
+          childTableCount++;
+        }
+        //console.log(childTableCount)
+        currentChildTableCount = childTableCount;
+        asfasfFieldTree.value = [
+          {
+            id: "rootid_" + data.label,
+            label: "关联的表单-" + data.label,
             children: [...resData.value],
             treeAttrs: data.treeAttrs,
             disabled: true,
-        }]
-        associatedFormsCurrentFormFieldTree1.value = [{
-            id: 'rootid_'+data.label,
-            label: '当前表单-'+data.treeAttrs.show,
-            children: [...resDataExceptSystemFields],
+          },
+        ];
+        asfasfMasterFieldTree.value = [
+          {
+            id: "rootid_" + data.label,
+            label: "关联的表单-" + data.label,
+            children: [...resDataExceptChild.value],
             treeAttrs: data.treeAttrs,
             disabled: true,
-        }]
-        currentFormChildTableFieldsForFillRole.value = [{
-            id: 'rootid_'+data.label,
-            label: '当前表单-'+data.treeAttrs.show,
-            children: [...currentFormChildTableFields],
+          },
+        ];
+        asfasfChildTableList.value = [
+          {
+            id: "rootid_" + data.label,
+            label: "关联的表单-" + data.label,
+            children: [...resDataOnlyChild.value],
             treeAttrs: data.treeAttrs,
             disabled: true,
-        }]
-        
-        resDataNoTable = resDataNoTable.filter((item: { type: string | null }) => item.type!="table")
-        
-        associatedFormsCurrentFormFieldTreeNoTable.value = [{
-            id: 'rootid_'+data.label,
-            label: '当前表单-'+data.treeAttrs.show,
-            children: [...resDataNoTable],
-            treeAttrs: data.treeAttrs,
-        }]
-
-        let resDataForGlxxsz = ref(data.children.slice(8))
-        
-        resDataForGlxxszExceptself = JSON.parse(JSON.stringify(resDataForGlxxsz.value));
-        
-        
-        
-        
-        
-        associatedFormsCurrentFormFieldTreeForGlxxsz.value = [{
-            id: 'rootid_'+data.label,
-            //label: '当前表单',
-            label: '当前表单-'+data.treeAttrs.show,
-            children: [...resDataForGlxxsz.value],
+          },
+        ];
+        asfasfChildTableFields.value = [
+          {
+            id: "rootid_" + data.label,
+            label: "关联的表单-" + data.label,
+            children: [...resDataOnlyChild1.value],
             treeAttrs: data.treeAttrs,
-        }]
-        associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value = [{
-            id: 'rootid_'+data.label,
-            //label: '当前表单',
-            label: '当前表单-'+data.treeAttrs.show,
-            children: [...resDataForGlxxsz.value],
-            treeAttrs: data.treeAttrs,//getAssociatedFormsCurrentFieldTreeData
-        }]
-
-        
-    }
-});
+            disabled: true,
+          },
+        ];
+      }
+      controlData.value.control.asfasfLabel = data.label;
+    });
+  }
 }
 
+function formidChangedOptionsValue3() {
+  if (controlData.value.control.optionsValue3Formid === "") {
+  } else {
+    getAsfasfFieldTreeOptionsValue3().then(({ data }) => {
+      if (data.id === "cfid为空") {
+        //alert("cfid为空")
+      } else {
+        if (data.treeAttrs.onlyToShowTableId == "") {
+          //当前选中的是主表
+          let resData = ref(data.children);
+          //let rootid_ = data.value.label
+          asfasfFieldTreeOptionsValue3.value = [
+            {
+              id: "rootid_" + data.label,
+              label: "关联的表单-" + data.label,
+              children: [...resData.value],
+              treeAttrs: data.treeAttrs,
+            },
+          ];
+        } else {
+          //当前选中的是子表
+          let resData = ref(data.children);
+          resData.value = resData.value.filter(
+            (item: { children: null }) => item.children != null
+          );
+          let arr = JSON.parse(JSON.stringify(resData.value));
+          arr = arr.filter(
+            (item: { label: any }) => item.label == data.treeAttrs.onlyToShowTableId
+          );
+
+          arr = arr[0].children;
+          // console.log(arr)
+          asfasfFieldTreeOptionsValue3.value = [
+            {
+              id: "rootid_" + data.label,
+              label: "关联的表单-" + data.label,
+              children: [...arr],
+              treeAttrs: data.treeAttrs,
+            },
+          ];
+        }
+        let optionsValue3Formid = controlData.value.control.optionsValue3Formid;
+        let str_optionsValue3Formid = optionsValue3Formid.split(":")[0];
+        let optionsValue3Field = controlData.value.control.optionsValue3Field;
+        let str_optionsValue3Field = optionsValue3Field.split(":")[1];
+        //alert(str_optionsValue3Field)
+        if (typeof str_optionsValue3Field != "undefined") {
+          if (str_optionsValue3Formid != str_optionsValue3Field) {
+            controlData.value.control.optionsValue3Field = "";
+          } else {
+            if (optionsValue3Formid.includes(":zibiaoid-")) {
+              let zibiaoid = optionsValue3Formid.split(":zibiaoid-")[1];
+              if (!optionsValue3Field.includes(zibiaoid)) {
+                controlData.value.control.optionsValue3Field = "";
+              }
+            }
+          }
+        }
+      }
+    });
+  }
+}
+let currentFormChildTableFieldsForFillRole = ref<Tree[]>();
+let associatedFormsCurrentFormFieldTree = ref<Tree[]>();
+let associatedFormsCurrentFormFieldTree1 = ref<Tree[]>();
+let associatedFormsCurrentFormFieldTreeNoTable = ref<Tree[]>();
+let associatedFormsCurrentFormFieldTreeForGlxxsz = ref<Tree[]>();
+let associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf = ref<Tree[]>();
+let resDataForGlxxszExceptself: any[] = [];
+let resDataForGlxxszExceptself1: any[] = [];
+let getAssociatedFormsCurrentFieldTreeData: any;
+getAssociatedFormsCurrentFieldTree1();
+function getAssociatedFormsCurrentFieldTree1() {
+  getAssociatedFormsCurrentFieldTree().then(({ data }) => {
+    // console.log(data)
+    getAssociatedFormsCurrentFieldTreeData = JSON.parse(JSON.stringify(data));
+    // console.log(getAssociatedFormsCurrentFieldTreeData)
+    if (data.id === "cfid为空" || data.id === "masterTable为null") {
+      //alert("cfid为空")
+    } else {
+      let resData = ref(data.children);
+      let resDataExceptSystemFields = JSON.parse(JSON.stringify(data.children));
+      let currentFormChildTableFields = JSON.parse(JSON.stringify(data.children));
+      let resDataNoTable = JSON.parse(JSON.stringify(data.children));
+
+      resDataExceptSystemFields = removeFirstNumElements(resDataExceptSystemFields, 8);
+      resDataExceptSystemFields.forEach((element: any) => {
+        if (element.type == "table") {
+          //console.log(element)
+          element.children = removeFirstNumElements(element.children, 6);
+        }
+      });
+      //在此组装当前表单子表字段数据
+      currentFormChildTableFields = currentFormChildTableFields.filter(
+        (item: { type: string }) => item.type == "table"
+      );
+      currentFormChildTableFields.forEach((element: any) => {
+        element.children = removeFirstNumElements(element.children, 6);
+      });
+
+      associatedFormsCurrentFormFieldTree.value = [
+        {
+          id: "rootid_" + data.label,
+          label: "当前表单-" + data.treeAttrs.show,
+          children: [...resData.value],
+          treeAttrs: data.treeAttrs,
+          disabled: true,
+        },
+      ];
+      associatedFormsCurrentFormFieldTree1.value = [
+        {
+          id: "rootid_" + data.label,
+          label: "当前表单-" + data.treeAttrs.show,
+          children: [...resDataExceptSystemFields],
+          treeAttrs: data.treeAttrs,
+          disabled: true,
+        },
+      ];
+      currentFormChildTableFieldsForFillRole.value = [
+        {
+          id: "rootid_" + data.label,
+          label: "当前表单-" + data.treeAttrs.show,
+          children: [...currentFormChildTableFields],
+          treeAttrs: data.treeAttrs,
+          disabled: true,
+        },
+      ];
 
-const customerFormTree = ref<Tree[]>()
-getCustomerFormList().then(({ data }) => {   
-    let resData = ref(data.children)
-	customerFormTree.value = [{
-        id: data.id,
-        //value: data.value,
-    	//label: data.label,
-		label: '请选择表单',
-        children: [...resData.value]
-    }]
-});
+      resDataNoTable = resDataNoTable.filter(
+        (item: { type: string | null }) => item.type != "table"
+      );
+
+      associatedFormsCurrentFormFieldTreeNoTable.value = [
+        {
+          id: "rootid_" + data.label,
+          label: "当前表单-" + data.treeAttrs.show,
+          children: [...resDataNoTable],
+          treeAttrs: data.treeAttrs,
+        },
+      ];
+
+      let resDataForGlxxsz = ref(data.children.slice(8));
+
+      resDataForGlxxszExceptself = JSON.parse(JSON.stringify(resDataForGlxxsz.value));
+
+      associatedFormsCurrentFormFieldTreeForGlxxsz.value = [
+        {
+          id: "rootid_" + data.label,
+          //label: '当前表单',
+          label: "当前表单-" + data.treeAttrs.show,
+          children: [...resDataForGlxxsz.value],
+          treeAttrs: data.treeAttrs,
+        },
+      ];
+      associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value = [
+        {
+          id: "rootid_" + data.label,
+          //label: '当前表单',
+          label: "当前表单-" + data.treeAttrs.show,
+          children: [...resDataForGlxxsz.value],
+          treeAttrs: data.treeAttrs, //getAssociatedFormsCurrentFieldTreeData
+        },
+      ];
+    }
+  });
+}
 
+const customerFormTree = ref<Tree[]>();
+getCustomerFormList().then(({ data }) => {
+  let resData = ref(data.children);
+  customerFormTree.value = [
+    {
+      id: data.id,
+      //value: data.value,
+      //label: data.label,
+      label: "请选择表单",
+      children: [...resData.value],
+    },
+  ];
+});
 
-const orgAndManTree = ref<Tree[]>()
-getAssociatedFormsOrgAndManTree().then(({ data }) => {   
-    let resData = ref(data.children)
-	orgAndManTree.value = [{
-        id: data.id,
-    	//label: data.label,
-		label: '组织机构',
-        children: [...resData.value]
-    }]
+const orgAndManTree = ref<Tree[]>();
+getAssociatedFormsOrgAndManTree().then(({ data }) => {
+  let resData = ref(data.children);
+  orgAndManTree.value = [
+    {
+      id: data.id,
+      //label: data.label,
+      label: "组织机构",
+      children: [...resData.value],
+    },
+  ];
 });
 
-const roleTree = ref<Tree[]>()
-getAssociatedFormsRoleTree().then(({ data }) => {   
-    let resData = ref(data.children)
-    // console.log("roleTree=============="+resData.value);
-	roleTree.value = [{
-        id: data.id,
-    	//label: data.label,
-		label: '角色',
-        children: [...resData.value]
-    }]
+const roleTree = ref<Tree[]>();
+getAssociatedFormsRoleTree().then(({ data }) => {
+  let resData = ref(data.children);
+  // console.log("roleTree=============="+resData.value);
+  roleTree.value = [
+    {
+      id: data.id,
+      //label: data.label,
+      label: "角色",
+      children: [...resData.value],
+    },
+  ];
 });
 //    field
-const fieldTreeSearchFlag = ref(false)
+const fieldTreeSearchFlag = ref(false);
 
-function handleFieldTreeExpand(){
-	
-	fieldTreeSearchFlag.value = true;
+function handleFieldTreeExpand() {
+  fieldTreeSearchFlag.value = true;
 }
 
-function handleFieldTreeCollapse(){
-	
-	fieldTreeSearchFlag.value = false;
+function handleFieldTreeCollapse() {
+  fieldTreeSearchFlag.value = false;
 }
 
-
-function handleFieldTreeContextmenu(MouseEvent:any, object:any, Node:any, element:any){
-    aft.value.addIcon_field(object)
+function handleFieldTreeContextmenu(
+  MouseEvent: any,
+  object: any,
+  Node: any,
+  element: any
+) {
+  aft.value.addIcon_field(object);
 }
-function handleFieldTreeContextmenuRange(MouseEvent:any, object:any, Node:any, element:any){
-    aftRange.value.addIcon_field(object)
+function handleFieldTreeContextmenuRange(
+  MouseEvent: any,
+  object: any,
+  Node: any,
+  element: any
+) {
+  aftRange.value.addIcon_field(object);
 }
 
-
-
 //org
-const orgTreeSearchFlag = ref(false)
+const orgTreeSearchFlag = ref(false);
 
-function handleOrgTreeExpand(){
-	
-	orgTreeSearchFlag.value = true;
+function handleOrgTreeExpand() {
+  orgTreeSearchFlag.value = true;
 }
 
-function handleOrgTreeCollapse(){
-	
-	orgTreeSearchFlag.value = false;
+function handleOrgTreeCollapse() {
+  orgTreeSearchFlag.value = false;
 }
 
-function handleOrgTreeContextmenu(MouseEvent:any, object:any, Node:any, element:any){
-    aft.value.addIcon_org(object)
+function handleOrgTreeContextmenu(MouseEvent: any, object: any, Node: any, element: any) {
+  aft.value.addIcon_org(object);
 }
-function handleOrgTreeContextmenuRange(MouseEvent:any, object:any, Node:any, element:any){
-    aftRange.value.addIcon_org(object)
+function handleOrgTreeContextmenuRange(
+  MouseEvent: any,
+  object: any,
+  Node: any,
+  element: any
+) {
+  aftRange.value.addIcon_org(object);
 }
 //role
-const roleTreeSearchFlag = ref(false)
+const roleTreeSearchFlag = ref(false);
 
-function handleRoleTreeExpand(){
-	
-	roleTreeSearchFlag.value = true;
+function handleRoleTreeExpand() {
+  roleTreeSearchFlag.value = true;
 }
 
-function handleRoleTreeCollapse(){
-	
-	roleTreeSearchFlag.value = false;
+function handleRoleTreeCollapse() {
+  roleTreeSearchFlag.value = false;
 }
 
-function handleRoleTreeContextmenu(MouseEvent:any, object:any, Node:any, element:any){
-    aft.value.addIcon(object)
+function handleRoleTreeContextmenu(
+  MouseEvent: any,
+  object: any,
+  Node: any,
+  element: any
+) {
+  aft.value.addIcon(object);
 }
-function handleRoleTreeContextmenuRange(MouseEvent:any, object:any, Node:any, element:any){
-    aftRange.value.addIcon(object)
+function handleRoleTreeContextmenuRange(
+  MouseEvent: any,
+  object: any,
+  Node: any,
+  element: any
+) {
+  aftRange.value.addIcon(object);
 }
 
+import { ElTree } from "element-plus";
 
-import { ElTree } from 'element-plus'
-
-
-const fieldTreeFilterText = ref('')
-const orgTreeFilterText = ref('')
-const roleTreeFilterText = ref('')
-const fieldTreeRef = ref<InstanceType<typeof ElTree>>()
-const orgTreeRef = ref<InstanceType<typeof ElTree>>()
-const roleTreeRef = ref<InstanceType<typeof ElTree>>()
+const fieldTreeFilterText = ref("");
+const orgTreeFilterText = ref("");
+const roleTreeFilterText = ref("");
+const fieldTreeRef = ref<InstanceType<typeof ElTree>>();
+const orgTreeRef = ref<InstanceType<typeof ElTree>>();
+const roleTreeRef = ref<InstanceType<typeof ElTree>>();
 watch(fieldTreeFilterText, (val) => {
-	fieldTreeRef.value!.filter(val)
-})
+  fieldTreeRef.value!.filter(val);
+});
 watch(orgTreeFilterText, (val) => {
-	orgTreeRef.value!.filter(val)
-})
+  orgTreeRef.value!.filter(val);
+});
 watch(roleTreeFilterText, (val) => {
-	roleTreeRef.value!.filter(val)
-})
+  roleTreeRef.value!.filter(val);
+});
 
 const filterNode = (value: string, associatedFormsCurrentFormFieldTree: Tree) => {
-	if (!value) return true
-	return associatedFormsCurrentFormFieldTree.label.includes(value)
-}
+  if (!value) return true;
+  return associatedFormsCurrentFormFieldTree.label.includes(value);
+};
 
 //关联表单隐藏条件弹窗flag
-const associatedFormsHideDialogFlag = ref(false)
-
-const associatedFormsDataRangeDialogFlag = ref(false)
-
-
-
+const associatedFormsHideDialogFlag = ref(false);
 
+const associatedFormsDataRangeDialogFlag = ref(false);
 
 //点击开启隐藏设置
-function associatedFormsHideDialoghandle(){
-
-        associatedFormsHideDialogFlag.value = true
-        controlData.value.control.hideConditionHtmlCopy = controlData.value.control.hideConditionHtml
-        nextTick(() => {
-            aft.value.focusEditor()
-        })
-    
+function associatedFormsHideDialoghandle() {
+  associatedFormsHideDialogFlag.value = true;
+  controlData.value.control.hideConditionHtmlCopy =
+    controlData.value.control.hideConditionHtml;
+  nextTick(() => {
+    aft.value.focusEditor();
+  });
 }
 
-
-
-function associatedFormsDataRangeDialoghandle(){
-
-        getAsfasfFieldTree().then(({ data }) => {
-    
-            if(data.id==="cfid为空"){
-                //alert("cfid为空")
-            }else{
-                let resData = ref(data.children)
-                let dataExceptChild = JSON.parse(JSON.stringify(data.children))
-                let dataOnlyChild = JSON.parse(JSON.stringify(data.children))
-                let dataOnlyChild1 = JSON.parse(JSON.stringify(data.children))
-                dataExceptChild = dataExceptChild.filter((obj: { type: string }) => obj.type!== 'table');
-                //console.log(dataExceptChild)
-                dataExceptChild = removeFirstNumElements(dataExceptChild,8);
-                dataOnlyChild = dataOnlyChild.filter((obj: { type: string }) => obj.type== 'table');
-                dataOnlyChild1 = dataOnlyChild1.filter((obj: { type: string }) => obj.type== 'table');
-                //console.log(dataOnlyChild1)
-                dataOnlyChild1.forEach((element: any) => {
-                    element.children = removeFirstNumElements(element.children,6);
-                });
-                /* console.log(dataOnlyChild1)
+function associatedFormsDataRangeDialoghandle() {
+  getAsfasfFieldTree().then(({ data }) => {
+    if (data.id === "cfid为空") {
+      //alert("cfid为空")
+    } else {
+      let resData = ref(data.children);
+      let dataExceptChild = JSON.parse(JSON.stringify(data.children));
+      let dataOnlyChild = JSON.parse(JSON.stringify(data.children));
+      let dataOnlyChild1 = JSON.parse(JSON.stringify(data.children));
+      dataExceptChild = dataExceptChild.filter(
+        (obj: { type: string }) => obj.type !== "table"
+      );
+      //console.log(dataExceptChild)
+      dataExceptChild = removeFirstNumElements(dataExceptChild, 8);
+      dataOnlyChild = dataOnlyChild.filter(
+        (obj: { type: string }) => obj.type == "table"
+      );
+      dataOnlyChild1 = dataOnlyChild1.filter(
+        (obj: { type: string }) => obj.type == "table"
+      );
+      //console.log(dataOnlyChild1)
+      dataOnlyChild1.forEach((element: any) => {
+        element.children = removeFirstNumElements(element.children, 6);
+      });
+      /* console.log(dataOnlyChild1)
                 console.log(dataOnlyChild) */
-                for(let m = 0;m<dataOnlyChild.length;m++){
-                    dataOnlyChild[m].children = []
-                }
-                let resDataExceptChild = ref(dataExceptChild)
-                let resDataOnlyChild = ref(dataOnlyChild)
-                let resDataOnlyChild1 = ref(dataOnlyChild1)
-                //console.log(resDataOnlyChild1.value)
-                //console.log(asfasfChildTableList.value)
-                //console.log(resDataOnlyChild.value)
-                let childTableCount = 0
-                for(let n = 0;n<resDataOnlyChild.value.length;n++){
-                    //console.log(resDataOnlyChild.value[n])
-                    resDataOnlyChild.value[n].disabled=false
-                    childTableCount = n;
-                }
-                //console.log(childTableCount)
-                currentChildTableCount = childTableCount
-                asfasfFieldTree.value = [{
-                    id: 'rootid_'+data.label,
-                    label: '关联的表单-'+data.label,
-                    children: [...resData.value],
-                    treeAttrs: data.treeAttrs,
-                    disabled:true,
-                }]
-                asfasfMasterFieldTree.value = [{
-                    id: 'rootid_'+data.label,
-                    label: '关联的表单-'+data.label,
-                    children: [...resDataExceptChild.value],
-                    treeAttrs: data.treeAttrs,
-                    disabled:true,
-                }]
-                asfasfChildTableList.value = [{
-                    id: 'rootid_'+data.label,
-                    label: '关联的表单-'+data.label,
-                    children: [...resDataOnlyChild.value],
-                    treeAttrs: data.treeAttrs,
-                    disabled:true,
-                }]
-                asfasfChildTableFields.value = [{
-                    id: 'rootid_'+data.label,
-                    label: '关联的表单-'+data.label,
-                    children: [...resDataOnlyChild1.value],
-                    treeAttrs: data.treeAttrs,
-                    disabled:true,
-                }]
-            }
-        });
-
-
+      for (let m = 0; m < dataOnlyChild.length; m++) {
+        dataOnlyChild[m].children = [];
+      }
+      let resDataExceptChild = ref(dataExceptChild);
+      let resDataOnlyChild = ref(dataOnlyChild);
+      let resDataOnlyChild1 = ref(dataOnlyChild1);
+      //console.log(resDataOnlyChild1.value)
+      //console.log(asfasfChildTableList.value)
+      //console.log(resDataOnlyChild.value)
+      let childTableCount = 0;
+      for (let n = 0; n < resDataOnlyChild.value.length; n++) {
+        //console.log(resDataOnlyChild.value[n])
+        resDataOnlyChild.value[n].disabled = false;
+        childTableCount = n;
+      }
+      //console.log(childTableCount)
+      currentChildTableCount = childTableCount;
+      asfasfFieldTree.value = [
+        {
+          id: "rootid_" + data.label,
+          label: "关联的表单-" + data.label,
+          children: [...resData.value],
+          treeAttrs: data.treeAttrs,
+          disabled: true,
+        },
+      ];
+      asfasfMasterFieldTree.value = [
+        {
+          id: "rootid_" + data.label,
+          label: "关联的表单-" + data.label,
+          children: [...resDataExceptChild.value],
+          treeAttrs: data.treeAttrs,
+          disabled: true,
+        },
+      ];
+      asfasfChildTableList.value = [
+        {
+          id: "rootid_" + data.label,
+          label: "关联的表单-" + data.label,
+          children: [...resDataOnlyChild.value],
+          treeAttrs: data.treeAttrs,
+          disabled: true,
+        },
+      ];
+      asfasfChildTableFields.value = [
+        {
+          id: "rootid_" + data.label,
+          label: "关联的表单-" + data.label,
+          children: [...resDataOnlyChild1.value],
+          treeAttrs: data.treeAttrs,
+          disabled: true,
+        },
+      ];
+    }
+  });
 
-        associatedFormsDataRangeDialogFlag.value = true
-        controlData.value.control.dataRangeConditionHtmlCopy = controlData.value.control.dataRangeConditionHtml
-        
-        nextTick(() => {
-            aftRange.value.focusEditor()
-        })
+  associatedFormsDataRangeDialogFlag.value = true;
+  controlData.value.control.dataRangeConditionHtmlCopy =
+    controlData.value.control.dataRangeConditionHtml;
 
+  nextTick(() => {
+    aftRange.value.focusEditor();
+  });
 }
 
 //自定义事件同步父子组件的text
-function aftTextChanged(str:string){
-    controlData.value.control.hideConditionHtml = str
+function aftTextChanged(str: string) {
+  controlData.value.control.hideConditionHtml = str;
 }
 
-function aftGongshiChanged(gongshi:any){
-    controlData.value.control.hideGongShi.formulaHtml = gongshi.formulaHtml
-    controlData.value.control.hideGongShi.mathsFormula = gongshi.mathsFormula
-    controlData.value.control.hideGongShi.mathsString = gongshi.mathsString
+function aftGongshiChanged(gongshi: any) {
+  controlData.value.control.hideGongShi.formulaHtml = gongshi.formulaHtml;
+  controlData.value.control.hideGongShi.mathsFormula = gongshi.mathsFormula;
+  controlData.value.control.hideGongShi.mathsString = gongshi.mathsString;
 }
 
-function aftTextChangedRange(str:string){
-    controlData.value.control.dataRangeConditionHtml = str
+function aftTextChangedRange(str: string) {
+  controlData.value.control.dataRangeConditionHtml = str;
 }
-function aftGongshiChangedRange(gongshi:any){
-    controlData.value.control.dataRangeGongShi.formulaHtml = gongshi.formulaHtml
-    controlData.value.control.dataRangeGongShi.mathsFormula = gongshi.mathsFormula
-    controlData.value.control.dataRangeGongShi.mathsString = gongshi.mathsString
+function aftGongshiChangedRange(gongshi: any) {
+  controlData.value.control.dataRangeGongShi.formulaHtml = gongshi.formulaHtml;
+  controlData.value.control.dataRangeGongShi.mathsFormula = gongshi.mathsFormula;
+  controlData.value.control.dataRangeGongShi.mathsString = gongshi.mathsString;
 }
 //asf隐藏条件取消编辑
-function asfhTextCancel(){
-    determine.value = false
-    associatedFormsHideDialogFlag.value = false
-    controlData.value.control.hideConditionHtml = controlData.value.control.hideConditionHtmlCopy
-    //父组件取消将copy同步至子组件
-    aft.value.handelCancel(controlData.value.control.hideConditionHtmlCopy)
+function asfhTextCancel() {
+  determine.value = false;
+  associatedFormsHideDialogFlag.value = false;
+  controlData.value.control.hideConditionHtml =
+    controlData.value.control.hideConditionHtmlCopy;
+  //父组件取消将copy同步至子组件
+  aft.value.handelCancel(controlData.value.control.hideConditionHtmlCopy);
 }
 
-function asfhTextCancelRange(){
-    determineRange.value = false
-    associatedFormsDataRangeDialogFlag.value = false
-    controlData.value.control.dataRangeConditionHtml = controlData.value.control.dataRangeConditionHtmlCopy
-    //父组件取消将copy同步至子组件
-    aftRange.value.handelCancel(controlData.value.control.dataRangeConditionHtmlCopy)
+function asfhTextCancelRange() {
+  determineRange.value = false;
+  associatedFormsDataRangeDialogFlag.value = false;
+  controlData.value.control.dataRangeConditionHtml =
+    controlData.value.control.dataRangeConditionHtmlCopy;
+  //父组件取消将copy同步至子组件
+  aftRange.value.handelCancel(controlData.value.control.dataRangeConditionHtmlCopy);
 }
 
 //上次点击了确定为true
-let determine = ref(true)
-let determineRange = ref(true)
+let determine = ref(true);
+let determineRange = ref(true);
 //监听associatedFormsHideDialogFlag true 重新init  tinymce
 watch(associatedFormsHideDialogFlag, (val) => {
-	if(val===true&&determine.value===false){
-        setTimeout(() => {
-            //alert(1)
-            aft.value.tinymceReInit()
-        }, 200);
-    }
-})
+  if (val === true && determine.value === false) {
+    setTimeout(() => {
+      //alert(1)
+      aft.value.tinymceReInit();
+    }, 200);
+  }
+});
 
 watch(associatedFormsDataRangeDialogFlag, (val) => {
-	if(val===true&&determineRange.value===false){
-        setTimeout(() => {
-            //alert(2)
-            aftRange.value.tinymceReInit()
-        }, 200);
-    }
-})
+  if (val === true && determineRange.value === false) {
+    setTimeout(() => {
+      //alert(2)
+      aftRange.value.tinymceReInit();
+    }, 200);
+  }
+});
 //关联表单数据填充规则根据已选择子表的数目和id将已选择的子表置为不可选择
-function selectedOrDelChildRole(){
-    
-    //console.log(asfasfChildTableList.value)
-    //console.log(controlData.value.control?.fillRoles?.child)
-    let selectedArr: any[] = []
-    controlData.value.control?.fillRoles?.child.forEach(function(item: any) {
-        if(item.asfChildTableKey!=""){
-            selectedArr.push(item)
+function selectedOrDelChildRole() {
+  //console.log(asfasfChildTableList.value)
+  //console.log(controlData.value.control?.fillRoles?.child)
+  let selectedArr: any[] = [];
+  controlData.value.control?.fillRoles?.child.forEach(function (item: any) {
+    if (item.asfChildTableKey != "") {
+      selectedArr.push(item);
+    }
+  });
+  //console.log(selectedArr)
+  if (asfasfChildTableList.value) {
+    asfasfChildTableList.value[0].children?.forEach(function (item: any) {
+      item.disabled = false;
+    });
+  }
+  if (asfasfChildTableList.value) {
+    asfasfChildTableList.value[0].children?.forEach(function (item: any) {
+      selectedArr.forEach(function (i: any) {
+        if (i.asfChildTableKey == item.id) {
+          item.disabled = true;
         }
+      });
     });
-    //console.log(selectedArr)
-    if(asfasfChildTableList.value){
-        asfasfChildTableList.value[0].children?.forEach(function(item: any){   
-            item.disabled=false
-        })
-    }
-    if(asfasfChildTableList.value){
-        asfasfChildTableList.value[0].children?.forEach(function(item: any){   
-            selectedArr.forEach(function(i: any){
-                if(i.asfChildTableKey==item.id){
-                    item.disabled=true
-                }
-            })
-        })
-    }
-    
+  }
 }
-//将已被选择的要填充的关联其他表单的表单的子表字段设为不可选择              
-function childRoleRightChanged(){
-    
-    let selectedArr: any[] = []
-    let otherMasterSelectedArr: any[] = []
-    let otherChildSelectedArr: any[] = []
-    asfsExpectCurrent.forEach(function(item: any) {
-        let master = item.control.fillRoles.master
-        let child = item.control.fillRoles.child
-        /* console.log(master)
+//将已被选择的要填充的关联其他表单的表单的子表字段设为不可选择
+function childRoleRightChanged() {
+  let selectedArr: any[] = [];
+  let otherMasterSelectedArr: any[] = [];
+  let otherChildSelectedArr: any[] = [];
+  asfsExpectCurrent.forEach(function (item: any) {
+    let master = item.control.fillRoles.master;
+    let child = item.control.fillRoles.child;
+    /* console.log(master)
         console.log(child) */
-        master.forEach(function(item: any) {
-            if(item.rightValue!=""){
-                otherMasterSelectedArr.push(item)
-            }
-        });
-        child.forEach(function(item: any) {
-            item.childRoles.forEach((element: any) => {
-                if(element.rightValue!=""){
-                    otherChildSelectedArr.push(element)
-                }
-            });
-        });
+    master.forEach(function (item: any) {
+      if (item.rightValue != "") {
+        otherMasterSelectedArr.push(item);
+      }
     });
-    let masterSelectedArr: any[] = []
-    controlData.value.control?.fillRoles?.master.forEach(function(item: any) {
-        if(item.rightValue!=""){
-            masterSelectedArr.push(item)
+    child.forEach(function (item: any) {
+      item.childRoles.forEach((element: any) => {
+        if (element.rightValue != "") {
+          otherChildSelectedArr.push(element);
         }
+      });
     });
-    let childSelectedArr: any[] = []
-    controlData.value.control?.fillRoles?.child.forEach(function(item: any) {
-        item.childRoles.forEach((element: any) => {
-            if(element.rightValue!=""){
-                childSelectedArr.push(element)
-            }
-        });
+  });
+  let masterSelectedArr: any[] = [];
+  controlData.value.control?.fillRoles?.master.forEach(function (item: any) {
+    if (item.rightValue != "") {
+      masterSelectedArr.push(item);
+    }
+  });
+  let childSelectedArr: any[] = [];
+  controlData.value.control?.fillRoles?.child.forEach(function (item: any) {
+    item.childRoles.forEach((element: any) => {
+      if (element.rightValue != "") {
+        childSelectedArr.push(element);
+      }
     });
+  });
 
-    /* 1.得到当前子表填充规则块在所有子表填充规则块数组中的index
+  /* 1.得到当前子表填充规则块在所有子表填充规则块数组中的index
     2.得到所有index在当前子表填充规则块之前的子表填充规则块
     3.得到2中所有right,凡是出现过的子表,就把这些子表的所有选项全部置为不可选 */
-    //console.log(asfs)
-
-
-    selectedArr.push(...otherMasterSelectedArr)
-    selectedArr.push(...otherChildSelectedArr)
-    selectedArr.push(...masterSelectedArr)
-    selectedArr.push(...childSelectedArr)
-    //主表控制 start
-    if(associatedFormsCurrentFormFieldTree1.value){
-        associatedFormsCurrentFormFieldTree1.value[0].children?.forEach(function(item: any){
-            if(item.type=="table"){
-                item.children.forEach((element: any) => {
-                    element.disabled = false
-                });
-            }else{
-                item.disabled = false
-            }
-            
-        })
-    }
-    if(associatedFormsCurrentFormFieldTree1.value){
-        associatedFormsCurrentFormFieldTree1.value[0].children?.forEach(function(item: any){
-            if(item.type=="table"){
-                item.children.forEach((element: any) => {
-                    selectedArr.forEach((j:any) => {
-                        if(j.rightValue==element.id){
-                            element.disabled = true
-                        }
-                    })
-                });
-            }else{
-                selectedArr.forEach((element:any) => {
-                    if(element.rightValue==item.id){
-                        item.disabled = true
-                    }
-                })
+  //console.log(asfs)
+
+  selectedArr.push(...otherMasterSelectedArr);
+  selectedArr.push(...otherChildSelectedArr);
+  selectedArr.push(...masterSelectedArr);
+  selectedArr.push(...childSelectedArr);
+  //主表控制 start
+  if (associatedFormsCurrentFormFieldTree1.value) {
+    associatedFormsCurrentFormFieldTree1.value[0].children?.forEach(function (item: any) {
+      if (item.type == "table") {
+        item.children.forEach((element: any) => {
+          element.disabled = false;
+        });
+      } else {
+        item.disabled = false;
+      }
+    });
+  }
+  if (associatedFormsCurrentFormFieldTree1.value) {
+    associatedFormsCurrentFormFieldTree1.value[0].children?.forEach(function (item: any) {
+      if (item.type == "table") {
+        item.children.forEach((element: any) => {
+          selectedArr.forEach((j: any) => {
+            if (j.rightValue == element.id) {
+              element.disabled = true;
             }
-        })
-    }
-    //主表控制 end
-    
-    //子表控制start
-    if(currentFormChildTableFieldsForFillRole.value){
-        currentFormChildTableFieldsForFillRole.value[0]?.children?.forEach((element: any) => {
-            element.children.forEach((item: any) => {
-                selectedArr.forEach((j:any) => {
-                    item.disabled = false
-                })
-            });
+          });
         });
-    }
-    if(currentFormChildTableFieldsForFillRole.value){
-        currentFormChildTableFieldsForFillRole.value[0]?.children?.forEach((element: any) => {
-            element.children.forEach((item: any) => {
-                selectedArr.forEach((j:any) => {
-                    if(j.rightValue==item.id){
-                        item.disabled = true
-                    }
-                })
-            });
+      } else {
+        selectedArr.forEach((element: any) => {
+          if (element.rightValue == item.id) {
+            item.disabled = true;
+          }
         });
-    }
-    //子表控制end
+      }
+    });
+  }
+  //主表控制 end
+
+  //子表控制start
+  if (currentFormChildTableFieldsForFillRole.value) {
+    currentFormChildTableFieldsForFillRole.value[0]?.children?.forEach((element: any) => {
+      element.children.forEach((item: any) => {
+        selectedArr.forEach((j: any) => {
+          item.disabled = false;
+        });
+      });
+    });
+  }
+  if (currentFormChildTableFieldsForFillRole.value) {
+    currentFormChildTableFieldsForFillRole.value[0]?.children?.forEach((element: any) => {
+      element.children.forEach((item: any) => {
+        selectedArr.forEach((j: any) => {
+          if (j.rightValue == item.id) {
+            item.disabled = true;
+          }
+        });
+      });
+    });
+  }
+  //子表控制end
 }
 
 //确定回调
-function handleDetermine(){
-    associatedFormsHideDialogFlag.value = false
-    determine.value = true
-    controlData.value.control.hideConditionHtmlCopy = controlData.value.control.hideConditionHtml
+function handleDetermine() {
+  associatedFormsHideDialogFlag.value = false;
+  determine.value = true;
+  controlData.value.control.hideConditionHtmlCopy =
+    controlData.value.control.hideConditionHtml;
 }
-function handleDetermineRange(){
-    associatedFormsDataRangeDialogFlag.value = false
-    determineRange.value = true
-    controlData.value.control.dataRangeConditionHtmlCopy = controlData.value.control.dataRangeConditionHtml
+function handleDetermineRange() {
+  associatedFormsDataRangeDialogFlag.value = false;
+  determineRange.value = true;
+  controlData.value.control.dataRangeConditionHtmlCopy =
+    controlData.value.control.dataRangeConditionHtml;
 }
 //数据填充规则
 
-const associatedFormsFillRolesDialogFlag = ref(false)
+const associatedFormsFillRolesDialogFlag = ref(false);
 //数据填充规则设置按钮
-function associatedFormsDataFillRolesDialoghandle(){
-    if(controlData.value.control.formid===''){
-        alert("请先选择要关联的表单")
-        
-    }else{
-        associatedFormsFillRolesDialogFlag.value = true
-    }
+function associatedFormsDataFillRolesDialoghandle() {
+  if (controlData.value.control.formid === "") {
+    alert("请先选择要关联的表单");
+  } else {
+    associatedFormsFillRolesDialogFlag.value = true;
+  }
 }
 
-function asfhTextCancelFillRoles(){
-    associatedFormsFillRolesDialogFlag.value = false
+function asfhTextCancelFillRoles() {
+  associatedFormsFillRolesDialogFlag.value = false;
 }
 //数据填充规则确定按钮
-function handleDetermineFillRoles(){
-    
-    associatedFormsFillRolesDialogFlag.value = false
+function handleDetermineFillRoles() {
+  associatedFormsFillRolesDialogFlag.value = false;
 }
 
-
-watch(()=>store.activeKey, () => {
-	// console.log("activeKey",store.activeKey);
-    if(controlData.value.type==='associatedForms'){
-        setTimeout(() => {
-            formidChanged()
-        }, 800);
-        /* aft.value.tinymceReInit()
+watch(
+  () => store.activeKey,
+  () => {
+    // console.log("activeKey",store.activeKey);
+    if (controlData.value.type === "associatedForms") {
+      setTimeout(() => {
+        formidChanged();
+      }, 800);
+      /* aft.value.tinymceReInit()
         aftRange.value.tinymceReInit() */
-    }else if(controlData.value.type==='radio'||controlData.value.type==='select'||controlData.value.type==='checkbox'){
-        
-        setTimeout(() => {
-            formidChangedOptionsValue3()
-        }, 800);
+    } else if (
+      controlData.value.type === "radio" ||
+      controlData.value.type === "select" ||
+      controlData.value.type === "checkbox"
+    ) {
+      setTimeout(() => {
+        formidChangedOptionsValue3();
+      }, 800);
     }
-})
-
-
-function addFillRole(){
-    let onlyNumber = uuidv4().replaceAll('-','').toString();   //获取唯一编码
-    controlData.value.control.fillRoles.master.push({
-        leftValue:'',
-		rightValue:'',
-        id:onlyNumber,
-    })
+  }
+);
+
+function addFillRole() {
+  let onlyNumber = uuidv4().replaceAll("-", "").toString(); //获取唯一编码
+  controlData.value.control.fillRoles.master.push({
+    leftValue: "",
+    rightValue: "",
+    id: onlyNumber,
+  });
 }
 
-function addChildFillRole(){
-    //子表填充规则要受到子表数量的限制
-    //currentChildTableCount
-    //controlData.value.control.fillRoles.child.length
-    selectedOrDelChildRole()
-    childRoleRightChanged()
-if(controlData.value.control.fillRoles.child.length<currentChildTableCount){
-        let onlyNumber = uuidv4().replaceAll('-','').toString();   //获取唯一编码
-        let onlyNumber1 = uuidv4().replaceAll('-','').toString();   //获取唯一编码
-        controlData.value.control.fillRoles.child.push({
-                                                        id: onlyNumber,
-                                                        asfChildTableKey: '',
-                                                        filterCondition:{
-                                                            conditionHtml: '',
-                                                            conditionHtmlCopy: '',
-                                                            gongShi:{
-                                                                formulaHtml:'',
-                                                                mathsFormula:'',
-                                                                mathsString:'',
-                                                            },
-                                                        },
-                                                        childRoles:[{
-											leftValue: '',
-											rightValue: '',
-											id: onlyNumber1,
-										}]
-                                                    })
-    }else{
-        alert("当前关联表单共 "+controlData.value.control.fillRoles.child.length+" 张子表,不可再添加")
-    }
-    
+function addChildFillRole() {
+  //子表填充规则要受到子表数量的限制
+  //currentChildTableCount
+  //controlData.value.control.fillRoles.child.length
+  selectedOrDelChildRole();
+  childRoleRightChanged();
+  if (controlData.value.control.fillRoles.child.length < currentChildTableCount) {
+    let onlyNumber = uuidv4().replaceAll("-", "").toString(); //获取唯一编码
+    let onlyNumber1 = uuidv4().replaceAll("-", "").toString(); //获取唯一编码
+    controlData.value.control.fillRoles.child.push({
+      id: onlyNumber,
+      asfChildTableKey: "",
+      filterCondition: {
+        conditionHtml: "",
+        conditionHtmlCopy: "",
+        gongShi: {
+          formulaHtml: "",
+          mathsFormula: "",
+          mathsString: "",
+        },
+      },
+      childRoles: [
+        {
+          leftValue: "",
+          rightValue: "",
+          id: onlyNumber1,
+        },
+      ],
+    });
+  } else {
+    alert(
+      "当前关联表单共 " +
+        controlData.value.control.fillRoles.child.length +
+        " 张子表,不可再添加"
+    );
+  }
 }
 
-function delRole(id:String){
-    const delRoleData:any = controlData.value.control.fillRoles.master
-        for (var i = 0; i < delRoleData.length; i++) {
-            if(delRoleData[i].id===id){
-                delRoleData.splice(i, 1);
-                i--; // 如果不减，将漏掉一个元素
-            }
-        }
+function delRole(id: String) {
+  const delRoleData: any = controlData.value.control.fillRoles.master;
+  for (var i = 0; i < delRoleData.length; i++) {
+    if (delRoleData[i].id === id) {
+      delRoleData.splice(i, 1);
+      i--; // 如果不减，将漏掉一个元素
+    }
+  }
 }
 
-
-
-function delChildRole(id:String){
-    
-    const delRoleData:any = controlData.value.control.fillRoles.child
-        for (var i = 0; i < delRoleData.length; i++) {
-            if(delRoleData[i].id===id){
-                delRoleData.splice(i, 1);
-                i--; // 如果不减，将漏掉一个元素
-            }
-        }
-        selectedOrDelChildRole()
-        childRoleRightChanged()
+function delChildRole(id: String) {
+  const delRoleData: any = controlData.value.control.fillRoles.child;
+  for (var i = 0; i < delRoleData.length; i++) {
+    if (delRoleData[i].id === id) {
+      delRoleData.splice(i, 1);
+      i--; // 如果不减，将漏掉一个元素
+    }
+  }
+  selectedOrDelChildRole();
+  childRoleRightChanged();
 }
-const associatedFormsChooseDialogFlag = ref(false)
-function chooseAssociatedForm(){
-    associatedFormsChooseDialogFlag.value = true
+const associatedFormsChooseDialogFlag = ref(false);
+function chooseAssociatedForm() {
+  associatedFormsChooseDialogFlag.value = true;
 }
-function handleDetermineAssociatedFormsChooseDialog(){
-    associatedFormsChooseDialogFlag.value = false
+function handleDetermineAssociatedFormsChooseDialog() {
+  associatedFormsChooseDialogFlag.value = false;
 }
 
-
-
-//liwenxuan20240403 associatedForms end 
-
+//liwenxuan20240403 associatedForms end
 
 //liwenxuan20240426 单选多选下拉 关联选项设置  start
 
-const glxxszDialogFlag = ref(false)
-const glxxszDialogFlagCheckBox = ref(false)
-const glxxszDialogFlagSwitch = ref(false)
-function handelGlxxszDialogSwitch(){
-    if(controlData.value.control.activeValue==undefined||controlData.value.control.inactiveValue==undefined){
-        alert("请先设置开关状态打开/关闭时的值")
-    }else{
-        glxxszDialogFlagSwitch.value = true
-    }
+const glxxszDialogFlag = ref(false);
+const glxxszDialogFlagCheckBox = ref(false);
+const glxxszDialogFlagSwitch = ref(false);
+function handelGlxxszDialogSwitch() {
+  if (
+    controlData.value.control.activeValue == undefined ||
+    controlData.value.control.inactiveValue == undefined
+  ) {
+    alert("请先设置开关状态打开/关闭时的值");
+  } else {
+    glxxszDialogFlagSwitch.value = true;
+  }
 }
-function handelGlxxszDialog(){
-    if(controlData.value.options.length===0){
-        alert("无可配置选项，请先添加。")
-    }else{
-        glxxszDialogFlag.value = true
-    }
+function handelGlxxszDialog() {
+  if (controlData.value.options.length === 0) {
+    alert("无可配置选项，请先添加。");
+  } else {
+    glxxszDialogFlag.value = true;
+  }
 }
 
-function handelGlxxszDialogCheckbox(){
-    glxxszDialogFlagCheckBox.value = true
+function handelGlxxszDialogCheckbox() {
+  glxxszDialogFlagCheckBox.value = true;
 }
 
-function handleDetermineGlxxszDialog(){
-    glxxszDialogFlag.value = false
+function handleDetermineGlxxszDialog() {
+  glxxszDialogFlag.value = false;
 }
-function handleDetermineGlxxszDialogSwitch(){
-    glxxszDialogFlagSwitch.value = false
+function handleDetermineGlxxszDialogSwitch() {
+  glxxszDialogFlagSwitch.value = false;
 }
-function handleDetermineGlxxszDialogCheckBox(){
-    glxxszDialogFlagCheckBox.value = false
+function handleDetermineGlxxszDialogCheckBox() {
+  glxxszDialogFlagCheckBox.value = false;
 }
 //同步开关的设置值和开关关联选项设置的值
-watch(()=>controlData.value.control,(newVal) => {
-	// console.log("同步开关的设置值和开关关联选项设置的值",typeof(newVal))
-    if(typeof(newVal)!="undefined"){
-        if(typeof(newVal.glxxszSwitch)!="undefined"){
-            if(typeof(controlData.value.control.activeValue)!="undefined"){
-                controlData.value.control.glxxszSwitch[0].openValue = controlData.value.control.activeValue
-                controlData.value.control.glxxszSwitch[0].conditionField = controlData.value.name
-            }
-            if(typeof(controlData.value.control.inactiveValue)!="undefined"){
-                controlData.value.control.glxxszSwitch[1].offValue = controlData.value.control.inactiveValue
-                controlData.value.control.glxxszSwitch[1].conditionField = controlData.value.name
-            }
+watch(
+  () => controlData.value.control,
+  (newVal) => {
+    // console.log("同步开关的设置值和开关关联选项设置的值",typeof(newVal))
+    if (typeof newVal != "undefined") {
+      if (typeof newVal.glxxszSwitch != "undefined") {
+        if (typeof controlData.value.control.activeValue != "undefined") {
+          controlData.value.control.glxxszSwitch[0].openValue =
+            controlData.value.control.activeValue;
+          controlData.value.control.glxxszSwitch[0].conditionField =
+            controlData.value.name;
         }
+        if (typeof controlData.value.control.inactiveValue != "undefined") {
+          controlData.value.control.glxxszSwitch[1].offValue =
+            controlData.value.control.inactiveValue;
+          controlData.value.control.glxxszSwitch[1].conditionField =
+            controlData.value.name;
+        }
+      }
     }
-	// console.log("同步开关的设置值和开关关联选项设置的值",controlData.value.control)
-},{ deep: true })
-
-
-
+    // console.log("同步开关的设置值和开关关联选项设置的值",controlData.value.control)
+  },
+  { deep: true }
+);
 
 //radio,select添加选项时同步配置选项
-watch(()=>controlData.value.options, (changedOptions:any) => {
-	// console.log("radio,select添加选项时同步配置选项",changedOptions)
-	// console.log("radio,select添加选项时同步配置选项------>",controlData.value)
-    if(controlData.value.type === "radio" || controlData.value.type === "select"){
-        if(controlData.value.config.optionsType==0){
-            if(changedOptions.length===0){
-                //删没了option
-                controlData.value.control.glxxsz = []
-            }else{
-                if(changedOptions.length < controlData.value.control.glxxsz.length){
-                    //删除了某个option
-                    controlData.value.control.glxxsz = controlData.value.control.glxxsz.filter((item: { optionValue: any }) => changedOptions.find((bItem: { value: any }) => item.optionValue == bItem.value))
-                }else{
-                    for(var i = 0; i < changedOptions.length; i++){
-                        if(controlData.value.control.glxxsz[i]===undefined){
-                            //新增了某个option
-                            controlData.value.control.glxxsz.push(
-                                {
-                                    conditionField: controlData.value.name,
-                                    optionLabel: changedOptions[i].label,
-                                    optionValue: changedOptions[i].value,
-                                    tableIndex: i,
-                                    id: uuidv4().replaceAll('-','').toString(),
-                                }
-                            )
-                        }else{
-                            //修改了某个option
-                            controlData.value.control.glxxsz[i].optionLabel = changedOptions[i].label
-                            controlData.value.control.glxxsz[i].optionValue = changedOptions[i].value
-                        }
-                    }
-                }
+watch(
+  () => controlData.value.options,
+  (changedOptions: any) => {
+    // console.log("radio,select添加选项时同步配置选项",changedOptions)
+    // console.log("radio,select添加选项时同步配置选项------>",controlData.value)
+    if (controlData.value.type === "radio" || controlData.value.type === "select") {
+      if (controlData.value.config.optionsType == 0) {
+        if (changedOptions.length === 0) {
+          //删没了option
+          controlData.value.control.glxxsz = [];
+        } else {
+          if (changedOptions.length < controlData.value.control.glxxsz.length) {
+            //删除了某个option
+            controlData.value.control.glxxsz = controlData.value.control.glxxsz.filter(
+              (item: { optionValue: any }) =>
+                changedOptions.find(
+                  (bItem: { value: any }) => item.optionValue == bItem.value
+                )
+            );
+          } else {
+            for (var i = 0; i < changedOptions.length; i++) {
+              if (controlData.value.control.glxxsz[i] === undefined) {
+                //新增了某个option
+                controlData.value.control.glxxsz.push({
+                  conditionField: controlData.value.name,
+                  optionLabel: changedOptions[i].label,
+                  optionValue: changedOptions[i].value,
+                  tableIndex: i,
+                  id: uuidv4().replaceAll("-", "").toString(),
+                });
+              } else {
+                //修改了某个option
+                controlData.value.control.glxxsz[i].optionLabel = changedOptions[i].label;
+                controlData.value.control.glxxsz[i].optionValue = changedOptions[i].value;
+              }
             }
+          }
         }
-    }else if(controlData.value.type === "checkbox"){
-        
-    }
-},{ deep: true })
-
-
-function createRowForGlxxsz(){
-    if(controlData.value.config.optionsType==0){
-        controlData.value.control.glxxszForCheckBox.push(
-            {
-                conditionField: controlData.value.name,
-                selectedOptions:[],
-                showFields:[],
-                id: uuidv4().replaceAll('-','').toString(),
-            }
-        )
+      }
+    } else if (controlData.value.type === "checkbox") {
     }
+  },
+  { deep: true }
+);
+
+function createRowForGlxxsz() {
+  if (controlData.value.config.optionsType == 0) {
+    controlData.value.control.glxxszForCheckBox.push({
+      conditionField: controlData.value.name,
+      selectedOptions: [],
+      showFields: [],
+      id: uuidv4().replaceAll("-", "").toString(),
+    });
+  }
 }
 
-function deleteRowForGlxxsz(row: { id: any }){
-    if(controlData.value.config.optionsType==0){
-        controlData.value.control.glxxszForCheckBox = controlData.value.control.glxxszForCheckBox.filter((item: { id: any }) => item.id!=row.id)
-    }
+function deleteRowForGlxxsz(row: { id: any }) {
+  if (controlData.value.config.optionsType == 0) {
+    controlData.value.control.glxxszForCheckBox = controlData.value.control.glxxszForCheckBox.filter(
+      (item: { id: any }) => item.id != row.id
+    );
+  }
 }
 /*  */
 
-const optionsValue3SettingDialogOpenFlag = ref(false)
-function optionsValue3Setting(){
-    optionsValue3SettingDialogOpenFlag.value = true
+const optionsValue3SettingDialogOpenFlag = ref(false);
+function optionsValue3Setting() {
+  optionsValue3SettingDialogOpenFlag.value = true;
 }
-function handleDetermineoptionsValue3(){
-    optionsValue3SettingDialogOpenFlag.value = false
+function handleDetermineoptionsValue3() {
+  optionsValue3SettingDialogOpenFlag.value = false;
 }
 
-
-
 //liwenxuan20240426 单选多选下拉 关联选项设置  end
 
-
-function optionsTypeChanged(){
-    controlData.value.config.optionsFun = ''
-    controlData.value.options = []
+function optionsTypeChanged() {
+  controlData.value.config.optionsFun = "";
+  controlData.value.options = [];
 }
 
-
-
-
-		
-    const optionsCss = [
-              { label: '无样式', value: '' },
-              { label: '每行两列', value: 'form-row-2' },
-              { label: '每行三列', value: 'form-row-3' },
-              { label: '每行四列', value: 'form-row-4' }
-    ]
-    const layouytStyle = reactive<any>(controlData.value.styles)
-    watch(()=>layouytStyle,(val : any)=>{
+const optionsCss = [
+  { label: "无样式", value: "" },
+  { label: "每行两列", value: "form-row-2" },
+  { label: "每行三列", value: "form-row-3" },
+  { label: "每行四列", value: "form-row-4" },
+];
+const layouytStyle = reactive<any>(controlData.value.styles);
+watch(
+  () => layouytStyle,
+  (val: any) => {
     //   console.log("监听样式处理",val)
-      controlData.value.styles = val
-     // Object.assign(store.controlAttr.styles.divStyle, val)
-    },
-    {
-      deep: true
-    });
-    const setStylefield = ref<string>("divStyle")
-    //liwenxuan 20240111 carousel  end  
-    const activeFormName = ref("0")
-    
-    /**
+    controlData.value.styles = val;
+    // Object.assign(store.controlAttr.styles.divStyle, val)
+  },
+  {
+    deep: true,
+  }
+);
+const setStylefield = ref<string>("divStyle");
+//liwenxuan 20240111 carousel  end
+const activeFormName = ref("0");
+
+/**
     @ 作者: 秦东
     @ 时间: 2024-03-01 08:16:45
     @ 功能: 判断是否是组件
     */
-    const cssIsShouw = (val:any) => {
-        if(val.length && val.length > 0){
-            return true;
-        }
-        return false;
-    }
+const cssIsShouw = (val: any) => {
+  if (val.length && val.length > 0) {
+    return true;
+  }
+  return false;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-03-18 11:42:52
 @ 功能: 上传图标相关
 */
-const imgUploadApiUrl = import.meta.env.VITE_APP_BASE_API+"/api/upordown" //上传地址
-const handleAvatarSuccess: UploadProps['onSuccess'] = (
-  response,
-  uploadFile
-) => {
-	//   imageUrl.value = URL.createObjectURL(uploadFile.raw!)
-	formConfig.value.imageUrl = response.data.url
-}
-
-const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
-	// console.log("beforeAvatarUpload",rawFile.type)
-  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/jpg' && rawFile.type !== 'image/png' && rawFile.type !== 'image/gif' && rawFile.type !== 'image/icon') {
-    ElMessage.error('请上传以下格式的图片(jpg、jpeg、png、gif、icon)!'+rawFile.type)
-    return false
+const imgUploadApiUrl = import.meta.env.VITE_APP_BASE_API + "/api/upordown"; //上传地址
+const handleAvatarSuccess: UploadProps["onSuccess"] = (response, uploadFile) => {
+  //   imageUrl.value = URL.createObjectURL(uploadFile.raw!)
+  formConfig.value.imageUrl = response.data.url;
+};
+
+const beforeAvatarUpload: UploadProps["beforeUpload"] = (rawFile) => {
+  // console.log("beforeAvatarUpload",rawFile.type)
+  if (
+    rawFile.type !== "image/jpeg" &&
+    rawFile.type !== "image/jpg" &&
+    rawFile.type !== "image/png" &&
+    rawFile.type !== "image/gif" &&
+    rawFile.type !== "image/icon"
+  ) {
+    ElMessage.error("请上传以下格式的图片(jpg、jpeg、png、gif、icon)!" + rawFile.type);
+    return false;
   } else if (rawFile.size / 1024 / 1024 > 2) {
-    ElMessage.error('图片大小不要大于 2MB!')
-    return false
+    ElMessage.error("图片大小不要大于 2MB!");
+    return false;
   }
-  return true
-}
-
-const page = ref<number>(1)
-const pageSize = ref<number>(200000)
-const loadingmore = ref(false)
-const loadingnomore = ref(false)
-const formGroup = ref<any[]>([])
+  return true;
+};
+
+const page = ref<number>(1);
+const pageSize = ref<number>(200000);
+const loadingmore = ref(false);
+const loadingnomore = ref(false);
+const formGroup = ref<any[]>([]);
 /**
 @ 作者: 秦东
 @ 时间: 2024-03-19 08:38:27
 @ 功能: 获取表单分组
 */
-const gainFormGroupList = () =>{
-	loadingmore.value = true;
-	let sendInfo = {
-		page:page.value,
-		pagesize:pageSize.value,
-		state:1
-	}
-	customerFormGroupList(sendInfo)
-		.then((data)=>{
-			// console.log("获取表单分组",data)
-			formGroup.value = data.data
-		})
-		.finally(()=>{
-			loadingmore.value = false;
-		})
-}
-let asfs: any[] = []
-let asfsExpectCurrent: any[] = []
-
-
+const gainFormGroupList = () => {
+  loadingmore.value = true;
+  let sendInfo = {
+    page: page.value,
+    pagesize: pageSize.value,
+    state: 1,
+  };
+  customerFormGroupList(sendInfo)
+    .then((data) => {
+      // console.log("获取表单分组",data)
+      formGroup.value = data.data;
+    })
+    .finally(() => {
+      loadingmore.value = false;
+    });
+};
+let asfs: any[] = [];
+let asfsExpectCurrent: any[] = [];
 
-watch(()=>props.formList,(dataList:any)=>{
+watch(
+  () => props.formList,
+  (dataList: any) => {
     //console.log(dataList)
-    
-    if(dataList&&Array.isArray(dataList)&&dataList.length>0&&controlData.value.type=="associatedForms"&&currentAsfChangeCount.value==0){
-        //console.log(1)
-        asfsExpectCurrent = []
-        asfs = []
-        currentAsfChangeCount.value = 1
-        for(let i = 0;i<dataList.length;i++){
-            if(dataList[i].type=="associatedForms"){
-                asfs.push(dataList[i])
-            }else if(dataList[i].type=="card"||dataList[i].type=="flex"||dataList[i].type=="div"||dataList[i].type=="table"){
-                
-                dataList[i].list.forEach((element:any) => {
-                    if(element.type=="associatedForms"){
-                        asfs.push(element)
-                    }
-                });
-            }else if(dataList[i].type=="grid"){
-                let columns = JSON.parse(JSON.stringify(dataList[i].columns));
-                //console.log(columns)
-                if(columns.length>0){ 
-                    for(let z = 0;z<columns.length;z++){
-                        for(let x = 0; x<columns[z].list.length;x++){
-                            let a = JSON.parse(JSON.stringify(columns[z].list[x]));
-                            //console.log(a)
-                            if(a.type=="associatedForms"){
-                                asfs.push(a)
-                            }
-                            
-                        }
-                    }
+
+    if (
+      dataList &&
+      Array.isArray(dataList) &&
+      dataList.length > 0 &&
+      controlData.value.type == "associatedForms" &&
+      currentAsfChangeCount.value == 0
+    ) {
+      //console.log(1)
+      asfsExpectCurrent = [];
+      asfs = [];
+      currentAsfChangeCount.value = 1;
+      for (let i = 0; i < dataList.length; i++) {
+        if (dataList[i].type == "associatedForms") {
+          asfs.push(dataList[i]);
+        } else if (
+          dataList[i].type == "card" ||
+          dataList[i].type == "flex" ||
+          dataList[i].type == "div" ||
+          dataList[i].type == "table"
+        ) {
+          dataList[i].list.forEach((element: any) => {
+            if (element.type == "associatedForms") {
+              asfs.push(element);
+            }
+          });
+        } else if (dataList[i].type == "grid") {
+          let columns = JSON.parse(JSON.stringify(dataList[i].columns));
+          //console.log(columns)
+          if (columns.length > 0) {
+            for (let z = 0; z < columns.length; z++) {
+              for (let x = 0; x < columns[z].list.length; x++) {
+                let a = JSON.parse(JSON.stringify(columns[z].list[x]));
+                //console.log(a)
+                if (a.type == "associatedForms") {
+                  asfs.push(a);
                 }
-            }else if(dataList[i].type=="tabs"){//tabs标签页有可能再嵌套一层flex或者table
-                let columns = JSON.parse(JSON.stringify(dataList[i].columns));
-                if(columns.length>0){
-                    for(let z = 0;z<columns.length;z++){
-                        for(let x = 0; x<columns[z].list.length;x++){
-                            let a = JSON.parse(JSON.stringify(columns[z].list[x]));
-                            //console.log(a)
-                            if(a.type=="associatedForms"){
-                                asfs.push(a)
-                            }else if(a.type=="flex"||a.type=="table"){
-                                if(a.list.length>0){
-                                    for(let m = 0;m<a.list.length;m++){
-                                        let q = JSON.parse(JSON.stringify(a.list[m]))
-                                        //console.log(q)
-                                        if(q.type=="associatedForms"){
-                                            asfs.push(q)
-                                        }
-                                    }
-                                }
-                            }
-                        }
+              }
+            }
+          }
+        } else if (dataList[i].type == "tabs") {
+          //tabs标签页有可能再嵌套一层flex或者table
+          let columns = JSON.parse(JSON.stringify(dataList[i].columns));
+          if (columns.length > 0) {
+            for (let z = 0; z < columns.length; z++) {
+              for (let x = 0; x < columns[z].list.length; x++) {
+                let a = JSON.parse(JSON.stringify(columns[z].list[x]));
+                //console.log(a)
+                if (a.type == "associatedForms") {
+                  asfs.push(a);
+                } else if (a.type == "flex" || a.type == "table") {
+                  if (a.list.length > 0) {
+                    for (let m = 0; m < a.list.length; m++) {
+                      let q = JSON.parse(JSON.stringify(a.list[m]));
+                      //console.log(q)
+                      if (q.type == "associatedForms") {
+                        asfs.push(q);
+                      }
                     }
+                  }
                 }
-            }	
+              }
+            }
+          }
         }
-        if(asfs.length>0){
-            asfsExpectCurrent = asfs.filter((item:any)=>{
-                return item.name!=controlData.value.name
-            })
-            /* if(asfsExpectCurrent.length>0){
+      }
+      if (asfs.length > 0) {
+        asfsExpectCurrent = asfs.filter((item: any) => {
+          return item.name != controlData.value.name;
+        });
+        /* if(asfsExpectCurrent.length>0){
                 console.log(asfsExpectCurrent)
             } */
-        }
+      }
     }
-    
-    
-},{
-    deep:true
-})
-
+  },
+  {
+    deep: true,
+  }
+);
 
 onMounted(() => {
-    
-    //console.log("------------------->",props.formData,props.formList) 
-    
-    
+  //console.log("------------------->",props.formData,props.formList)
 
-    
-    
-	gainFormGroupList()
-    
-    
-    
-    
-})
+  gainFormGroupList();
+});
 
 /**
 @ 作者: 秦东
@@ -3252,61 +3338,62 @@ onMounted(() => {
 const handleVisibleChange = (visible: any) => {
   if (visible) {
     // 如果下拉框显示
-    let selectDropdown: any = document.querySelector('.el-select-dropdown__wrap')
+    let selectDropdown: any = document.querySelector(".el-select-dropdown__wrap");
     // 监听下拉框滚动事件
-    selectDropdown.addEventListener('scroll', loadNextPage)
+    selectDropdown.addEventListener("scroll", loadNextPage);
   } else {
     // 如果下拉框隐藏
-    let selectDropdown: any = document.querySelector('.el-select-dropdown__wrap')
+    let selectDropdown: any = document.querySelector(".el-select-dropdown__wrap");
     // 移除下拉框滚动事件监听
-    selectDropdown.removeEventListener('scroll', loadNextPage)
+    selectDropdown.removeEventListener("scroll", loadNextPage);
   }
-}
+};
 const loadNextPage = () => {
-  let selectDropdown: any = document.querySelector('.el-select-dropdown__wrap');
+  let selectDropdown: any = document.querySelector(".el-select-dropdown__wrap");
   // 判断下拉框是否触底
-  if (selectDropdown.scrollTop + selectDropdown.clientHeight >= selectDropdown.scrollHeight - 2) {
-    loadingnomore.value = false
-    loadingmore.value = true
+  if (
+    selectDropdown.scrollTop + selectDropdown.clientHeight >=
+    selectDropdown.scrollHeight - 2
+  ) {
+    loadingnomore.value = false;
+    loadingmore.value = true;
     if (selectoptions.value.length <= 20) {
       setTimeout(() => {
         selectoptions.value.push({
           label: String(selectoptions.value.length),
           value: String(selectoptions.value.length),
-        }
-        )
-        loadingmore.value = false
-
-      }, 2000)
-    }else{
-      loadingmore.value = false
-    selectDropdown.removeEventListener('scroll', loadNextPage)
-    loadingnomore.value = true
+        });
+        loadingmore.value = false;
+      }, 2000);
+    } else {
+      loadingmore.value = false;
+      selectDropdown.removeEventListener("scroll", loadNextPage);
+      loadingnomore.value = true;
     }
   } else {
-    loadingnomore.value = true
+    loadingnomore.value = true;
   }
-}
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-22 13:57:55
 @ 功能: 判断该输入框是否不可编辑
 */
-const disabledIstrue = (val:string) => {
-	let ary = ["creater","creater_time","edit_time","owner","org"]
-	if (ary.includes(val)){
-		return true;
-	}else{
-		return false;
-	}
-}
+const disabledIstrue = (val: string) => {
+  let ary = ["creater", "creater_time", "edit_time", "owner", "org"];
+  if (ary.includes(val)) {
+    return true;
+  } else {
+    return false;
+  }
+};
 
 // watch(()=>controlData.value.customRules,(val:any) => {
 // 	// console.log("啊啊啊啊啊",val,typeof(val));
 // 	if(typeof(val)=="object"){
 // 		if(Array.isArray(val)){
 // 			val.forEach((item:any)=>{
-				
+
 // 			})
 // 		}
 // 	}
@@ -3318,224 +3405,242 @@ const disabledIstrue = (val:string) => {
 @ 时间: 2024-08-14 13:16:26
 @ 功能: 必填文本框改变
 */
-const requiredText = (val:any) => {
-	
-	if(typeof(controlData.value.customRules)=="object"){
-		if(Array.isArray(controlData.value.customRules)){	
-			controlData.value.customRules.forEach((item:any)=>{
-				if(item.type == ValidateText.type){
-					item.message = val
-				}
-			})
-		}
-	}
-	console.log("判断校验规则-1-->",controlData.value.customRules)
-}
+const requiredText = (val: any) => {
+  if (typeof controlData.value.customRules == "object") {
+    if (Array.isArray(controlData.value.customRules)) {
+      controlData.value.customRules.forEach((item: any) => {
+        if (item.type == ValidateText.type) {
+          item.message = val;
+        }
+      });
+    }
+  }
+  console.log("判断校验规则-1-->", controlData.value.customRules);
+};
 
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-14 14:35:07
 @ 功能: 校验文本框改变
 */
-const requiredTextRadio = (val:any) => {
-	console.log("校验文本框改变-->",val)
-	if(val.type == radioVerify.type){
-		if(typeof(controlData.value.customRules)=="object"){
-			if(Array.isArray(controlData.value.customRules)){	
-				controlData.value.customRules.forEach((item:any)=>{
-					if(item.type == radioVerify.type){
-						item.message = val.message
-					}
-				})
-			}
-		}
-	}
-	
-}
+const requiredTextRadio = (val: any) => {
+  console.log("校验文本框改变-->", val);
+  if (val.type == radioVerify.type) {
+    if (typeof controlData.value.customRules == "object") {
+      if (Array.isArray(controlData.value.customRules)) {
+        controlData.value.customRules.forEach((item: any) => {
+          if (item.type == radioVerify.type) {
+            item.message = val.message;
+          }
+        });
+      }
+    }
+  }
+};
 
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-14 13:21:43
 @ 功能: 是否选中必填
 */
-const requiredChangeSet = (val:boolean) => {
-	if (!controlData.value?.customRules) {
-		controlData.value.customRules = []
+const requiredChangeSet = (val: boolean) => {
+  if (!controlData.value?.customRules) {
+    controlData.value.customRules = [];
+  }
+  if (val) {
+    if (
+      Array.isArray(controlData.value.customRules) &&
+      controlData.value.customRules.length > 0
+    ) {
+      let isNewWrite = true;
+      controlData.value.customRules.forEach((item: any) => {
+        if (item.type == ValidateText.type) {
+          isNewWrite = false;
+        }
+      });
+      if (isNewWrite) {
+        controlData.value.customRules.push({
+          type: ValidateText.type,
+          message: ValidateText.message,
+          trigger: "blur",
+        });
+      }
+    } else {
+      controlData.value.customRules.push({
+        type: ValidateText.type,
+        message: ValidateText.message,
+        trigger: "blur",
+      });
     }
-	if(val){
-		if(Array.isArray(controlData.value.customRules) && controlData.value.customRules.length > 0){
-			let isNewWrite = true
-			controlData.value.customRules.forEach((item:any)=>{
-				if(item.type == ValidateText.type){
-					isNewWrite = false
-				}
-			})
-			if(isNewWrite){
-				controlData.value.customRules.push({ 
-					type: ValidateText.type, 
-					message: ValidateText.message, 
-					trigger: "blur" 
-				})
-			}
-		}else{
-			controlData.value.customRules.push({ 
-					type: ValidateText.type, 
-					message: ValidateText.message, 
-					trigger: "blur" 
-				})
-		}
-	}else{
-		if(Array.isArray(controlData.value.customRules) && controlData.value.customRules.length > 0){
-			controlData.value.customRules.forEach((item:any,index:number)=>{
-				
-				if(item.type == ValidateText.type){
-					controlData.value.customRules.splice(index, 1)
-				}
-			})
-		}
-		// controlData.value.item.rules.splice(0, 1)
-	}
-	// console.log("判断校验规则-222-->",controlData.value.customRules)
-}
+  } else {
+    if (
+      Array.isArray(controlData.value.customRules) &&
+      controlData.value.customRules.length > 0
+    ) {
+      controlData.value.customRules.forEach((item: any, index: number) => {
+        if (item.type == ValidateText.type) {
+          controlData.value.customRules.splice(index, 1);
+        }
+      });
+    }
+    // controlData.value.item.rules.splice(0, 1)
+  }
+  // console.log("判断校验规则-222-->",controlData.value.customRules)
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-14 14:14:42
 @ 功能: 单选改变事件
 */
-const radioChangeSet = (val:any) => {
-	console.log("单选改变事件-222-->",val)
-	let pickRadio = {}
-	let isTrue = true
-	textUinrVerfy.forEach((item:any) => {
-		if(item.type == val){
-			pickRadio = item
-			isTrue = false
-		}
-	})
-	if(isTrue){
-		numberUinrVerfy.forEach((item:any) => {
-			if(item.type == val){
-				pickRadio = item
-				isTrue = false
-			}
-		})
-	}
-	// console.log("单选改变事件-3333-->",pickRadio)
-	if (!controlData.value?.customRules) {
-		controlData.value.customRules = []
+const radioChangeSet = (val: any) => {
+  console.log("单选改变事件-222-->", val);
+  let pickRadio = {};
+  let isTrue = true;
+  textUinrVerfy.forEach((item: any) => {
+    if (item.type == val) {
+      pickRadio = item;
+      isTrue = false;
     }
-	if(Array.isArray(controlData.value.customRules) && controlData.value.customRules.length > 0){
-		let isNewWrite = true
-		controlData.value.customRules.forEach((item:any,index:number)=>{
-			if(item.type == ValidateText.type){
-				isNewWrite = false
-			}else{
-				controlData.value.customRules.splice(index, 1)
-			}
-		})
-		controlData.value.customRules.push({ 
-			type: pickRadio.type, 
-			message: pickRadio.message, 
-			trigger: "blur" 
-		})
-	}else{
-		controlData.value.customRules.push({ 
-			type: pickRadio.type, 
-			message: pickRadio.message, 
-			trigger: "blur" 
-		})
-	}
-}
+  });
+  if (isTrue) {
+    numberUinrVerfy.forEach((item: any) => {
+      if (item.type == val) {
+        pickRadio = item;
+        isTrue = false;
+      }
+    });
+  }
+  // console.log("单选改变事件-3333-->",pickRadio)
+  if (!controlData.value?.customRules) {
+    controlData.value.customRules = [];
+  }
+  if (
+    Array.isArray(controlData.value.customRules) &&
+    controlData.value.customRules.length > 0
+  ) {
+    let isNewWrite = true;
+    controlData.value.customRules.forEach((item: any, index: number) => {
+      if (item.type == ValidateText.type) {
+        isNewWrite = false;
+      } else {
+        controlData.value.customRules.splice(index, 1);
+      }
+    });
+    controlData.value.customRules.push({
+      type: pickRadio.type,
+      message: pickRadio.message,
+      trigger: "blur",
+    });
+  } else {
+    controlData.value.customRules.push({
+      type: pickRadio.type,
+      message: pickRadio.message,
+      trigger: "blur",
+    });
+  }
+};
 </script>
 <template>
-    
-	<div  class="sidebar-tools">
-            <el-tabs v-model="state.tabsName">
-                <el-tab-pane label="字段配置" name="first">
-                    <el-form size="small" class="form">
-                        <!-- <div class=""><h3>通用属性</h3></div> -->
-                        <el-divider content-position="left">通用属性</el-divider>
-			
-                        <template v-for="(item, index) in attrList" :key="index">
-							
-    
-                            <el-form-item :label="item.label"  class="form_cont">
-                                <el-select
-                                    v-if="item.type === 'select'"
-                                    :placeholder="item.placeholder"
-                                    v-model="item.value"
-                                    :filterable="item.path === 'name'"
-                                    :allow-create="item.path === 'name'"
-                                    :clearable="item.clearable"
-                                    @change="controlChange(item, $event)"
-                                >
-                                    <el-option
-                                    v-for="(opt, key) in item.dict"
-                                    :key="key"
-                                    :value="item.path === 'name' ? opt.name : key"
-                                    :label="
-                                        item.path === 'name' ? `${opt.label}(${opt.name})` : opt
-                                    "
-                                    />
-                                </el-select>
-                                <el-switch
-                                    v-else-if="item.type === 'switch'"
-                                    v-model="item.value"
-                                    @change="controlChange(item, $event)"
-                                />
-    
-                                <template v-else-if="item.type === 'digitpage'">
-                                    <el-row>
-                                        <el-col :span="12">
-                                            <el-select
-                                                v-model="item.selectvalue"
-                                                :placeholder="item.placeholder"
-                                                :filterable="item.path === 'name'"
-                                                :allow-create="item.path === 'name'"
-                                                :clearable="item.clearable"
-                                                @change="digitPageSub(item, $event)"
-                                            >
-                                                <el-option
-                                                    v-for="(opt, key) in item.dict"
-                                                    :key="key"
-                                                    :value="item.path === 'name' ? opt.name : key"
-                                                    :label="
-                                                        item.path === 'name' ? `${opt.label}(${opt.name})` : opt
-                                                    "
-                                                />
-                                            </el-select>
-                                        </el-col>
-                                        <el-col :span="12">
-                                            <el-input-number
-                                                v-if="item.selectvalue == 'default'"
-                                                v-model="item.control.modelValue"
-                                                class="mx-4"
-                                            />
-                                        </el-col>
-                                    </el-row>
-                                    <div  v-if="item.selectvalue == 'simple'" style="width:100%;cursor: pointer; margin-top:10px;"  @click="openMathDialog(item)" v-html="item.control.mathFormula.formulaHtml"></div>
-                                    <MathFormula  v-model:show="mathBoxShow" :sub-unit="subUnit" :unit-info="attrList" :form-listmap="formListmap" @updata-digit="updataDigit" />
-                                    
-                                </template>
-    
-                                
-                                <el-row v-else-if="item.type === 'uploadvideo_url'">
-                                    <!-- {{ controlData.control }} -->
-                                    <el-upload  
-                                    
-                                    :action="uploadUrl"  :before-remove="beforeRemove"
-                                    :on-success="videoUploadOk" :show-file-list="true"
-                                    :on-error="videoUploadErr"
-                                    :limit="1"
-                                    :on-exceed="handleExceed"
-                                    accept=".mp4,.MOV,.WMV,.FLV,.AVI,.AVCHD,.WebM,.MKV,.rmvb">
-                                        <el-button v-if="!controlData.control.videoMsg[videoIndex].videoReady" type="primary">点此上传</el-button>
-                                        <el-button v-if="controlData.control.videoMsg[videoIndex].videoReady" type="primary">已上传,点击修改</el-button>
-                                    </el-upload>
-                                    <!-- <el-button v-if="controlData.control.videoMsg[videoIndex].videoReady" type="primary">已上传,点击修改</el-button> 
+  <div class="sidebar-tools">
+    <el-tabs v-model="state.tabsName">
+      <el-tab-pane label="字段配置" name="first">
+        <el-form size="small" class="form">
+          <!-- <div class=""><h3>通用属性</h3></div> -->
+          <el-divider content-position="left">通用属性</el-divider>
+
+          <template v-for="(item, index) in attrList" :key="index">
+            <el-form-item :label="item.label" class="form_cont">
+              <el-select
+                v-if="item.type === 'select'"
+                :placeholder="item.placeholder"
+                v-model="item.value"
+                :filterable="item.path === 'name'"
+                :allow-create="item.path === 'name'"
+                :clearable="item.clearable"
+                @change="controlChange(item, $event)"
+              >
+                <el-option
+                  v-for="(opt, key) in item.dict"
+                  :key="key"
+                  :value="item.path === 'name' ? opt.name : key"
+                  :label="item.path === 'name' ? `${opt.label}(${opt.name})` : opt"
+                />
+              </el-select>
+              <el-switch
+                v-else-if="item.type === 'switch'"
+                v-model="item.value"
+                @change="controlChange(item, $event)"
+              />
+
+              <template v-else-if="item.type === 'digitpage'">
+                <el-row>
+                  <el-col :span="12">
+                    <el-select
+                      v-model="item.selectvalue"
+                      :placeholder="item.placeholder"
+                      :filterable="item.path === 'name'"
+                      :allow-create="item.path === 'name'"
+                      :clearable="item.clearable"
+                      @change="digitPageSub(item, $event)"
+                    >
+                      <el-option
+                        v-for="(opt, key) in item.dict"
+                        :key="key"
+                        :value="item.path === 'name' ? opt.name : key"
+                        :label="item.path === 'name' ? `${opt.label}(${opt.name})` : opt"
+                      />
+                    </el-select>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-input-number
+                      v-if="item.selectvalue == 'default'"
+                      v-model="item.control.modelValue"
+                      class="mx-4"
+                    />
+                  </el-col>
+                </el-row>
+                <div
+                  v-if="item.selectvalue == 'simple'"
+                  style="width: 100%; cursor: pointer; margin-top: 10px"
+                  @click="openMathDialog(item)"
+                  v-html="item.control.mathFormula.formulaHtml"
+                ></div>
+                <MathFormula
+                  v-model:show="mathBoxShow"
+                  :sub-unit="subUnit"
+                  :unit-info="attrList"
+                  :form-listmap="formListmap"
+                  @updata-digit="updataDigit"
+                />
+              </template>
+
+              <el-row v-else-if="item.type === 'uploadvideo_url'">
+                <!-- {{ controlData.control }} -->
+                <el-upload
+                  :action="uploadUrl"
+                  :before-remove="beforeRemove"
+                  :on-success="videoUploadOk"
+                  :show-file-list="true"
+                  :on-error="videoUploadErr"
+                  :limit="1"
+                  :on-exceed="handleExceed"
+                  accept=".mp4,.MOV,.WMV,.FLV,.AVI,.AVCHD,.WebM,.MKV,.rmvb"
+                >
+                  <el-button
+                    v-if="!controlData.control.videoMsg[videoIndex].videoReady"
+                    type="primary"
+                    >点此上传</el-button
+                  >
+                  <el-button
+                    v-if="controlData.control.videoMsg[videoIndex].videoReady"
+                    type="primary"
+                    >已上传,点击修改</el-button
+                  >
+                </el-upload>
+                <!-- <el-button v-if="controlData.control.videoMsg[videoIndex].videoReady" type="primary">已上传,点击修改</el-button> 
                                     v-if="!controlData.control.videoMsg[videoIndex].videoReady"-->
-                                </el-row>
-                                <!-- <el-row v-else-if="item.type === 'uploadvideo_poster'">
+              </el-row>
+              <!-- <el-row v-else-if="item.type === 'uploadvideo_poster'">
                                     <el-upload  
                                     v-if="controlData.control.videoMsg[videoIndex].videoReady&&controlData.control.videoMsg[videoIndex].poster===''"
                                     :action="uploadUrl"  :before-remove="beforeRemove"
@@ -3555,68 +3660,97 @@ const radioChangeSet = (val:any) => {
                                     <el-button v-if="!controlData.control[videoIndex].videoReady" type="warning">请先上传视频</el-button>
                                     <el-button v-if="controlData.control.videoMsg[videoIndex].videoReady&&controlData.control.videoMsg[videoIndex].poster!=''" type="primary">已上传,点击修改</el-button>
                                 </el-row>  -->
-                                <el-row v-else-if="item.type === 'uploadvideo_autoPlay'">
-                                    <el-switch v-model="controlData.control.videoMsg[videoIndex].videoAutoPlay" />
-                                </el-row>
-                                <el-row v-else-if="item.type === 'uploadvideo_loopPlay'">
-                                    <el-switch v-model="controlData.control.videoMsg[videoIndex].loop" />
-                                </el-row>
-                                <el-row v-else-if="item.type === 'uploadvideo_width'">
-                                    <el-input-number v-model="controlData.control.videoMsg[videoIndex].videoWidth" :step="50" :max="4096"/>
-                                </el-row>
-                                <el-row v-else-if="item.type === 'uploadvideo_height'">
-                                    <el-input-number v-model="controlData.control.videoMsg[videoIndex].videoHeight" :step="50" :max="2160"/>
-                                </el-row>
-    
-                                <el-row v-else-if="item.type === 'carousel'">
-    
-                                    <el-button  type="primary" append-to-body="true" modal="true" @click="dialogTableVisible = true"  >轮播图设置</el-button>
-                                </el-row>
-                                
-
-								<el-row v-else-if="item.type === 'transfer_name'">
-									<el-input
-										v-model="controlData.config.transferName"
-										placeholder="请输入穿梭框名"
-										style="width:221px"
-									/>
-								</el-row>
-								<el-row v-else-if="item.type ==='transfer_options_datasource'">
-									<!-- <span style="display:inline-block;width:78px">选项数据源</span> -->
-									<el-select
-										v-model="controlData.config.transferDataSource"
-										placeholder="选项数据源"
-										style="width: 150px; height:20px">
-										<el-option
-										v-for="dataSourceOption1 in transferDataSourceOptions"
-										:key="dataSourceOption1.value"
-										:label="dataSourceOption1.label"
-										:value="dataSourceOption1.value"
-										/>
-										
-									</el-select>
-									<div v-if="controlData.config.transferDataSource==='固定选项'" style="width: auto;margin-top:33px;margin-left:-220px;padding-bottom: 6px;">
-										<el-button  type="primary" append-to-body="true" modal="true" @click="transferDialogTableVisible = true"  >编辑固定选项</el-button>
-									</div>
-									<div v-if="controlData.config.transferDataSource==='数据源'" style="width: auto;margin-top: 20px;">
-										<!-- <span style="display:inline-block;width:50px;margin-bottom: 25px;">接口url</span> -->
-										<el-input
-											v-model="controlData.config.apiUrl"
-											
-											style="width:278px;margin-left: -68px;margin-top: -5px;"
-											placeholder="数据源接口url">
-												<template #prepend>
-													<el-select
-														v-model="controlData.config.method"
-														style="width: 100px">
-														<el-option label="get" value="get" />
-														<el-option label="post" value="post" />
-													</el-select>
-												</template>
-											</el-input>
-									</div>
-								</el-row>
-								<!-- <el-row v-else-if="item.type === 'lowcodeImage_radius'">
+              <el-row v-else-if="item.type === 'uploadvideo_autoPlay'">
+                <el-switch
+                  v-model="controlData.control.videoMsg[videoIndex].videoAutoPlay"
+                />
+              </el-row>
+              <el-row v-else-if="item.type === 'uploadvideo_loopPlay'">
+                <el-switch v-model="controlData.control.videoMsg[videoIndex].loop" />
+              </el-row>
+              <el-row v-else-if="item.type === 'uploadvideo_width'">
+                <el-input-number
+                  v-model="controlData.control.videoMsg[videoIndex].videoWidth"
+                  :step="50"
+                  :max="4096"
+                />
+              </el-row>
+              <el-row v-else-if="item.type === 'uploadvideo_height'">
+                <el-input-number
+                  v-model="controlData.control.videoMsg[videoIndex].videoHeight"
+                  :step="50"
+                  :max="2160"
+                />
+              </el-row>
+
+              <el-row v-else-if="item.type === 'carousel'">
+                <el-button
+                  type="primary"
+                  append-to-body="true"
+                  modal="true"
+                  @click="dialogTableVisible = true"
+                  >轮播图设置</el-button
+                >
+              </el-row>
+
+              <el-row v-else-if="item.type === 'transfer_name'">
+                <el-input
+                  v-model="controlData.config.transferName"
+                  placeholder="请输入穿梭框名"
+                  style="width: 221px"
+                />
+              </el-row>
+              <el-row v-else-if="item.type === 'transfer_options_datasource'">
+                <!-- <span style="display:inline-block;width:78px">选项数据源</span> -->
+                <el-select
+                  v-model="controlData.config.transferDataSource"
+                  placeholder="选项数据源"
+                  style="width: 150px; height: 20px"
+                >
+                  <el-option
+                    v-for="dataSourceOption1 in transferDataSourceOptions"
+                    :key="dataSourceOption1.value"
+                    :label="dataSourceOption1.label"
+                    :value="dataSourceOption1.value"
+                  />
+                </el-select>
+                <div
+                  v-if="controlData.config.transferDataSource === '固定选项'"
+                  style="
+                    width: auto;
+                    margin-top: 33px;
+                    margin-left: -220px;
+                    padding-bottom: 6px;
+                  "
+                >
+                  <el-button
+                    type="primary"
+                    append-to-body="true"
+                    modal="true"
+                    @click="transferDialogTableVisible = true"
+                    >编辑固定选项</el-button
+                  >
+                </div>
+                <div
+                  v-if="controlData.config.transferDataSource === '数据源'"
+                  style="width: auto; margin-top: 20px"
+                >
+                  <!-- <span style="display:inline-block;width:50px;margin-bottom: 25px;">接口url</span> -->
+                  <el-input
+                    v-model="controlData.config.apiUrl"
+                    style="width: 278px; margin-left: -68px; margin-top: -5px"
+                    placeholder="数据源接口url"
+                  >
+                    <template #prepend>
+                      <el-select v-model="controlData.config.method" style="width: 100px">
+                        <el-option label="get" value="get" />
+                        <el-option label="post" value="post" />
+                      </el-select>
+                    </template>
+                  </el-input>
+                </div>
+              </el-row>
+              <!-- <el-row v-else-if="item.type === 'lowcodeImage_radius'">
 									<el-switch v-model="controlData.control.radius" style="margin-right: 15px;"/>
 									<el-popover
 										placement="top-start"
@@ -3629,7 +3763,7 @@ const radioChangeSet = (val:any) => {
 									</template>
 									</el-popover>
 								</el-row> -->
-								<!-- <el-row v-else-if="item.type === 'lowcodeImage_url'">
+              <!-- <el-row v-else-if="item.type === 'lowcodeImage_url'">
 									<el-upload 
 									:action="uploadUrl"  :before-remove="beforeRemove"
 									:on-success="lowcodeImageUploadSuccess" 
@@ -3640,7 +3774,7 @@ const radioChangeSet = (val:any) => {
 										<el-button v-if="controlData.control.uploadFlag" type="primary">已上传,点击修改</el-button>
 									</el-upload>
 								</el-row> -->
-								<!-- <el-row v-else-if="item.type === 'lowcodeImage_showMode'">
+              <!-- <el-row v-else-if="item.type === 'lowcodeImage_showMode'">
 									<el-select
 										v-model="controlData.control.showMode"
 										placeholder="选项数据源"
@@ -3662,7 +3796,7 @@ const radioChangeSet = (val:any) => {
 										<span style="margin-right: 10px;">百分比高 </span><el-input-number v-model="controlData.control.heightPercent" />
 									</div>
 								</el-row> -->
-								<!-- <el-row v-else-if="item.type === 'lowcodeImage_fit'">
+              <!-- <el-row v-else-if="item.type === 'lowcodeImage_fit'">
 									<el-radio-group v-model="controlData.control.fit">
 										<el-popover
 											placement="top-start"
@@ -3727,7 +3861,7 @@ const radioChangeSet = (val:any) => {
 										
 									</el-radio-group>
 								</el-row> -->
-								<!-- <el-row v-else-if="item.type === 'lowcodeImage_boderAndShadow'">
+              <!-- <el-row v-else-if="item.type === 'lowcodeImage_boderAndShadow'">
 									<el-switch v-model="controlData.control.boderAndShadow" style="margin-right: 15px;"/>
 								</el-row>
 								<el-row v-else-if="item.type === 'lowcodeImage_link'">
@@ -3769,404 +3903,471 @@ const radioChangeSet = (val:any) => {
 									
 								</el-row> -->
 
-								<el-row v-else-if="item.type === 'associatedForms_hide'">
-									<el-button v-if="controlData.control.hideConditionHtml===''" style="padding-top: 5px;" type="primary" link append-to-body="true" modal="true" @click="associatedFormsHideDialoghandle"  >设置隐藏条件</el-button>
-									<div   style="width:100%; cursor: pointer;"  @click="associatedFormsHideDialoghandle" v-html="controlData.control.hideConditionHtml"></div>
-								</el-row>
-
-
-                                <el-row v-else-if="item.type === 'associatedForms_form'">
-                                    <el-button type="primary" link style="display:block;cursor: pointer;" @click="chooseAssociatedForm">{{ controlData.control.asfasfLabel==''?'选择关联表单':controlData.control.asfasfLabel }}</el-button>
-                                    
-								</el-row> 
-
-                                <el-row v-else-if="item.type === 'associatedForms_dataRange'">
-									<el-button v-if="controlData.control.dataRangeConditionHtml===''" style="padding-top: 5px;" type="primary" link append-to-body="true" modal="true" @click="associatedFormsDataRangeDialoghandle"  >设置数据范围</el-button>
-									<div style="width:100%; cursor: pointer;" @click="associatedFormsDataRangeDialoghandle"  v-html="controlData.control.dataRangeConditionHtml"></div>
-								</el-row>
-
-
-                                <el-row v-else-if="item.type === 'associatedForms_FillRoles'">
-									<el-button  style="padding-top: 5px;" type="primary" link append-to-body="true" modal="true" @click="associatedFormsDataFillRolesDialoghandle"  >设置数据填充规则</el-button>
-								
-								</el-row>
-
-								<el-row v-else-if="item.path === 'unitName'">
-									<el-input
-										:type="item.inputStyle"
-										v-model="item.value"
-										:placeholder="item.placeholder"
-										disabled 
-									/>
-								
-								</el-row>
-								
-
-                                <el-input
-                                    v-else
-                                    :type="item.inputStyle"
-                                    v-model="item.value"
-                                    :placeholder="item.placeholder"
-									:disabled="isNotWriteWord(item)"
-                                    @input="controlChange(item, $event)"
-                                />
-                                
-    
-                            </el-form-item>
-    
-                            
-                            
-                        </template>
-                        
-                        <template v-if="controlData.config">
-                            <!-- <el-form-item label="联动条件"  class="form_cont">
+              <el-row v-else-if="item.type === 'associatedForms_hide'">
+                <el-button
+                  v-if="controlData.control.hideConditionHtml === ''"
+                  style="padding-top: 5px"
+                  type="primary"
+                  link
+                  append-to-body="true"
+                  modal="true"
+                  @click="associatedFormsHideDialoghandle"
+                  >设置隐藏条件</el-button
+                >
+                <div
+                  style="width: 100%; cursor: pointer"
+                  @click="associatedFormsHideDialoghandle"
+                  v-html="controlData.control.hideConditionHtml"
+                ></div>
+              </el-row>
+
+              <el-row v-else-if="item.type === 'associatedForms_form'">
+                <el-button
+                  type="primary"
+                  link
+                  style="display: block; cursor: pointer"
+                  @click="chooseAssociatedForm"
+                  >{{
+                    controlData.control.asfasfLabel == ""
+                      ? "选择关联表单"
+                      : controlData.control.asfasfLabel
+                  }}</el-button
+                >
+              </el-row>
+
+              <el-row v-else-if="item.type === 'associatedForms_dataRange'">
+                <el-button
+                  v-if="controlData.control.dataRangeConditionHtml === ''"
+                  style="padding-top: 5px"
+                  type="primary"
+                  link
+                  append-to-body="true"
+                  modal="true"
+                  @click="associatedFormsDataRangeDialoghandle"
+                  >设置数据范围</el-button
+                >
+                <div
+                  style="width: 100%; cursor: pointer"
+                  @click="associatedFormsDataRangeDialoghandle"
+                  v-html="controlData.control.dataRangeConditionHtml"
+                ></div>
+              </el-row>
+
+              <el-row v-else-if="item.type === 'associatedForms_FillRoles'">
+                <el-button
+                  style="padding-top: 5px"
+                  type="primary"
+                  link
+                  append-to-body="true"
+                  modal="true"
+                  @click="associatedFormsDataFillRolesDialoghandle"
+                  >设置数据填充规则</el-button
+                >
+              </el-row>
+
+              <el-row v-else-if="item.path === 'unitName'">
+                <el-input
+                  :type="item.inputStyle"
+                  v-model="item.value"
+                  :placeholder="item.placeholder"
+                  disabled
+                />
+              </el-row>
+
+              <el-input
+                v-else
+                :type="item.inputStyle"
+                v-model="item.value"
+                :placeholder="item.placeholder"
+                :disabled="isNotWriteWord(item)"
+                @input="controlChange(item, $event)"
+              />
+            </el-form-item>
+          </template>
+
+          <template v-if="controlData.config">
+            <!-- <el-form-item label="联动条件"  class="form_cont">
                                 <el-switch v-model="controlData.config.linkKey" />
                             </el-form-item> -->
-                            <template v-if="controlData.config.linkKey">
-                                <el-form-item  class="form_cont">
-                                    <el-input
-                                    v-model="controlData.config.linkValue"
-                                    type="textarea"
-                                    placeholder="表达式如: $.input>1 $表示为当前表单数据，input为字段标识"
-                                    />
-                                </el-form-item>
-                                <el-form-item
-                                    class="form_cont"
-                                    v-if="
-                                    showHide(
-                                        [
-                                        'input',
-                                        'textarea',
-                                        'radio',
-                                        'checkbox',
-                                        'select',
-                                        'date',
-                                        'switch',
-                                        'number',
-                                        'cascader',
-                                        'slider',
-                                        'datePicker',
-                                        'timePicker',
-                                        'colorPicker',
-                                        'inputNumber',
-                                        'rate',
-                                        'treeSelect'
-                                        ],
-                                        true
-                                    )
-                                    "
-                                    label="联动结果"
-                                >
-                                    <el-radio-group
-                                        v-model="controlData.config.linkResult"
-                                        class="option-radio"
-                                    >
-                                        <el-radio label="hidden">隐藏(默认)</el-radio>
-                                        <el-radio label="disabled">禁用</el-radio>
-                                    </el-radio-group>
-                                </el-form-item>
-                            </template>
-                        </template>
-                        <template v-if="showHide(['tabs'], true)">
-                            <!-- <div class="h3"><h3>标签配置项</h3></div> -->
-                            <el-divider content-position="left">标签配置项</el-divider>
-                            <el-form-item
-                                class="form_cont"
-                                v-for="(item, index) in controlData.columns"
-                                :key="index"
-                            >
-                                <el-col :span="12">
-                                    <el-input v-model="item.label" placeholder="标签配置项" />
-                                </el-col>
-                                <el-col :span="2" :offset="1">
-                                    <i
-                                        class="icon-del"
-                                        @click="delSelectOption(index as number, 'tabs')"
-                                    ></i>
-                                </el-col>
-                            </el-form-item>
-                            <el-form-item  class="form_cont">
-                                <el-button @click="addSelectOption('tabs')">增加标签</el-button>
-                            </el-form-item>
-                        </template>
-                        <!--编号规则设置--->
-                        <div
-                            v-if="showHide(['serialNumber'],true)"
-                        >
-                            <!-- <div class="h3"><h3>编码规则配置</h3></div> -->
-                            <el-divider content-position="left">编码规则配置</el-divider>
-                            <el-form-item label="编码方式" class="form_cont">
-                                <el-switch v-model="controlData.config.automatic" inline-prompt active-text="自动编码" inactive-text="手动编码" style="--el-switch-on-color: #13ce66; --el-switch-off-color: #E6A23C" />
-                            </el-form-item>
-                            <div v-if="controlData.config.automatic">
-                                <el-form-item v-for="(item, index) in controlData.config.customRules" :key="index" class="form_cont">
-                                    
-                                    <el-input v-model="item.rule" :placeholder="item.message?item.message:'请输入自定义字符'">
-                                        <template #prepend>
-                                            <el-select
-                                                v-model="item.type"
-                                                style="width: 100px"
-                                                @change="rulesSelectNumChange(item, $event)"
-                                            >
-                                                <el-option
-                                                    v-for="list in state.numberRulesList"
-                                                    :key="list.type"
-                                                    :label="list.label"
-                                                    :value="list.type"
-                                                />
-                                            </el-select>
-                                        </template>
-                                        <template #append>
-                                            <i
-                                            class="icon-del"
-                                            @click="delNumRules(index as number)"
-                                            ></i>
-                                        </template>
-                                    </el-input>
-    
-    
-                                </el-form-item>
-                                <el-form-item class="form_cont">
-                                    <el-button @click="addNumRules">添加规则</el-button>
-                                </el-form-item>
-                            </div>
-                        </div>
-                        <!-- {{controlData.config.optionsType}} -->
-                        <div v-if="showHide(['switch'],true)">
-                            <el-button @click="handelGlxxszDialogSwitch">关联选项设置</el-button>
-                        </div>
-                        <div v-if="showHide(['radio','select',],true)&&controlData.config.optionsType==0">
-                            <el-button @click="handelGlxxszDialog">关联选项设置</el-button>
-                        </div>
-                        <div v-if="showHide(['checkbox',],true)&&controlData.config.optionsType==0">
-                            <el-button @click="handelGlxxszDialogCheckbox">关联选项设置</el-button>
-                        </div>
-                        <div
-                            v-if="
-                            showHide(
-                                [
-                                'radio',
-                                'select',
-                                'checkbox',
-                                'cascader',
-                                'inputSlot',
-                                'treeSelect'
-                                ],
-                                true
-                            )
-                            "
-                        >
-                            <!-- <div class="h3"><h3>选项配置</h3></div> -->
-                            <el-divider content-position="left">选项配置</el-divider>
-                            <el-form-item v-if="showHide(['select'], true)" label="添加全部项" class="form_cont">
-                                <el-input
-                                    v-model="controlData.config.addAll"
-                                    placeholder="请输入全部项文案"
-                                />
-                            </el-form-item>
-                            <el-form-item label="选项数据源" class="form_cont">
-                                <el-select
-                                    v-model="controlData.config.optionsType"
-                                    @change="optionsTypeChanged"
-                                >
-                                    <el-option :value="0" label="固定选项" />
-                                    <el-option :value="3" label="系统表单字段"/>
-                                    <el-option :value="1" label="数据源" />
-                                    <el-option :value="2" label="接口字典" />
-                                </el-select>
-                            </el-form-item>
-                            <template v-if="controlData.config.optionsType === 0">
-                                <div v-if="controlData.type !== 'cascader'&&controlData.type !== 'checkbox'&&controlData.type !== 'radio'&&controlData.type !== 'select'">
-                                    <el-form-item
-                                        v-for="(item, index) in controlData.options"
-                                        :key="index"
-                                        class="form_cont"
-										label="选项标签"
-                                    >
-                                        <el-col :span="10">
-                                            <el-input v-model="item.label" placeholder="选项标签" />
-                                        </el-col>
-                                        <!-- <el-col :span="10" :offset="1">
+            <template v-if="controlData.config.linkKey">
+              <el-form-item class="form_cont">
+                <el-input
+                  v-model="controlData.config.linkValue"
+                  type="textarea"
+                  placeholder="表达式如: $.input>1 $表示为当前表单数据，input为字段标识"
+                />
+              </el-form-item>
+              <el-form-item
+                class="form_cont"
+                v-if="
+                  showHide(
+                    [
+                      'input',
+                      'textarea',
+                      'radio',
+                      'checkbox',
+                      'select',
+                      'date',
+                      'switch',
+                      'number',
+                      'cascader',
+                      'slider',
+                      'datePicker',
+                      'timePicker',
+                      'colorPicker',
+                      'inputNumber',
+                      'rate',
+                      'treeSelect',
+                    ],
+                    true
+                  )
+                "
+                label="联动结果"
+              >
+                <el-radio-group
+                  v-model="controlData.config.linkResult"
+                  class="option-radio"
+                >
+                  <el-radio label="hidden">隐藏(默认)</el-radio>
+                  <el-radio label="disabled">禁用</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </template>
+          </template>
+          <template v-if="showHide(['tabs'], true)">
+            <!-- <div class="h3"><h3>标签配置项</h3></div> -->
+            <el-divider content-position="left">标签配置项</el-divider>
+            <el-form-item
+              class="form_cont"
+              v-for="(item, index) in controlData.columns"
+              :key="index"
+            >
+              <el-col :span="12">
+                <el-input v-model="item.label" placeholder="标签配置项" />
+              </el-col>
+              <el-col :span="2" :offset="1">
+                <i class="icon-del" @click="delSelectOption(index as number, 'tabs')"></i>
+              </el-col>
+            </el-form-item>
+            <el-form-item class="form_cont">
+              <el-button @click="addSelectOption('tabs')">增加标签</el-button>
+            </el-form-item>
+          </template>
+          <!--编号规则设置--->
+          <div v-if="showHide(['serialNumber'], true)">
+            <!-- <div class="h3"><h3>编码规则配置</h3></div> -->
+            <el-divider content-position="left">编码规则配置</el-divider>
+            <el-form-item label="编码方式" class="form_cont">
+              <el-switch
+                v-model="controlData.config.automatic"
+                inline-prompt
+                active-text="自动编码"
+                inactive-text="手动编码"
+                style="--el-switch-on-color: #13ce66; --el-switch-off-color: #e6a23c"
+              />
+            </el-form-item>
+            <div v-if="controlData.config.automatic">
+              <el-form-item
+                v-for="(item, index) in controlData.config.customRules"
+                :key="index"
+                class="form_cont"
+              >
+                <el-input
+                  v-model="item.rule"
+                  :placeholder="item.message ? item.message : '请输入自定义字符'"
+                >
+                  <template #prepend>
+                    <el-select
+                      v-model="item.type"
+                      style="width: 100px"
+                      @change="rulesSelectNumChange(item, $event)"
+                    >
+                      <el-option
+                        v-for="list in state.numberRulesList"
+                        :key="list.type"
+                        :label="list.label"
+                        :value="list.type"
+                      />
+                    </el-select>
+                  </template>
+                  <template #append>
+                    <i class="icon-del" @click="delNumRules(index as number)"></i>
+                  </template>
+                </el-input>
+              </el-form-item>
+              <el-form-item class="form_cont">
+                <el-button @click="addNumRules">添加规则</el-button>
+              </el-form-item>
+            </div>
+          </div>
+          <!-- {{controlData.config.optionsType}} -->
+          <div v-if="showHide(['switch'], true)">
+            <el-button @click="handelGlxxszDialogSwitch">关联选项设置</el-button>
+          </div>
+          <div
+            v-if="
+              showHide(['radio', 'select'], true) && controlData.config.optionsType == 0
+            "
+          >
+            <el-button @click="handelGlxxszDialog">关联选项设置</el-button>
+          </div>
+          <div v-if="showHide(['checkbox'], true) && controlData.config.optionsType == 0">
+            <el-button @click="handelGlxxszDialogCheckbox">关联选项设置</el-button>
+          </div>
+          <div
+            v-if="
+              showHide(
+                ['radio', 'select', 'checkbox', 'cascader', 'inputSlot', 'treeSelect'],
+                true
+              )
+            "
+          >
+            <!-- <div class="h3"><h3>选项配置</h3></div> -->
+            <el-divider content-position="left">选项配置</el-divider>
+            <el-form-item
+              v-if="showHide(['select'], true)"
+              label="添加全部项"
+              class="form_cont"
+            >
+              <el-input
+                v-model="controlData.config.addAll"
+                placeholder="请输入全部项文案"
+              />
+            </el-form-item>
+            <el-form-item label="选项数据源" class="form_cont">
+              <el-select
+                v-model="controlData.config.optionsType"
+                @change="optionsTypeChanged"
+              >
+                <el-option :value="0" label="固定选项" />
+                <el-option :value="3" label="系统表单字段" />
+                <el-option :value="1" label="数据源" />
+                <el-option :value="2" label="接口字典" />
+              </el-select>
+            </el-form-item>
+            <template v-if="controlData.config.optionsType === 0">
+              <div
+                v-if="
+                  controlData.type !== 'cascader' &&
+                  controlData.type !== 'checkbox' &&
+                  controlData.type !== 'radio' &&
+                  controlData.type !== 'select'
+                "
+              >
+                <el-form-item
+                  v-for="(item, index) in controlData.options"
+                  :key="index"
+                  class="form_cont"
+                  label="选项标签"
+                >
+                  <el-col :span="10">
+                    <el-input v-model="item.label" placeholder="选项标签" />
+                  </el-col>
+                  <!-- <el-col :span="10" :offset="1">
                                             <el-input v-model="item.value" placeholder="选项值" />
                                         </el-col> -->
-                                        <el-col :span="2" :offset="1">
-                                            <i
-                                                class="icon-del"
-                                                @click="delSelectOption(index as number)"
-                                            ></i>
-                                        </el-col>
-                                    </el-form-item>
-                                </div>
-                                <!-- 多选选择框选项拖动功能 liwenxuan 20240815 start -->
-                                <div v-if="controlData.type !== 'cascader'&&(controlData.type == 'checkbox'||controlData.type == 'radio'||controlData.type == 'select')">
-                                    <draggable
-                                        :list="controlData.options" 
-                                        :force-fallback="true" 
-                                        chosen-class="chosenClass" 
-                                        animation="300"
-                                        
-                                    >
-                                    
-                                        <template #item="{ element }">
-                                            <div class="item form_cont">
-                                                <el-form-item>
-                                                    <el-col :span="2" style="padding-top:4px;cursor: move;color: #66B1FF">
-                                                        <i class="icon-move" ></i>
-                                                    </el-col>
-                                                    <el-col :span="6" style="cursor: move;">
-                                                        选项标签
-                                                    </el-col>
-                                                    <el-col :span="10">
-                                                        <el-input v-model="element.label" placeholder="选项标签" />
-                                                        
-                                                    </el-col>
-                                                    <el-col :span="2" :offset="1">
-                                                        <i
-                                                            class="icon-del"
-                                                            @click="delSelectOption(element.value as number)"
-                                                        ></i>
-                                                    </el-col>
-                                                </el-form-item>
-                                                
-                                            </div>
-                                        </template>
-                                    </draggable>
-                                </div>
-                                <!-- 多选选择框选项拖动功能 liwenxuan 20240815 end -->
-                                <el-form-item class="form_cont">
-                                    <el-button @click="addSelectOption">{{ controlData.type === 'cascader' ? '编辑' : '新增' }}</el-button>
-                                </el-form-item>
-                            </template>
-                            <template v-else-if="controlData.config.optionsType === 3">
-                                <el-button type="primary" style="margin-bottom:10px;margin-left:80px" plain @click="optionsValue3Setting">选择系统表单字段</el-button>
-                                <!--  <el-button  style="padding-top: 5px;" type="primary" link append-to-body="true" modal="true" @click="optionsValue3Setting"  >选择系统表单字段</el-button> -->
-                            </template>
-                            <template v-else>
-                                <el-form-item class="form_cont">
-                                    <el-input
-                                        v-model="controlData.config.optionsFun"
-                                        :placeholder="
-                                            getOptionPlaceholder(controlData.config.optionsType)
-                                        "
-                                    >
-                                        <template
-                                            v-if="controlData.config.optionsType === 1"
-                                            #prepend
-                                        >
-                                            <el-select
-                                                v-model="controlData.config.method"
-                                                style="width: 80px"
-                                            >
-                                                <el-option label="get" value="get" />
-                                                <el-option label="post" value="post" />
-                                            </el-select>
-                                        </template>
-                                    </el-input>
-                                </el-form-item>
-                                <template v-if="controlData.config.optionsType === 1">
-                                    <el-form-item label="指定label属性值" class="form_cont">
-                                        <el-input
-                                            v-model="controlData.config.label"
-                                            placeholder="返回数据中没有label时可设置"
-                                        />
-                                    </el-form-item>
-                                    <el-form-item label="指定value属性值" class="form_cont">
-                                        <el-input
-                                            v-model="controlData.config.value"
-                                            placeholder="返回数据中没有value时可设置"
-                                        />
-                                    </el-form-item>
-                                </template>
-                                <el-form-item v-if="controlData.config.optionsType === 1" class="form_cont">
-                                    <el-button
-                                        @click="
-                                            optionsEvent(
-                                            'optionsParams',
-                                            '请求前处理事件，参数(data,route,form) data请求参数,route页面路由,form表单值'
-                                            )
-                                        "
-                                    >beforeRequest</el-button>
-                                    <el-button
-                                        @click="
-                                            optionsEvent(
-                                            'optionsResult',
-                                            '请求返回结束处理；，也可为字符串，如opt=formatTest'
-                                            )
-                                        "
-                                    >afterResponse</el-button>
-                                </el-form-item>
-                            </template>
-                            <el-form-item label="尝试转换value值为" class="form_cont">
-                                <el-select
-                                    v-model="controlData.config.transformData"
-                                    placeholder="默认为number"
-                                >
-                                    <el-option value="none">不转换</el-option>
-                                    <el-option value="number">number</el-option>
-                                    <el-option value="string">string</el-option>
-                                </el-select>
-                            </el-form-item>
-                        </div>
-                        <template
-                            v-if="
-                            !state.isSearch &&
-                            showHide([
-                                'txt',
-                                'title',
-                                'table',
-                                'grid',
-                                'tabs',
-                                'card',
-                                'switch',
-                                'gridChild',
-                                'tableColumn',
-                                'divider',
-                                'div',
-                                'button'
-                            ])
-                            "
+                  <el-col :span="2" :offset="1">
+                    <i class="icon-del" @click="delSelectOption(index as number)"></i>
+                  </el-col>
+                </el-form-item>
+              </div>
+              <!-- 多选选择框选项拖动功能 liwenxuan 20240815 start -->
+              <div
+                v-if="
+                  controlData.type !== 'cascader' &&
+                  (controlData.type == 'checkbox' ||
+                    controlData.type == 'radio' ||
+                    controlData.type == 'select')
+                "
+              >
+                <draggable
+                  :list="controlData.options"
+                  :force-fallback="true"
+                  chosen-class="chosenClass"
+                  animation="300"
+                >
+                  <template #item="{ element }">
+                    <div class="item form_cont">
+                      <el-form-item>
+                        <el-col
+                          :span="2"
+                          style="padding-top: 4px; cursor: move; color: #66b1ff"
                         >
-                        
-                            <!-- <div class="h3"><h3>校验设置</h3></div> -->
-                            <el-divider content-position="left">校验设置</el-divider>
-                            <div v-if="showHide(['input', 'password', 'component','digitpage'], true)" class="jiaoYan">
-				
-							<el-form-item class="form_cont">
-								<el-input v-model="ValidateText.message" @input="requiredText" :placeholder="ValidateText.message">
-									<template #prepend>
-									必填
-									</template>
-									<template #append>
-										<el-checkbox v-model="ValidateText.checkbox" @change="requiredChangeSet"  />
-									</template>
-								</el-input>
-							</el-form-item>
-							<el-form-item  v-if="showHide(['input', 'password', 'component'], true)" class="form_cont">
-								<el-radio-group v-model="radioVerify.type" @change="radioChangeSet">
-									<el-input v-for="item in textUinrVerfy" v-model="item.message" @input="requiredTextRadio(item)" :placeholder="item.message" class="radioInput">
-										<template #prepend>
-											{{item.label}}
-										</template>
-										<template #append>
-											<el-radio :value="item.type" />
-										</template>
-									</el-input>
-								</el-radio-group>
-							</el-form-item>
-							<el-form-item v-else class="form_cont">
-								<el-radio-group v-model="radioVerify.type" @change="radioChangeSet">
-									<el-input v-for="item in numberUinrVerfy" v-model="item.message" @input="requiredTextRadio(item)" :placeholder="item.message" class="radioInput">
-										<template #prepend>
-											{{item.label}}
-										</template>
-										<template #append>
-											<el-radio :value="item.type" />
-										</template>
-									</el-input>
-								</el-radio-group>
-							</el-form-item>
-
-                                <!-- <el-form-item
+                          <i class="icon-move"></i>
+                        </el-col>
+                        <el-col :span="6" style="cursor: move"> 选项标签 </el-col>
+                        <el-col :span="10">
+                          <el-input v-model="element.label" placeholder="选项标签" />
+                        </el-col>
+                        <el-col :span="2" :offset="1">
+                          <i
+                            class="icon-del"
+                            @click="delSelectOption(element.value as number)"
+                          ></i>
+                        </el-col>
+                      </el-form-item>
+                    </div>
+                  </template>
+                </draggable>
+              </div>
+              <!-- 多选选择框选项拖动功能 liwenxuan 20240815 end -->
+              <el-form-item class="form_cont">
+                <el-button @click="addSelectOption">{{
+                  controlData.type === "cascader" ? "编辑" : "新增"
+                }}</el-button>
+              </el-form-item>
+            </template>
+            <template v-else-if="controlData.config.optionsType === 3">
+              <el-button
+                type="primary"
+                style="margin-bottom: 10px; margin-left: 80px"
+                plain
+                @click="optionsValue3Setting"
+                >选择系统表单字段</el-button
+              >
+              <!--  <el-button  style="padding-top: 5px;" type="primary" link append-to-body="true" modal="true" @click="optionsValue3Setting"  >选择系统表单字段</el-button> -->
+            </template>
+            <template v-else>
+              <el-form-item class="form_cont">
+                <el-input
+                  v-model="controlData.config.optionsFun"
+                  :placeholder="getOptionPlaceholder(controlData.config.optionsType)"
+                >
+                  <template v-if="controlData.config.optionsType === 1" #prepend>
+                    <el-select v-model="controlData.config.method" style="width: 80px">
+                      <el-option label="get" value="get" />
+                      <el-option label="post" value="post" />
+                    </el-select>
+                  </template>
+                </el-input>
+              </el-form-item>
+              <template v-if="controlData.config.optionsType === 1">
+                <el-form-item label="指定label属性值" class="form_cont">
+                  <el-input
+                    v-model="controlData.config.label"
+                    placeholder="返回数据中没有label时可设置"
+                  />
+                </el-form-item>
+                <el-form-item label="指定value属性值" class="form_cont">
+                  <el-input
+                    v-model="controlData.config.value"
+                    placeholder="返回数据中没有value时可设置"
+                  />
+                </el-form-item>
+              </template>
+              <el-form-item v-if="controlData.config.optionsType === 1" class="form_cont">
+                <el-button
+                  @click="
+                    optionsEvent(
+                      'optionsParams',
+                      '请求前处理事件，参数(data,route,form) data请求参数,route页面路由,form表单值'
+                    )
+                  "
+                  >beforeRequest</el-button
+                >
+                <el-button
+                  @click="
+                    optionsEvent(
+                      'optionsResult',
+                      '请求返回结束处理；，也可为字符串，如opt=formatTest'
+                    )
+                  "
+                  >afterResponse</el-button
+                >
+              </el-form-item>
+            </template>
+            <el-form-item label="尝试转换value值为" class="form_cont">
+              <el-select
+                v-model="controlData.config.transformData"
+                placeholder="默认为number"
+              >
+                <el-option value="none">不转换</el-option>
+                <el-option value="number">number</el-option>
+                <el-option value="string">string</el-option>
+              </el-select>
+            </el-form-item>
+          </div>
+          <template
+            v-if="
+              !state.isSearch &&
+              showHide([
+                'txt',
+                'title',
+                'table',
+                'grid',
+                'tabs',
+                'card',
+                'switch',
+                'gridChild',
+                'tableColumn',
+                'divider',
+                'div',
+                'button',
+              ])
+            "
+          >
+            <!-- <div class="h3"><h3>校验设置</h3></div> -->
+            <el-divider content-position="left">校验设置</el-divider>
+            <div
+              v-if="showHide(['input', 'password', 'component', 'digitpage'], true)"
+              class="jiaoYan"
+            >
+              <el-form-item class="form_cont">
+                <el-input
+                  v-model="ValidateText.message"
+                  @input="requiredText"
+                  :placeholder="ValidateText.message"
+                >
+                  <template #prepend> 必填 </template>
+                  <template #append>
+                    <el-checkbox
+                      v-model="ValidateText.checkbox"
+                      @change="requiredChangeSet"
+                    />
+                  </template>
+                </el-input>
+              </el-form-item>
+              <el-form-item
+                v-if="showHide(['input', 'password', 'component'], true)"
+                class="form_cont"
+              >
+                <el-radio-group v-model="radioVerify.type" @change="radioChangeSet">
+                  <el-input
+                    v-for="item in textUinrVerfy"
+                    v-model="item.message"
+                    @input="requiredTextRadio(item)"
+                    :placeholder="item.message"
+                    class="radioInput"
+                  >
+                    <template #prepend>
+                      {{ item.label }}
+                    </template>
+                    <template #append>
+                      <el-radio :value="item.type" />
+                    </template>
+                  </el-input>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item v-else class="form_cont">
+                <el-radio-group v-model="radioVerify.type" @change="radioChangeSet">
+                  <el-input
+                    v-for="item in numberUinrVerfy"
+                    v-model="item.message"
+                    @input="requiredTextRadio(item)"
+                    :placeholder="item.message"
+                    class="radioInput"
+                  >
+                    <template #prepend>
+                      {{ item.label }}
+                    </template>
+                    <template #append>
+                      <el-radio :value="item.type" />
+                    </template>
+                  </el-input>
+                </el-radio-group>
+              </el-form-item>
+
+              <!-- <el-form-item
                                     v-for="(item, index) in controlData.customRules"
                                     :key="item.type"
                                     class="form_cont"
@@ -4220,23 +4421,20 @@ const radioChangeSet = (val:any) => {
                                         </el-tooltip>
                                     </el-button>
                                 </el-form-item> -->
-                            </div>
-                            <el-form-item class="form_cont" v-else>
-							
-                            <el-checkbox
-                                :model-value="checkboxRequired"
-                                @change="requiredChange"
-                                >必填
-                            </el-checkbox>
-                            <el-input
-                                v-if="controlData.item?.rules && controlData.item?.rules[0]"
-                                v-model="controlData.item.rules[0].message"
-                                placeholder="自定义必填错误提示"
-                            />
-                            </el-form-item>
-                        </template>
-                        <!-- <div class="h3"><h3>其他属性</h3></div> -->
-                        <!-- <el-divider content-position="left">其他属性</el-divider>
+            </div>
+            <el-form-item class="form_cont" v-else>
+              <el-checkbox :model-value="checkboxRequired" @change="requiredChange"
+                >必填
+              </el-checkbox>
+              <el-input
+                v-if="controlData.item?.rules && controlData.item?.rules[0]"
+                v-model="controlData.item.rules[0].message"
+                placeholder="自定义必填错误提示"
+              />
+            </el-form-item>
+          </template>
+          <!-- <div class="h3"><h3>其他属性</h3></div> -->
+          <!-- <el-divider content-position="left">其他属性</el-divider>
                         <div v-if="showHide(['grid', 'card', 'gridChild', 'divider', 'div'])"  class="form_cont">
                             
     
@@ -4251,903 +4449,1192 @@ const radioChangeSet = (val:any) => {
                             </el-tooltip>
                             </el-button>
                         </div> -->
-                        <el-divider content-position="left">高级属性</el-divider>
-                       
-                        <LayoutPage v-if="cssIsShouw(attrList)"  v-model:styles-val="controlDataStyls" :place="controlData.type" />
-    
-    
-    
-    
-                    </el-form>
-                </el-tab-pane>
-                <el-tab-pane label="表单配置" name="second">
-                    <el-form size="small" class="form">
-                        <el-divider content-position="left">基础配置</el-divider>
-								<el-form-item v-if="formConfig.classify != 4"  class="form_cont">
-									<template #label>
-										归属分组
-									</template>
-									
-									<el-select id="groupForm" v-model="formConfig.groupKey" placeholder="Select" ref="groupForm">
-										<el-option v-for="item in formGroup.list" :key="item.idStr" :label="item.title" :value="item.idStr" />
-										<p v-if="loadingmore">加载中</p>
-										<p v-if="loadingnomore">无数据</p>
-									</el-select>
-								</el-form-item>
-                                <el-form-item
-                                    v-for="(item, index) in formAttr.filter(item => !item.hide)"
-                                    :label="item.label"
-                                    :key="index"
-                                    class="form_cont"
-                                >
-                                    <el-select
-                                        v-if="item.type === 'select'"
-                                        v-model="item.value"
-                                        :filterable="item.key === 'class'"
-                                        :allow-create="item.key === 'class'"
-                                        :placeholder="item.placeholder"
-                                        :clearable="item.clearable"
-                                        @change="formAttrChange(item)"
-                                    >
-                                        <el-option
-                                            
-                                            v-for="opt in item.options"
-                                            :key="opt.label || opt.name"
-                                            :label="opt.label || opt.name"
-                                            :value="formatNumber(opt.value ?? opt.id)"
-                                        />
-                                    </el-select>
-                                    <el-switch
-                                        v-else-if="item.type === 'switch'"
-                                        v-model="item.value"
-                                        @input="formAttrChange(item)"
-                                    />
-                                    <el-input
-                                        v-else
-                                        v-model="item.value"
-                                        :placeholder="item.placeholder"
-                                        :disabled="isNotWrite(item)"
-                                        @input="formAttrChange(item)"
-                                    />
-                                </el-form-item>
-								
-								<el-form-item  class="form_cont">
-									<template #label>
-										表单图标
-									</template>
-									<el-upload
-										class="avatar-uploader"
-										:action="imgUploadApiUrl"
-										:show-file-list="false"
-										:on-success="handleAvatarSuccess"
-										:before-upload="beforeAvatarUpload"
-									>
-										<img v-if="formConfig.imageUrl" :src="formConfig.imageUrl" class="avatar" />
-										<el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
-									</el-upload>
-								</el-form-item>
-                                <el-form-item class="form_cont" label="数据标题">
-                                    
-                                    
-                                    <el-tree-select
-                                        v-model="formData.dataTitle"
-                                        multiple
-                                        clearable
-                                        collapse-tags
-                                        :data="associatedFormsCurrentFormFieldTreeNoTable"
-                                        :render-after-expand="false"
-                                        style="width: 240px"
-                                    />
-                                    
-                                </el-form-item>
-                        
-                       
-                        <el-divider content-position="left">表单整体布局</el-divider>
-                        <el-form-item label="组件尺寸" class="form_cont">
-                            <el-radio-group v-model="formData.size">
-                                <el-radio-button label="large">大</el-radio-button>
-                                <el-radio-button label="default">适中</el-radio-button>
-                                <el-radio-button label="small">小</el-radio-button>
-                            </el-radio-group>
-                        </el-form-item>
-                        <el-form-item label="表单样式名称" class="form_cont">
-                            <el-select
-                                v-model="formData.class"
-                                class="m-2"
-                                placeholder="额外添加的表单class类名"
-                            >
-                                <el-option
-                                v-for="item in optionsCss"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value"
-                                />
-                            </el-select>
-                        </el-form-item>
-                            <el-form-item label="行内表单模式" class="form_cont">
-                            <el-switch v-model="formData.inline" active-text="开启" inactive-text="关闭" />
-                            </el-form-item>
-                            <el-form-item label="标签宽度" class="form_cont">
-                            <el-input v-model="formData.labelWidth" clearable placeholder="表单标签宽度">
-                                <template #append >PX</template>
-                            </el-input>
-                            </el-form-item>
-                            <el-form-item label="标签后缀" class="form_cont">
-                            <el-input v-model="formData.labelSuffix" placeholder="表单标签后缀" />
-                            </el-form-item>
-                            <el-form-item label="表单标签对齐方式" class="form_cont">
-                            <el-radio-group v-model="formData.labelPosition">
-                                <el-radio-button label="left">左</el-radio-button>
-                                <el-radio-button label="right">右</el-radio-button>
-                                <el-radio-button label="top">上</el-radio-button>
-                            </el-radio-group>
-                            </el-form-item>
-                            <el-form-item label="必填项星号位置" class="form_cont">
-                            <el-radio-group v-model="formData.requireAsteriskPosition">
-                                <el-radio-button label="left">左</el-radio-button>
-                                <el-radio-button label="right">右</el-radio-button>
-                            </el-radio-group>
-                            </el-form-item>
-                            <el-form-item label="是否隐藏星号" class="form_cont">
-                            <el-switch v-model="formData.hideRequiredAsterisk" active-text="隐藏" inactive-text="显示" style="--el-switch-on-color: #ff4949; --el-switch-off-color: #13ce66" />
-                            </el-form-item>
-                            <el-form-item label="校验错误信息" class="form_cont">
-                            <el-switch v-model="formData.showMessage" active-text="显示" inactive-text="隐藏" />
-                            </el-form-item>
-                            <el-form-item label="行内展示校验信息" class="form_cont">
-                            <el-switch v-model="formData.inlineMessage" active-text="显示" inactive-text="隐藏" />
-                            </el-form-item>
-                            <el-form-item label="校验结果反馈图标" class="form_cont">
-                            <el-switch v-model="formData.statusIcon" active-text="显示" inactive-text="隐藏" />
-                            </el-form-item>
-                        <el-divider content-position="left">表单功能补充</el-divider>
-                        <el-form-item class="form_cont">
-                            <el-button @click="editFormStyle(state.tooltip.css)"
-                            >
-                                编辑表单样式
-                                <el-tooltip :content="state.tooltip.css" placement="top">
-                                    <el-icon>
-                                        <QuestionFilled />
-                                    </el-icon>
-                                </el-tooltip>
-                            </el-button>
-                            <el-button @click="editFormDict(state.tooltip.dict)"
-                            >
-                                设置数据字典
-                                <el-tooltip :content="state.tooltip.dict" placement="top">
-                                    <el-icon>
-                                        <QuestionFilled />
-                                    </el-icon>
-                                </el-tooltip>
-                            </el-button>
-                        </el-form-item>
-						<template v-if="!state.isSearch">
-                            <el-divider content-position="left">接口数据事件</el-divider>
-    
-                            <el-form-item v-if="!state.isSearch" class="form_cont">
-                                <template #label
-                                >
-                                    添加时获取请求
-                                    <el-tooltip
-                                        content="新增表单数据时，从接口获取新增初始数据"
-                                        placement="top"
-                                    >
-                                        <el-icon>
-                                            <QuestionFilled />
-                                        </el-icon>
-                                    </el-tooltip>
-                                </template>
-                                <el-switch
-                                    v-model="formConfig.addLoad"
-                                    @change="
-                                        formAttrChange({ key: 'addLoad', path: 'config' }, $event)
-                                    "
-                                />
-                            </el-form-item>
-                            <el-form-item label="新增数据保存url" class="form_cont">
-                                <el-input
-                                    v-model="formConfig.addUrl"
-                                    placeholder="表单提交的url，非特殊不需要设置"
-                                />
-                            </el-form-item>
-                            <el-form-item label="修改数据保存url" class="form_cont">
-                                <el-input
-                                    v-model="formConfig.editUrl"
-                                    placeholder="修改提交的url，非特殊不需要设置"
-                                />
-                            </el-form-item>
-                            <el-form-item label="获取表单数据url" class="form_cont">
-                                <el-input
-                                    v-model="formConfig.requestUrl"
-                                    placeholder="获取表单数据url，非特殊不需要设置"
-                                />
-                            </el-form-item>
-                            <el-form-item class="event-btn form_cont">
-                                <el-button
-                                    @click="
-                                    eventClick(
-                                        'beforeRequest',
-                                        '获取表单初始数据前事件，可修改请求参数'
-                                    )
-                                    "
-                                    >beforeRequest
-                                </el-button>
-                                <el-button
-                                    @click="
-                                    eventClick(
-                                        'afterResponse',
-                                        '获取表单初始数据后事件，可对请求返回数据进行处理；也可为字符串，如opt=formatTest'
-                                    )
-                                    "
-                                    >afterResponse
-                                </el-button>
-                                <el-button
-                                    @click="
-                                    eventClick(
-                                        'beforeSubmit',
-                                        '表单数据提交前事件，可对提交数据进行处理；也可为字符串，如opt=formatTest'
-                                    )
-                                    "
-                                    >beforeSubmit
-                                </el-button>
-                                <el-button
-                                    @click="eventClick('afterSubmit', '表单数据提交成功事件')"
-                                    >afterSubmit
-                                </el-button>
-                                <el-button
-                                    @click="
-                                    eventClick(
-                                        'change',
-                                        '表单组件值改变事件。当表单某值改变时，可修改其他组件的值；也可为字符串，如opt=formChange,字符串即为/utils/formChangeValue(name,model,key)中的key值'
-                                    )
-                                    "
-                                    >表单组件改变事件change
-                                </el-button>
-                            </el-form-item>
-                        </template>
-                    </el-form>
-                </el-tab-pane>
-            </el-tabs>
-    
-            
-    
-        </div>
-        <!-- 轮播图设置弹窗 20240122 start -->
-        
-            <el-dialog v-model="dialogTableVisible" title="轮播图设置" top="20px" style="margin-top:70px,margin-left:270px">
-                <div v-if="controlData.type=='lowcodeCarsusel'" style="margin-bottom: 30px;">
-                    <span style="margin-right: 10px;">轮播图宽度(像素):</span><el-input-number v-model="controlData.control.config.carsuselWidth" :step="64" :max="4096" :min="178"/>
-                    <span style="margin-left:15px;margin-right: 10px;">轮播图高度(像素):</span><el-input-number v-model="controlData.control.config.carsuselHeight" :step="36" :max="4096" :min="100"/>
-                    <span style="margin-left:15px;margin-right: 10px;">切图间隔(毫秒):</span><el-input-number v-model="controlData.control.config.interval" :step="200"/>
-                </div>
-            <el-table v-if="controlData.type=='lowcodeCarsusel'" :data="controlData.control.carsuselConfigArr" border style="width: 100%" row-key="imgId">
-                <el-table-column  label="设置图片" width="180" >
-                    <template #default="propFlag">
-                        <el-upload 
-                        :action="uploadUrl"  :before-remove="beforeRemove"
-                        :on-success="carouselImgUploadSuccess" 
-                        :on-error="videoUploadErr"
-                        :limit="1"
-                        accept=".jpg,.jpeg,.png,.tif,.tga,.bmp,.dds,.svg,.eps,.pdf,.hdr,.raw,.exr,.psd,.afphoto,.afdesign">
-                            <el-button v-if="!propFlag.row.uploadFlag" type="primary" @click="changeCurrentUploadImgid(propFlag.row)">点此上传</el-button>
-                            <el-button v-if="propFlag.row.uploadFlag" type="primary" @click="changeCurrentUploadImgid(propFlag.row)">已上传,点击修改</el-button>
-                        </el-upload>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="imgUrl" label="查看图片" width="180">
-                    <template #default="imgScope">
-                        <!-- {{ imgScope.row.imgUrl }} -->
-                        
-                        <el-image style="width: 100px; height: 100px;cursor:pointer;" :src="imgScope.row.imgUrl" fit="contain" alt="暂未上传" @click="handlePreview(imgScope.$index, imgScope.row)" >
-                            <template #error>
-                                <div class="image-slot">
-                                    <el-image style="width: 100px; height: 100px;" :src="errimg" fit="contain" ></el-image>
-                                </div>
-                            </template>
-                        </el-image>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="link" label="链接地址">
-                    <template #default="linkScope">
-                        
-                        <el-input v-model="linkScope.row.link"  placeholder="输入图片的链接地址" />
-                    </template>
-                </el-table-column>
-                <el-table-column fixed="right" label="操作（增/删）" width="120" >
-                    
-                    <template #default="scope">
-                        
-                            <el-button v-if="controlData.control.carsuselConfigArr.length>1" type="danger" :icon="Delete" circle @click="deleteRow(scope.row)"/>
-                        
-                            <el-button v-if="controlData.control.carsuselConfigArr[controlData.control.carsuselConfigArr.length-1].imgId == scope.row.imgId" type="success" :icon="Plus" circle @click="createRow(scope.row)" />
-                        
-                    </template>
-                </el-table-column>
-            </el-table>
-        </el-dialog>
-        <!-- 图片预览 -->
-        <el-image-viewer
-        v-if="showImagePreview"
-        :zoom-rate="1.2"
-        :url-list="carouselImgUrlList"
-        @close="closePreview"
-        />
-        
-
-	<el-dialog v-model="transferDialogTableVisible" title="创建穿梭框选项树" top="150px" style="margin-top:70px;" width="50%" >
-		<div v-if="controlData.type=='lowcodeTransfer'">
-			<el-button type="success" plain style="margin-top: 5px;margin-bottom: 5px;" @click="addRootNode()">新增根节点</el-button>
-			
-			<!-- 建立树 -->
-			<div class="custom-tree-container">
-				
-				<el-tree
-				
-				:data="controlData.control.fixedOptions"
-				show-checkbox
-				node-key="id"
-				:default-expand-all = "false"
-				:expand-on-click-node="true"
-				>
-				<template #default="{ node, data }">
-					<span class="custom-tree-node">
-					<span>{{ node.label }}</span>
-					<span style="float: right;">
-						<a style="color: green;" @click="append(data)"> 新增子节点 </a>
-						<a style="margin-left: 8px;" @click="changeLabel(node,data)"> 编辑节点名 </a>
-						<a style="margin-left: 8px;color: orange;" @click="setNodeEnable(node,data)"> 设为可选/不可选 </a>
-						<a style="margin-left: 8px;color: red;" @click="remove(node, data)"> 删除本节点 </a>
-					</span>
-					</span>
-				</template>
-				</el-tree>
-			</div>
-			
-		</div>
-	</el-dialog>
-	<!-- 穿梭框设置弹窗 liwenxuan 20240217 end -->
-
-
-	<!-- 关联表单设置弹窗 liwenxuan 20240402 start -->
-
-
-
-    <el-dialog  v-model="associatedFormsChooseDialogFlag" class="glxxsztc" top="150px" :close-on-click-modal="false" title="选择关联表单" :show-close="false" style="margin-top:70px;" width="50%" >
-        <template v-if="controlData.type=='associatedForms'">
-            <div style="display:flex;margin-bottom: 2px;margin-top:28px"><span style="font-size: larger;margin-left: 35px;margin-right: 15px;">请选择表单</span>
-                <el-tree-select
-                    v-model="controlData.control.formid"
-                    style="width: 390px;"
-                    :data="customerFormTree[0].children"
-                    check-strictly
-                    :render-after-expand="false"
-                    filterable
-                    node-key="id"
-                    @change="formidChanged"
-                />
-            </div>
-            
-        </template>
-        <template #footer>
-        <div class="dialog-footer">
-            <el-button type="primary" @click="handleDetermineAssociatedFormsChooseDialog">
-            确定
+          <el-divider content-position="left">高级属性</el-divider>
+
+          <LayoutPage
+            v-if="cssIsShouw(attrList)"
+            v-model:styles-val="controlDataStyls"
+            :place="controlData.type"
+          />
+        </el-form>
+      </el-tab-pane>
+      <el-tab-pane label="表单配置" name="second">
+        <el-form size="small" class="form">
+          <el-divider content-position="left">基础配置</el-divider>
+          <el-form-item v-if="formConfig.classify != 4" class="form_cont">
+            <template #label> 归属分组 </template>
+
+            <el-select
+              id="groupForm"
+              v-model="formConfig.groupKey"
+              placeholder="Select"
+              ref="groupForm"
+            >
+              <el-option
+                v-for="item in formGroup.list"
+                :key="item.idStr"
+                :label="item.title"
+                :value="item.idStr"
+              />
+              <p v-if="loadingmore">加载中</p>
+              <p v-if="loadingnomore">无数据</p>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            v-for="(item, index) in formAttr.filter((item) => !item.hide)"
+            :label="item.label"
+            :key="index"
+            class="form_cont"
+          >
+            <el-select
+              v-if="item.type === 'select'"
+              v-model="item.value"
+              :filterable="item.key === 'class'"
+              :allow-create="item.key === 'class'"
+              :placeholder="item.placeholder"
+              :clearable="item.clearable"
+              @change="formAttrChange(item)"
+            >
+              <el-option
+                v-for="opt in item.options"
+                :key="opt.label || opt.name"
+                :label="opt.label || opt.name"
+                :value="formatNumber(opt.value ?? opt.id)"
+              />
+            </el-select>
+            <el-switch
+              v-else-if="item.type === 'switch'"
+              v-model="item.value"
+              @input="formAttrChange(item)"
+            />
+            <el-input
+              v-else
+              v-model="item.value"
+              :placeholder="item.placeholder"
+              :disabled="isNotWrite(item)"
+              @input="formAttrChange(item)"
+            />
+          </el-form-item>
+
+          <el-form-item class="form_cont">
+            <template #label> 表单图标 </template>
+            <el-upload
+              class="avatar-uploader"
+              :action="imgUploadApiUrl"
+              :show-file-list="false"
+              :on-success="handleAvatarSuccess"
+              :before-upload="beforeAvatarUpload"
+            >
+              <img v-if="formConfig.imageUrl" :src="formConfig.imageUrl" class="avatar" />
+              <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+            </el-upload>
+          </el-form-item>
+          <el-form-item class="form_cont" label="数据标题">
+            <el-tree-select
+              v-model="formData.dataTitle"
+              multiple
+              clearable
+              collapse-tags
+              :data="associatedFormsCurrentFormFieldTreeNoTable"
+              :render-after-expand="false"
+              style="width: 240px"
+            />
+          </el-form-item>
+
+          <el-divider content-position="left">表单整体布局</el-divider>
+          <el-form-item label="组件尺寸" class="form_cont">
+            <el-radio-group v-model="formData.size">
+              <el-radio-button label="large">大</el-radio-button>
+              <el-radio-button label="default">适中</el-radio-button>
+              <el-radio-button label="small">小</el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="表单样式名称" class="form_cont">
+            <el-select
+              v-model="formData.class"
+              class="m-2"
+              placeholder="额外添加的表单class类名"
+            >
+              <el-option
+                v-for="item in optionsCss"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="行内表单模式" class="form_cont">
+            <el-switch
+              v-model="formData.inline"
+              active-text="开启"
+              inactive-text="关闭"
+            />
+          </el-form-item>
+          <el-form-item label="标签宽度" class="form_cont">
+            <el-input v-model="formData.labelWidth" clearable placeholder="表单标签宽度">
+              <template #append>PX</template>
+            </el-input>
+          </el-form-item>
+          <el-form-item label="标签后缀" class="form_cont">
+            <el-input v-model="formData.labelSuffix" placeholder="表单标签后缀" />
+          </el-form-item>
+          <el-form-item label="表单标签对齐方式" class="form_cont">
+            <el-radio-group v-model="formData.labelPosition">
+              <el-radio-button label="left">左</el-radio-button>
+              <el-radio-button label="right">右</el-radio-button>
+              <el-radio-button label="top">上</el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="必填项星号位置" class="form_cont">
+            <el-radio-group v-model="formData.requireAsteriskPosition">
+              <el-radio-button label="left">左</el-radio-button>
+              <el-radio-button label="right">右</el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="是否隐藏星号" class="form_cont">
+            <el-switch
+              v-model="formData.hideRequiredAsterisk"
+              active-text="隐藏"
+              inactive-text="显示"
+              style="--el-switch-on-color: #ff4949; --el-switch-off-color: #13ce66"
+            />
+          </el-form-item>
+          <el-form-item label="校验错误信息" class="form_cont">
+            <el-switch
+              v-model="formData.showMessage"
+              active-text="显示"
+              inactive-text="隐藏"
+            />
+          </el-form-item>
+          <el-form-item label="行内展示校验信息" class="form_cont">
+            <el-switch
+              v-model="formData.inlineMessage"
+              active-text="显示"
+              inactive-text="隐藏"
+            />
+          </el-form-item>
+          <el-form-item label="校验结果反馈图标" class="form_cont">
+            <el-switch
+              v-model="formData.statusIcon"
+              active-text="显示"
+              inactive-text="隐藏"
+            />
+          </el-form-item>
+          <el-divider content-position="left">表单功能补充</el-divider>
+          <el-form-item class="form_cont">
+            <el-button @click="editFormStyle(state.tooltip.css)">
+              编辑表单样式
+              <el-tooltip :content="state.tooltip.css" placement="top">
+                <el-icon>
+                  <QuestionFilled />
+                </el-icon>
+              </el-tooltip>
             </el-button>
-        </div>
-        </template> 
-    </el-dialog>
-
-    
-
-	<el-dialog v-model="associatedFormsHideDialogFlag" title="隐藏条件" top="150px" :close-on-click-modal="false" :show-close="false" style="margin-top:70px ;min-height: 500px" width="50%"  >
-		
-		<template v-if="controlData.type=='associatedForms'">
-			<div class="common-layout">
-				<el-container>
-				<el-aside width="300px" style="height:420px;border: 1px solid gainsboro;margin-right: 5px;">
-					<!-- <el-input
+            <el-button @click="editFormDict(state.tooltip.dict)">
+              设置数据字典
+              <el-tooltip :content="state.tooltip.dict" placement="top">
+                <el-icon>
+                  <QuestionFilled />
+                </el-icon>
+              </el-tooltip>
+            </el-button>
+          </el-form-item>
+          <template v-if="!state.isSearch">
+            <el-divider content-position="left">接口数据事件</el-divider>
+
+            <el-form-item v-if="!state.isSearch" class="form_cont">
+              <template #label>
+                添加时获取请求
+                <el-tooltip
+                  content="新增表单数据时，从接口获取新增初始数据"
+                  placement="top"
+                >
+                  <el-icon>
+                    <QuestionFilled />
+                  </el-icon>
+                </el-tooltip>
+              </template>
+              <el-switch
+                v-model="formConfig.addLoad"
+                @change="formAttrChange({ key: 'addLoad', path: 'config' }, $event)"
+              />
+            </el-form-item>
+            <el-form-item label="新增数据保存url" class="form_cont">
+              <el-input
+                v-model="formConfig.addUrl"
+                placeholder="表单提交的url，非特殊不需要设置"
+              />
+            </el-form-item>
+            <el-form-item label="修改数据保存url" class="form_cont">
+              <el-input
+                v-model="formConfig.editUrl"
+                placeholder="修改提交的url，非特殊不需要设置"
+              />
+            </el-form-item>
+            <el-form-item label="获取表单数据url" class="form_cont">
+              <el-input
+                v-model="formConfig.requestUrl"
+                placeholder="获取表单数据url，非特殊不需要设置"
+              />
+            </el-form-item>
+            <el-form-item class="event-btn form_cont">
+              <el-button
+                @click="
+                  eventClick('beforeRequest', '获取表单初始数据前事件，可修改请求参数')
+                "
+                >beforeRequest
+              </el-button>
+              <el-button
+                @click="
+                  eventClick(
+                    'afterResponse',
+                    '获取表单初始数据后事件，可对请求返回数据进行处理；也可为字符串，如opt=formatTest'
+                  )
+                "
+                >afterResponse
+              </el-button>
+              <el-button
+                @click="
+                  eventClick(
+                    'beforeSubmit',
+                    '表单数据提交前事件，可对提交数据进行处理；也可为字符串，如opt=formatTest'
+                  )
+                "
+                >beforeSubmit
+              </el-button>
+              <el-button @click="eventClick('afterSubmit', '表单数据提交成功事件')"
+                >afterSubmit
+              </el-button>
+              <el-button
+                @click="
+                  eventClick(
+                    'change',
+                    '表单组件值改变事件。当表单某值改变时，可修改其他组件的值；也可为字符串，如opt=formChange,字符串即为/utils/formChangeValue(name,model,key)中的key值'
+                  )
+                "
+                >表单组件改变事件change
+              </el-button>
+            </el-form-item>
+          </template>
+        </el-form>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+  <!-- 轮播图设置弹窗 20240122 start -->
+
+  <el-dialog
+    v-model="dialogTableVisible"
+    title="轮播图设置"
+    top="20px"
+    style="margin-top:70px,margin-left:270px"
+  >
+    <div v-if="controlData.type == 'lowcodeCarsusel'" style="margin-bottom: 30px">
+      <span style="margin-right: 10px">轮播图宽度(像素):</span
+      ><el-input-number
+        v-model="controlData.control.config.carsuselWidth"
+        :step="64"
+        :max="4096"
+        :min="178"
+      />
+      <span style="margin-left: 15px; margin-right: 10px">轮播图高度(像素):</span
+      ><el-input-number
+        v-model="controlData.control.config.carsuselHeight"
+        :step="36"
+        :max="4096"
+        :min="100"
+      />
+      <span style="margin-left: 15px; margin-right: 10px">切图间隔(毫秒):</span
+      ><el-input-number v-model="controlData.control.config.interval" :step="200" />
+    </div>
+    <el-table
+      v-if="controlData.type == 'lowcodeCarsusel'"
+      :data="controlData.control.carsuselConfigArr"
+      border
+      style="width: 100%"
+      row-key="imgId"
+    >
+      <el-table-column label="设置图片" width="180">
+        <template #default="propFlag">
+          <el-upload
+            :action="uploadUrl"
+            :before-remove="beforeRemove"
+            :on-success="carouselImgUploadSuccess"
+            :on-error="videoUploadErr"
+            :limit="1"
+            accept=".jpg,.jpeg,.png,.tif,.tga,.bmp,.dds,.svg,.eps,.pdf,.hdr,.raw,.exr,.psd,.afphoto,.afdesign"
+          >
+            <el-button
+              v-if="!propFlag.row.uploadFlag"
+              type="primary"
+              @click="changeCurrentUploadImgid(propFlag.row)"
+              >点此上传</el-button
+            >
+            <el-button
+              v-if="propFlag.row.uploadFlag"
+              type="primary"
+              @click="changeCurrentUploadImgid(propFlag.row)"
+              >已上传,点击修改</el-button
+            >
+          </el-upload>
+        </template>
+      </el-table-column>
+      <el-table-column prop="imgUrl" label="查看图片" width="180">
+        <template #default="imgScope">
+          <!-- {{ imgScope.row.imgUrl }} -->
+
+          <el-image
+            style="width: 100px; height: 100px; cursor: pointer"
+            :src="imgScope.row.imgUrl"
+            fit="contain"
+            alt="暂未上传"
+            @click="handlePreview(imgScope.$index, imgScope.row)"
+          >
+            <template #error>
+              <div class="image-slot">
+                <el-image
+                  style="width: 100px; height: 100px"
+                  :src="errimg"
+                  fit="contain"
+                ></el-image>
+              </div>
+            </template>
+          </el-image>
+        </template>
+      </el-table-column>
+      <el-table-column prop="link" label="链接地址">
+        <template #default="linkScope">
+          <el-input v-model="linkScope.row.link" placeholder="输入图片的链接地址" />
+        </template>
+      </el-table-column>
+      <el-table-column fixed="right" label="操作（增/删）" width="120">
+        <template #default="scope">
+          <el-button
+            v-if="controlData.control.carsuselConfigArr.length > 1"
+            type="danger"
+            :icon="Delete"
+            circle
+            @click="deleteRow(scope.row)"
+          />
+
+          <el-button
+            v-if="
+              controlData.control.carsuselConfigArr[
+                controlData.control.carsuselConfigArr.length - 1
+              ].imgId == scope.row.imgId
+            "
+            type="success"
+            :icon="Plus"
+            circle
+            @click="createRow(scope.row)"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+  </el-dialog>
+  <!-- 图片预览 -->
+  <el-image-viewer
+    v-if="showImagePreview"
+    :zoom-rate="1.2"
+    :url-list="carouselImgUrlList"
+    @close="closePreview"
+  />
+
+  <el-dialog
+    v-model="transferDialogTableVisible"
+    title="创建穿梭框选项树"
+    top="150px"
+    style="margin-top: 70px"
+    width="50%"
+  >
+    <div v-if="controlData.type == 'lowcodeTransfer'">
+      <el-button
+        type="success"
+        plain
+        style="margin-top: 5px; margin-bottom: 5px"
+        @click="addRootNode()"
+        >新增根节点</el-button
+      >
+
+      <!-- 建立树 -->
+      <div class="custom-tree-container">
+        <el-tree
+          :data="controlData.control.fixedOptions"
+          show-checkbox
+          node-key="id"
+          :default-expand-all="false"
+          :expand-on-click-node="true"
+        >
+          <template #default="{ node, data }">
+            <span class="custom-tree-node">
+              <span>{{ node.label }}</span>
+              <span style="float: right">
+                <a style="color: green" @click="append(data)"> 新增子节点 </a>
+                <a style="margin-left: 8px" @click="changeLabel(node, data)">
+                  编辑节点名
+                </a>
+                <a
+                  style="margin-left: 8px; color: orange"
+                  @click="setNodeEnable(node, data)"
+                >
+                  设为可选/不可选
+                </a>
+                <a style="margin-left: 8px; color: red" @click="remove(node, data)">
+                  删除本节点
+                </a>
+              </span>
+            </span>
+          </template>
+        </el-tree>
+      </div>
+    </div>
+  </el-dialog>
+  <!-- 穿梭框设置弹窗 liwenxuan 20240217 end -->
+
+  <!-- 关联表单设置弹窗 liwenxuan 20240402 start -->
+
+  <el-dialog
+    v-model="associatedFormsChooseDialogFlag"
+    class="glxxsztc"
+    top="150px"
+    :close-on-click-modal="false"
+    title="选择关联表单"
+    :show-close="false"
+    style="margin-top: 70px"
+    width="50%"
+  >
+    <template v-if="controlData.type == 'associatedForms'">
+      <div style="display: flex; margin-bottom: 2px; margin-top: 28px">
+        <span style="font-size: larger; margin-left: 35px; margin-right: 15px"
+          >请选择表单</span
+        >
+        <el-tree-select
+          v-model="controlData.control.formid"
+          style="width: 390px"
+          :data="customerFormTree[0].children"
+          check-strictly
+          :render-after-expand="false"
+          filterable
+          node-key="id"
+          @change="formidChanged"
+        />
+      </div>
+    </template>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="handleDetermineAssociatedFormsChooseDialog">
+          确定
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+
+  <el-dialog
+    v-model="associatedFormsHideDialogFlag"
+    title="隐藏条件"
+    top="150px"
+    :close-on-click-modal="false"
+    :show-close="false"
+    style="margin-top: 70px; min-height: 500px"
+    width="50%"
+  >
+    <template v-if="controlData.type == 'associatedForms'">
+      <div class="common-layout">
+        <el-container>
+          <el-aside
+            width="300px"
+            style="height: 420px; border: 1px solid gainsboro; margin-right: 5px"
+          >
+            <!-- <el-input
 						v-show="fieldTreeSearchFlag"
 						v-model="fieldTreeFilterText"
 						style="width:98%;margin: 3px;"
 						placeholder="搜索字段"
 						class="filter-tree"
 					/> -->
-					<el-tree
-						ref="fieldTreeRef"
-                        node-key="id"
-                        empty-text="请先保存当前表单"
-						:data="associatedFormsCurrentFormFieldTree"
-						:props="treeDefaultProps"
-						:filter-node-method="filterNode"
-						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
-						@node-expand="handleFieldTreeExpand"
-						@node-collapse="handleFieldTreeCollapse"
-						
-						@node-contextmenu="handleFieldTreeContextmenu"
-						
-						
-					/>
-                    <!-- <el-input
+            <el-tree
+              ref="fieldTreeRef"
+              node-key="id"
+              empty-text="请先保存当前表单"
+              :data="associatedFormsCurrentFormFieldTree"
+              :props="treeDefaultProps"
+              :filter-node-method="filterNode"
+              style="max-width: 600px; border: 1px solid gainsboro; margin: 3px"
+              @node-expand="handleFieldTreeExpand"
+              @node-collapse="handleFieldTreeCollapse"
+              @node-contextmenu="handleFieldTreeContextmenu"
+            />
+            <!-- <el-input
 						v-show="orgTreeSearchFlag"
 						v-model="orgTreeFilterText"
 						style="width:98%;margin: 3px;"
 						placeholder="搜索字段"
 						class="filter-tree"
 					/> -->
-					<el-tree
-                        ref="orgTreeRef"
-						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
-						:data="orgAndManTree"
-						:props="treeDefaultProps"
-						:filter-node-method="filterNode"
-                        @node-expand="handleOrgTreeExpand"
-						@node-collapse="handleOrgTreeCollapse"
-						
-						@node-contextmenu="handleOrgTreeContextmenu"
-					/>
-                    <!-- <el-input
+            <el-tree
+              ref="orgTreeRef"
+              style="max-width: 600px; border: 1px solid gainsboro; margin: 3px"
+              :data="orgAndManTree"
+              :props="treeDefaultProps"
+              :filter-node-method="filterNode"
+              @node-expand="handleOrgTreeExpand"
+              @node-collapse="handleOrgTreeCollapse"
+              @node-contextmenu="handleOrgTreeContextmenu"
+            />
+            <!-- <el-input
 						v-show="roleTreeSearchFlag"
 						v-model="roleTreeFilterText"
 						style="width:98%;margin: 3px;"
 						placeholder="搜索字段"
 						class="filter-tree"
 					/> -->
-					<el-tree
-                        ref="roleTreeRef"
-						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
-						:data="roleTree"
-						:props="treeDefaultProps"
-						:filter-node-method="filterNode"
-                        @node-expand="handleRoleTreeExpand"
-						@node-collapse="handleRoleTreeCollapse"
-						
-						@node-contextmenu="handleRoleTreeContextmenu"
-					/>
-				</el-aside>
-				<el-main style="border: 1px solid gainsboro; padding: 3px;" class="associatedFormsHideDialogMain">
-					<div style="border: 1px solid gainsboro; height: 7%; border-bottom: 0px; padding-top: 3px; padding-left: 5px; background-color: #E6F3FE;">当满足以下条件时此控件隐藏</div>
-					<div  id="associatedFormsHideEditArea" style="border: 1px solid gainsboro; height: 38%; border-bottom: 0px;">
-                        <AssociatedFormsTinyace ref="aft" :aft-text="controlData.control.hideConditionHtml" :aft-text-copy = "controlData.control.hideConditionHtmlCopy" @text-change = "aftTextChanged" @gongshi-change = "aftGongshiChanged"></AssociatedFormsTinyace>
-                        <!-- <div style="border: 1px solid #4189EF;width:90px;height:26px;border-radius: 3px;padding:2px;text-align: center;cursor:pointer;float: right;margin-top: -32px;margin-right: 5px;z-index:99999999;position: relative;">
+            <el-tree
+              ref="roleTreeRef"
+              style="max-width: 600px; border: 1px solid gainsboro; margin: 3px"
+              :data="roleTree"
+              :props="treeDefaultProps"
+              :filter-node-method="filterNode"
+              @node-expand="handleRoleTreeExpand"
+              @node-collapse="handleRoleTreeCollapse"
+              @node-contextmenu="handleRoleTreeContextmenu"
+            />
+          </el-aside>
+          <el-main
+            style="border: 1px solid gainsboro; padding: 3px"
+            class="associatedFormsHideDialogMain"
+          >
+            <div
+              style="
+                border: 1px solid gainsboro;
+                height: 7%;
+                border-bottom: 0px;
+                padding-top: 3px;
+                padding-left: 5px;
+                background-color: #e6f3fe;
+              "
+            >
+              当满足以下条件时此控件隐藏
+            </div>
+            <div
+              id="associatedFormsHideEditArea"
+              style="border: 1px solid gainsboro; height: 38%; border-bottom: 0px"
+            >
+              <AssociatedFormsTinyace
+                ref="aft"
+                :aft-text="controlData.control.hideConditionHtml"
+                :aft-text-copy="controlData.control.hideConditionHtmlCopy"
+                @text-change="aftTextChanged"
+                @gongshi-change="aftGongshiChanged"
+              ></AssociatedFormsTinyace>
+              <!-- <div style="border: 1px solid #4189EF;width:90px;height:26px;border-radius: 3px;padding:2px;text-align: center;cursor:pointer;float: right;margin-top: -32px;margin-right: 5px;z-index:99999999;position: relative;">
                             <span style="color: #4189EF;font:6px;margin-right: 5px;">fx</span>插入函数
                         </div> -->
-                        
-                    </div>
-					<div style="border: 1px solid gainsboro; height: 55%; padding-top: 20px;">
-                        <ul>
-                            <li>请从左侧面板<span style="color: red">右击</span>选择字段或选项</li>
-                            <li>支持的符号：<span style="color: red">'==', '>=', '>', '<=', '<', '!='</span></li>
-                            <li>支持<span style="color: red">"包含,不包含,当前用户"</span>关键字,用于组织机构条件和角色条件</li>
-                            <li>参考举例：</li>
-                            <span style="margin-left: 14px;">年龄>10</span><br>
-                            <span style="margin-left: 14px;">企管部包含当前用户</span><br>
-                            <span style="margin-left: 14px;">绩效考核执行人包含当前用户</span><br>
-                            <span style="margin-left: 14px;">张三!=当前用户</span>
-                        </ul>
-                    </div>
-				</el-main>
-				</el-container>
-			</div>
-		</template>
-		<template #footer>
-		<div class="dialog-footer">
-			<el-button @click="asfhTextCancel">取消</el-button>
-			<el-button type="primary" @click="handleDetermine">
-			确定
-			</el-button>
-		</div>
+            </div>
+            <div style="border: 1px solid gainsboro; height: 55%; padding-top: 20px">
+              <ul>
+                <li>请从左侧面板<span style="color: red">右击</span>选择字段或选项</li>
+                <li>
+                  支持的符号：<span style="color: red"
+                    >'==', '>=', '>', '<=', '<', '!='</span
+                  >
+                </li>
+                <li>
+                  支持<span style="color: red">"包含,不包含,当前用户"</span
+                  >关键字,用于组织机构条件和角色条件
+                </li>
+                <li>参考举例：</li>
+                <span style="margin-left: 14px">年龄>10</span
+                ><br />
+                <span style="margin-left: 14px">企管部包含当前用户</span
+                ><br />
+                <span style="margin-left: 14px">绩效考核执行人包含当前用户</span
+                ><br />
+                <span style="margin-left: 14px">张三!=当前用户</span>
+              </ul>
+            </div>
+          </el-main>
+        </el-container>
+      </div>
     </template>
-	</el-dialog>
-
-
-<!-- 数据范围编辑弹窗 -->
-
-    <el-dialog v-model="associatedFormsDataRangeDialogFlag" title="数据范围" top="150px" :close-on-click-modal="false" :show-close="false" style="margin-top:70px ;min-height: 500px" width="50%"  >
-		
-		<template v-if="controlData.type=='associatedForms'">
-			<div class="common-layout">
-				<el-container>
-				<el-aside width="300px" style="height:420px;border: 1px solid gainsboro;margin-right: 5px;">
-
-
-                    <el-tree
-						ref="fieldTreeRef"
-                        node-key="id"
-                        empty-text="选择关联的表单后展示"
-						:data="asfasfFieldTree"
-						:props="treeDefaultProps"
-						:filter-node-method="filterNode"
-						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
-						@node-expand="handleFieldTreeExpand"
-						@node-collapse="handleFieldTreeCollapse"
-						@node-contextmenu="handleFieldTreeContextmenuRange"
-					/>
-					<!-- <el-input
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="asfhTextCancel">取消</el-button>
+        <el-button type="primary" @click="handleDetermine"> 确定 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+
+  <!-- 数据范围编辑弹窗 -->
+
+  <el-dialog
+    v-model="associatedFormsDataRangeDialogFlag"
+    title="数据范围"
+    top="150px"
+    :close-on-click-modal="false"
+    :show-close="false"
+    style="margin-top: 70px; min-height: 500px"
+    width="50%"
+  >
+    <template v-if="controlData.type == 'associatedForms'">
+      <div class="common-layout">
+        <el-container>
+          <el-aside
+            width="300px"
+            style="height: 420px; border: 1px solid gainsboro; margin-right: 5px"
+          >
+            <el-tree
+              ref="fieldTreeRef"
+              node-key="id"
+              empty-text="选择关联的表单后展示"
+              :data="asfasfFieldTree"
+              :props="treeDefaultProps"
+              :filter-node-method="filterNode"
+              style="max-width: 600px; border: 1px solid gainsboro; margin: 3px"
+              @node-expand="handleFieldTreeExpand"
+              @node-collapse="handleFieldTreeCollapse"
+              @node-contextmenu="handleFieldTreeContextmenuRange"
+            />
+            <!-- <el-input
 						v-show="fieldTreeSearchFlag"
 						v-model="fieldTreeFilterText"
 						style="width:98%;margin: 3px;"
 						placeholder="搜索字段"
 						class="filter-tree"
 					/> -->
-					<el-tree
-						ref="fieldTreeRef"
-                        node-key="id"
-                        empty-text="请先保存当前表单"
-						:data="associatedFormsCurrentFormFieldTree"
-						:props="treeDefaultProps"
-						:filter-node-method="filterNode"
-						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
-						@node-expand="handleFieldTreeExpand"
-						@node-collapse="handleFieldTreeCollapse"
-						@node-contextmenu="handleFieldTreeContextmenuRange"
-					/>
-                    <!-- <el-input
+            <el-tree
+              ref="fieldTreeRef"
+              node-key="id"
+              empty-text="请先保存当前表单"
+              :data="associatedFormsCurrentFormFieldTree"
+              :props="treeDefaultProps"
+              :filter-node-method="filterNode"
+              style="max-width: 600px; border: 1px solid gainsboro; margin: 3px"
+              @node-expand="handleFieldTreeExpand"
+              @node-collapse="handleFieldTreeCollapse"
+              @node-contextmenu="handleFieldTreeContextmenuRange"
+            />
+            <!-- <el-input
 						v-show="orgTreeSearchFlag"
 						v-model="orgTreeFilterText"
 						style="width:98%;margin: 3px;"
 						placeholder="搜索字段"
 						class="filter-tree"
 					/> -->
-					<el-tree
-                        ref="orgTreeRef"
-						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
-						:data="orgAndManTree"
-						:props="treeDefaultProps"
-						:filter-node-method="filterNode"
-                        @node-expand="handleOrgTreeExpand"
-						@node-collapse="handleOrgTreeCollapse"
-						
-						@node-contextmenu="handleOrgTreeContextmenuRange"
-					/>
-                    <!-- <el-input
+            <el-tree
+              ref="orgTreeRef"
+              style="max-width: 600px; border: 1px solid gainsboro; margin: 3px"
+              :data="orgAndManTree"
+              :props="treeDefaultProps"
+              :filter-node-method="filterNode"
+              @node-expand="handleOrgTreeExpand"
+              @node-collapse="handleOrgTreeCollapse"
+              @node-contextmenu="handleOrgTreeContextmenuRange"
+            />
+            <!-- <el-input
 						v-show="roleTreeSearchFlag"
 						v-model="roleTreeFilterText"
 						style="width:98%;margin: 3px;"
 						placeholder="搜索字段"
 						class="filter-tree"
 					/> -->
-					<el-tree
-                        ref="roleTreeRef"
-						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
-						:data="roleTree"
-						:props="treeDefaultProps"
-						:filter-node-method="filterNode"
-                        @node-expand="handleRoleTreeExpand"
-						@node-collapse="handleRoleTreeCollapse"
-						
-						@node-contextmenu="handleRoleTreeContextmenuRange"
-					/>
-				</el-aside>
-				<el-main style="border: 1px solid gainsboro; padding: 3px;" class="associatedFormsHideDialogMain">
-					<div style="border: 1px solid gainsboro; height: 7%; border-bottom: 0px; padding-top: 3px; padding-left: 5px; background-color: #E6F3FE;">仅可选择符合以下条件的数据</div>
-					<div  id="associatedFormsHideEditArea" style="border: 1px solid gainsboro; height: 38%; border-bottom: 0px;">
-                        <AssociatedFormsTinyaceRange ref="aftRange" :aft-text="controlData.control.dataRangeConditionHtml" :aft-text-copy = "controlData.control.dataRangeConditionHtmlCopy" :current-form = "props.customerformid" @text-change = "aftTextChangedRange" @gongshi-change = "aftGongshiChangedRange"></AssociatedFormsTinyaceRange>
-                        <!-- <div style="border: 1px solid #4189EF;width:90px;height:26px;border-radius: 3px;padding:2px;text-align: center;cursor:pointer;float: right;margin-top: -32px;margin-right: 5px;z-index:99999999;position: relative;">
+            <el-tree
+              ref="roleTreeRef"
+              style="max-width: 600px; border: 1px solid gainsboro; margin: 3px"
+              :data="roleTree"
+              :props="treeDefaultProps"
+              :filter-node-method="filterNode"
+              @node-expand="handleRoleTreeExpand"
+              @node-collapse="handleRoleTreeCollapse"
+              @node-contextmenu="handleRoleTreeContextmenuRange"
+            />
+          </el-aside>
+          <el-main
+            style="border: 1px solid gainsboro; padding: 3px"
+            class="associatedFormsHideDialogMain"
+          >
+            <div
+              style="
+                border: 1px solid gainsboro;
+                height: 7%;
+                border-bottom: 0px;
+                padding-top: 3px;
+                padding-left: 5px;
+                background-color: #e6f3fe;
+              "
+            >
+              仅可选择符合以下条件的数据
+            </div>
+            <div
+              id="associatedFormsHideEditArea"
+              style="border: 1px solid gainsboro; height: 38%; border-bottom: 0px"
+            >
+              <AssociatedFormsTinyaceRange
+                ref="aftRange"
+                :aft-text="controlData.control.dataRangeConditionHtml"
+                :aft-text-copy="controlData.control.dataRangeConditionHtmlCopy"
+                :current-form="props.customerformid"
+                @text-change="aftTextChangedRange"
+                @gongshi-change="aftGongshiChangedRange"
+              ></AssociatedFormsTinyaceRange>
+              <!-- <div style="border: 1px solid #4189EF;width:90px;height:26px;border-radius: 3px;padding:2px;text-align: center;cursor:pointer;float: right;margin-top: -32px;margin-right: 5px;z-index:99999999;position: relative;">
                             <span style="color: #4189EF;font:6px;margin-right: 5px;">fx</span>插入函数
                         </div> -->
-                        
-                    </div>
-					<div style="border: 1px solid gainsboro; height: 55%; padding-top: 20px;">
-                        <ul>
-                            <li>请从左侧面板<span style="color: red">右击</span>选择字段或选项</li>
-                            <li>支持的符号：<span style="color: red">'==', '>=', '>', '<=', '<', '!='</span></li>
-                            <li>支持<span style="color: red">"包含,不包含,数据拥有者,数据所属部门"</span>关键字,用于组织机构条件,角色条件,==运算符和!=运算符</li>
-                            <li>参考举例：</li>
-                            <span style="margin-left: 14px;">年龄>10</span><br>
-                            <span style="margin-left: 14px;">企管部==数据所属部门</span><br>
-                            <span style="margin-left: 14px;">绩效考核执行人包含数据拥有者</span><br>
-                            <span style="margin-left: 14px;">生产部包含数据所属部门</span>
-                        </ul>
-                    </div>
-				</el-main>
-				</el-container>
-			</div>
-		</template>
-		<template #footer>
-		<div class="dialog-footer">
-			<el-button @click="asfhTextCancelRange">取消</el-button>
-			<el-button type="primary" @click="handleDetermineRange">
-			确定
-			</el-button>
-		</div>
-    </template>
-	</el-dialog>
-
-
-
-
-
-
-    <!-- 数据填充规则弹窗 -->
-    <el-dialog v-model="associatedFormsFillRolesDialogFlag" title="数据填充规则" top="150px" :close-on-click-modal="false" :show-close="false" style="margin-top:70px ;min-height: 300px;max-height:900px"  width="60%"  >
-		<template v-if="controlData.type=='associatedForms'">
-            <el-button  style="font-size: large;margin-top: 10px;margin-bottom: 15px;"   type="primary" link append-to-body="true" modal="true" @click="addFillRole">十 主表填充规则</el-button>
-            <div style="max-height:230px;border:1px solid white;overflow-y:auto;">
-                <div style="background-color: #F0F0F0;padding: 12px;border-radius: 5px;padding-left:45px;padding-bottom: 10px;margin-right: 10px;"><!-- #F5F7FA     #E6F3FE  #F0F0F0  #F5F7FA-->
-                    <template v-for="(item, index) in controlData.control.fillRoles.master"  :key="controlData.control.fillRoles.master[index].id">
-                        <AssociatedFormsFillRole 
-                            v-if="showAssociatedFormsFillRole"
-                            v-model:left-value="controlData.control.fillRoles.master[index].leftValue"  
-                            v-model:right-value="controlData.control.fillRoles.master[index].rightValue" 
-                            :left-tree-source = "asfasfMasterFieldTree" 
-                            :right-tree-source = "associatedFormsCurrentFormFieldTree1"  
-                            :current-key="controlData.control.fillRoles.master[index].id"  
-                            @del-role = "delRole"
-                            @child-role-right-changed = "childRoleRightChanged"  
-                            >
-                        </AssociatedFormsFillRole>
-                    </template>
-                </div>              
-            </div>
-            <el-popover
-                v-if="currentChildTableCount>0"
-				placement="right-start"
-				title=""
-				:width="200"
-				trigger="hover"
-				content="【关联表单子表字段】暂不支持填充至【当前表单主表字段】"
-			>
-				<template #reference>
-					<el-button  style="font-size: large;margin-top: 23px;margin-bottom: 15px;"   type="primary" link append-to-body="true" modal="true" @click="addChildFillRole">十 子表填充规则</el-button>
-				</template>
-			</el-popover>
-            <div v-if="currentChildTableCount>0" style="max-height: 330px;overflow-y:auto;padding-top: 7px;">
-                <template v-for="(item, index) in controlData.control.fillRoles.child"  :key="controlData.control.fillRoles.child[index].id">
-                    <AssociatedFormsChildFillRole 
-                        v-model:selected-child-table="controlData.control.fillRoles.child[index].asfChildTableKey"  
-                        v-model:filter-condition="controlData.control.fillRoles.child[index].filterCondition"
-                        v-model:child-roles = "controlData.control.fillRoles.child[index].childRoles"
-                        :child-table-list="asfasfChildTableList"
-                        :asfasf-field-tree="asfasfFieldTree"
-                        :tree-default-props="treeDefaultProps"
-                        :filter-node="filterNode"
-                        
-                        :org-and-man-tree="orgAndManTree"
-                        :handle-org-tree-contextmenu-range = "handleOrgTreeContextmenuRange"
-                        :role-tree="roleTree"
-                        :handle-role-tree-contextmenu-range="handleRoleTreeContextmenuRange"
-                        :associated-forms-current-form-field-tree= "associatedFormsCurrentFormFieldTree"  
-                        :asfasf-child-table-fields = "asfasfChildTableFields"
-                        :current-key="controlData.control.fillRoles.child[index].id" 
-                        :current-form-child-table-fields-for-fill-role = "currentFormChildTableFieldsForFillRole"
-                        @selected-or-del-child-role = "selectedOrDelChildRole"
-                        @child-role-right-changed = "childRoleRightChanged"
-                        @del-role = "delChildRole"
-                        >
-                    </AssociatedFormsChildFillRole>
-                </template>
             </div>
-		</template>
-		<template #footer>
-            <div class="dialog-footer">
-                <!-- <el-button @click="asfhTextCancelFillRoles">取消</el-button> -->
-                <el-button type="primary" @click="handleDetermineFillRoles">
-                确定
-                </el-button>
+            <div style="border: 1px solid gainsboro; height: 55%; padding-top: 20px">
+              <ul>
+                <li>请从左侧面板<span style="color: red">右击</span>选择字段或选项</li>
+                <li>
+                  支持的符号：<span style="color: red"
+                    >'==', '>=', '>', '<=', '<', '!='</span
+                  >
+                </li>
+                <li>
+                  支持<span style="color: red">"包含,不包含,数据拥有者,数据所属部门"</span
+                  >关键字,用于组织机构条件,角色条件,==运算符和!=运算符
+                </li>
+                <li>参考举例：</li>
+                <span style="margin-left: 14px">年龄>10</span
+                ><br />
+                <span style="margin-left: 14px">企管部==数据所属部门</span
+                ><br />
+                <span style="margin-left: 14px">绩效考核执行人包含数据拥有者</span
+                ><br />
+                <span style="margin-left: 14px">生产部包含数据所属部门</span>
+              </ul>
             </div>
+          </el-main>
+        </el-container>
+      </div>
+    </template>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="asfhTextCancelRange">取消</el-button>
+        <el-button type="primary" @click="handleDetermineRange"> 确定 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+
+  <!-- 数据填充规则弹窗 -->
+  <el-dialog
+    v-model="associatedFormsFillRolesDialogFlag"
+    title="数据填充规则"
+    top="150px"
+    :close-on-click-modal="false"
+    :show-close="false"
+    style="margin-top: 70px; min-height: 300px; max-height: 900px"
+    width="60%"
+  >
+    <template v-if="controlData.type == 'associatedForms'">
+      <el-button
+        style="font-size: large; margin-top: 10px; margin-bottom: 15px"
+        type="primary"
+        link
+        append-to-body="true"
+        modal="true"
+        @click="addFillRole"
+        >十 主表填充规则</el-button
+      >
+      <div style="max-height: 230px; border: 1px solid white; overflow-y: auto">
+        <div
+          style="
+            background-color: #f0f0f0;
+            padding: 12px;
+            border-radius: 5px;
+            padding-left: 45px;
+            padding-bottom: 10px;
+            margin-right: 10px;
+          "
+        >
+          <!-- #F5F7FA     #E6F3FE  #F0F0F0  #F5F7FA-->
+          <template
+            v-for="(item, index) in controlData.control.fillRoles.master"
+            :key="controlData.control.fillRoles.master[index].id"
+          >
+            <AssociatedFormsFillRole
+              v-if="showAssociatedFormsFillRole"
+              v-model:left-value="controlData.control.fillRoles.master[index].leftValue"
+              v-model:right-value="controlData.control.fillRoles.master[index].rightValue"
+              :left-tree-source="asfasfMasterFieldTree"
+              :right-tree-source="associatedFormsCurrentFormFieldTree1"
+              :current-key="controlData.control.fillRoles.master[index].id"
+              @del-role="delRole"
+              @child-role-right-changed="childRoleRightChanged"
+            >
+            </AssociatedFormsFillRole>
+          </template>
+        </div>
+      </div>
+      <el-popover
+        v-if="currentChildTableCount > 0"
+        placement="right-start"
+        title=""
+        :width="200"
+        trigger="hover"
+        content="【关联表单子表字段】暂不支持填充至【当前表单主表字段】"
+      >
+        <template #reference>
+          <el-button
+            style="font-size: large; margin-top: 23px; margin-bottom: 15px"
+            type="primary"
+            link
+            append-to-body="true"
+            modal="true"
+            @click="addChildFillRole"
+            >十 子表填充规则</el-button
+          >
         </template>
-	</el-dialog>
-    
-    
-
-
-	<!-- 关联表单设置弹窗 liwenxuan 20240402 end -->
-
-
-<!-- 关联选项设置弹窗 liwenxuan 20240426 start -->  <!-- :title="`关联选项设置--`+controlData.item.label+`--`+controlData.name" -->
-        <el-dialog  v-model="glxxszDialogFlag" class="glxxsztc" top="150px" :close-on-click-modal="false"    :title="`关联选项设置--`+controlData.name"  :show-close="false" style="margin-top:70px;" width="50%" >
-
-            
-            
-            <template v-if="(controlData.type=='radio'||controlData.type=='select')&&controlData.config.optionsType==0">
-                
-                <el-table  
-                :data="controlData.options" stripe  border style="width: 100%;min-height:50px;max-height:500px;overflow-y:auto" 
-                            :cell-style="{height: '55px',paddingLeft: '15px'}" :header-cell-style="{background:'#F3F4F7',color:'#555',}" 
-                            >
-                
-                    <el-table-column prop="link" label="当选项为" width="220">
-                        <template #default="optionScope">
-                            <span style="background-color: #E8EAEE;border-radius: 8px;padding-top: 5px;padding-bottom: 5px;padding-left: 15px;padding-right: 15px;">{{ optionScope.row.label }}</span>
-                            
-                        </template>
-                    </el-table-column>
-                    <el-table-column fixed="right" label="显示以下组件" >
-                            <template #default="fieldScope">
-                                
-                                <el-tree-select v-model="controlData.control.glxxsz[fieldScope.$index].showFields" style="width: 100%" :data="associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf[0].children" multiple   />
-                            </template>
-                    </el-table-column>
-                </el-table>
-            </template>
-            <template #footer>
-            <div class="dialog-footer">
-                
-                <el-button type="primary" @click="handleDetermineGlxxszDialog">
-                确定
-                </el-button>
-            </div>
+      </el-popover>
+      <div
+        v-if="currentChildTableCount > 0"
+        style="max-height: 330px; overflow-y: auto; padding-top: 7px"
+      >
+        <template
+          v-for="(item, index) in controlData.control.fillRoles.child"
+          :key="controlData.control.fillRoles.child[index].id"
+        >
+          <AssociatedFormsChildFillRole
+            v-model:selected-child-table="
+              controlData.control.fillRoles.child[index].asfChildTableKey
+            "
+            v-model:filter-condition="
+              controlData.control.fillRoles.child[index].filterCondition
+            "
+            v-model:child-roles="controlData.control.fillRoles.child[index].childRoles"
+            :child-table-list="asfasfChildTableList"
+            :asfasf-field-tree="asfasfFieldTree"
+            :tree-default-props="treeDefaultProps"
+            :filter-node="filterNode"
+            :org-and-man-tree="orgAndManTree"
+            :handle-org-tree-contextmenu-range="handleOrgTreeContextmenuRange"
+            :role-tree="roleTree"
+            :handle-role-tree-contextmenu-range="handleRoleTreeContextmenuRange"
+            :associated-forms-current-form-field-tree="
+              associatedFormsCurrentFormFieldTree
+            "
+            :asfasf-child-table-fields="asfasfChildTableFields"
+            :current-key="controlData.control.fillRoles.child[index].id"
+            :current-form-child-table-fields-for-fill-role="
+              currentFormChildTableFieldsForFillRole
+            "
+            @selected-or-del-child-role="selectedOrDelChildRole"
+            @child-role-right-changed="childRoleRightChanged"
+            @del-role="delChildRole"
+          >
+          </AssociatedFormsChildFillRole>
         </template>
-        </el-dialog>
-
-        <el-dialog v-model="glxxszDialogFlagCheckBox"  class="glxxsztc" top="150px" :close-on-click-modal="false" :title="`关联选项设置--`+controlData.name" :show-close="false" style="margin-top:70px;" width="50%" >
-
-            
-            
-            <template v-if="controlData.type=='checkbox'">
-                
-                <el-table  
-                    :data="controlData.control.glxxszForCheckBox" stripe  border style="width: 100%;min-height:50px;max-height:500px;overflow-y:auto" 
-                    :cell-style="{height: '55px',paddingLeft: '15px'}" :header-cell-style="{background:'#F3F4F7',color:'#555',}">
-
-                    <el-table-column prop="link" label="当选项为" width="300">
-                        <template #default="optionScope">
-                            <el-tree-select v-model="controlData.control.glxxszForCheckBox[optionScope.$index].selectedOptions" style="width: 100%" :data="controlData.options" multiple />
-                        </template>
-                    </el-table-column>
-
-                    <el-table-column fixed="right" label="显示以下组件" >
-                        <template #default="fieldScope">
-                            <el-tree-select v-model="controlData.control.glxxszForCheckBox[fieldScope.$index].showFields" style="width: 100%" :data="associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf[0].children" multiple   />
-                        </template>
-                    </el-table-column>
-
-                    <el-table-column fixed="right" label="操作" width="130">
-                        
-                        
-                        
-                        <template #default="operateScope">
-                            
-                            <el-button  type="danger" :icon="Delete" circle @click="deleteRowForGlxxsz(operateScope.row)"/>
-                        </template>
-                        
-                    </el-table-column>
-
-                </el-table>
-                <el-button plain type="success" style="margin-top: 10px;" @click="createRowForGlxxsz">新增</el-button>
-            </template>
-            <template #footer>
-            <div class="dialog-footer">
-                
-                <el-button type="primary" @click="handleDetermineGlxxszDialogCheckBox">
-                确定
-                </el-button>
-            </div>
-            </template>
-            </el-dialog>
-
-
-
-
-
-            <el-dialog  v-model="glxxszDialogFlagSwitch" class="glxxsztc" top="150px" :close-on-click-modal="false" :title="`关联选项设置--`+controlData.name" :show-close="false" style="margin-top:70px;" width="50%" >
-
-                        
-                        
-                <template v-if="controlData.type=='switch'">
-                    <div style="display:flex;margin-bottom: 20px;margin-top:20px"><span style="font-size: larger;margin-left: 35px;margin-right: 15px;">当开关打开时显示</span>
-                        <el-tree-select v-model="controlData.control.glxxszSwitch[0].showFields" style="width: 60%" :data="associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf[0].children" multiple   />
-                    </div>
-                    <div style="display:flex"><span style="font-size: larger;margin-left: 35px;margin-right: 15px;">当开关关闭时显示</span>
-                        <el-tree-select v-model="controlData.control.glxxszSwitch[1].showFields" style="width: 60%" :data="associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf[0].children" multiple   />
-                    </div>
-                    
-                </template>
-                <template #footer>
-                <div class="dialog-footer">
-                    
-                    <el-button type="primary" @click="handleDetermineGlxxszDialogSwitch">
-                    确定
-                    </el-button>
-                </div>
-                </template> 
-            </el-dialog>
-
-
-        <!-- 关联选项设置弹窗 liwenxuan 20240426 end -->
-
-        <!-- 单选下拉多选选项来源value3--系统表单字段 start-->
-
-        <el-dialog  v-model="optionsValue3SettingDialogOpenFlag" class="glxxsztc" top="150px" :close-on-click-modal="false" title="选择表单字段" :show-close="false" style="margin-top:70px;" width="50%"    >
-            <template v-if="controlData.type=='radio'||controlData.type=='select'||controlData.type=='checkbox'">
-                <div style="display:flex;margin-bottom: 20px;margin-top:20px"><span style="font-size: larger;margin-left: 35px;margin-right: 15px;">请选择表单</span>
-                    <el-tree-select
-                        v-model="controlData.control.optionsValue3Formid"
-                        style="width: 390px;"
-                        :data="customerFormTree[0].children"
-                        check-strictly
-                        :render-after-expand="false"
-                        filterable
-                        node-key="id"
-                        @change="formidChangedOptionsValue3"
-                    />
-                </div>
-                <div style="display:flex" v-if="typeof(controlData.control.optionsValue3Formid)!='undefined' && typeof(asfasfFieldTreeOptionsValue3)!='undefined' && controlData.control.optionsValue3Formid!=''">
-				
-				<span style="font-size: larger;margin-left: 35px;margin-right: 15px;">请选择字段</span>
-                    <!--
+      </div>
+    </template>
+    <template #footer>
+      <div class="dialog-footer">
+        <!-- <el-button @click="asfhTextCancelFillRoles">取消</el-button> -->
+        <el-button type="primary" @click="handleDetermineFillRoles"> 确定 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+
+  <!-- 关联表单设置弹窗 liwenxuan 20240402 end -->
+
+  <!-- 关联选项设置弹窗 liwenxuan 20240426 start -->
+  <!-- :title="`关联选项设置--`+controlData.item.label+`--`+controlData.name" -->
+  <el-dialog
+    v-model="glxxszDialogFlag"
+    class="glxxsztc"
+    top="150px"
+    :close-on-click-modal="false"
+    :title="`关联选项设置--` + controlData.name"
+    :show-close="false"
+    style="margin-top: 70px"
+    width="50%"
+  >
+    <template
+      v-if="
+        (controlData.type == 'radio' || controlData.type == 'select') &&
+        controlData.config.optionsType == 0
+      "
+    >
+      <el-table
+        :data="controlData.options"
+        stripe
+        border
+        style="width: 100%; min-height: 50px; max-height: 500px; overflow-y: auto"
+        :cell-style="{ height: '55px', paddingLeft: '15px' }"
+        :header-cell-style="{ background: '#F3F4F7', color: '#555' }"
+      >
+        <el-table-column prop="link" label="当选项为" width="220">
+          <template #default="optionScope">
+            <span
+              style="
+                background-color: #e8eaee;
+                border-radius: 8px;
+                padding-top: 5px;
+                padding-bottom: 5px;
+                padding-left: 15px;
+                padding-right: 15px;
+              "
+              >{{ optionScope.row.label }}</span
+            >
+          </template>
+        </el-table-column>
+        <el-table-column fixed="right" label="显示以下组件">
+          <template #default="fieldScope">
+            <el-tree-select
+              v-model="controlData.control.glxxsz[fieldScope.$index].showFields"
+              style="width: 100%"
+              :data="associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf[0].children"
+              multiple
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+    </template>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="handleDetermineGlxxszDialog"> 确定 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+
+  <el-dialog
+    v-model="glxxszDialogFlagCheckBox"
+    class="glxxsztc"
+    top="150px"
+    :close-on-click-modal="false"
+    :title="`关联选项设置--` + controlData.name"
+    :show-close="false"
+    style="margin-top: 70px"
+    width="50%"
+  >
+    <template v-if="controlData.type == 'checkbox'">
+      <el-table
+        :data="controlData.control.glxxszForCheckBox"
+        stripe
+        border
+        style="width: 100%; min-height: 50px; max-height: 500px; overflow-y: auto"
+        :cell-style="{ height: '55px', paddingLeft: '15px' }"
+        :header-cell-style="{ background: '#F3F4F7', color: '#555' }"
+      >
+        <el-table-column prop="link" label="当选项为" width="300">
+          <template #default="optionScope">
+            <el-tree-select
+              v-model="
+                controlData.control.glxxszForCheckBox[optionScope.$index].selectedOptions
+              "
+              style="width: 100%"
+              :data="controlData.options"
+              multiple
+            />
+          </template>
+        </el-table-column>
+
+        <el-table-column fixed="right" label="显示以下组件">
+          <template #default="fieldScope">
+            <el-tree-select
+              v-model="
+                controlData.control.glxxszForCheckBox[fieldScope.$index].showFields
+              "
+              style="width: 100%"
+              :data="associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf[0].children"
+              multiple
+            />
+          </template>
+        </el-table-column>
+
+        <el-table-column fixed="right" label="操作" width="130">
+          <template #default="operateScope">
+            <el-button
+              type="danger"
+              :icon="Delete"
+              circle
+              @click="deleteRowForGlxxsz(operateScope.row)"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-button plain type="success" style="margin-top: 10px" @click="createRowForGlxxsz"
+        >新增</el-button
+      >
+    </template>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="handleDetermineGlxxszDialogCheckBox">
+          确定
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+
+  <el-dialog
+    v-model="glxxszDialogFlagSwitch"
+    class="glxxsztc"
+    top="150px"
+    :close-on-click-modal="false"
+    :title="`关联选项设置--` + controlData.name"
+    :show-close="false"
+    style="margin-top: 70px"
+    width="50%"
+  >
+    <template v-if="controlData.type == 'switch'">
+      <div style="display: flex; margin-bottom: 20px; margin-top: 20px">
+        <span style="font-size: larger; margin-left: 35px; margin-right: 15px"
+          >当开关打开时显示</span
+        >
+        <el-tree-select
+          v-model="controlData.control.glxxszSwitch[0].showFields"
+          style="width: 60%"
+          :data="associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf[0].children"
+          multiple
+        />
+      </div>
+      <div style="display: flex">
+        <span style="font-size: larger; margin-left: 35px; margin-right: 15px"
+          >当开关关闭时显示</span
+        >
+        <el-tree-select
+          v-model="controlData.control.glxxszSwitch[1].showFields"
+          style="width: 60%"
+          :data="associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf[0].children"
+          multiple
+        />
+      </div>
+    </template>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="handleDetermineGlxxszDialogSwitch">
+          确定
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+
+  <!-- 关联选项设置弹窗 liwenxuan 20240426 end -->
+
+  <!-- 单选下拉多选选项来源value3--系统表单字段 start-->
+
+  <el-dialog
+    v-model="optionsValue3SettingDialogOpenFlag"
+    class="glxxsztc"
+    top="150px"
+    :close-on-click-modal="false"
+    title="选择表单字段"
+    :show-close="false"
+    style="margin-top: 70px"
+    width="50%"
+  >
+    <template
+      v-if="
+        controlData.type == 'radio' ||
+        controlData.type == 'select' ||
+        controlData.type == 'checkbox'
+      "
+    >
+      <div style="display: flex; margin-bottom: 20px; margin-top: 20px">
+        <span style="font-size: larger; margin-left: 35px; margin-right: 15px"
+          >请选择表单</span
+        >
+        <el-tree-select
+          v-model="controlData.control.optionsValue3Formid"
+          style="width: 390px"
+          :data="customerFormTree[0].children"
+          check-strictly
+          :render-after-expand="false"
+          filterable
+          node-key="id"
+          @change="formidChangedOptionsValue3"
+        />
+      </div>
+      <div
+        style="display: flex"
+        v-if="
+          typeof controlData.control.optionsValue3Formid != 'undefined' &&
+          typeof asfasfFieldTreeOptionsValue3 != 'undefined' &&
+          controlData.control.optionsValue3Formid != ''
+        "
+      >
+        <span style="font-size: larger; margin-left: 35px; margin-right: 15px"
+          >请选择字段</span
+        >
+        <!--
                         
                         
                     -->
-                    <el-tree-select v-model="controlData.control.optionsValue3Field" style="width: 390px;" :data="asfasfFieldTreeOptionsValue3[0].children"    />
-                </div>
-            </template>
-            <template #footer>
-            <div class="dialog-footer">
-                <el-button type="primary" @click="handleDetermineoptionsValue3">
-                确定
-                </el-button>
-            </div>
-            </template> 
-        </el-dialog>
+        <el-tree-select
+          v-model="controlData.control.optionsValue3Field"
+          style="width: 390px"
+          :data="asfasfFieldTreeOptionsValue3[0].children"
+        />
+      </div>
+    </template>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="handleDetermineoptionsValue3"> 确定 </el-button>
+      </div>
+    </template>
+  </el-dialog>
 </template>
-<style  lang='scss' scoped>
+<style lang="scss" scoped>
 li::before {
-        content: "";
-        display: inline-block;
-        width: 4px;
-        height: 4px;
-        border-radius: 50%;
-        background-color: gray;
-        margin-right: 5px;
-        margin-left: 5px;
-        margin-bottom: 3.5px;
-    }
+  content: "";
+  display: inline-block;
+  width: 4px;
+  height: 4px;
+  border-radius: 50%;
+  background-color: gray;
+  margin-right: 5px;
+  margin-left: 5px;
+  margin-bottom: 3.5px;
+}
 
-	.sidebar-tools .el-tabs__content{
-        padding: 0;
-		
-    }
-	.el-collapse-item__header {
-        padding-left: 10px;
-        background-color: rgb(229, 229, 229);
-    }
-    .el-collapse-item__header{
-        padding-left: 10px;
-        background-color: rgb(229, 229, 229);
-    }
+.sidebar-tools .el-tabs__content {
+  padding: 0;
+}
+.el-collapse-item__header {
+  padding-left: 10px;
+  background-color: rgb(229, 229, 229);
+}
+.el-collapse-item__header {
+  padding-left: 10px;
+  background-color: rgb(229, 229, 229);
+}
 
-    .form_cont{
-        padding: 0 10px;
-		.radioInput{
-			margin-bottom: 10px;
-		}
-    }
-	.avatar-uploader{
-		width: 100px;
-		height: 100px;
-		.avatar{
-			width: 100px;
-			height: 100px;
-		}
-		.avatar-uploader-icon{
-			width: 100px;
-			height: 100px;
-		}
+.form_cont {
+  padding: 0 10px;
+  .radioInput {
+    margin-bottom: 10px;
+  }
+}
+.avatar-uploader {
+  width: 100px;
+  height: 100px;
+  .avatar {
+    width: 100px;
+    height: 100px;
+  }
+  .avatar-uploader-icon {
+    width: 100px;
+    height: 100px;
+  }
 }
 .custom-tree-node {
-	flex: 1;
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	font-size: 14px;
-	padding-right: 8px;
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 14px;
+  padding-right: 8px;
 }
-.custom-tree-node:hover{
-	background-color:antiquewhite;
+.custom-tree-node:hover {
+  background-color: antiquewhite;
 }
 
-.associatedFormsHideDialogMain7{
-	display: flex;
-	
-	
+.associatedFormsHideDialogMain7 {
+  display: flex;
 }
-.el-main{
-	--el-main-padding: 5px
+.el-main {
+  --el-main-padding: 5px;
 }
-.jiaoYan{
-	.el-input-group__append, .el-input-group__prepend{
-		padding: 0 5px;
-	}
+.jiaoYan {
+  .el-input-group__append,
+  .el-input-group__prepend {
+    padding: 0 5px;
+  }
 }
 </style>
diff --git a/src/components/DesignForm/public/expand/cascader.vue b/src/components/DesignForm/public/expand/cascader.vue
index e1d6b4c..8daea62 100644
--- a/src/components/DesignForm/public/expand/cascader.vue
+++ b/src/components/DesignForm/public/expand/cascader.vue
@@ -3,45 +3,49 @@
 @ 时间: 2024-09-29 13:46:55
 @ 备注: 级联器
 -->
-<script lang='ts' setup>
+<script lang="ts" setup>
+import { stringToObj } from "@/utils/DesignForm/form";
 const props = withDefaults(
-    defineProps<{
-		modelValue?: string
-		disabled?: boolean
-		action?: string
-		name?: string
-		fileList?: Object
-		control?: Object
-		config?: Object
-		data?: Object
-		options?: Object
-    }>(),
-    {}
-)
+  defineProps<{
+    modelValue?: string;
+    disabled?: boolean;
+    action?: string;
+    name?: string;
+    fileList?: Object;
+    control?: Object;
+    config?: Object;
+    data?: Object;
+    options?: Object;
+  }>(),
+  {}
+);
 const emits = defineEmits<{
-    (e: 'update:modelValue', value: string): void
-}>()
+  (e: "update:modelValue", value: string): void;
+}>();
 const value = computed({
-	get: () => {
-		console.log("图片上传处理-112->",props.modelValue)
-		return props.modelValue
-	},
-	set: (newVal: any) => {
-		emits('update:modelValue', newVal)
-		return newVal
-	},
+  get: () => {
+    console.log("图片上传处理-112->", props.modelValue, stringToObj(props.modelValue));
+    return stringToObj(props.modelValue);
+  },
+  set: (newVal: any) => {
+    emits("update:modelValue", newVal);
+    return newVal;
+  },
 });
-const handleChange = () => {
-
-}
+const handleChange = () => {};
+const cascaderProps = {
+  label: "label",
+  value: "value",
+  children: "children",
+};
 </script>
 <template>
-	<el-cascader
-      v-model="value"
-      :options="props.options"
-      @change="handleChange"
-    />
+  <el-cascader
+    v-model="value"
+    :options="props.options"
+    clearable
+    :props="cascaderProps"
+    @change="handleChange"
+  />
 </template>
-<style  lang='scss' scoped>
-
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/components/DesignForm/public/form/calculate/cssInfo.ts b/src/components/DesignForm/public/form/calculate/cssInfo.ts
index 3c1c0ef..1721677 100644
--- a/src/components/DesignForm/public/form/calculate/cssInfo.ts
+++ b/src/components/DesignForm/public/form/calculate/cssInfo.ts
@@ -110,8 +110,14 @@ export const AnalysisCss = (ele:any) =>{
 
     if(ele['width']){
         if(ele['width'] != ""){
-            styleObject['width'] = ele['width'].toString()+"px";
+			if(ele['width'].includes('%')){
+				styleObject['width'] = ele['width']
+			}else{
+				styleObject['width'] = ele['width'].toString()+"px";
+			}
+            
         }
+		
     }
     if(ele['widthMax'] && ele['widthMax'] != ""){
         styleObject['max-width'] = ele['widthMax'].toString()+"px";
diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue
index fe6e216..798bb77 100644
--- a/src/components/DesignForm/public/form/formGroup.vue
+++ b/src/components/DesignForm/public/form/formGroup.vue
@@ -3,253 +3,245 @@
 @ 时间: 2023-09-20 13:00:49
 @ 备注: 自定义表单组件渲染
 -->
-<script lang='ts' setup>
-import { computed, watch, inject, onUnmounted } from 'vue'
-import Draggable from 'vuedraggable-es'
-import FormItem from './formItem.vue'
-import ChildTable from './childTable.vue'
-import Tooltips from '@/components/DesignForm/tooltip.vue'
-import FlexBox from './flexBox.vue'
-import { useDesignFormStore } from '@/store/DesignForm/designForm'
-import { FormList,formTableInfo } from '@/api/DesignForm/types'
-import {
-  constFormBtnEvent,
-  constFormProps
-} from '@/api/DesignForm/utils'
-import { Md5 } from 'ts-md5';
-import { jsonParseStringify } from '@/utils/DesignForm'
-import request from '@/utils/request';
-import { AnalysisCss } from '@/components/DesignForm/public/form/calculate/cssInfo.ts'
+<script lang="ts" setup>
+import { computed, watch, inject, onUnmounted } from "vue";
+import Draggable from "vuedraggable-es";
+import FormItem from "./formItem.vue";
+import ChildTable from "./childTable.vue";
+import Tooltips from "@/components/DesignForm/tooltip.vue";
+import FlexBox from "./flexBox.vue";
+import { useDesignFormStore } from "@/store/DesignForm/designForm";
+import { FormList, formTableInfo } from "@/api/DesignForm/types";
+import { constFormBtnEvent, constFormProps } from "@/api/DesignForm/utils";
+import { Md5 } from "ts-md5";
+import { jsonParseStringify } from "@/utils/DesignForm";
+import request from "@/utils/request";
+import { AnalysisCss } from "@/components/DesignForm/public/form/calculate/cssInfo.ts";
 
 const props = withDefaults(
-    defineProps<{
-      	data: FormList[]
-		tableinfo:formTableInfo
-		numrun?:number
-		nodeKey?:string
-		purview?:any[]
-		alldata?:any
-    }>(),
-    {
-		data: () => {
-			return []
-		}
-    }
-)
+  defineProps<{
+    data: FormList[];
+    tableinfo: formTableInfo;
+    numrun?: number;
+    nodeKey?: string;
+    purview?: any[];
+    alldata?: any;
+  }>(),
+  {
+    data: () => {
+      return [];
+    },
+  }
+);
 
-let emits = defineEmits(['optionsValue3Get2','asfValueChanged']);
+let emits = defineEmits(["optionsValue3Get2", "asfValueChanged"]);
 
-const store = useDesignFormStore() as any //自定义表单存储器
-const formProps = inject(constFormProps, {}) as any
-const type = computed(() => {				//动态计算属性
-  	return formProps.value.type
-})
+const store = useDesignFormStore() as any; //自定义表单存储器
+const formProps = inject(constFormProps, {}) as any;
+const type = computed(() => {
+  //动态计算属性
+  return formProps.value.type;
+});
 const state = reactive({
-    clone: true, // 允许clone
-    gridAdd: false
-})
-const dataList = ref<any>(props.data)
+  clone: true, // 允许clone
+  gridAdd: false,
+});
+const dataList = ref<any>(props.data);
 
 watch(
-    () => props.data,
-    (v: FormList[]) => {
-      	dataList.value = v
-		// console.log("监听表单变化++++++++++>",v)
-    },
-	{
-    deep: true
-}
-)
+  () => props.data,
+  (v: FormList[]) => {
+    dataList.value = v;
+    // console.log("监听表单变化++++++++++>",v)
+  },
+  {
+    deep: true,
+  }
+);
 const activeKey = computed(() => {
-    return store.activeKey
-})
+  return store.activeKey;
+});
 // 禁止容器嵌套
 const notNested = (type: string) => {
-    // const controlType = ['grid', 'table', 'tabs', 'div', 'flex', 'card']
-	const controlType = ['grid',  'tabs',  'div',  'card']
-	// let kjkdh = controlType.includes(type)
-	// console.log("禁止容器嵌套",kjkdh,controlType)
-    return controlType.includes(type)
-	// return false
-}
+  // const controlType = ['grid', 'table', 'tabs', 'div', 'flex', 'card']
+  const controlType = ["grid", "tabs", "div", "card"];
+  // let kjkdh = controlType.includes(type)
+  // console.log("禁止容器嵌套",kjkdh,controlType)
+  return controlType.includes(type);
+  // return false
+};
 const notNestedTableFlex = (type: string) => {
-    const controlType = ['grid', 'table', 'tabs', 'div', 'flex', 'card']
-	// let kjkdh = controlType.includes(type)
-	// console.log("禁止容器嵌套",kjkdh,controlType)
-    return controlType.includes(type)
-	// return false
-}
+  const controlType = ["grid", "table", "tabs", "div", "flex", "card"];
+  // let kjkdh = controlType.includes(type)
+  // console.log("禁止容器嵌套",kjkdh,controlType)
+  return controlType.includes(type);
+  // return false
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-22 15:03:31
 @ 功能: 判断不能重复出现的组件
 */
 const determineDuplicates = (type: string) => {
-	const controlType = ["founder","founderTime","editTime","owner","deptOrg"]
-	// console.log("判断不能重复出现的组件",dataList);
-	if(dataList.value.length > 0){
-		let jibuqi = 0;
-		dataList.value.forEach((item:any)=>{
-			// console.log("组件循环",item);
-			if(controlType.includes(type)){
-				if(type == item.type){
-					jibuqi++
-				}
-			}
-			
-		})
-		// console.log("组件循环",jibuqi);
-		if(jibuqi > 1){
-			ElMessage({
-				showClose: true,
-				message: '此类控件在表单中只能出现一次！不可重复添加！',
-				type: 'error',
-			})
-			return true;
-		}else{
-			return false
-		}
-	}else{
-		return false
-	}
-	// return controlType.includes(type)
-}
+  const controlType = ["founder", "founderTime", "editTime", "owner", "deptOrg"];
+  // console.log("判断不能重复出现的组件",dataList);
+  if (dataList.value.length > 0) {
+    let jibuqi = 0;
+    dataList.value.forEach((item: any) => {
+      // console.log("组件循环",item);
+      if (controlType.includes(type)) {
+        if (type == item.type) {
+          jibuqi++;
+        }
+      }
+    });
+    // console.log("组件循环",jibuqi);
+    if (jibuqi > 1) {
+      ElMessage({
+        showClose: true,
+        message: "此类控件在表单中只能出现一次！不可重复添加！",
+        type: "error",
+      });
+      return true;
+    } else {
+      return false;
+    }
+  } else {
+    return false;
+  }
+  // return controlType.includes(type)
+};
 // 删除或复制
 const click = (action: string, index: number, item?: any) => {
-    if (type.value !== 5) {
-      return // 非设计模式
-    }
-    if (action === 'clone') {
-		const key = item.type + new Date().getTime().toString()
-		const newItem = jsonParseStringify(item)
-		dataList.value.splice(index, 0, Object.assign(newItem, { name: key }))
-    } else if (action === 'del') {
-		dataList.value.splice(index, 1)
-		// 清空右侧栏信息
-		store.setActiveKey('')
-		store.setControlAttr({})
-    } else if (action === 'gridAdd') {
-		item.columns.push({
-			list: [],
-			attr: { span: 12 }
-		})
-    } else if (action === 'delGridChild') {
-      	item.splice(index, 1)
-    }
-}
+  if (type.value !== 5) {
+    return; // 非设计模式
+  }
+  if (action === "clone") {
+    const key = item.type + new Date().getTime().toString();
+    const newItem = jsonParseStringify(item);
+    dataList.value.splice(index, 0, Object.assign(newItem, { name: key }));
+  } else if (action === "del") {
+    dataList.value.splice(index, 1);
+    // 清空右侧栏信息
+    store.setActiveKey("");
+    store.setControlAttr({});
+  } else if (action === "gridAdd") {
+    item.columns.push({
+      list: [],
+      attr: { span: 12 },
+    });
+  } else if (action === "delGridChild") {
+    item.splice(index, 1);
+  }
+};
 const draggableAdd = (evt: any) => {
-    if (type.value !== 5) {
-      	return // 非设计模式
-    }
-    const newIndex = evt.newIndex
-    const key = new Date().getTime().toString()
-    const obj: any = dataList.value[newIndex]
-    const isNested = evt.target && evt.target.getAttribute('data-type') // 不能嵌套
-	// console.log("设计拖拽事件-----1------->",newIndex)
-    // console.log("设计拖拽事件-----2------->",key)
-    // console.log("设计拖拽事件-----3------->",obj)
-	// console.log("设计拖拽事件-----4------->",isNested)
-	// console.log("设计拖拽事件-----4------->",dataList.value)
-    if ((isNested === 'not-nested' && notNested(obj.type))  || ((isNested === 'not-table' || isNested === 'not-flex') && notNestedTableFlex(obj.type)) || determineDuplicates(obj.type)) {
-		dataList.value.splice(newIndex, 1)
-		return
-    }
-    if (!obj) {
-      	return
-    }
-    const label = obj.label || obj.item.label
-    delete obj.label
-    delete obj.icon
-    let objectItem = {}
-    // 不需要添加item的项
-    const notNeedItem = [
-		'txt',
-		'title',
-		'button',
-		'table',
-		'grid',
-		'tabs',
-		'flex',
-		'div'
-    ]
-	// console.log("非设计模式-->",obj.type)
-    if (!notNeedItem.includes(obj.type)) {
-		objectItem = {
-			item: {
-				label: label
-			}
-		}
-    }
-    // 不需要name的组件
-    let nameObj = {}
-    const notNeedName = [
-		'txt',
-		'title',
-		'button',
-		'grid',
-		'tabs',
-		'divider',
-		'div',
-		'card'
-    ]
-	switch(obj.type){
-		case "founder":
-			nameObj = {
-				name: "creater"
-			}
-			// console.log("founder--->creater",nameObj)
-			break
-		case "founderTime":
-			nameObj = {
-				name: "creater_time"
-			}
-			// console.log("founderTime-->creater_time",nameObj)
-			break
-		case "editTime":
-			nameObj = {
-				name: "edit_time"
-			}
-			// console.log("editTime--->edit_time",nameObj)
-			break
-		case "owner":
-			nameObj = {
-				name: "owner"
-			}
-			// console.log("owner------>owner",nameObj)
-			break
-		case "deptOrg":
-			nameObj = {
-				name:"org"
-			}
-			// console.log("deptOrg---->org",nameObj)
-			break
-		default:
-			if (!notNeedName.includes(obj.type) && !obj.name) {
-				nameObj = {
-					name: obj.type + key
-				}
-			}
-	}
-    
-
-	// console.log("设计拖拽事件-----5------->",obj)
-    // console.log("设计拖拽事件-----6------->",nameObj)
-    // console.log("设计拖拽事件-----7------->",objectItem)
-
-    Object.assign(obj, nameObj, objectItem)
-	// console.log("设计拖拽事件-----8------->",obj)
-    groupClick(obj)
-}
+  if (type.value !== 5) {
+    return; // 非设计模式
+  }
+  const newIndex = evt.newIndex;
+  const key = new Date().getTime().toString();
+  const obj: any = dataList.value[newIndex];
+  const isNested = evt.target && evt.target.getAttribute("data-type"); // 不能嵌套
+  // console.log("设计拖拽事件-----1------->",newIndex)
+  // console.log("设计拖拽事件-----2------->",key)
+  // console.log("设计拖拽事件-----3------->",obj)
+  // console.log("设计拖拽事件-----4------->",isNested)
+  // console.log("设计拖拽事件-----4------->",dataList.value)
+  if (
+    (isNested === "not-nested" && notNested(obj.type)) ||
+    ((isNested === "not-table" || isNested === "not-flex") &&
+      notNestedTableFlex(obj.type)) ||
+    determineDuplicates(obj.type)
+  ) {
+    dataList.value.splice(newIndex, 1);
+    return;
+  }
+  if (!obj) {
+    return;
+  }
+  const label = obj.label || obj.item.label;
+  delete obj.label;
+  delete obj.icon;
+  let objectItem = {};
+  // 不需要添加item的项
+  const notNeedItem = ["txt", "title", "button", "table", "grid", "tabs", "flex", "div"];
+  // console.log("非设计模式-->",obj.type)
+  if (!notNeedItem.includes(obj.type)) {
+    objectItem = {
+      item: {
+        label: label,
+      },
+    };
+  }
+  // 不需要name的组件
+  let nameObj = {};
+  const notNeedName = [
+    "txt",
+    "title",
+    "button",
+    "grid",
+    "tabs",
+    "divider",
+    "div",
+    "card",
+  ];
+  switch (obj.type) {
+    case "founder":
+      nameObj = {
+        name: "creater",
+      };
+      // console.log("founder--->creater",nameObj)
+      break;
+    case "founderTime":
+      nameObj = {
+        name: "creater_time",
+      };
+      // console.log("founderTime-->creater_time",nameObj)
+      break;
+    case "editTime":
+      nameObj = {
+        name: "edit_time",
+      };
+      // console.log("editTime--->edit_time",nameObj)
+      break;
+    case "owner":
+      nameObj = {
+        name: "owner",
+      };
+      // console.log("owner------>owner",nameObj)
+      break;
+    case "deptOrg":
+      nameObj = {
+        name: "org",
+      };
+      // console.log("deptOrg---->org",nameObj)
+      break;
+    default:
+      if (!notNeedName.includes(obj.type) && !obj.name) {
+        nameObj = {
+          name: obj.type + key,
+        };
+      }
+  }
+
+  // console.log("设计拖拽事件-----5------->",obj)
+  // console.log("设计拖拽事件-----6------->",nameObj)
+  // console.log("设计拖拽事件-----7------->",objectItem)
+
+  Object.assign(obj, nameObj, objectItem);
+  // console.log("设计拖拽事件-----8------->",obj)
+  groupClick(obj);
+};
 const getGroupName = (item: any) => {
-    if (item.name) {
-      	return item.name
-    } else {
-		let md5Object:any = new Md5()
-		md5Object.appendAsciiStr(JSON.stringify(item))
-		let md5Str = md5Object.end()
-		return md5Str
-    }
-}
+  if (item.name) {
+    return item.name;
+  } else {
+    let md5Object: any = new Md5();
+    md5Object.appendAsciiStr(JSON.stringify(item));
+    let md5Str = md5Object.end();
+    return md5Str;
+  }
+};
 // 点击激活当前
 /**
  * styles:{
@@ -259,685 +251,679 @@ const getGroupName = (item: any) => {
 			}
  */
 const groupClick = (item: any, ele?: string) => {
-    // 设计模式下才执行
-    if (type.value !== 5) {
-      	return
-    }
-    if (ele) {
-      	item.type = ele
-    }
-	if(!item.styles){
-		item.styles={
-				divStyle:{},
-				labelStyle:{},
-				inputStyle:{}
-			}
-	}
-	// console.log("点击激活当前--->",getGroupName(item))
-    store.setActiveKey(getGroupName(item))
-    store.setControlAttr(item)
-    // grid时显示添加列按钮
-    state.gridAdd = item.type === 'grid'
-    // state.clone = !notNested(item.type)
-	state.clone = !notNestedTableFlex(item.type)
-}
+  // 设计模式下才执行
+  if (type.value !== 5) {
+    return;
+  }
+  if (ele) {
+    item.type = ele;
+  }
+  if (!item.styles) {
+    item.styles = {
+      divStyle: {},
+      labelStyle: {},
+      inputStyle: {},
+    };
+  }
+  // console.log("点击激活当前--->",getGroupName(item))
+  store.setActiveKey(getGroupName(item));
+  store.setControlAttr(item);
+  // grid时显示添加列按钮
+  state.gridAdd = item.type === "grid";
+  // state.clone = !notNested(item.type)
+  state.clone = !notNestedTableFlex(item.type);
+};
 // 返回栅格宽度
 const getFormItemStyle = (ele: FormList) => {
-	// console.log("返回栅格宽度311---->",ele)
-    if (ele.config?.span === 0) {
-      	return { width: 'auto', margin: '0 5px' }
+  //   console.log("返回栅格宽度311---->", ele);
+  if (ele.config?.span === 0) {
+    return { width: "auto", margin: "0 5px" };
+  }
+  if (ele.config && ele.config.span) {
+    if (ele.styles?.divStyle) {
+      ele.styles.divStyle.width = (ele.config.span / 24) * 100 + "%";
+      //   console.log("返回栅格宽度311--2-->", ele.styles.divStyle);
+      return AnalysisCss(ele.styles.divStyle);
     }
-    if (ele.config && ele.config.span) {
-      	return { width: (ele.config.span / 24) * 100 + '%' }
-    }
-	if(ele.styles?.divStyle){
+    return { width: (ele.config.span / 24) * 100 + "%" };
+  }
+  if (ele.styles?.divStyle) {
     //   console.log("返回栅格宽度3",AnalysisCss(ele.styles.divStyle))
-      return AnalysisCss(ele.styles.divStyle)
-    }
-}
+    return AnalysisCss(ele.styles.divStyle);
+  }
+};
 // 根据关联条件显示隐藏当前项
 const linksShow = (el: FormList, index: number) => {
-
-	/* 
+  /* 
 		
 	*/
-    // 当前项设置了关联条件，当关联主体的值等于当前组件设定的值时
-    if (!el.config) {
-      	return true
-    }
-    const key = el.config.linkKey
-	//liwenxuan 关联选项设置效果实现  
-	//console.log("linksShow--------"+index+"--------"+JSON.stringify(el))
-	//仅第一次加载会触发，须将出现在配置条件中的表单项隐藏。
-	
-    const value = el.config.linkValue
-    const linkResult = el.config.linkResult
-    if (key && value && type.value !== 5) {
-		const Fn = new Function('$', `return (${value})`)
-		// console.log(Fn)
-		const pass = Fn(formProps.value.model)
-		if (linkResult === 'disabled') {
-			// 设置为disabled后返回显示状态
-			dataList.value[index].control.disabled = pass
-			return true
-		} else {
-			return pass
-		}
+  // 当前项设置了关联条件，当关联主体的值等于当前组件设定的值时
+  if (!el.config) {
+    return true;
+  }
+  const key = el.config.linkKey;
+  //liwenxuan 关联选项设置效果实现
+  //console.log("linksShow--------"+index+"--------"+JSON.stringify(el))
+  //仅第一次加载会触发，须将出现在配置条件中的表单项隐藏。
+
+  const value = el.config.linkValue;
+  const linkResult = el.config.linkResult;
+  if (key && value && type.value !== 5) {
+    const Fn = new Function("$", `return (${value})`);
+    // console.log(Fn)
+    const pass = Fn(formProps.value.model);
+    if (linkResult === "disabled") {
+      // 设置为disabled后返回显示状态
+      dataList.value[index].control.disabled = pass;
+      return true;
+    } else {
+      return pass;
     }
-    return true
-}
+  }
+  return true;
+};
 // 根据表单设置不显示指定字段
 const linksIf = (obj: FormList) => {
-    const { type } = formProps.value
-    const { config: { disabledAdd, disabledEdit, disabledDetail } = {} } = obj
-    if (type === 1) {
-		if (disabledAdd) {
-			// 编辑页 || 新增页
-			return false // 不显示
-		}
-    } else if (type === 2) {
-		// 编辑
-		if (disabledEdit) {
-			return false
-		}
-    } else if (type === 4 || type === 3) {
-		// 查看
-		if (disabledDetail) {
-			return false
-		}
+  const { type } = formProps.value;
+  const { config: { disabledAdd, disabledEdit, disabledDetail } = {} } = obj;
+  if (type === 1) {
+    if (disabledAdd) {
+      // 编辑页 || 新增页
+      return false; // 不显示
     }
-    // 如果当前字段的name值存在于表单数据的vIf中，则不显示
-    const vIf: string | string[] = formProps.value.hideField
-    if (vIf?.length > 0 && obj.name) {
-      	return vIf.indexOf(obj.name) === -1 // 存在时返回false隐藏
+  } else if (type === 2) {
+    // 编辑
+    if (disabledEdit) {
+      return false;
     }
-    return true
-}
+  } else if (type === 4 || type === 3) {
+    // 查看
+    if (disabledDetail) {
+      return false;
+    }
+  }
+  // 如果当前字段的name值存在于表单数据的vIf中，则不显示
+  const vIf: string | string[] = formProps.value.hideField;
+  if (vIf?.length > 0 && obj.name) {
+    return vIf.indexOf(obj.name) === -1; // 存在时返回false隐藏
+  }
+  return true;
+};
 //按钮点击事件
-const injectBtnEvent:any = inject(constFormBtnEvent)
+const injectBtnEvent: any = inject(constFormBtnEvent);
 const clickBtn = (control: any) => {
-	// console.log(control)
-    // 0: '提交表单',
-    // 1: '重置表单',
-    // 2: '取消返回',
-    // 3: '无动作(自定义)'
-    if (type.value !== 5) {
-		// 非设计模式才触发事件
-		injectBtnEvent && injectBtnEvent(control)
-    }
-}
+  // console.log(control)
+  // 0: '提交表单',
+  // 1: '重置表单',
+  // 2: '取消返回',
+  // 3: '无动作(自定义)'
+  if (type.value !== 5) {
+    // 非设计模式才触发事件
+    injectBtnEvent && injectBtnEvent(control);
+  }
+};
 onUnmounted(() => {
-    
-    dataList.value = {}
-    store.setActiveKey('')
-    store.setControlAttr({})
-})
-const asfs: any[] = []
-const tables: any[] = []
-onMounted(()=>{
-	// console.log('非设计模式才触发事件',props.nodeKey,"---------------->",props.purview)
-	// console.log('formGroup onMounted',props.data,dataList.value,props.tableinfo)
-
-
-	
-	setTimeout(()=>{
-		if(dataList&&Array.isArray(dataList.value)&&dataList.value.length>0){
-			for(let i = 0;i<dataList.value.length;i++){
-				if(dataList.value[i].type=="associatedForms"){
-					asfs.push(dataList.value[i])
-				}else if(dataList.value[i].type=="card"||dataList.value[i].type=="flex"||dataList.value[i].type=="div"||dataList.value[i].type=="table"){
-
-					if(dataList.value[i].type=="table"){
-						tables.push(dataList.value[i])
-					}
-					
-					dataList.value[i].list.forEach((element:any) => {
-						if(element.type=="associatedForms"){
-							asfs.push(element)
-						}
-					});
-				}else if(dataList.value[i].type=="grid"){
-					let columns = JSON.parse(JSON.stringify(dataList.value[i].columns));
-					//console.log(columns)
-					if(columns.length>0){ 
-						for(let z = 0;z<columns.length;z++){
-							for(let x = 0; x<columns[z].list.length;x++){
-								let a = JSON.parse(JSON.stringify(columns[z].list[x]));
-								//console.log(a)
-								if(a.type=="associatedForms"){
-									asfs.push(a)
-								}
-								
-							}
-						}
-					}
-				}else if(dataList.value[i].type=="tabs"){//tabs标签页有可能再嵌套一层flex或者table
-					let columns = JSON.parse(JSON.stringify(dataList.value[i].columns));
-					if(columns.length>0){
-						for(let z = 0;z<columns.length;z++){
-							for(let x = 0; x<columns[z].list.length;x++){
-								let a = JSON.parse(JSON.stringify(columns[z].list[x]));
-								//console.log(a)
-								if(a.type=="associatedForms"){
-									asfs.push(a)
-								}else if(a.type=="flex"||a.type=="table"){
-
-									if(a.type=="table"){
-										tables.push(dataList.value[i])
-									}
-
-									if(a.list.length>0){
-										for(let m = 0;m<a.list.length;m++){
-											let q = JSON.parse(JSON.stringify(a.list[m]))
-											//console.log(q)
-											if(q.type=="associatedForms"){
-												asfs.push(q)
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}	
-			}
-			/* if(asfs.length>0){
+  dataList.value = {};
+  store.setActiveKey("");
+  store.setControlAttr({});
+});
+const asfs: any[] = [];
+const tables: any[] = [];
+onMounted(() => {
+  // console.log('非设计模式才触发事件',props.nodeKey,"---------------->",props.purview)
+  // console.log('formGroup onMounted',props.data,dataList.value,props.tableinfo)
+
+  setTimeout(() => {
+    if (dataList && Array.isArray(dataList.value) && dataList.value.length > 0) {
+      for (let i = 0; i < dataList.value.length; i++) {
+        if (dataList.value[i].type == "associatedForms") {
+          asfs.push(dataList.value[i]);
+        } else if (
+          dataList.value[i].type == "card" ||
+          dataList.value[i].type == "flex" ||
+          dataList.value[i].type == "div" ||
+          dataList.value[i].type == "table"
+        ) {
+          if (dataList.value[i].type == "table") {
+            tables.push(dataList.value[i]);
+          }
+
+          dataList.value[i].list.forEach((element: any) => {
+            if (element.type == "associatedForms") {
+              asfs.push(element);
+            }
+          });
+        } else if (dataList.value[i].type == "grid") {
+          let columns = JSON.parse(JSON.stringify(dataList.value[i].columns));
+          //console.log(columns)
+          if (columns.length > 0) {
+            for (let z = 0; z < columns.length; z++) {
+              for (let x = 0; x < columns[z].list.length; x++) {
+                let a = JSON.parse(JSON.stringify(columns[z].list[x]));
+                //console.log(a)
+                if (a.type == "associatedForms") {
+                  asfs.push(a);
+                }
+              }
+            }
+          }
+        } else if (dataList.value[i].type == "tabs") {
+          //tabs标签页有可能再嵌套一层flex或者table
+          let columns = JSON.parse(JSON.stringify(dataList.value[i].columns));
+          if (columns.length > 0) {
+            for (let z = 0; z < columns.length; z++) {
+              for (let x = 0; x < columns[z].list.length; x++) {
+                let a = JSON.parse(JSON.stringify(columns[z].list[x]));
+                //console.log(a)
+                if (a.type == "associatedForms") {
+                  asfs.push(a);
+                } else if (a.type == "flex" || a.type == "table") {
+                  if (a.type == "table") {
+                    tables.push(dataList.value[i]);
+                  }
+
+                  if (a.list.length > 0) {
+                    for (let m = 0; m < a.list.length; m++) {
+                      let q = JSON.parse(JSON.stringify(a.list[m]));
+                      //console.log(q)
+                      if (q.type == "associatedForms") {
+                        asfs.push(q);
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      /* if(asfs.length>0){
 				//console.log(asfs)
 			} */
-			/* if(tables.length>0){
+      /* if(tables.length>0){
 				console.log(tables)
 			} */
-		}
-	},500)
-})
-function getNewObject(obj:any, arr:any) {
-	//console.log(obj)
-	//console.log(arr)
-	let key = arr[0];
-	let newKey = arr[1];
-	if (obj[key]) {
-		return { [newKey]: obj[key] };
-	}
-	return {};
+    }
+  }, 500);
+});
+function getNewObject(obj: any, arr: any) {
+  //console.log(obj)
+  //console.log(arr)
+  let key = arr[0];
+  let newKey = arr[1];
+  if (obj[key]) {
+    return { [newKey]: obj[key] };
+  }
+  return {};
 }
-function asfValueChanged(val:any){
-
-	
-	/* console.log("formGroup-asfValueChanged",val)
+function asfValueChanged(val: any) {
+  /* console.log("formGroup-asfValueChanged",val)
 	console.log(val.currentVal)
 	console.log(val.fillFieldsMaster)
 	console.log(val.fillFieldsChild) */
-	
 
-	//[key][props.rowIndex][key1]
-	/* console.log(val.tableFlag)
+  //[key][props.rowIndex][key1]
+  /* console.log(val.tableFlag)
 	console.log(val.key)
 	console.log(val.propsRowIndex)
 	console.log(val.key1) */
-	let fillFieldsMaster = ""
-	let masterFillRoleFieldsArray1: any[] = [];
-
-	if(val.fillFieldsMaster.length>0){
-		fillFieldsMaster = val.fillFieldsMaster.substring(0, val.fillFieldsMaster.length - 1);
-		let masterFillRoleFieldsArray  = fillFieldsMaster.split(";");
-		//console.log(masterFillRoleFieldsArray)
-		masterFillRoleFieldsArray.forEach((item:any)=>{
-			let itemArray  = item.split("_");
-			itemArray.splice(0, 1);
-			
-			itemArray = itemArray.map((item1:any) => item1.split(':').pop());
-			//console.log(itemArray)
-			masterFillRoleFieldsArray1.push(itemArray)
-
-		})
-
-	}
-
-	if(val.fillFieldsChild&&val.fillFieldsChild.length>0){
-		/* console.log(val.asfFormId)
+  let fillFieldsMaster = "";
+  let masterFillRoleFieldsArray1: any[] = [];
+
+  if (val.fillFieldsMaster.length > 0) {
+    fillFieldsMaster = val.fillFieldsMaster.substring(0, val.fillFieldsMaster.length - 1);
+    let masterFillRoleFieldsArray = fillFieldsMaster.split(";");
+    //console.log(masterFillRoleFieldsArray)
+    masterFillRoleFieldsArray.forEach((item: any) => {
+      let itemArray = item.split("_");
+      itemArray.splice(0, 1);
+
+      itemArray = itemArray.map((item1: any) => item1.split(":").pop());
+      //console.log(itemArray)
+      masterFillRoleFieldsArray1.push(itemArray);
+    });
+  }
+
+  if (val.fillFieldsChild && val.fillFieldsChild.length > 0) {
+    /* console.log(val.asfFormId)
 		console.log(val.masterOnField) */
-		let fillFieldsChild = JSON.parse(val.fillFieldsChild);
-		if (fillFieldsChild && fillFieldsChild.length > 0) {
-			fillFieldsChild = fillFieldsChild.filter((element:any)=>{
-				if(containsDangerousWords(element.filterCondition.gongShi.mathsFormula)){
-					//alert("筛选条件非法")
-					console.log("筛选条件非法===>"+element.filterCondition.conditionHtml)
-				}else{
-					return element
-				}
-			})
-		}
-		//console.log(fillFieldsChild)
-		getAsfTableFill(val.asfFormId,val.glbbddbd,val.currentVal,fillFieldsChild).then(({ data }) => {   
-			//console.log(data)
-			if(data&&data.length>0){
-				data.forEach((dataElement:any) => {
-					tables.forEach((tableItem: any) => {
-						if(dataElement.tableName==tableItem.name){
-							//console.log(formProps.value.model)
-							//console.log(tableItem)
-							//console.log(dataElement)
-							let tableName = dataElement.tableName
-							//console.log(tableName)
-							if(tableItem.list.length>0){
-								let tableRowArray: { type: any; name: any }[] = []
-								tableItem.list.forEach((listItem:any) => {
-									//console.log(listItem)
-									tableRowArray.push({
-										type:listItem.type,
-										name:listItem.name
-									}) 
-								});
-								//console.log(tableRowArray)
-								const result = generateXResult(dataElement, tableRowArray);
-								//console.log(result);
-								formProps.value.model[tableName] = result
-							}
-							
-						}
-					});
-				});
-			}
-			
-        });
-	}
-
-
-	//emits("asfValueChanged",val)
-	if(val.options.length>0){
-		//console.log(val.options)
-		if(val.options[0].fillRolesFieldsMap){
-			val.options.forEach((item:any)=>{
-				if(item.fillRolesFieldsMap.value == val.currentVal){
-					//console.log(masterFillRoleFieldsArray1)
-					if(masterFillRoleFieldsArray1.length>0){
-						masterFillRoleFieldsArray1.forEach((item1:any)=>{
-							//console.log(item.fillRolesFieldsMap)
-							//console.log(item1)
-							let x = convertObjectToArray(getNewObject(item.fillRolesFieldsMap,item1))
-							//console.log(x)
-							let strOrNumber = convertToStringOrNumber(x[1])
-							let strOrNumberOrArray
-							if(isString(strOrNumber)&&strOrNumber.includes("[")){
-								strOrNumberOrArray = convertIfValidNumberArray(strOrNumber)
-							}
-							/* console.log(strOrNumber)
+    let fillFieldsChild = JSON.parse(val.fillFieldsChild);
+    if (fillFieldsChild && fillFieldsChild.length > 0) {
+      fillFieldsChild = fillFieldsChild.filter((element: any) => {
+        if (containsDangerousWords(element.filterCondition.gongShi.mathsFormula)) {
+          //alert("筛选条件非法")
+          console.log("筛选条件非法===>" + element.filterCondition.conditionHtml);
+        } else {
+          return element;
+        }
+      });
+    }
+    //console.log(fillFieldsChild)
+    getAsfTableFill(val.asfFormId, val.glbbddbd, val.currentVal, fillFieldsChild).then(
+      ({ data }) => {
+        //console.log(data)
+        if (data && data.length > 0) {
+          data.forEach((dataElement: any) => {
+            tables.forEach((tableItem: any) => {
+              if (dataElement.tableName == tableItem.name) {
+                //console.log(formProps.value.model)
+                //console.log(tableItem)
+                //console.log(dataElement)
+                let tableName = dataElement.tableName;
+                //console.log(tableName)
+                if (tableItem.list.length > 0) {
+                  let tableRowArray: { type: any; name: any }[] = [];
+                  tableItem.list.forEach((listItem: any) => {
+                    //console.log(listItem)
+                    tableRowArray.push({
+                      type: listItem.type,
+                      name: listItem.name,
+                    });
+                  });
+                  //console.log(tableRowArray)
+                  const result = generateXResult(dataElement, tableRowArray);
+                  //console.log(result);
+                  formProps.value.model[tableName] = result;
+                }
+              }
+            });
+          });
+        }
+      }
+    );
+  }
+
+  //emits("asfValueChanged",val)
+  if (val.options.length > 0) {
+    //console.log(val.options)
+    if (val.options[0].fillRolesFieldsMap) {
+      val.options.forEach((item: any) => {
+        if (item.fillRolesFieldsMap.value == val.currentVal) {
+          //console.log(masterFillRoleFieldsArray1)
+          if (masterFillRoleFieldsArray1.length > 0) {
+            masterFillRoleFieldsArray1.forEach((item1: any) => {
+              //console.log(item.fillRolesFieldsMap)
+              //console.log(item1)
+              let x = convertObjectToArray(getNewObject(item.fillRolesFieldsMap, item1));
+              //console.log(x)
+              let strOrNumber = convertToStringOrNumber(x[1]);
+              let strOrNumberOrArray;
+              if (isString(strOrNumber) && strOrNumber.includes("[")) {
+                strOrNumberOrArray = convertIfValidNumberArray(strOrNumber);
+              }
+              /* console.log(strOrNumber)
 							console.log(strOrNumberOrArray) */
-							
-							/* console.log(x[1])
+
+              /* console.log(x[1])
 							console.log(strOrNumberOrArray)
 							console.log(formProps.value.model[x[0]]) */
-							if(strOrNumberOrArray){
-								formProps.value.model[x[0]] = strOrNumberOrArray
-							}else{
-								/* console.log(x)
+              if (strOrNumberOrArray) {
+                formProps.value.model[x[0]] = strOrNumberOrArray;
+              } else {
+                /* console.log(x)
 								console.log(formProps.value.model)
 								console.log(val.tableFlag)
 								console.log(val.key)
 								console.log(val.propsRowIndex)
 								console.log(val.key1) */
-								
-								if(val.tableFlag){
-									//console.log(formProps.value.model)
-									let urlArr = findPathInObject(formProps.value.model,x[0])
-									//console.log(urlArr)
-									if(urlArr[0]==x[0]){
-										formProps.value.model[x[0]] = strOrNumber
-									}else{
-										formProps.value.model[val.key][val.propsRowIndex][x[0]] = strOrNumber
-									}
-									
-								}else{
-									formProps.value.model[x[0]] = strOrNumber
-								}
-								
-							}
-							
-							//console.log(formProps.value.model[x[0]])
-							
-						})
-					}
-					
 
-				}
+                if (val.tableFlag) {
+                  //console.log(formProps.value.model)
+                  let urlArr = findPathInObject(formProps.value.model, x[0]);
+                  //console.log(urlArr)
+                  if (urlArr[0] == x[0]) {
+                    formProps.value.model[x[0]] = strOrNumber;
+                  } else {
+                    formProps.value.model[val.key][val.propsRowIndex][x[0]] = strOrNumber;
+                  }
+                } else {
+                  formProps.value.model[x[0]] = strOrNumber;
+                }
+              }
 
-			})
-		}
-	}
+              //console.log(formProps.value.model[x[0]])
+            });
+          }
+        }
+      });
+    }
+  }
 }
 
 function findPathInObject(obj: any, target: string): string[] {
-    function search(obj: any, target: string, path: string[] = []): string[] | null {
-        if (typeof obj === "object" && obj!== null) {
-            for (let key in obj) {
-                let newPath = path.concat(key);
-                if (key === target) {
-                    return newPath;
-                } else if (Array.isArray(obj[key])) {
-                    for (let i = 0; i < obj[key].length; i++) {
-                        let result = search(obj[key][i], target, newPath);
-                        if (result) {
-                            return result;
-                        }
-                    }
-                } else if (typeof obj[key] === "object" && obj[key]!== null) {
-                    let result = search(obj[key], target, newPath);
-                    if (result) {
-                        return result;
-                    }
-                }
+  function search(obj: any, target: string, path: string[] = []): string[] | null {
+    if (typeof obj === "object" && obj !== null) {
+      for (let key in obj) {
+        let newPath = path.concat(key);
+        if (key === target) {
+          return newPath;
+        } else if (Array.isArray(obj[key])) {
+          for (let i = 0; i < obj[key].length; i++) {
+            let result = search(obj[key][i], target, newPath);
+            if (result) {
+              return result;
             }
+          }
+        } else if (typeof obj[key] === "object" && obj[key] !== null) {
+          let result = search(obj[key], target, newPath);
+          if (result) {
+            return result;
+          }
         }
-        return null;
+      }
     }
+    return null;
+  }
 
-    return search(obj, target) || [];
+  return search(obj, target) || [];
 }
 
 interface DetailObject {
-    [key: string]: any
+  [key: string]: any;
 }
 
 interface TableRow {
-    type: string;
-    name: string;
+  type: string;
+  name: string;
 }
 
-function generateXResult(dataElement: { tableDetail: DetailObject[] }, tableRowArray: TableRow[]): DetailObject[] {
-    const xResult: DetailObject[] = [];
-    const propertyNames = tableRowArray.map(item => item.name);
-    for (const detail of dataElement.tableDetail) {
-        const obj: DetailObject = {};
-        propertyNames.forEach(name => {
-			let strOrNumber = convertToStringOrNumber(detail[name])
-			let strOrNumberOrArray
-			if(isString(strOrNumber)&&strOrNumber.includes("[")){
-				strOrNumberOrArray = convertIfValidNumberArray(strOrNumber)
-			}
-			if(strOrNumberOrArray){
-				obj[name] = strOrNumberOrArray
-			}else{
-				obj[name] = strOrNumber
-			}
-        });
-        xResult.push(obj);
-    }
-    return xResult;
+function generateXResult(
+  dataElement: { tableDetail: DetailObject[] },
+  tableRowArray: TableRow[]
+): DetailObject[] {
+  const xResult: DetailObject[] = [];
+  const propertyNames = tableRowArray.map((item) => item.name);
+  for (const detail of dataElement.tableDetail) {
+    const obj: DetailObject = {};
+    propertyNames.forEach((name) => {
+      let strOrNumber = convertToStringOrNumber(detail[name]);
+      let strOrNumberOrArray;
+      if (isString(strOrNumber) && strOrNumber.includes("[")) {
+        strOrNumberOrArray = convertIfValidNumberArray(strOrNumber);
+      }
+      if (strOrNumberOrArray) {
+        obj[name] = strOrNumberOrArray;
+      } else {
+        obj[name] = strOrNumber;
+      }
+    });
+    xResult.push(obj);
+  }
+  return xResult;
 }
-function getAsfTableFill(asfFormId:any,glbbddbd:any,currentVal:any,fillFieldsChild:any){
-	/* console.log(asfFormId)
+function getAsfTableFill(
+  asfFormId: any,
+  glbbddbd: any,
+  currentVal: any,
+  fillFieldsChild: any
+) {
+  /* console.log(asfFormId)
 	console.log(glbbddbd)
 	console.log(fillFieldsChild) */
-	/* asfFormId = JSON.stringify(asfFormId)
+  /* asfFormId = JSON.stringify(asfFormId)
 	glbbddbd = JSON.stringify(glbbddbd)
 	currentVal = JSON.stringify(currentVal) */
-	fillFieldsChild = JSON.stringify(fillFieldsChild)
-	return request({ 
-		url: '/javasys/lowCode/AssociatedForms/getAsfTableFill',
-		method: 'post',
-		data: {
-			asfFormId:asfFormId,
-			glbbddbd:glbbddbd,
-			currentVal:currentVal,
-			fillFieldsChild:fillFieldsChild,
-		},
-	});
+  fillFieldsChild = JSON.stringify(fillFieldsChild);
+  return request({
+    url: "/javasys/lowCode/AssociatedForms/getAsfTableFill",
+    method: "post",
+    data: {
+      asfFormId: asfFormId,
+      glbbddbd: glbbddbd,
+      currentVal: currentVal,
+      fillFieldsChild: fillFieldsChild,
+    },
+  });
 }
 function containsDangerousWords(str: string | undefined): boolean {
-	if (str === undefined) {
-		return false;
-	}
-	const dangerousWords = new Set<string>([
-		"drop",
-		"table",
-		"where",
-		"select",
-		"insert",
-		"update",
-		"delete",
-		"and",
-		"or",
-		"union",
-		"order by",
-		"group by",
-		"having",
-		"exec",
-		"execute",
-	]);
-	const words = str.split(" ");
-	for (const word of words) {
-		if (dangerousWords.has(word.toLowerCase())) {
-		return true;
-		}
-	}
-	return false;
+  if (str === undefined) {
+    return false;
+  }
+  const dangerousWords = new Set<string>([
+    "drop",
+    "table",
+    "where",
+    "select",
+    "insert",
+    "update",
+    "delete",
+    "and",
+    "or",
+    "union",
+    "order by",
+    "group by",
+    "having",
+    "exec",
+    "execute",
+  ]);
+  const words = str.split(" ");
+  for (const word of words) {
+    if (dangerousWords.has(word.toLowerCase())) {
+      return true;
+    }
+  }
+  return false;
 }
 function isString(value: any): value is string {
-	return typeof value === 'string';
+  return typeof value === "string";
 }
 function convertIfValidNumberArray(str: string): number[] | null {
-	const regex = /^\[(\d+(,\d+)*)?\]$/;
-	if (regex.test(str)) {
-		const numbersStr = str.slice(1, -1);
-		if (numbersStr.length === 0) {
-		return [];
-		}
-		return numbersStr.split(',').map(item => Number(item));
-	} else {
-		return null;
-	}
+  const regex = /^\[(\d+(,\d+)*)?\]$/;
+  if (regex.test(str)) {
+    const numbersStr = str.slice(1, -1);
+    if (numbersStr.length === 0) {
+      return [];
+    }
+    return numbersStr.split(",").map((item) => Number(item));
+  } else {
+    return null;
+  }
 }
 function convertToStringOrNumber(str: string): number | string {
-    const isOnlyNumbers = /^\d+$/.test(str);
-    return isOnlyNumbers? Number(str) : str;
+  const isOnlyNumbers = /^\d+$/.test(str);
+  return isOnlyNumbers ? Number(str) : str;
 }
-function convertObjectToArray(obj:any) {
-	for (let key in obj) {
-		return [key, obj[key]];
-	}
-	return [];
+function convertObjectToArray(obj: any) {
+  for (let key in obj) {
+    return [key, obj[key]];
+  }
+  return [];
 }
 const getFormItemLableStyle = (ele: any) => {
-    if(ele?.labelStyle){ 
+  if (ele?.labelStyle) {
     //   console.log("返回栅格宽度3",AnalysisCss(ele))
-    	return AnalysisCss(ele?.labelStyle)
-    }
-}
+    return AnalysisCss(ele?.labelStyle);
+  }
+};
 
-function optionsValue3Get1(data: any,fieldName: string){
-	//console.log("formGroup---optionsValue3Get1")
-	emits('optionsValue3Get2',data,fieldName)
+function optionsValue3Get1(data: any, fieldName: string) {
+  //console.log("formGroup---optionsValue3Get1")
+  emits("optionsValue3Get2", data, fieldName);
 }
 
-
-
-function optionsValue3GetTable(data: any,fieldName: string){
-	/* console.log("formGroup---optionsValue3GetTable")
+function optionsValue3GetTable(data: any, fieldName: string) {
+  /* console.log("formGroup---optionsValue3GetTable")
 	console.log(data)
 	console.log(fieldName) */
-	emits('optionsValue3Get2',data,fieldName)
+  emits("optionsValue3Get2", data, fieldName);
 }
 /* 
 	
 */
 </script>
 <template>
-	<draggable
-		itemKey="id"
-		:list="dataList"
-		name="fade"
-		class="drag"
-		v-bind="{
-		group: 'form',
-		ghostClass: 'ghost',
-		animation: 200,
-		handle: '.drag-move',
-		disabled: type !== 5
-		}"
-		@add="draggableAdd"
-	>
-	
-		<template #item="{ element, index }">
-			
-			<div
-				class="group"
-				:class="{
-				['group-' + element.type]: true,
-				active: activeKey === getGroupName(element)
-				}"
-				:style="getFormItemStyle(element)"
-				@click.stop="groupClick(element)"
-				v-show="linksShow(element, index)"
-				v-if="linksIf(element)"
-			>
-		
-				
-			
-				<!--选项卡组件-->
-				<template v-if="element.type === 'tabs'">
-					<div class="form-tabs">
-						<el-tabs
-						v-bind="element.control"
-						:class="[element.config?.className]"
-						>
-						<el-tab-pane
-							v-for="(item, tIndex) in element.columns"
-							:label="item.label"
-							:key="tIndex"
-						>
-							<form-group :data="item.list" data-type="not-nested" />
-						</el-tab-pane>
-						</el-tabs>
-					</div>
-				</template>
-				<!--标题组件-->
-				<template v-else-if="element.type === 'title'">
-					<div
-						class="title"
-						:class="[element.config.className]"
-						v-bind="element.control"
-						:style="getFormItemLableStyle(element.styles)"
-					>
-						<span  v-html="element.control.modelValue"></span>
-						<Tooltips
-							:content="element.config.help"
-							v-if="element.config.help"
-						/>
-					</div>
-				</template>
-				<!--文字组件-->
-				<template v-else-if="element.type === 'txt'">
-					<div
-						v-bind="element.control"
-						:class="[element.config.className]"
-						v-html="element.control.modelValue"
-					>
-					</div>
-				</template>
-				<!--表格组件-->
-				<template v-else-if="element.type === 'table'">
-					
-					<div class="form-table" v-if="type === 5">
-						<!-- <form-group :data="element.list" data-type="not-nested" /> -->
-						<form-group :data="element.list" data-type="not-table" />
-					</div>
-					
-					<child-table v-else :data="element" @asf-value-changed="asfValueChanged" @optionsValue3GetTable = "optionsValue3GetTable"/>
-				</template>
-				<!--格栅布局-->
-				<template v-else-if="element.type === 'grid'">
-					<el-row class="form-row" :style="type === 5?'padding: 0 0 20px 0;':''" :class="[element.className]">
-						<el-col
-							class="form-col"
-							:class="{
-								'active-col': activeKey === getGroupName(col),
-								[col.className]: col.className
-							}"
-							v-bind="col.attr"
-							v-for="(col, i) in element.columns"
-							:key="i"
-							@click.stop="groupClick(col, 'gridChild')"
-						>
-							<form-group :data="col.list" data-type="not-nested" />
-							<div class="drag-control" v-if="type === 5">
-								<div class="item-control">
-								<i
-									class="icon-del"
-									@click.stop="click('delGridChild', i as number, element.columns)"
-								>
-								</i>
-								</div>
-							</div>
-						</el-col>
-					</el-row>
-				</template>
-				<!--卡片布局-->
-				<template v-else-if="element.type === 'card'">
-					<el-collapse model-value="1">
-						<el-collapse-item :title="element.item.label" name="1">
-							<template #title v-if="element.help">
-								{{ element.item.label }}
-								<Tooltips :content="element.help" />
-							</template>
-							<form-group :data="element.list" data-type="not-nested" />
-						</el-collapse-item>
-					</el-collapse>
-				</template>
-				<!--分割线-->
-				<template v-else-if="element.type === 'divider'">
-					<el-divider v-bind="element.control">{{ element.item && element.item.label }}</el-divider>
-				</template>
-				<!--div容器-->
-				<template v-else-if="element.type === 'div'">
-					<div
-						class="div-layout"
-						v-bind="element.control"
-						:class="{
-						[element.className]: element.className,
-						inline: element.config?.inline,
-						[element.config?.textAlign]: element.config?.textAlign
-						}"
-					>
-						<form-group :data="element.list" data-type="not-nested" />
-					</div>
-				</template>
-				<!--弹性布局-->
-				<template v-else-if="element.type === 'flex'">
-					<!-- <form-group
+  <draggable
+    itemKey="id"
+    :list="dataList"
+    name="fade"
+    class="drag"
+    v-bind="{
+      group: 'form',
+      ghostClass: 'ghost',
+      animation: 200,
+      handle: '.drag-move',
+      disabled: type !== 5,
+    }"
+    @add="draggableAdd"
+  >
+    <template #item="{ element, index }">
+      <div
+        class="group"
+        :class="{
+          ['group-' + element.type]: true,
+          active: activeKey === getGroupName(element),
+        }"
+        :style="getFormItemStyle(element)"
+        @click.stop="groupClick(element)"
+        v-show="linksShow(element, index)"
+        v-if="linksIf(element)"
+      >
+        <!--选项卡组件-->
+        <template v-if="element.type === 'tabs'">
+          <div class="form-tabs">
+            <el-tabs v-bind="element.control" :class="[element.config?.className]">
+              <el-tab-pane
+                v-for="(item, tIndex) in element.columns"
+                :label="item.label"
+                :key="tIndex"
+              >
+                <form-group :data="item.list" data-type="not-nested" />
+              </el-tab-pane>
+            </el-tabs>
+          </div>
+        </template>
+        <!--标题组件-->
+        <template v-else-if="element.type === 'title'">
+          <div
+            class="title"
+            :class="[element.config.className]"
+            v-bind="element.control"
+            :style="getFormItemLableStyle(element.styles)"
+          >
+            <span v-html="element.control.modelValue"></span>
+            <Tooltips :content="element.config.help" v-if="element.config.help" />
+          </div>
+        </template>
+        <!--文字组件-->
+        <template v-else-if="element.type === 'txt'">
+          <div
+            v-bind="element.control"
+            :class="[element.config.className]"
+            v-html="element.control.modelValue"
+          ></div>
+        </template>
+        <!--表格组件-->
+        <template v-else-if="element.type === 'table'">
+          <div class="form-table" v-if="type === 5">
+            <!-- <form-group :data="element.list" data-type="not-nested" /> -->
+            <form-group :data="element.list" data-type="not-table" />
+          </div>
+
+          <child-table
+            v-else
+            :data="element"
+            @asf-value-changed="asfValueChanged"
+            @optionsValue3GetTable="optionsValue3GetTable"
+          />
+        </template>
+        <!--格栅布局-->
+        <template v-else-if="element.type === 'grid'">
+          <el-row
+            class="form-row"
+            :style="type === 5 ? 'padding: 0 0 20px 0;' : ''"
+            :class="[element.className]"
+          >
+            <el-col
+              class="form-col"
+              :class="{
+                'active-col': activeKey === getGroupName(col),
+                [col.className]: col.className,
+              }"
+              v-bind="col.attr"
+              v-for="(col, i) in element.columns"
+              :key="i"
+              @click.stop="groupClick(col, 'gridChild')"
+            >
+              <form-group :data="col.list" data-type="not-nested" />
+              <div class="drag-control" v-if="type === 5">
+                <div class="item-control">
+                  <i
+                    class="icon-del"
+                    @click.stop="click('delGridChild', i as number, element.columns)"
+                  >
+                  </i>
+                </div>
+              </div>
+            </el-col>
+          </el-row>
+        </template>
+        <!--卡片布局-->
+        <template v-else-if="element.type === 'card'">
+          <el-collapse model-value="1">
+            <el-collapse-item :title="element.item.label" name="1">
+              <template #title v-if="element.help">
+                {{ element.item.label }}
+                <Tooltips :content="element.help" />
+              </template>
+              <form-group :data="element.list" data-type="not-nested" />
+            </el-collapse-item>
+          </el-collapse>
+        </template>
+        <!--分割线-->
+        <template v-else-if="element.type === 'divider'">
+          <el-divider v-bind="element.control">{{
+            element.item && element.item.label
+          }}</el-divider>
+        </template>
+        <!--div容器-->
+        <template v-else-if="element.type === 'div'">
+          <div
+            class="div-layout"
+            v-bind="element.control"
+            :class="{
+              [element.className]: element.className,
+              inline: element.config?.inline,
+              [element.config?.textAlign]: element.config?.textAlign,
+            }"
+          >
+            <form-group :data="element.list" data-type="not-nested" />
+          </div>
+        </template>
+        <!--弹性布局-->
+        <template v-else-if="element.type === 'flex'">
+          <!-- <form-group
 						:data="element.list"
 						data-type="not-nested"
 						v-if="type === 5"
 					/> -->
-					<form-group
-						:data="element.list"
-						data-type="not-flex"
-						v-if="type === 5"
-					/>
-					<flex-box :data="element" v-else />
-					<el-button
-						style="position: relative; top: -28px; left: 10px"
-						v-if="element.config.addBtnText && type === 5"
-						size="small"
-					>
-						{{ element.config.addBtnText }}
-					</el-button>
-				</template>
-				<!--按钮-->
-				<template v-else-if="element.type === 'button'">
-					<div
-						:class="[element.config?.className]"
-						:style="{ 'text-align': element.config?.textAlign }"
-					>
-						<el-button
-						v-bind="element.control"
-						@click="clickBtn(element.control)"
-						color="#626aef"
-						>
-						<td :style="getFormItemLableStyle(element.styles)">{{ element.control?.label }}</td>
-						</el-button>
-					</div>
-				</template>
-				<!-- 创建人
+          <form-group :data="element.list" data-type="not-flex" v-if="type === 5" />
+          <flex-box :data="element" v-else />
+          <el-button
+            style="position: relative; top: -28px; left: 10px"
+            v-if="element.config.addBtnText && type === 5"
+            size="small"
+          >
+            {{ element.config.addBtnText }}
+          </el-button>
+        </template>
+        <!--按钮-->
+        <template v-else-if="element.type === 'button'">
+          <div
+            :class="[element.config?.className]"
+            :style="{ 'text-align': element.config?.textAlign }"
+          >
+            <el-button
+              v-bind="element.control"
+              @click="clickBtn(element.control)"
+              color="#626aef"
+            >
+              <td :style="getFormItemLableStyle(element.styles)">
+                {{ element.control?.label }}
+              </td>
+            </el-button>
+          </div>
+        </template>
+        <!-- 创建人
 				<FounderForm v-else-if="element.type === 'founder' " :data="element" :tablekey="props.tableinfo" :numrun="props.numrun" />
 				创建时间
 				<FounderTime  v-else-if="element.type === 'founderTime' " :data="element" :tablekey="props.tableinfo" :numrun="props.numrun" />
@@ -962,39 +948,43 @@ function optionsValue3GetTable(data: any,fieldName: string){
 				<OrgCitys v-else-if="element.type === 'organization' " :data="element" />
 				<UrlLink v-else-if="element.type === 'urllink' && type != 4" :data="element" />
 				<SerialNumber  v-else-if="element.type === 'serialNumber' && type != 4" :data="element" :tablekey="props.tableinfo" :numrun="props.numrun" /> -->
-				<!--其他组件-->
-				<FormItem v-else :data="element" @optionsValue3Get1="optionsValue3Get1" :purview="props.purview" :node-key="props.nodeKey" :tablekey="props.tableinfo" :numrun="props.numrun" @asf-value-changed="asfValueChanged" />
-				
-				
-				<!--组件设计外功能框架-->
-				<template v-if="type === 5">
-					<div class="drag-control">
-						<div class="item-control">
-							<i
-								class="icon-plus"
-								@click.stop="click('gridAdd', index, element)"
-								v-if="state.gridAdd"
-								title="添加列"
-							></i>
-							<i
-								class="icon-clone"
-								@click.stop="click('clone', index, element)"
-								v-if="state.clone"
-								title="克隆"
-							></i>
-							<i class="icon-del" @click.stop="click('del', index)"></i>
-						</div>
-						<div class="drag-move icon-move"></div>
-					</div>
-					<!-- <div class="tooltip" style="display: black;">{{ element.name }}</div> -->
-					<div class="tooltip" style="display: black;"></div>
-				</template>
-
-			</div>
-		</template>
-  	</draggable>
+        <!--其他组件-->
+        <FormItem
+          v-else
+          :data="element"
+          @optionsValue3Get1="optionsValue3Get1"
+          :purview="props.purview"
+          :node-key="props.nodeKey"
+          :tablekey="props.tableinfo"
+          :numrun="props.numrun"
+          @asf-value-changed="asfValueChanged"
+        />
+
+        <!--组件设计外功能框架-->
+        <template v-if="type === 5">
+          <div class="drag-control">
+            <div class="item-control">
+              <i
+                class="icon-plus"
+                @click.stop="click('gridAdd', index, element)"
+                v-if="state.gridAdd"
+                title="添加列"
+              ></i>
+              <i
+                class="icon-clone"
+                @click.stop="click('clone', index, element)"
+                v-if="state.clone"
+                title="克隆"
+              ></i>
+              <i class="icon-del" @click.stop="click('del', index)"></i>
+            </div>
+            <div class="drag-move icon-move"></div>
+          </div>
+          <!-- <div class="tooltip" style="display: black;">{{ element.name }}</div> -->
+          <div class="tooltip" style="display: black"></div>
+        </template>
+      </div>
+    </template>
+  </draggable>
 </template>
-<style  lang='scss' scoped>
-
-</style>
-
+<style lang="scss" scoped></style>
diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue
index 54508b8..9193320 100644
--- a/src/components/DesignForm/public/form/formItem.vue
+++ b/src/components/DesignForm/public/form/formItem.vue
@@ -3,1249 +3,1389 @@
 @ 时间: 2023-07-14 08:50:36
 @ 备注: 表单项目
 -->
-<script lang='ts' setup>
+<script lang="ts" setup>
+import { inject, onMounted, computed, watch, onUnmounted, markRaw } from "vue";
+import { Md5 } from "ts-md5";
+import { ElMessage } from "element-plus";
+import Tooltips from "@/components/DesignForm/tooltip.vue";
+import TinymceEdit from "./tinymce.vue";
+import { FormItem, FormList } from "@/api/DesignForm/types";
 import {
-    inject,
-    onMounted,
-    computed,
-    watch,
-    onUnmounted,
-    markRaw
-} from 'vue'
-import { Md5 } from 'ts-md5'
-import { ElMessage } from 'element-plus'
-import Tooltips from '@/components/DesignForm/tooltip.vue'
-import TinymceEdit from './tinymce.vue'
-import { FormItem, FormList } from '@/api/DesignForm/types'
-import { 
-	formatNumber, 
-	objectToArray,
-	constControlChange,
-    constSetFormOptions,
-    constFormProps,
-    constGetControlByName
-} from '@/api/DesignForm/utils'
-import validate from '@/api/DesignForm/validate'
-import ExpandUser from '@/components/DesignForm/public/expand/user.vue'
-import OrgCentent from '@/components/DesignForm/public/expand/org.vue' 
-import LokOrgCentent from '@/widget/org/cont.vue' 
+  formatNumber,
+  objectToArray,
+  constControlChange,
+  constSetFormOptions,
+  constFormProps,
+  constGetControlByName,
+} from "@/api/DesignForm/utils";
+import validate from "@/api/DesignForm/validate";
+import ExpandUser from "@/components/DesignForm/public/expand/user.vue";
+import OrgCentent from "@/components/DesignForm/public/expand/org.vue";
+import LokOrgCentent from "@/widget/org/cont.vue";
 
-import DigitpagePage from '@/components/DesignForm/public/expand/digitpage.vue'
-import LowcodeImagePage from '@/components/DesignForm/public/expand/lowcodeImage.vue'
+import DigitpagePage from "@/components/DesignForm/public/expand/digitpage.vue";
+import LowcodeImagePage from "@/components/DesignForm/public/expand/lowcodeImage.vue";
 
 // import LowcodeImagePage from '@/widget/lowcodeimage/index.vue'
 
+import UploadPage from "@/components/DesignForm/public/expand/uploadPage.vue";
+import UploadPageList from "@/components/DesignForm/public/expand/uploadPageList.vue";
+import OrgCitys from "@/components/DesignForm/public/expand/orgCitys.vue";
+import DatePickerPage from "@/components/DesignForm/public/expand/datePicker.vue";
+import CascaderPage from "@/components/DesignForm/public/expand/cascader.vue";
+import AssociatedForms from "@/widget/associatedforms/index.vue";
 
-import UploadPage from '@/components/DesignForm/public/expand/uploadPage.vue'
-import UploadPageList from '@/components/DesignForm/public/expand/uploadPageList.vue'
-import OrgCitys from '@/components/DesignForm/public/expand/orgCitys.vue'
-import DatePickerPage from '@/components/DesignForm/public/expand/datePicker.vue'
-import CascaderPage from '@/components/DesignForm/public/expand/cascader.vue'
-import AssociatedForms from '@/widget/associatedforms/index.vue'
-
-
-
-import AKSelect from './select.vue'
-import { uploadUrl,getRequest } from '@/api/DesignForm'
-import formatResult from '@/utils/DesignForm/formatResult'
-import { debounce } from '@/utils/DesignForm/index'
-import { useRoute } from 'vue-router'
-
-import { json2string,objToStringify,string2json,stringToObj } from '@/utils/DesignForm/form'
+import AKSelect from "./select.vue";
+import { uploadUrl, getRequest } from "@/api/DesignForm";
+import formatResult from "@/utils/DesignForm/formatResult";
+import { debounce } from "@/utils/DesignForm/index";
+import { useRoute } from "vue-router";
 
+import {
+  json2string,
+  objToStringify,
+  string2json,
+  stringToObj,
+} from "@/utils/DesignForm/form";
 
-import TextImg from "@/assets/image/tinymce.png"
+import TextImg from "@/assets/image/tinymce.png";
 
-import { AnalysisCss,AnalysisInputCss } from '@/components/DesignForm/public/form/calculate/cssInfo.ts'
+import {
+  AnalysisCss,
+  AnalysisInputCss,
+} from "@/components/DesignForm/public/form/calculate/cssInfo.ts";
 
-import request from '@/utils/request';
+import request from "@/utils/request";
 
-import { getgovcont } from '@/api/hr/org/index'
+import { getgovcont } from "@/api/hr/org/index";
 
 const props = withDefaults(
-    defineProps<{
-		data: FormList
-		modelValue?: any // 子表和弹性布局时时有传
-		tProp?: string // 子表时的form-item的prop值，用于子表校验用
-		nodeKey?:string
-		purview?:any[]
-		optionsValue3Get1?:any
-		tablekey?:any
-		numrun?:any
-		rowIndex?:any
-    }>(),
-    {}
-)
+  defineProps<{
+    data: FormList;
+    modelValue?: any; // 子表和弹性布局时时有传
+    tProp?: string; // 子表时的form-item的prop值，用于子表校验用
+    nodeKey?: string;
+    purview?: any[];
+    optionsValue3Get1?: any;
+    tablekey?: any;
+    numrun?: any;
+    rowIndex?: any;
+  }>(),
+  {}
+);
 const emits = defineEmits<{
-    (e: 'update:modelValue', val: any): void
-	(e: 'optionsValue3Get1', val: any,fieldName: string): void
-	(e: 'asfValueChanged', val: any): void
-}>()
-const route = useRoute()
-const formProps = inject(constFormProps, {}) as any
+  (e: "update:modelValue", val: any): void;
+  (e: "optionsValue3Get1", val: any, fieldName: string): void;
+  (e: "asfValueChanged", val: any): void;
+}>();
+const route = useRoute();
+const formProps = inject(constFormProps, {}) as any;
 const type = computed(() => {
-    return formProps.value.type
-})
+  return formProps.value.type;
+});
 const config = computed(() => {
-    return props.data.config || {}
-})
+  return props.data.config || {};
+});
 //组件css部分
 const configStyle = computed(() => {
-    return props.data.styles || {}
-})
+  return props.data.styles || {};
+});
 
 const control = computed(() => {
-	if(props.data.type == "upload"){
-		props.data.control.action = uploadUrl
-	}
-    return props.data.control
-	// return props.data
-})
-const 	options = ref(props.data.options)
+  if (props.data.type == "upload") {
+    props.data.control.action = uploadUrl;
+  }
+  return props.data.control;
+  // return props.data
+});
+const options = ref(props.data.options);
 //console.log("FormItem*********************************************************"+JSON.stringify(props.data))
-const changeEvent = inject(constControlChange, '') as any
+const changeEvent = inject(constControlChange, "") as any;
 const updateModel = (val: any) => {
-	let controlAttribute = ""
-	if(props.data.control){
-		if(props.data.control.type){
-			controlAttribute = props.data.control.type
-		}
-	}
-    changeEvent &&
+  let controlAttribute = "";
+  if (props.data.control) {
+    if (props.data.control.type) {
+      controlAttribute = props.data.control.type;
+    }
+  }
+  changeEvent &&
     changeEvent({
-        key: props.data.name,
-        value: val,
-        data: props.data,
-        tProp: props.tProp,
-		type: props.data.type,
-		attribute: controlAttribute
-    })
-}
+      key: props.data.name,
+      value: val,
+      data: props.data,
+      tProp: props.tProp,
+      type: props.data.type,
+      attribute: controlAttribute,
+    });
+};
 const value = computed({
-    get() {
-		if (props.tProp) {
-			// 表格和弹性布局
-			return props.modelValue
-		} else {
-			if(props.data.type == "checkbox"){
-				if (formProps.value.model[props.data.name] == null || formProps.value.model[props.data.name] == ""){
-					// formProps.value.model[props.data.name] = []
-					// return formProps.value.model[props.data.name]
-					return []
-				}else{
-					return formProps.value.model[props.data.name]
-				}
-			}else{
-				return formProps.value.model[props.data.name]
-			}
-			
-		}
-    },
-    set(newVal: any) {
-		if (props.tProp) {
-			emits('update:modelValue', newVal)
-		}
-		updateModel(newVal)
+  get() {
+    if (props.tProp) {
+      // 表格和弹性布局
+      return props.modelValue;
+    } else {
+      if (props.data.type == "checkbox") {
+        if (
+          formProps.value.model[props.data.name] == null ||
+          formProps.value.model[props.data.name] == ""
+        ) {
+          // formProps.value.model[props.data.name] = []
+          // return formProps.value.model[props.data.name]
+          return [];
+        } else {
+          return formProps.value.model[props.data.name];
+        }
+      } else {
+        return formProps.value.model[props.data.name];
+      }
+    }
+  },
+  set(newVal: any) {
+    if (props.tProp) {
+      emits("update:modelValue", newVal);
     }
-})
+    updateModel(newVal);
+  },
+});
 // 选择数据转换，默认尝试转数字
 const transformOption = (val: string | number, type?: string) => {
-    switch (config.value.transformData || type) {
-		case 'none':
-				return val
-		case 'string':
-			try {
-				return val.toString()
-			} catch (e) {
-				return val
-			}
-    }
-    return formatNumber(val)
- }
+  switch (config.value.transformData || type) {
+    case "none":
+      return val;
+    case "string":
+      try {
+        return val.toString();
+      } catch (e) {
+        return val;
+      }
+  }
+  return formatNumber(val);
+};
 
 // 当通用修改属性功能添加新字段时，数组更新但toRefs没更新
-const getControlByName = inject(constGetControlByName) as any
+const getControlByName = inject(constGetControlByName) as any;
 const sourceFunKey = computed(() => {
-    const iReg = new RegExp('(?<=\\${)(.*?)(?=})', 'g')
-    //const iReg = new RegExp('\\${.*?}', 'g') // 结果会包含开头和结尾=>${name}
-    const apiUrl = config.value.optionsFun
-    const replace = apiUrl?.match(iReg)
-    return replace && replace[0]
-})
+  const iReg = new RegExp("(?<=\\${)(.*?)(?=})", "g");
+  //const iReg = new RegExp('\\${.*?}', 'g') // 结果会包含开头和结尾=>${name}
+  const apiUrl = config.value.optionsFun;
+  const replace = apiUrl?.match(iReg);
+  return replace && replace[0];
+});
 const getLabel = (ele: FormItem) => {
-    const showColon = formProps.value.showColon ? '：' : ''
-    if (ele) {
-    	return ele.showLabel ? '' : ele.label + showColon
-    } else {
-      	return ''
-    }
-}
+  const showColon = formProps.value.showColon ? "：" : "";
+  if (ele) {
+    return ele.showLabel ? "" : ele.label + showColon;
+  } else {
+    return "";
+  }
+};
 const currentComponent = computed(() => {
-    if (props.data.type === 'component') {
-      	// 自定义组件
-      	return config.value.componentName
-    }
-    if (props.data.type === 'expand-user') {
-      	return markRaw(ExpandUser)
-    }
-	if (props.data.type === 'orgCentent') {
-      	return markRaw(OrgCentent)
-    }
-	if (props.data.type === 'digitpage') {
-      	return markRaw(DigitpagePage)
-    }
-	if (props.data.type === 'lowcodeImage') {
-      	return markRaw(LowcodeImagePage)
-    }
-	if (props.data.type === 'upload') {
-      	return markRaw(UploadPage)
+  if (props.data.type === "component") {
+    // 自定义组件
+    return config.value.componentName;
+  }
+  if (props.data.type === "expand-user") {
+    return markRaw(ExpandUser);
+  }
+  if (props.data.type === "orgCentent") {
+    return markRaw(OrgCentent);
+  }
+  if (props.data.type === "digitpage") {
+    return markRaw(DigitpagePage);
+  }
+  if (props.data.type === "lowcodeImage") {
+    return markRaw(LowcodeImagePage);
+  }
+  if (props.data.type === "upload") {
+    return markRaw(UploadPage);
+  }
+  if (props.data.type === "organization") {
+    return markRaw(OrgCitys);
+  }
+  if (props.data.type === "datePicker") {
+    props.data.control.valueFormat = "x";
+    // props.data.control.align="right"
+    // props.data.control.appendToBody =true
+    return markRaw(DatePickerPage);
+  }
+  if (props.data.type === "cascader") {
+    return markRaw(CascaderPage);
+  }
+  if (props.data.type === "switch") {
+    if (typeof props.data.control.activeValue === "number") {
+      props.data.control.activeValue = props.data.control.activeValue.toString();
     }
-	if (props.data.type === 'organization') {
-      	return markRaw(OrgCitys)
+    if (typeof props.data.control.inactiveValue === "number") {
+      props.data.control.inactiveValue = props.data.control.inactiveValue.toString();
     }
-	if (props.data.type === 'datePicker') {
-		props.data.control.valueFormat="x"
-		// props.data.control.align="right"
-		// props.data.control.appendToBody =true   
-		return markRaw(DatePickerPage)
-	}
-	if(props.data.type === 'cascader'){
-		return markRaw(CascaderPage)
-	}
-	if (props.data.type === 'switch') {
-		if(typeof props.data.control.activeValue === "number"){
-			props.data.control.activeValue=props.data.control.activeValue.toString()
-		}
-		if(typeof props.data.control.inactiveValue === "number"){
-			props.data.control.inactiveValue=props.data.control.inactiveValue.toString()
-		}
-	}
-	// if (props.data.type === 'timePicker') {
-	// 	props.data.control.valueFormat="timestamp"
-	// }
-	// console.log("自定义组件",props.data)
-    	return `el-${props.data.type}`
-})
+  }
+  // if (props.data.type === 'timePicker') {
+  // 	props.data.control.valueFormat="timestamp"
+  // }
+  // console.log("自定义组件",props.data)
+  return `el-${props.data.type}`;
+});
 // 控制编辑模式下是否可用
 const editDisabled = computed(() => {
-    if (type.value === 3) {
-      	return true // 查看模式，为不可编辑状态
-    }
-    if (type.value === 1 && config.value.addDisabled) {
-      	return true
-    }
-    if (type.value === 2 && config.value.editDisabled) {
-      	return true // 编辑模式
-    }
-	// return judgeIsDisabled(key)
-    return control.value.disabled
-})
+  if (type.value === 3) {
+    return true; // 查看模式，为不可编辑状态
+  }
+  if (type.value === 1 && config.value.addDisabled) {
+    return true;
+  }
+  if (type.value === 2 && config.value.editDisabled) {
+    return true; // 编辑模式
+  }
+  // return judgeIsDisabled(key)
+  return control.value.disabled;
+});
 // 返回当前item项的校验规则
 const itemRules = computed(() => {
-    let temp
-    const itemR: any = props.data.item?.rules || []
-    const customR = formatCustomRules()
-    // 如果三个都没有设置，则返回undefined
-    if (itemR?.length || customR?.length) {
-      	temp = [...customR, ...itemR]
-    }
-    return temp
-})
+  let temp;
+  const itemR: any = props.data.item?.rules || [];
+  const customR = formatCustomRules();
+  // 如果三个都没有设置，则返回undefined
+  if (itemR?.length || customR?.length) {
+    temp = [...customR, ...itemR];
+  }
+  return temp;
+});
 // data 根据条件搜索，select远程搜索里data有值
 const getAxiosOptions = debounce((data?: any) => {
-	//console.log(props.data)
-    const {
-		optionsType,
-		optionsFun,
-		method = 'post',
-		afterResponse,
-		beforeRequest,
-		label,
-		value,
-		debug // =true可用于调试，不存sessionStorage
-    } = config.value
-    if (optionsType !== 0) {
-      	let sourceFun = optionsFun
-      	// 接口数据源
-      	if (optionsType === 1 && sourceFun) {
-        	// 当前控件为动态获取数据，防多次加载，先从本地取。data=true时直接请求
-			let md5Object:any = new Md5()
-			md5Object.appendAsciiStr(JSON.stringify(sourceFun + data))
-			let md5Str = md5Object.end()
-			// const key = 'getOptions_' + props.data.name + md5(sourceFun + data)
-			const key = 'getOptions_' + props.data.name + md5Str
-			const storage = window.sessionStorage.getItem(key)
-        if (storage && !data && !debug) {
-          	const val = JSON.parse(storage)
-			if (props.data.type === 'treeSelect') {
-				control.value.data = val
-			} else {
-				options.value = val
-			}
+  //console.log(props.data)
+  const {
+    optionsType,
+    optionsFun,
+    method = "post",
+    afterResponse,
+    beforeRequest,
+    label,
+    value,
+    debug, // =true可用于调试，不存sessionStorage
+  } = config.value;
+  if (optionsType !== 0) {
+    let sourceFun = optionsFun;
+    // 接口数据源
+    if (optionsType === 1 && sourceFun) {
+      // 当前控件为动态获取数据，防多次加载，先从本地取。data=true时直接请求
+      let md5Object: any = new Md5();
+      md5Object.appendAsciiStr(JSON.stringify(sourceFun + data));
+      let md5Str = md5Object.end();
+      // const key = 'getOptions_' + props.data.name + md5(sourceFun + data)
+      const key = "getOptions_" + props.data.name + md5Str;
+      const storage = window.sessionStorage.getItem(key);
+      if (storage && !data && !debug) {
+        const val = JSON.parse(storage);
+        if (props.data.type === "treeSelect") {
+          control.value.data = val;
         } else {
-          	// 从url里提取一个动态值,${name}形式提取name
-			if (sourceFunKey.value) {
-				const val = formProps.value.model[sourceFunKey.value]
-				const string = '${' + sourceFunKey.value + '}'
-				sourceFun = sourceFun.replace(string, val)
-			}
-			// 处理请求前的数据
-			//let newData = Object.assign({}, data || {}, queryParams)
-          	let newData = data || {}
-			if (typeof beforeRequest === 'function') {
-				newData =
-				beforeRequest(newData, route, formProps.value.model) ?? data
-			}
-			if (newData === false) {
-				return
-			}
-			if (method === 'get') {
-				newData = { params: newData }
-			}
-          	// getRequest(sourceFun, newData, { method: method })
-			// 	.then((res: any) => {
-			// 	const result = res.data.list || res.data
-			// 	let formatRes: any = result
-			// 	// 这里做数据转换，很多时候后端并不能提供完全符合且一样的数据
-			// 	if (typeof afterResponse === 'string' && afterResponse) {
-			// 		formatRes = formatResult(result, afterResponse)
-			// 	} else if (typeof afterResponse === 'function') {
-			// 		// 没有return时，使用原来的，相当于没处理
-			// 		formatRes = afterResponse(result) ?? result
-			// 	} else if (label || value) {
-			// 		// 没有设置afterResponse时，这里将数据转换为[{label:'',value:''}]形式。只处理一级
-			// 		formatRes = []
-			// 		result.forEach((item: any) => {
-			// 		formatRes.push({
-			// 			label: item[label] || item.label,
-			// 			value: item[value] || item.value
-			// 		})
-			// 		})
-			// 	}
-			// 	if (formatRes === false) {
-			// 		return
-			// 	}
-			// 	// console.log('formatRes', formatRes)
-			// 	if (props.data.type === 'treeSelect') {
-			// 		control.value.data = formatRes
-			// 	} else {
-			// 		options.value = formatRes
-			// 	}
-			// 	if (typeof formatRes === 'object') {
-			// 		window.sessionStorage.setItem(key, JSON.stringify(formatRes)) //缓存，例如子表添加时不用每添加一行就请求一次
-			// 	}
-			// 	})
-			// 	.catch((res: any) => {
-			// 	if (props.data.type === 'treeSelect') {
-			// 		control.value.data = []
-			// 	} else {
-			// 		options.value = []
-			// 	}
-			// 		console.log(res)
-			// 	})
-        	}
-    	}else if(optionsType === 3){//liwenxuan 20240611 系统表单字段效果实现
-			/*
+          options.value = val;
+        }
+      } else {
+        // 从url里提取一个动态值,${name}形式提取name
+        if (sourceFunKey.value) {
+          const val = formProps.value.model[sourceFunKey.value];
+          const string = "${" + sourceFunKey.value + "}";
+          sourceFun = sourceFun.replace(string, val);
+        }
+        // 处理请求前的数据
+        //let newData = Object.assign({}, data || {}, queryParams)
+        let newData = data || {};
+        if (typeof beforeRequest === "function") {
+          newData = beforeRequest(newData, route, formProps.value.model) ?? data;
+        }
+        if (newData === false) {
+          return;
+        }
+        if (method === "get") {
+          newData = { params: newData };
+        }
+        // getRequest(sourceFun, newData, { method: method })
+        // 	.then((res: any) => {
+        // 	const result = res.data.list || res.data
+        // 	let formatRes: any = result
+        // 	// 这里做数据转换，很多时候后端并不能提供完全符合且一样的数据
+        // 	if (typeof afterResponse === 'string' && afterResponse) {
+        // 		formatRes = formatResult(result, afterResponse)
+        // 	} else if (typeof afterResponse === 'function') {
+        // 		// 没有return时，使用原来的，相当于没处理
+        // 		formatRes = afterResponse(result) ?? result
+        // 	} else if (label || value) {
+        // 		// 没有设置afterResponse时，这里将数据转换为[{label:'',value:''}]形式。只处理一级
+        // 		formatRes = []
+        // 		result.forEach((item: any) => {
+        // 		formatRes.push({
+        // 			label: item[label] || item.label,
+        // 			value: item[value] || item.value
+        // 		})
+        // 		})
+        // 	}
+        // 	if (formatRes === false) {
+        // 		return
+        // 	}
+        // 	// console.log('formatRes', formatRes)
+        // 	if (props.data.type === 'treeSelect') {
+        // 		control.value.data = formatRes
+        // 	} else {
+        // 		options.value = formatRes
+        // 	}
+        // 	if (typeof formatRes === 'object') {
+        // 		window.sessionStorage.setItem(key, JSON.stringify(formatRes)) //缓存，例如子表添加时不用每添加一行就请求一次
+        // 	}
+        // 	})
+        // 	.catch((res: any) => {
+        // 	if (props.data.type === 'treeSelect') {
+        // 		control.value.data = []
+        // 	} else {
+        // 		options.value = []
+        // 	}
+        // 		console.log(res)
+        // 	})
+      }
+    } else if (optionsType === 3) {
+      //liwenxuan 20240611 系统表单字段效果实现
+      /*
 				在这里请求后台获取字段
 			*/
-			//console.log("formItem---291",props.data.control.optionsValue3Field)
-			if(props.data.control.optionsValue3Field && props.data.control.optionsValue3Field != "" && props.data.control.optionsValue3Field != null && props.data.control.optionsValue3Field != "undefined"){
-				//console.log(111)
-				getFieldRecord(props.data.control.optionsValue3Field).then(({ data }) => {
-					
-					let fieldName = props.data.name
-					//console.log(data,fieldName)
-					emits('optionsValue3Get1',data,fieldName)
-					
-				})
-			}
-			
-		}
-      	setFormDict(formProps.value.dict) // 表格里新增时行时需要重新设一次
+      //console.log("formItem---291",props.data.control.optionsValue3Field)
+      if (
+        props.data.control.optionsValue3Field &&
+        props.data.control.optionsValue3Field != "" &&
+        props.data.control.optionsValue3Field != null &&
+        props.data.control.optionsValue3Field != "undefined"
+      ) {
+        //console.log(111)
+        getFieldRecord(props.data.control.optionsValue3Field).then(({ data }) => {
+          let fieldName = props.data.name;
+          //console.log(data,fieldName)
+          emits("optionsValue3Get1", data, fieldName);
+        });
+      }
     }
-})
+    setFormDict(formProps.value.dict); // 表格里新增时行时需要重新设一次
+  }
+});
 watch(
-    () => props.data.control.optionsValue3Field,
-    (val:any) => {
-		//console.log("监听--optionsValue3Field-》",val)
-		getAxiosOptions() 
-    }
-)
+  () => props.data.control.optionsValue3Field,
+  (val: any) => {
+    //console.log("监听--optionsValue3Field-》",val)
+    getAxiosOptions();
+  }
+);
 watch(
-    () => props.data.config.optionsType,
-    () => {
-		getAxiosOptions() 
-    }
-)
-
+  () => props.data.config.optionsType,
+  () => {
+    getAxiosOptions();
+  }
+);
 
 function getFieldRecord(param1: any) {
-	return request({
-		url: '/javasys/lowCode/AssociatedForms/getFieldRecord',
-		method: 'post',
-		data: {
-			optionsValue3Field:param1
-		},
-	});
+  return request({
+    url: "/javasys/lowCode/AssociatedForms/getFieldRecord",
+    method: "post",
+    data: {
+      optionsValue3Field: param1,
+    },
+  });
 }
 watch(
-    () => formProps.value.model[sourceFunKey.value],
-    () => {
-      	getAxiosOptions() 
-    }
-)
+  () => formProps.value.model[sourceFunKey.value],
+  () => {
+    getAxiosOptions();
+  }
+);
 // 处理自定义校验规则，将customRules转换后追加到rules里
 const formatCustomRules = () => {
-    const rulesReg: any = {}
-    validate &&
-    validate.forEach(item => {
-        rulesReg[item.type] = item.regExp
-    })
+  const rulesReg: any = {};
+  validate &&
+    validate.forEach((item) => {
+      rulesReg[item.type] = item.regExp;
+    });
 
-    // 获取校验方法 父级使用provide方法注入
-    const temp: any = []
-    props.data.customRules?.forEach((item: any) => {
-		if (!item.message && item.type !== 'methods') {
-			return // 方法时允许提示信息为空
-		}
-		let obj = {}
-		if (item.type === 'required') {
-			obj = { required: true }
-		} else if (item.type === 'rules') {
-			// 自定义表达式
-			obj = { pattern: item.rules }
-		} else if (item.type === 'methods') {
-			// 方法时
-			const methods: any = item.methods
-			if (methods) {
-			obj = { validator: inject(methods, {}) }
-			}
-		} else if (item.type) {
-			obj = { pattern: rulesReg[item.type as string] }
-		}
-		// 这里判断下防某些条件下重复push的可能或存重复校验类型
-		let message: any = { message: item.message }
-		if (!item.message) {
-			// 当使用validator校验时，如果存在message字段则不能使用 callback(new Error('x'));的提示
-			message = {}
-		}
-		temp.push(
-			Object.assign(
-				{
-					trigger: item.trigger || 'blur'
-				},
-				obj,
-				message
-			)
-		)
-    })
-    return temp
-  }
+  // 获取校验方法 父级使用provide方法注入
+  const temp: any = [];
+  props.data.customRules?.forEach((item: any) => {
+    if (!item.message && item.type !== "methods") {
+      return; // 方法时允许提示信息为空
+    }
+    let obj = {};
+    if (item.type === "required") {
+      obj = { required: true };
+    } else if (item.type === "rules") {
+      // 自定义表达式
+      obj = { pattern: item.rules };
+    } else if (item.type === "methods") {
+      // 方法时
+      const methods: any = item.methods;
+      if (methods) {
+        obj = { validator: inject(methods, {}) };
+      }
+    } else if (item.type) {
+      obj = { pattern: rulesReg[item.type as string] };
+    }
+    // 这里判断下防某些条件下重复push的可能或存重复校验类型
+    let message: any = { message: item.message };
+    if (!item.message) {
+      // 当使用validator校验时，如果存在message字段则不能使用 callback(new Error('x'));的提示
+      message = {};
+    }
+    temp.push(
+      Object.assign(
+        {
+          trigger: item.trigger || "blur",
+        },
+        obj,
+        message
+      )
+    );
+  });
+  return temp;
+};
 // 从数据接口获取数据设置options，在表单添加或编辑时数据加载完成
 const setFormDict = (val: any) => {
-	// console.log("从数据接口获取数据设置options",val)
-    if (val && config.value.optionsType === 2) {
-      		const opt = val[config.value.optionsFun] || val[props.data.name] // 不填写默认为当前字段名
-      	if (opt !== undefined) {
-        	options.value = objectToArray(opt)
-      	}
+  // console.log("从数据接口获取数据设置options",val)
+  if (val && config.value.optionsType === 2) {
+    const opt = val[config.value.optionsFun] || val[props.data.name]; // 不填写默认为当前字段名
+    if (opt !== undefined) {
+      options.value = objectToArray(opt);
     }
-}
-  // 从接口返回的dict会在这里触发
+  }
+};
+// 从接口返回的dict会在这里触发
 watch(
-    () => formProps.value.dict,
-    (val: any) => {
-      	setFormDict(val)
-    },
-    {
-      	/*deep: true*/
-    }
-)
+  () => formProps.value.dict,
+  (val: any) => {
+    setFormDict(val);
+  },
+  {
+    /*deep: true*/
+  }
+);
 // 对单选多选select设置options
-const formOptions = inject(constSetFormOptions, {}) as any
+const formOptions = inject(constSetFormOptions, {}) as any;
 watch(
-    () => formOptions.value,
-    (val: any) => {
-		// console.log("子表内的需要注意下，只有在子表有记录时才生效",val)
-		const opt = val[props.data.name]
-		// 子表内的需要注意下，只有在子表有记录时才生效
-		if (val && opt !== undefined) {
-			if (props.data.type === 'treeSelect') {
-			// 树结构的参数为data
-			control.value.data = objectToArray(opt)
-			} else {
-			options.value = objectToArray(opt)
-			}
-		}
+  () => formOptions.value,
+  (val: any) => {
+    // console.log("子表内的需要注意下，只有在子表有记录时才生效",val)
+    const opt = val[props.data.name];
+    // 子表内的需要注意下，只有在子表有记录时才生效
+    if (val && opt !== undefined) {
+      if (props.data.type === "treeSelect") {
+        // 树结构的参数为data
+        control.value.data = objectToArray(opt);
+      } else {
+        options.value = objectToArray(opt);
+      }
     }
-)
+  }
+);
 // ------------图片上传处理-----------
 const fileList = computed<any>(() => {
-    const imgVal = formProps.value.model[props.data.name]
-	// console.log("图片上传处理-->",imgVal)
-    if (imgVal && typeof imgVal === 'string') {
-		// console.log("图片上传处理-2->",imgVal)
-		const temp: any = []
-		imgVal.split(',').forEach((item: string) => {
-			// console.log("图片上传处理-3->",item)
-			temp.push({
-			name: item,
-			url: item
-			})
-		})
-		return temp
-    }
-    return imgVal || [] // 这样可支持默认值为array([name:'',url:''这种形式])
-})
+  const imgVal = formProps.value.model[props.data.name];
+  // console.log("图片上传处理-->",imgVal)
+  if (imgVal && typeof imgVal === "string") {
+    // console.log("图片上传处理-2->",imgVal)
+    const temp: any = [];
+    imgVal.split(",").forEach((item: string) => {
+      // console.log("图片上传处理-3->",item)
+      temp.push({
+        name: item,
+        url: item,
+      });
+    });
+    return temp;
+  }
+  return imgVal || []; // 这样可支持默认值为array([name:'',url:''这种形式])
+});
 // 上传成功时
 const uploadSuccess = (response: any, uploadFile: any, uploadFiles: any) => {
-	// console.log("response==>",response)
-	// console.log("uploadFile==>",uploadFile)
-	// console.log("uploadFiles==>",uploadFiles)
-    const oldList = []
-    fileList.value.forEach((item: any) => {
-      	oldList.push(item.url)
-    })
-    // oldList.push(response.path)
-	oldList.push(response.data.url)
-    updateModel(oldList.join(','))
-    control.value.onSuccess &&
-    control.value.onSuccess(response, uploadFile, uploadFiles)
-	// console.log("uploadSuccess===>",control.value)
-	// console.log("uploadSuccess=fileList==>",fileList)
-}
+  // console.log("response==>",response)
+  // console.log("uploadFile==>",uploadFile)
+  // console.log("uploadFiles==>",uploadFiles)
+  const oldList = [];
+  fileList.value.forEach((item: any) => {
+    oldList.push(item.url);
+  });
+  // oldList.push(response.path)
+  oldList.push(response.data.url);
+  updateModel(oldList.join(","));
+  control.value.onSuccess && control.value.onSuccess(response, uploadFile, uploadFiles);
+  // console.log("uploadSuccess===>",control.value)
+  // console.log("uploadSuccess=fileList==>",fileList)
+};
 // 从列表移除
 const uploadRemove = (uploadFile: any, uploadFiles: any) => {
-    const oldList: any = []
-    fileList.value.forEach((item: any) => {
-		if (item.url !== uploadFile.url) {
-			oldList.push(item.url)
-		}
-    })
-    updateModel(oldList.join(','))
-    control.value.onRemove && control.value.onRemove(uploadFile, uploadFiles)
-    // todo 需从服务端删除已上传图片时，这里需要发删除请求接口
-}
+  const oldList: any = [];
+  fileList.value.forEach((item: any) => {
+    if (item.url !== uploadFile.url) {
+      oldList.push(item.url);
+    }
+  });
+  updateModel(oldList.join(","));
+  control.value.onRemove && control.value.onRemove(uploadFile, uploadFiles);
+  // todo 需从服务端删除已上传图片时，这里需要发删除请求接口
+};
 // 上传错误
 const uploadError = (err: any, file: any, fileList: any) => {
-    // console.log('uploadError')
-    ElMessage.error(file.name + '上传失败')
-    control.value.onError && control.value.onError(err, file, fileList)
-}
+  // console.log('uploadError')
+  ElMessage.error(file.name + "上传失败");
+  control.value.onError && control.value.onError(err, file, fileList);
+};
 // -------------图片上传结束----------------
 /****input slot处理***/
 const getInputSlot = (key?: string) => {
-    const slot = key === 'p' ? config.value.prepend : config.value.append
-    const has = slot.indexOf('key:') === 0
-    if (!has) {
-      	return false
-    }
-    const slotKey = slot.replace('key:', '')
-    const control = getControlByName(slotKey)
-    if (!control || Object.keys(control)?.length === 0) {
-      	return false
-    }
-    return control
-}
+  const slot = key === "p" ? config.value.prepend : config.value.append;
+  const has = slot.indexOf("key:") === 0;
+  if (!has) {
+    return false;
+  }
+  const slotKey = slot.replace("key:", "");
+  const control = getControlByName(slotKey);
+  if (!control || Object.keys(control)?.length === 0) {
+    return false;
+  }
+  return control;
+};
 const inputSlotChange = (val: string | number, name: string) => {
-    changeEvent &&
+  changeEvent &&
     changeEvent({
-        key: name,
-        value: val,
-        data: {},
-        tProp: ''
-    })
-}
-  /****input slot处理结束***/
-  // treeSelect
-  // const filterMethod = (val: string) => {
-  //   if (props.data.type === 'treeSelect') {
-  //     // 请求参数名，可使用config.queryName传进来
-  //     const queryName = config.value.queryName || 'name'
-  //     control.value.filterMethod && control.value.filterMethod(val)
-  //     getAxiosOptions({ [queryName]: val })
-  //   }
-  // }
+      key: name,
+      value: val,
+      data: {},
+      tProp: "",
+    });
+};
+/****input slot处理结束***/
+// treeSelect
+// const filterMethod = (val: string) => {
+//   if (props.data.type === 'treeSelect') {
+//     // 请求参数名，可使用config.queryName传进来
+//     const queryName = config.value.queryName || 'name'
+//     control.value.filterMethod && control.value.filterMethod(val)
+//     getAxiosOptions({ [queryName]: val })
+//   }
+// }
 onMounted(() => {
-    getAxiosOptions()
-})
-onUnmounted(() => {})
+  getAxiosOptions();
+});
+onUnmounted(() => {});
 /**
 @ 作者: 秦东
 @ 时间: 2024-03-01 09:07:11
 @ 功能: 布局处理
 */
 const getFormItemLableStyle = (ele: any) => {
-    if(ele?.labelStyle){
+  if (ele?.labelStyle) {
     //   console.log("返回栅格宽度3",AnalysisCss(ele?.labelStyle))
-      return AnalysisCss(ele?.labelStyle)
-    }
-}
-const getFormItemInputStyle = (ele: any,sty:number) => {
-    if(ele?.inputStyle){
+    return AnalysisCss(ele?.labelStyle);
+  }
+};
+const getFormItemInputStyle = (ele: any, sty: number) => {
+  if (ele?.inputStyle) {
     //   console.log("返回栅格宽度4",AnalysisInputCss(ele?.inputStyle,sty))
-      return AnalysisInputCss(ele?.inputStyle,sty)
-    }
-}
-const imgUploadApiUrl = import.meta.env.VITE_APP_BASE_API+"/api/upordown"
+    return AnalysisInputCss(ele?.inputStyle, sty);
+  }
+};
+const imgUploadApiUrl = import.meta.env.VITE_APP_BASE_API + "/api/upordown";
 
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-27 14:17:16
 @ 功能: 判断此组件是否可见
 */
-const judgeIsShow = (key:string) => {
-	// console.log("判断此组件是否可见---->",key)
-	if(props.nodeKey != undefined && props.purview != undefined && props.purview != null && props.purview != null && props.purview != "" && props.purview != "") {
-		if(props.purview.length < 1){
-			return true;
-		}else{
-			let isShow = false;
-			if(Array.isArray(props.purview)){
-				props.purview.forEach((item)=>{
-					if(item.nodeKey == props.nodeKey){
-						
-						if(item.powerAry && item.powerAry.length > 0){
-							item.powerAry.forEach((itm)=>{
-								if(itm.id == key){
-									// console.log("判断此组件是否可见",itm,itm.id == key,"--------->",itm.isLook)
-									isShow =  itm.isLook
-									
-								}
-							})
-						}
-					}
-					
-				})
-			}
-			
-			return isShow
-		}
-	}else{
-		return true;
-	}
+const judgeIsShow = (key: string) => {
+  // console.log("判断此组件是否可见---->",key)
+  if (
+    props.nodeKey != undefined &&
+    props.purview != undefined &&
+    props.purview != null &&
+    props.purview != null &&
+    props.purview != "" &&
+    props.purview != ""
+  ) {
+    if (props.purview.length < 1) {
+      return true;
+    } else {
+      let isShow = false;
+      if (Array.isArray(props.purview)) {
+        props.purview.forEach((item) => {
+          if (item.nodeKey == props.nodeKey) {
+            if (item.powerAry && item.powerAry.length > 0) {
+              item.powerAry.forEach((itm) => {
+                if (itm.id == key) {
+                  // console.log("判断此组件是否可见",itm,itm.id == key,"--------->",itm.isLook)
+                  isShow = itm.isLook;
+                }
+              });
+            }
+          }
+        });
+      }
 
-}
+      return isShow;
+    }
+  } else {
+    return true;
+  }
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-27 15:11:42
 @ 功能: 判断是否禁用
 */
-const judgeIsDisabled = (key:string)  => {
-	if (type.value === 3) {
-      	return true // 查看模式，为不可编辑状态
-    }
-    if (type.value === 1 && config.value.addDisabled) {
-      	return true
-    }
-    if (type.value === 2 && config.value.editDisabled) {
-      	return true // 编辑模式
+const judgeIsDisabled = (key: string) => {
+  if (type.value === 3) {
+    return true; // 查看模式，为不可编辑状态
+  }
+  if (type.value === 1 && config.value.addDisabled) {
+    return true;
+  }
+  if (type.value === 2 && config.value.editDisabled) {
+    return true; // 编辑模式
+  }
+  if (
+    props.nodeKey != undefined &&
+    props.purview != undefined &&
+    props.purview != null &&
+    props.purview != null &&
+    props.purview != "" &&
+    props.purview != ""
+  ) {
+    if (props.purview.length < 1) {
+      return false;
+    } else {
+      let isShow = true;
+      props.purview.forEach((item) => {
+        if (item.nodeKey == props.nodeKey) {
+          if (item.powerAry && item.powerAry.length > 0) {
+            item.powerAry.forEach((itm) => {
+              if (itm.id == key) {
+                console.log(
+                  "判断此组件是否禁用",
+                  itm,
+                  itm.id == key,
+                  "--------->",
+                  itm.isLook
+                );
+                isShow = !itm.isEdit;
+              }
+            });
+          }
+        }
+      });
+      return isShow;
     }
-	if(props.nodeKey != undefined && props.purview != undefined && props.purview != null && props.purview != null && props.purview != "" && props.purview != "") {
-		if(props.purview.length < 1){
-			return false;
-		}else{
-			let isShow = true;
-			props.purview.forEach((item)=>{
-				if(item.nodeKey == props.nodeKey){
-					
-					if(item.powerAry && item.powerAry.length > 0){
-						item.powerAry.forEach((itm)=>{
-							if(itm.id == key){
-								console.log("判断此组件是否禁用",itm,itm.id == key,"--------->",itm.isLook)
-								isShow =  !itm.isEdit
-								
-							}
-						})
-					}
-				}
-				
-			})
-			return isShow
-		}
-	}else{
-		return false;
-	}
-}
+  } else {
+    return false;
+  }
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-02 13:02:49
 @ 功能: 将时间戳转换成字符串
 */
-const timeToString = (timeVal:any,types:int) => {
-	// console.log("将时间戳转换成字符串",timeVal,types)
-	let timeStr = ""
-	if(Array.isArray(timeVal)){
-		if(timeVal.length >= 2){
-			let startTime = timeToAry(timeVal[0])
-			let endTime = timeToAry(timeVal[1])
-			switch(types){
-			case "year":	//年
-				timeStr = `${startTime.year} 至 ${endTime.year}`;
-				break;
-			case "month":	//月
-				timeStr = `${startTime.year}-${startTime.month} 至 ${endTime.year}-${endTime.month}`;
-				break;
-			case "datetime": //日期+时间
-				timeStr = `${startTime.year}-${startTime.month}-${startTime.day} ${startTime.hours}:${startTime.minutes}:${startTime.seconds} 至 ${endTime.year}-${endTime.month}-${endTime.day} ${endTime.hours}:${endTime.minutes}:${endTime.seconds}`;
-				break;
-			case  "week":	//周
-				let startWeek = getYearWeek(startTime)
-				let endWeek = getYearWeek(endTime)
-				timeStr = `${startWeek} 至 ${endWeek}`;
-				break;
-			case "timeCalss": //时间
-				timeStr = `${startTime.hours}:${startTime.minutes}:${startTime.seconds} 至 ${endTime.hours}:${endTime.minutes}:${endTime.seconds}`;
-				break;
-			case "datetimerange":
-				timeStr = `${startTime.year}-${startTime.month}-${startTime.day} ${startTime.hours}:${startTime.minutes}:${startTime.seconds} 至 ${endTime.year}-${endTime.month}-${endTime.day} ${endTime.hours}:${endTime.minutes}:${endTime.seconds}`;
-				break;
-			case "daterange":
-				timeStr = `${startTime.year}-${startTime.month}-${startTime.day} 至 ${endTime.year}-${endTime.month}-${endTime.day}`;
-				break;
-			case "monthrange":
-				timeStr = `${startTime.year}-${startTime.month} 至 ${endTime.year}-${endTime.month}`;
-				break;
-			default:
-				timeStr = `${startTime.year}-${startTime.month}-${startTime.day} 至 ${endTime.year}-${endTime.month}-${endTime.day}`;
-				break;
-			}
-		}else if(timeVal.length == 1){
-			let {year,month,day,hours,minutes,seconds} = timeToAry(timeVal[0])
-			switch(types){
-				case "year":	//年
-					timeStr = `${year}`;
-					break;
-				case "month":	//月
-					timeStr = `${year}-${month}`;
-					break;
-				case "datetime": //日期+时间
-					timeStr = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-					break;
-				case  "week":	//周
-					timeStr = getYearWeek(timeVal)
-					break;
-				case "timeCalss": //时间
-					timeStr = `${hours}:${minutes}:${seconds}`;
-					break;
-				default:
-					timeStr = `${year}-${month}-${day}`
-					break;
-			}
-		}else{
-			timeStr = "未知时间"
-		}
-	}else{
-		let {year,month,day,hours,minutes,seconds} = timeToAry(timeVal)
-		switch(types){
-			case "year":	//年
-				timeStr = `${year}`;
-				break;
-			case "month":	//月
-				timeStr = `${year}-${month}`;
-				break;
-			case "datetime": //日期+时间
-				timeStr = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-				break;
-			case  "week":	//周
-				timeStr = getYearWeek(timeVal)
-				break;
-			case "timeCalss": //时间
-				timeStr = `${hours}:${minutes}:${seconds}`;
-				break;
-			default:
-				timeStr = `${year}-${month}-${day}`
-				break;
-		}
-	}
-	
-	return timeStr
-}
+const timeToString = (timeVal: any, types: int) => {
+  // console.log("将时间戳转换成字符串",timeVal,types)
+  let timeStr = "";
+  if (Array.isArray(timeVal)) {
+    if (timeVal.length >= 2) {
+      let startTime = timeToAry(timeVal[0]);
+      let endTime = timeToAry(timeVal[1]);
+      switch (types) {
+        case "year": //年
+          timeStr = `${startTime.year} 至 ${endTime.year}`;
+          break;
+        case "month": //月
+          timeStr = `${startTime.year}-${startTime.month} 至 ${endTime.year}-${endTime.month}`;
+          break;
+        case "datetime": //日期+时间
+          timeStr = `${startTime.year}-${startTime.month}-${startTime.day} ${startTime.hours}:${startTime.minutes}:${startTime.seconds} 至 ${endTime.year}-${endTime.month}-${endTime.day} ${endTime.hours}:${endTime.minutes}:${endTime.seconds}`;
+          break;
+        case "week": //周
+          let startWeek = getYearWeek(startTime);
+          let endWeek = getYearWeek(endTime);
+          timeStr = `${startWeek} 至 ${endWeek}`;
+          break;
+        case "timeCalss": //时间
+          timeStr = `${startTime.hours}:${startTime.minutes}:${startTime.seconds} 至 ${endTime.hours}:${endTime.minutes}:${endTime.seconds}`;
+          break;
+        case "datetimerange":
+          timeStr = `${startTime.year}-${startTime.month}-${startTime.day} ${startTime.hours}:${startTime.minutes}:${startTime.seconds} 至 ${endTime.year}-${endTime.month}-${endTime.day} ${endTime.hours}:${endTime.minutes}:${endTime.seconds}`;
+          break;
+        case "daterange":
+          timeStr = `${startTime.year}-${startTime.month}-${startTime.day} 至 ${endTime.year}-${endTime.month}-${endTime.day}`;
+          break;
+        case "monthrange":
+          timeStr = `${startTime.year}-${startTime.month} 至 ${endTime.year}-${endTime.month}`;
+          break;
+        default:
+          timeStr = `${startTime.year}-${startTime.month}-${startTime.day} 至 ${endTime.year}-${endTime.month}-${endTime.day}`;
+          break;
+      }
+    } else if (timeVal.length == 1) {
+      let { year, month, day, hours, minutes, seconds } = timeToAry(timeVal[0]);
+      switch (types) {
+        case "year": //年
+          timeStr = `${year}`;
+          break;
+        case "month": //月
+          timeStr = `${year}-${month}`;
+          break;
+        case "datetime": //日期+时间
+          timeStr = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+          break;
+        case "week": //周
+          timeStr = getYearWeek(timeVal);
+          break;
+        case "timeCalss": //时间
+          timeStr = `${hours}:${minutes}:${seconds}`;
+          break;
+        default:
+          timeStr = `${year}-${month}-${day}`;
+          break;
+      }
+    } else {
+      timeStr = "未知时间";
+    }
+  } else {
+    let { year, month, day, hours, minutes, seconds } = timeToAry(timeVal);
+    switch (types) {
+      case "year": //年
+        timeStr = `${year}`;
+        break;
+      case "month": //月
+        timeStr = `${year}-${month}`;
+        break;
+      case "datetime": //日期+时间
+        timeStr = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+        break;
+      case "week": //周
+        timeStr = getYearWeek(timeVal);
+        break;
+      case "timeCalss": //时间
+        timeStr = `${hours}:${minutes}:${seconds}`;
+        break;
+      default:
+        timeStr = `${year}-${month}-${day}`;
+        break;
+    }
+  }
+
+  return timeStr;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-02 13:22:14
 @ 功能: 时间戳转换对象
 */
-const timeToAry = (timestamp:number) => {
-	const date = new Date(timestamp);
-	const year = date.getFullYear();
-	const month = ('0' + (date.getMonth() + 1)).slice(-2);
-	const day = ('0' + date.getDate()).slice(-2);
-	const hours = ('0' + date.getHours()).slice(-2);
-	const minutes = ('0' + date.getMinutes()).slice(-2);
-	const seconds = ('0' + date.getSeconds()).slice(-2);
-	return {
-		year:year,
-		month:month,
-		day:day,
-		hours:hours,
-		minutes:minutes,
-		seconds
-	}
-}
+const timeToAry = (timestamp: number) => {
+  const date = new Date(timestamp);
+  const year = date.getFullYear();
+  const month = ("0" + (date.getMonth() + 1)).slice(-2);
+  const day = ("0" + date.getDate()).slice(-2);
+  const hours = ("0" + date.getHours()).slice(-2);
+  const minutes = ("0" + date.getMinutes()).slice(-2);
+  const seconds = ("0" + date.getSeconds()).slice(-2);
+  return {
+    year: year,
+    month: month,
+    day: day,
+    hours: hours,
+    minutes: minutes,
+    seconds,
+  };
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-02 13:21:05
 @ 功能: 计算当前时间戳是今年第几周
 */
-const getYearWeek = (timestamp:number) => {
-    const date = new Date(timestamp);
-  	const firstDayOfYear = new Date(date.getFullYear(), 0, 1);
-  	const pastDaysOfYear = (date - firstDayOfYear) / 86400000;
-  	const weekNumber = Math.ceil((pastDaysOfYear + firstDayOfYear.getDay() + 1) / 7);
+const getYearWeek = (timestamp: number) => {
+  const date = new Date(timestamp);
+  const firstDayOfYear = new Date(date.getFullYear(), 0, 1);
+  const pastDaysOfYear = (date - firstDayOfYear) / 86400000;
+  const weekNumber = Math.ceil((pastDaysOfYear + firstDayOfYear.getDay() + 1) / 7);
   return weekNumber;
-}
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-02 13:42:22
 @ 功能: 判断单选值
 */
-const judgeRadio = (val:any,list:any) => {
-	let valStr = ""
-	if(Array.isArray(list)){
-		if(list.length > 0){
-			list.forEach((item) => {
-				if(item.value == val){
-					valStr = item.label
-				} 
-			})
-		}
-	}
-	return valStr
-}
+const judgeRadio = (val: any, list: any) => {
+  let valStr = "";
+  if (Array.isArray(list)) {
+    if (list.length > 0) {
+      list.forEach((item) => {
+        if (item.value == val) {
+          valStr = item.label;
+        }
+      });
+    }
+  }
+  return valStr;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-02 13:42:22
 @ 功能: 判断多选值
 */
-const judgeCheckbox = (val:any,list:any) => {
-	let valAry = []
-	if(Array.isArray(val)){
-		if(val.length > 0){
-			if(Array.isArray(list)){
-				val.forEach((item) => {
-					list.forEach((ltem) => {
-						if(item == ltem.value){
-							valAry.push(ltem.label)
-						}
-					})
-				})
-			}
-		}
-	}
-	return valAry
-}
+const judgeCheckbox = (val: any, list: any) => {
+  let valAry = [];
+  if (Array.isArray(val)) {
+    if (val.length > 0) {
+      if (Array.isArray(list)) {
+        val.forEach((item) => {
+          list.forEach((ltem) => {
+            if (item == ltem.value) {
+              valAry.push(ltem.label);
+            }
+          });
+        });
+      }
+    }
+  }
+  return valAry;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-05 10:00:31
 @ 功能: 下拉菜单处理
 */
-const selectValue = (val:any,list:any) => {
-	// console.log("下拉菜单处理",val,list)
-	let valAry = []
-	if(val && val != "" && val != null ){
-		let pickSelect = val
-		if(Array.isArray(val)){
-			pickSelect = val
-		}else{
-			pickSelect = JSON.parse(val)
-		}
-		 
-		// console.log("下拉菜单处理-----3------->",pickSelect)
-	
+const selectValue = (val: any, list: any) => {
+  // console.log("下拉菜单处理",val,list)
+  let valAry = [];
+  if (val && val != "" && val != null) {
+    let pickSelect = val;
+    if (Array.isArray(val)) {
+      pickSelect = val;
+    } else {
+      pickSelect = JSON.parse(val);
+    }
 
-		if(Array.isArray(pickSelect)){
-			if(pickSelect.length > 0){
-				
-				if(Array.isArray(list)){
-					pickSelect.forEach((item) => {
-						
-						list.forEach((ltem) => {
-							if(item*1 == ltem.value*1){
-								valAry.push(ltem.label)
-							}
-						})
-					})
-				}
-			}
-		}else{
-			if(Array.isArray(list)){
-				list.forEach((ltem) => {
-					if(val == ltem.value){
-						valAry.push(ltem.label)
-					}
-				})
-			}
-		}
-	}else{
-		// console.log("下拉菜单处理-4->",val)
-	}
-	
-	// console.log("下拉菜单处理-2->",valAry)
-	return valAry
-}
+    // console.log("下拉菜单处理-----3------->",pickSelect)
+
+    if (Array.isArray(pickSelect)) {
+      if (pickSelect.length > 0) {
+        if (Array.isArray(list)) {
+          pickSelect.forEach((item) => {
+            list.forEach((ltem) => {
+              if (item * 1 == ltem.value * 1) {
+                valAry.push(ltem.label);
+              }
+            });
+          });
+        }
+      }
+    } else {
+      if (Array.isArray(list)) {
+        list.forEach((ltem) => {
+          if (val == ltem.value) {
+            valAry.push(ltem.label);
+          }
+        });
+      }
+    }
+  } else {
+    // console.log("下拉菜单处理-4->",val)
+  }
+
+  // console.log("下拉菜单处理-2->",valAry)
+  return valAry;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-06 08:34:05
 @ 功能: 选择用户
 */
-const pickUserVal = (val:any) => {
-	// console.log("选择用户-2->",val)
-	if(Array.isArray(val)){
-		return val
-	}else{
-		// let valAry = string2json(val)
-		// console.log("选择用户-2->",valAry)
-		return val
-	}
-}
-
+const pickUserVal = (val: any) => {
+  // console.log("选择用户-2->",val)
+  if (Array.isArray(val)) {
+    return val;
+  } else {
+    // let valAry = string2json(val)
+    // console.log("选择用户-2->",valAry)
+    return val;
+  }
+};
 
-function asfValueChanged(val:any){
-	//console.log("formItem-asfValueChanged",val)
-	emits("asfValueChanged",val)
+function asfValueChanged(val: any) {
+  //console.log("formItem-asfValueChanged",val)
+  emits("asfValueChanged", val);
 }
 /**
 @ 作者: 秦东
 @ 时间: 2024-09-17 14:30:37
 @ 功能: 解析下载图片
 */
-const uploadPic = (val:any) => {
-	console.log("解析下载图片-->",val)
-	if(val != ""){
-		let urlAry = string2json(val)
-		// let urlAry =  val.toString().split(",")
-		console.log("解析下载图片-2->",urlAry)
-		return urlAry
-	}else{
-		return [];
-	}
-}
+const uploadPic = (val: any) => {
+  console.log("解析下载图片-->", val);
+  if (val != "") {
+    let urlAry = string2json(val);
+    // let urlAry =  val.toString().split(",")
+    console.log("解析下载图片-2->", urlAry);
+    return urlAry;
+  } else {
+    return [];
+  }
+};
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-11-29 13:46:36
+@ 功能: 获取级联选择值
+*/
+const judjeCascader = (val: any[], options: any[]) => {
+  console.log("val===========>", val);
+  if (val == "" || val == undefined || val == null) return "";
+  if (val && val.length < 0) return "";
+  let valAry = stringToObj(val);
+  console.log("获取级联选择值", stringToObj(val), val.length, options);
+  if (!Array.isArray(valAry)) return "";
+  let title = "";
+  valAry.forEach((item: any) => {
+    // console.log("item", item);
+
+    console.log(item + "=============:", item, diGuiJilian(item, options));
+    if (title == "") {
+      title = title + diGuiJilian(item, options);
+    } else {
+      title = title + " / " + diGuiJilian(item, options);
+    }
+  });
+  return title;
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-11-29 13:57:04
+@ 功能: 递归查询数据
+*/
+const diGuiJilian = (val: any, options: any[]) => {
+  if (!Array.isArray(options)) return "";
+  let dataVal = "";
+  options.forEach((item: any) => {
+    if (item.value == val) {
+      // console.log(val + "=======递归查询数据======:", item.value, item.label);
+      dataVal = item.label;
+      // return dataVal;
+      // return item.label;
+    }
+
+    if (item.children && item.children.length > 0) {
+      // console.log(
+      //   val + "=======递归查询数据====1==:",
+      //   item.children,
+      //   item.children.length
+      // );
+      let gdVal = diGuiJilian(val, item.children);
+      if (gdVal != "") {
+        dataVal = gdVal;
+      }
+    }
+  });
+  return dataVal;
+};
 </script>
 <template>
-	<BaiduMap v-if="judgeIsShow(data.name) &&data.type === 'baidumap' && type != 4" :data="data" />
-	
-	
-	
-	<!--拥有者-->
-	<OwnerPage v-else-if="judgeIsShow(data.name) && data.type === 'owner' " :data="data" :tablekey="props.tablekey" :numrun="props.numrun"  />
-	<SerialNumber  v-else-if="judgeIsShow(data.name) && data.type === 'serialNumber' && type != 4" :data="data" :tablekey="props.tablekey" :numrun="props.numrun" />
-	<!--创建人-->
-	<FounderForm v-else-if="judgeIsShow(data.name) && data.type === 'founder' " :data="data" :tablekey="props.tablekey" :numrun="props.numrun" />
-	<!--创建时间-->
-	<FounderTime  v-else-if="judgeIsShow(data.name) && data.type === 'founderTime' " :data="data" :tablekey="props.tablekey" :numrun="props.numrun" />
-	<!--修改时间-->
-	<EditTime v-else-if="judgeIsShow(data.name) && data.type === 'editTime' " :data="data" :tablekey="props.tablekey" :numrun="props.numrun" />
-	<!--关联表单-->
-	<AssociatedForms  v-else-if="judgeIsShow(data.name) && data.type === 'associatedForms' && type != 4" :data="data" :form-props="formProps" :tablekey="props.tablekey" :row-index="props.rowIndex" @asf-value-changed="asfValueChanged"/>
+  <BaiduMap
+    v-if="judgeIsShow(data.name) && data.type === 'baidumap' && type != 4"
+    :data="data"
+  />
 
-	<VideoUpAndPlay  v-else-if="judgeIsShow(data.name) && data.type === 'videoUpAndPlay' " :data="data" />
+  <!--拥有者-->
+  <OwnerPage
+    v-else-if="judgeIsShow(data.name) && data.type === 'owner'"
+    :data="data"
+    :tablekey="props.tablekey"
+    :numrun="props.numrun"
+  />
 
+  <SerialNumber
+    v-else-if="judgeIsShow(data.name) && data.type === 'serialNumber' && type != 4"
+    :data="data"
+    :tablekey="props.tablekey"
+    :numrun="props.numrun"
+  />
+  <!--创建人-->
+  <FounderForm
+    v-else-if="judgeIsShow(data.name) && data.type === 'founder'"
+    :data="data"
+    :tablekey="props.tablekey"
+    :numrun="props.numrun"
+  />
+  <!--创建时间-->
+  <FounderTime
+    v-else-if="judgeIsShow(data.name) && data.type === 'founderTime'"
+    :data="data"
+    :tablekey="props.tablekey"
+    :numrun="props.numrun"
+  />
+  <!--修改时间-->
+  <EditTime
+    v-else-if="judgeIsShow(data.name) && data.type === 'editTime'"
+    :data="data"
+    :tablekey="props.tablekey"
+    :numrun="props.numrun"
+  />
+  <!--关联表单-->
+  <AssociatedForms
+    v-else-if="judgeIsShow(data.name) && data.type === 'associatedForms' && type != 4"
+    :data="data"
+    :form-props="formProps"
+    :tablekey="props.tablekey"
+    :row-index="props.rowIndex"
+    @asf-value-changed="asfValueChanged"
+  />
 
-	<LowcodeTransfer  v-else-if="judgeIsShow(data.name) && data.type === 'lowcodeTransfer' && type != 4" :data="data" />
-				
-				<LowcodeCarsusel  v-else-if="judgeIsShow(data.name) && data.type === 'lowcodeCarsusel'" :data="data" />
-				<SignatureMap  v-else-if="judgeIsShow(data.name) && data.type === 'signaturemap' && type != 4" :data="data" />
+  <VideoUpAndPlay
+    v-else-if="judgeIsShow(data.name) && data.type === 'videoUpAndPlay'"
+    :data="data"
+  />
 
-				
-				
-				
-				<UrlLink v-else-if="judgeIsShow(data.name) && data.type === 'urllink' && type != 4" :data="data" />
+  <LowcodeTransfer
+    v-else-if="judgeIsShow(data.name) && data.type === 'lowcodeTransfer' && type != 4"
+    :data="data"
+  />
 
-	
+  <LowcodeCarsusel
+    v-else-if="judgeIsShow(data.name) && data.type === 'lowcodeCarsusel'"
+    :data="data"
+  />
+  <SignatureMap
+    v-else-if="judgeIsShow(data.name) && data.type === 'signaturemap' && type != 4"
+    :data="data"
+  />
 
-	<el-form-item
-		v-bind="data.item"
-		v-if="judgeIsShow(data.name) && data.type != 'owner' && data.type != 'baidumap'   && data.type != 'serialNumber' && data.type != 'founder' && data.type != 'founderTime' && data.type != 'editTime' && data.type != 'associatedForms' && data.type != 'videoUpAndPlay'  && data.type != 'lowcodeTransfer' && data.type != 'lowcodeCarsusel' && data.type != 'signaturemap' && data.type != 'signaturemap' && data.type != 'urllink'"
-		:disabled="judgeIsDisabled(data.name)"
-		:prop="tProp || data.name"
-		:class="config.className"
-		:rules="itemRules as any"
-		:label="getLabel(data.item as FormItem)"
-	>
-	
-		<template #label v-if="config.help">
-			<span :style="getFormItemLableStyle(configStyle)">{{ getLabel(data.item) }}</span>
-			<Tooltips :content="config.help" />
-		</template>
-		<template #label v-else>
-			<span :style="getFormItemLableStyle(configStyle)" >{{ getLabel(data.item) }}</span>
-			{{editDisabled}}
-		</template>
-		<template class="form-value" v-if="type === 4">
-	
-			<div class="form-value" v-if="data.type === 'datePicker'" v-html="timeToString(value,data.control.type)">
+  <UrlLink
+    v-else-if="judgeIsShow(data.name) && data.type === 'urllink' && type != 4"
+    :data="data"
+  />
 
-			</div>
-			<div class="form-value" v-else-if="data.type == 'timePicker'" v-html="timeToString(value,'timeCalss')">
-				
-			</div>
-			<div class="form-value" v-else-if="data.type == 'radio'" v-html="judgeRadio(value,data.options)">
-				
-			</div>
-			<div class="form-value" v-else-if="data.type == 'checkbox'" v-html="judgeCheckbox(value,data.options)">
-				
-			</div>
-			<div class="form-value" v-else-if="data.type == 'colorPicker'" >
-				<div :style="'width:20px; height:20px; background-color:'+value+';'"></div>
-			</div>
-			<div class="form-value" v-else-if="data.type == 'slider'" style="width:200px;" >
-				<el-slider v-model="value" disabled />
-			</div>
-			<div class="form-value" v-else-if="data.type == 'rate'" >
-				<el-rate  v-model="value" disabled  />
-			</div>
-			<div class="form-value" v-else-if="data.type == 'switch'" >
-				<el-switch
-					v-model="value"
-					:active-value="data.control.activeValue"
-					:inactive-value="data.control.inactiveValue"
-					disabled 
-				/>
-			</div>
-			<div class="form-value" v-else-if="data.type == 'select'" v-html="selectValue(value,data.options)">
-				
-			</div>
-			<div class="form-value" v-else-if="data.type == 'upload'" >
-				<UploadPageList :img-list="value" :control="control" :data="data"  />
-				
-			</div> 
-			<div class="form-value" v-else-if="data.type == 'tinymce'"  v-html="value">
-			
-			</div>
-			<template class="form-value" v-else-if="data.type == 'signaturemap'" >
-				<el-image style="width: 100%; height: 100%" :src="value"  />
-			</template>
-			<div class="form-value" v-else-if="data.type == 'lowcodeTransfer'"  v-html="value">
-			</div>
-			<div class="form-value" v-else-if="data.type == 'baidumap'" style="width: 100%;" >
-				<BaiduMapLook :address="value" />
-			</div>
-			<div class="form-value" v-else-if="data.type == 'expand-user'" v-html="pickUserVal(value)">
-				
-			</div>
-			<LokOrgCentent  v-else-if="data.type == 'orgCentent'" :orgid="value" />
-			
-			<div class="form-value" v-else  v-html="value">
-			</div>
-		</template>
-		<template v-else>
-	
-			<el-input
-				v-bind="control"
-				v-model="value"
-				:disabled="judgeIsDisabled(data.name)"
-				:type="data.type === 'password' ? 'password' : 'text'"
-				:style="getFormItemInputStyle(configStyle,2)"
-        		:input-style="getFormItemInputStyle(configStyle,3)"
-				v-if="['input', 'password'].includes(data.type)"
-				:placeholder="data.control.placeholder?data.control.placeholder:'请输入'+getLabel(data.item)"
-				
-			>
-				<template #prepend v-if="config.prepend">
-					<div v-if="getInputSlot('p')">
-						<AKSelect
-							:data="getInputSlot('p')"
-							:disabled="judgeIsDisabled(data.name)"
-							:transform-option="transformOption"
-							@change="inputSlotChange"
-							type="slot"
-						/>
-					</div>
-					<span v-else>{{ config.prepend }}</span>
-				</template>
-				<template #append v-if="config.append">
-					<div v-if="getInputSlot()">
-						<AKSelect
-							:data="getInputSlot()"
-							:disabled="judgeIsDisabled(data.name)"
-							:transform-option="transformOption"
-							type="slot"
-							@change="inputSlotChange"
-						/>
-					</div>
-					<span v-else>{{ config.append }}</span>
-				</template>
-				
-			</el-input>
-			<el-input
-				v-bind="control"
-				v-model="value"
-				:disabled="judgeIsDisabled(data.name)"
-				type="textarea"
-				:placeholder="data.control.placeholder?data.control.placeholder:'请输入'+getLabel(data.item)"
-				:style="getFormItemInputStyle(configStyle,2)"
-        		:input-style="getFormItemInputStyle(configStyle,3)"
-				v-if="['textarea', 'description'].includes(data.type)"
-			/>
-			<el-radio-group
-				v-bind="control"
-				:disabled="judgeIsDisabled(data.name)"
-				v-model="value"
-				v-if="data.type === 'radio'"
-				:style="getFormItemInputStyle(configStyle,4)"
-			>
-				<el-radio
-					:key="index"
-					:label="transformOption(item.value)"
-					v-for="(item, index) in props.data.options"
-					
-				>
-					<span :style="getFormItemInputStyle(configStyle,5)">{{ item.label }}</span>
-				</el-radio>
-			</el-radio-group>
-			<el-checkbox-group
-				v-bind="control"
-				:disabled="judgeIsDisabled(data.name)"
-				v-model="value"
-				v-if="data.type === 'checkbox'"
-				:style="getFormItemInputStyle(configStyle,4)"
-			>
-				<el-checkbox
-					v-for="(item, index) in props.data.options"
-					:key="index"
-					:label="transformOption(item.value)"
-				>
-				<span :style="getFormItemInputStyle(configStyle,5)">{{ item.label }}</span>
-				</el-checkbox>
-			</el-checkbox-group>
-			<AKSelect
-				v-if="
-				data.type === 'select' || (type === 5 && data.type === 'inputSlot')
-				"
-				:data="data"
-				:disabled="judgeIsDisabled(data.name)"
-				v-model="value"
-				:options="props.data.options"
-				:remote-method="getAxiosOptions"
-				:transformOption="transformOption"
-				:placeholder="data.control.placeholder?data.control.placeholder:'请选择'+getLabel(data.item)"
-			/>
-			<component
-				v-if="['organization'].includes(data.type)"
-				:is="currentComponent"
-				:data="data"
-				v-bind="control"
-				:control="control"
-				:config="config"
-				:name="control.file || 'file'"
-				:disabled="judgeIsDisabled(data.name)"
-				:options="options"
-				v-model="value"
-			/>
-			<component
-				v-if="['upload'].includes(data.type)"
-				:is="currentComponent"
-				:data="data"
-				v-bind="control"
-				:control="control"
-				:config="config"
-				:name="control.file || 'file'"
-				:disabled="judgeIsDisabled(data.name)"
-				:options="options"
-				v-model="value"
-			/>
+  <el-form-item
+    v-bind="data.item"
+    v-if="
+      judgeIsShow(data.name) &&
+      data.type != 'owner' &&
+      data.type != 'baidumap' &&
+      data.type != 'serialNumber' &&
+      data.type != 'founder' &&
+      data.type != 'founderTime' &&
+      data.type != 'editTime' &&
+      data.type != 'associatedForms' &&
+      data.type != 'videoUpAndPlay' &&
+      data.type != 'lowcodeTransfer' &&
+      data.type != 'lowcodeCarsusel' &&
+      data.type != 'signaturemap' &&
+      data.type != 'signaturemap' &&
+      data.type != 'urllink'
+    "
+    :disabled="judgeIsDisabled(data.name)"
+    :prop="tProp || data.name"
+    :class="config.className"
+    :rules="itemRules as any"
+    :label="getLabel(data.item as FormItem)"
+  >
+    <template #label v-if="config.help">
+      <span :style="getFormItemLableStyle(configStyle)">{{ getLabel(data.item) }}</span>
+      <Tooltips :content="config.help" />
+    </template>
+    <template #label v-else>
+      <span :style="getFormItemLableStyle(configStyle)">{{ getLabel(data.item) }}</span>
+      {{ editDisabled }}
+    </template>
+    <template class="form-value" v-if="type === 4">
+      <div
+        class="form-value"
+        v-if="data.type === 'datePicker'"
+        v-html="timeToString(value, data.control.type)"
+      ></div>
+      <div
+        class="form-value"
+        v-else-if="data.type == 'timePicker'"
+        v-html="timeToString(value, 'timeCalss')"
+      ></div>
+      <div
+        class="form-value"
+        v-else-if="data.type == 'radio'"
+        v-html="judgeRadio(value, data.options)"
+      ></div>
+      <div
+        class="form-value"
+        v-else-if="data.type == 'checkbox'"
+        v-html="judgeCheckbox(value, data.options)"
+      ></div>
+      <div class="form-value" v-else-if="data.type == 'cascader'">
+        {{ judjeCascader(value, data.options) }}
+      </div>
+      <div class="form-value" v-else-if="data.type == 'colorPicker'">
+        <div :style="'width:20px; height:20px; background-color:' + value + ';'"></div>
+      </div>
+      <div class="form-value" v-else-if="data.type == 'slider'" style="width: 200px">
+        <el-slider v-model="value" disabled />
+      </div>
+      <div class="form-value" v-else-if="data.type == 'rate'">
+        <el-rate v-model="value" disabled />
+      </div>
+      <div class="form-value" v-else-if="data.type == 'switch'">
+        <el-switch
+          v-model="value"
+          :active-value="data.control.activeValue"
+          :inactive-value="data.control.inactiveValue"
+          disabled
+        />
+      </div>
+      <div
+        class="form-value"
+        v-else-if="data.type == 'select'"
+        v-html="selectValue(value, data.options)"
+      ></div>
+      <div class="form-value" v-else-if="data.type == 'upload'">
+        <UploadPageList :img-list="value" :control="control" :data="data" />
+      </div>
+      <div class="form-value" v-else-if="data.type == 'tinymce'" v-html="value"></div>
+      <template class="form-value" v-else-if="data.type == 'signaturemap'">
+        <el-image style="width: 100%; height: 100%" :src="value" />
+      </template>
+      <div
+        class="form-value"
+        v-else-if="data.type == 'lowcodeTransfer'"
+        v-html="value"
+      ></div>
+      <div class="form-value" v-else-if="data.type == 'baidumap'" style="width: 100%">
+        <BaiduMapLook :address="value" />
+      </div>
+      <div
+        class="form-value"
+        v-else-if="data.type == 'expand-user'"
+        v-html="pickUserVal(value)"
+      ></div>
+      <LokOrgCentent v-else-if="data.type == 'orgCentent'" :orgid="value" />
 
-			<component
-				v-if="['cascader'].includes(data.type)"
-				:is="currentComponent"
-				v-bind="control"
-				:data="data"
-				:control="control"
-				:config="config"
-				:disabled="judgeIsDisabled(data.name)"
-				:options="options"
-				v-model="value"
-				
-			/>
-			
-			<component
-				v-if="['treeSelect'].includes(data.type)"
-				:is="currentComponent"
-				v-bind="control"
-				:disabled="judgeIsDisabled(data.name)"
-				:options="options"
-				v-model="value"
-				
-			/>
-			<el-time-picker v-if="data.type=='timePicker'" v-model="value" value-format="x" :placeholder="data.control.placeholder?data.control.placeholder:'请选择'+getLabel(data.item)" />
+      <div class="form-value" v-else v-html="value"></div>
+    </template>
+    <template v-else>
+      <el-input
+        v-bind="control"
+        v-model="value"
+        :disabled="judgeIsDisabled(data.name)"
+        :type="data.type === 'password' ? 'password' : 'text'"
+        :style="getFormItemInputStyle(configStyle, 2)"
+        :input-style="getFormItemInputStyle(configStyle, 3)"
+        v-if="['input', 'password'].includes(data.type)"
+        :placeholder="
+          data.control.placeholder
+            ? data.control.placeholder
+            : '请输入' + getLabel(data.item)
+        "
+      >
+        <template #prepend v-if="config.prepend">
+          <div v-if="getInputSlot('p')">
+            <AKSelect
+              :data="getInputSlot('p')"
+              :disabled="judgeIsDisabled(data.name)"
+              :transform-option="transformOption"
+              @change="inputSlotChange"
+              type="slot"
+            />
+          </div>
+          <span v-else>{{ config.prepend }}</span>
+        </template>
+        <template #append v-if="config.append">
+          <div v-if="getInputSlot()">
+            <AKSelect
+              :data="getInputSlot()"
+              :disabled="judgeIsDisabled(data.name)"
+              :transform-option="transformOption"
+              type="slot"
+              @change="inputSlotChange"
+            />
+          </div>
+          <span v-else>{{ config.append }}</span>
+        </template>
+      </el-input>
+      <el-input
+        v-bind="control"
+        v-model="value"
+        :disabled="judgeIsDisabled(data.name)"
+        type="textarea"
+        :placeholder="
+          data.control.placeholder
+            ? data.control.placeholder
+            : '请输入' + getLabel(data.item)
+        "
+        :style="getFormItemInputStyle(configStyle, 2)"
+        :input-style="getFormItemInputStyle(configStyle, 3)"
+        v-if="['textarea', 'description'].includes(data.type)"
+      />
+      <el-radio-group
+        v-bind="control"
+        :disabled="judgeIsDisabled(data.name)"
+        v-model="value"
+        v-if="data.type === 'radio'"
+        :style="getFormItemInputStyle(configStyle, 4)"
+      >
+        <el-radio
+          :key="index"
+          :label="transformOption(item.value)"
+          v-for="(item, index) in props.data.options"
+        >
+          <span :style="getFormItemInputStyle(configStyle, 5)">{{ item.label }}</span>
+        </el-radio>
+      </el-radio-group>
+      <el-checkbox-group
+        v-bind="control"
+        :disabled="judgeIsDisabled(data.name)"
+        v-model="value"
+        v-if="data.type === 'checkbox'"
+        :style="getFormItemInputStyle(configStyle, 4)"
+      >
+        <el-checkbox
+          v-for="(item, index) in props.data.options"
+          :key="index"
+          :label="transformOption(item.value)"
+        >
+          <span :style="getFormItemInputStyle(configStyle, 5)">{{ item.label }}</span>
+        </el-checkbox>
+      </el-checkbox-group>
+      <AKSelect
+        v-if="data.type === 'select' || (type === 5 && data.type === 'inputSlot')"
+        :data="data"
+        :disabled="judgeIsDisabled(data.name)"
+        v-model="value"
+        :options="props.data.options"
+        :remote-method="getAxiosOptions"
+        :transformOption="transformOption"
+        :placeholder="
+          data.control.placeholder
+            ? data.control.placeholder
+            : '请选择' + getLabel(data.item)
+        "
+      />
+      <component
+        v-if="['organization'].includes(data.type)"
+        :is="currentComponent"
+        :data="data"
+        v-bind="control"
+        :control="control"
+        :config="config"
+        :name="control.file || 'file'"
+        :disabled="judgeIsDisabled(data.name)"
+        :options="options"
+        v-model="value"
+      />
+      <component
+        v-if="['upload'].includes(data.type)"
+        :is="currentComponent"
+        :data="data"
+        v-bind="control"
+        :control="control"
+        :config="config"
+        :name="control.file || 'file'"
+        :disabled="judgeIsDisabled(data.name)"
+        :options="options"
+        v-model="value"
+      />
 
-			<component
-				v-if="
-				[
-				'datePicker'
-				].includes(data.type)
-				"
-				:is="currentComponent"
-				v-bind="control"
-				:disabled="judgeIsDisabled(data.name)"
-				:data="data" 
-				:placeholder="data.control.placeholder?data.control.placeholder:'请选择'+getLabel(data.item)"
-				v-model="value"
-			/>
+      <component
+        v-if="['cascader'].includes(data.type)"
+        :is="currentComponent"
+        v-bind="control"
+        :data="data"
+        :control="control"
+        :config="config"
+        :disabled="judgeIsDisabled(data.name)"
+        :options="options"
+        v-model="value"
+      />
 
+      <component
+        v-if="['treeSelect'].includes(data.type)"
+        :is="currentComponent"
+        v-bind="control"
+        :disabled="judgeIsDisabled(data.name)"
+        :options="options"
+        v-model="value"
+      />
+      <el-time-picker
+        v-if="data.type == 'timePicker'"
+        v-model="value"
+        value-format="x"
+        :placeholder="
+          data.control.placeholder
+            ? data.control.placeholder
+            : '请选择' + getLabel(data.item)
+        "
+      />
 
-			<component
-				v-if="
-				[
-					'rate',
-					'slider',
-					'switch',
-					'inputNumber',
-					'colorPicker',
-					'component',
-					'expand-user',
-					'orgCentent',
-					'digitpage',
-				].includes(data.type)
-				"
-				:is="currentComponent"
-				v-bind="control"
-				:disabled="judgeIsDisabled(data.name)"
-				:placeholder="data.control.placeholder?data.control.placeholder:'请选择'+getLabel(data.item)"
-				v-model="value"
-			/>
-			<component
-				v-if="
-				[
-					'lowcodeImage'
-				].includes(data.type)
-				"
-				:is="currentComponent"
-				v-bind="control"
-				:disabled="judgeIsDisabled(data.name)"
-				:placeholder="data.control.placeholder?data.control.placeholder:'请选择'+getLabel(data.item)"
-				:data="data" 
-				:tablekey="props.tablekey" 
-				:form-table-set-up="props.alldata"
-				v-model="value"
-			/>
-				
-				
-				
-				
-				
-				
-				
-				
-				
-			
-			<template v-if="data.type === 'tinymce'">
-				<!--  设计模式时拖动会出现异常，设计模式暂用图片代替-->
-				
-				<div class="app-container" v-if="[1, 2, 3].includes(type as number)">
-					<editor  v-if="[1, 2, 3].includes(type as number)" v-bind="control" v-model="value" :disabled="judgeIsDisabled(data.name)" style="height: 500px" />
-				</div>
-				<img
-					alt=""
-					:src="TextImg"
-					v-if="type === 5"
-					style="max-width: 100%"
-				/>
-			</template>
-		</template>
-  	</el-form-item>
-</template>
-<style  lang='scss' scoped>
+      <component
+        v-if="['datePicker'].includes(data.type)"
+        :is="currentComponent"
+        v-bind="control"
+        :disabled="judgeIsDisabled(data.name)"
+        :data="data"
+        :placeholder="
+          data.control.placeholder
+            ? data.control.placeholder
+            : '请选择' + getLabel(data.item)
+        "
+        v-model="value"
+      />
+
+      <component
+        v-if="
+          [
+            'rate',
+            'slider',
+            'switch',
+            'inputNumber',
+            'colorPicker',
+            'component',
+            'expand-user',
+            'orgCentent',
+            'digitpage',
+          ].includes(data.type)
+        "
+        :is="currentComponent"
+        v-bind="control"
+        :disabled="judgeIsDisabled(data.name)"
+        :placeholder="
+          data.control.placeholder
+            ? data.control.placeholder
+            : '请选择' + getLabel(data.item)
+        "
+        v-model="value"
+      />
+      <component
+        v-if="['lowcodeImage'].includes(data.type)"
+        :is="currentComponent"
+        v-bind="control"
+        :disabled="judgeIsDisabled(data.name)"
+        :placeholder="
+          data.control.placeholder
+            ? data.control.placeholder
+            : '请选择' + getLabel(data.item)
+        "
+        :data="data"
+        :tablekey="props.tablekey"
+        :form-table-set-up="props.alldata"
+        v-model="value"
+      />
 
-</style>
+      <template v-if="data.type === 'tinymce'">
+        <!--  设计模式时拖动会出现异常，设计模式暂用图片代替-->
+
+        <div class="app-container" v-if="[1, 2, 3].includes(type as number)">
+          <editor
+            v-if="[1, 2, 3].includes(type as number)"
+            v-bind="control"
+            v-model="value"
+            :disabled="judgeIsDisabled(data.name)"
+            style="height: 500px"
+          />
+        </div>
+        <img alt="" :src="TextImg" v-if="type === 5" style="max-width: 100%" />
+      </template>
+    </template>
+  </el-form-item>
+</template>
+<style lang="scss" scoped></style>
diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue
index 151c3c6..32a75f9 100644
--- a/src/components/DesignForm/tableListPage/index.vue
+++ b/src/components/DesignForm/tableListPage/index.vue
@@ -3,232 +3,243 @@
 @ 时间: 2024-03-29 14:21:27
 @ 备注: 自定义表单通用列表
 -->
-<script lang='ts' setup>
-import { json2string,objToStringify,string2json,stringToObj } from '@/utils/DesignForm/form'
-import { onBeforeRouteLeave, useRoute, useRouter } from 'vue-router'
-import { useDesignFormStore } from '@/store/DesignForm/designForm'
-import { attrButton,FormPageList,FormPageConfig,viewPageType } from '@/api/DesignForm/tableButton'
-import { inputUnit,timeUnit,choiceUnit,switchUnit,orgUnit,checkboxUnit } from '@/api/DesignForm/fieldUnit'
-import type { FormInstance, FormRules,ElNotification  } from 'element-plus'
-import { gainFormPageListCont } from '@/api/DesignForm/requestapi'
-import { Picture,InfoFilled,QuestionFilled } from '@element-plus/icons-vue'
-import request from '@/utils/request';
-import { softDeletion,retractRunWorkFlow } from '@/api/taskapi/management'
+<script lang="ts" setup>
+import {
+  json2string,
+  objToStringify,
+  string2json,
+  stringToObj,
+} from "@/utils/DesignForm/form";
+import { onBeforeRouteLeave, useRoute, useRouter } from "vue-router";
+import { useDesignFormStore } from "@/store/DesignForm/designForm";
+import {
+  attrButton,
+  FormPageList,
+  FormPageConfig,
+  viewPageType,
+} from "@/api/DesignForm/tableButton";
+import {
+  inputUnit,
+  timeUnit,
+  choiceUnit,
+  switchUnit,
+  orgUnit,
+  checkboxUnit,
+} from "@/api/DesignForm/fieldUnit";
+import type { FormInstance, FormRules, ElNotification } from "element-plus";
+import { gainFormPageListCont } from "@/api/DesignForm/requestapi";
+import { Picture, InfoFilled, QuestionFilled } from "@element-plus/icons-vue";
+import request from "@/utils/request";
+import { softDeletion, retractRunWorkFlow } from "@/api/taskapi/management";
 
-import { 
-	formatNumber
-} from '@/api/DesignForm/utils'
+import { formatNumber } from "@/api/DesignForm/utils";
 //引入组件
-import FormPageCont from '@/components/DesignForm/tableListPage/formPageCont.vue'
-import TableFlow from '@/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue'
-import TimeAxisPage from '@/components/DesignForm/app/timeAxis.vue'
-import CardPage from '@/components/DesignForm/app/cardPage.vue'
-import GanttPage from '@/components/DesignForm/app/gannttPage.vue'
-import MapPage from '@/components/DesignForm/app/mapPage.vue'
-import CalendarPage from '@/components/DesignForm/app/calendar/calendar1/calendarPage.vue'
-import SearchSelect from '@/components/DesignForm/app/calendar/selectSearch.vue'
+import FormPageCont from "@/components/DesignForm/tableListPage/formPageCont.vue";
+import TableFlow from "@/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue";
+import TimeAxisPage from "@/components/DesignForm/app/timeAxis.vue";
+import CardPage from "@/components/DesignForm/app/cardPage.vue";
+import GanttPage from "@/components/DesignForm/app/gannttPage.vue";
+import MapPage from "@/components/DesignForm/app/mapPage.vue";
+import CalendarPage from "@/components/DesignForm/app/calendar/calendar1/calendarPage.vue";
+import SearchSelect from "@/components/DesignForm/app/calendar/selectSearch.vue";
 
 const props = withDefaults(
-    defineProps<{
-		data: FormPageList
-		searchData?: attrButton[]
-		config:FormPageConfig
-		formId?:string
-		beforeRequest?: (params: any, rout: any) => any
-		afterResponse?: (result: any) => any | string
-		beforeDelete?: (params: any, route: any) => any
-		showPage?: boolean
-		requestUrl?: string // 请求的api
-		deleteUrl?: string // 删除的api
-		dict?: { [key: string | number]: string | number }
-		fixedBottomScroll?: boolean
-		query?: { [key: string]: any } // 一些附加的请求参数
-		autoLoad?: boolean // 初始时自动请求加载数据
-		delKey?: string // 删除标识
-		lookPageIsShow?:boolean,
-		versionid?:string,
-		versiontitle?:string,
-		viewPage?:viewPageType
-    }>(),
-    {
-		showPage: true,
-		data: () => {
-			return { columns: [],controlBtn:[],operateBtn:[],config:{} }
-		},
-		searchData: () => {
-			return []
-		},
-		config:() =>{
-			return {}
-		},
-		dict: () => {
-			return {}
-		},
-		formId:() =>{
-			return ""
-		},
-		versionid:() =>{
-			return ""
-		},
-		versiontitle:() =>{
-			return ""
-		},
-		fixedBottomScroll: true,
-		autoLoad: true,
-		delKey: 'id',
-		query: () => {
-			return {}
-		},
-		lookPageIsShow:() => {
-			return false
-		},
-		viewPage: () => {
-			return []
-		}
-    }
-)
+  defineProps<{
+    data: FormPageList;
+    searchData?: attrButton[];
+    config: FormPageConfig;
+    formId?: string;
+    beforeRequest?: (params: any, rout: any) => any;
+    afterResponse?: (result: any) => any | string;
+    beforeDelete?: (params: any, route: any) => any;
+    showPage?: boolean;
+    requestUrl?: string; // 请求的api
+    deleteUrl?: string; // 删除的api
+    dict?: { [key: string | number]: string | number };
+    fixedBottomScroll?: boolean;
+    query?: { [key: string]: any }; // 一些附加的请求参数
+    autoLoad?: boolean; // 初始时自动请求加载数据
+    delKey?: string; // 删除标识
+    lookPageIsShow?: boolean;
+    versionid?: string;
+    versiontitle?: string;
+    viewPage?: viewPageType;
+  }>(),
+  {
+    showPage: true,
+    data: () => {
+      return { columns: [], controlBtn: [], operateBtn: [], config: {} };
+    },
+    searchData: () => {
+      return [];
+    },
+    config: () => {
+      return {};
+    },
+    dict: () => {
+      return {};
+    },
+    formId: () => {
+      return "";
+    },
+    versionid: () => {
+      return "";
+    },
+    versiontitle: () => {
+      return "";
+    },
+    fixedBottomScroll: true,
+    autoLoad: true,
+    delKey: "id",
+    query: () => {
+      return {};
+    },
+    lookPageIsShow: () => {
+      return false;
+    },
+    viewPage: () => {
+      return [];
+    },
+  }
+);
 const emits = defineEmits<{
-    (e: 'selectionChange', row: any): void
-    (e: 'btnClick', btn: any, row?: any): void // 列表上面及表格列表里添加删除按钮事件
-	(e: 'optionsValue5Get5', data: any, fieldName: any): void
-}>()
-const operState = ref<number>(1)	//操作状态	1：新增；2：重新发起；3：申请修改；4：提交审批;5:普通表单修改
-const idList = ref<string[]>([])
-const designStore = useDesignFormStore()
-const route = useRoute()
-const router = useRouter()
-const tableDataList = ref([]) // 表格行数据
-const currentAsfTableDataList = ref([])//当前点击的关联表单数据
-const openTaskDrawer = ref(false)	//新增数据
+  (e: "selectionChange", row: any): void;
+  (e: "btnClick", btn: any, row?: any): void; // 列表上面及表格列表里添加删除按钮事件
+  (e: "optionsValue5Get5", data: any, fieldName: any): void;
+}>();
+const operState = ref<number>(1); //操作状态	1：新增；2：重新发起；3：申请修改；4：提交审批;5:普通表单修改
+const idList = ref<string[]>([]);
+const designStore = useDesignFormStore();
+const route = useRoute();
+const router = useRouter();
+const tableDataList = ref([]); // 表格行数据
+const currentAsfTableDataList = ref([]); //当前点击的关联表单数据
+const openTaskDrawer = ref(false); //新增数据
 
 const state = reactive({
-    loading: false,
-    currentPage: 1,
-    pageSize: props.config?.pageSize || 2,
-    total: 0,
-    selectionChecked: [],
-    dict: {}, // 接口返回的
-    searchFormDown: false,
-    treeValue: {}, // 侧栏树选中的值
-    tableScrollMargin: 0,
-    columnsCheck: designStore.getColumnsCheck(route.path),
-    currentNodeKey: ''
-})
+  loading: false,
+  currentPage: 1,
+  pageSize: props.config?.pageSize || 2,
+  total: 0,
+  selectionChecked: [],
+  dict: {}, // 接口返回的
+  searchFormDown: false,
+  treeValue: {}, // 侧栏树选中的值
+  tableScrollMargin: 0,
+  columnsCheck: designStore.getColumnsCheck(route.path),
+  currentNodeKey: "",
+});
 
-const viewType = ref(1)
-const viewLayout = ref<any>()
+const viewType = ref(1);
+const viewLayout = ref<any>();
 /**
 @ 作者: 秦东
 @ 时间: 2024-03-28 16:03:12
 @ 功能: 判断类型
 */
-const unitIsShow = (val:tableButton,unitName:string) => {
-	// val.pattern
-	switch (val.fieldClass) {
-		case "id":		//自定义表单保留字
-			return inputUnit.includes(unitName);
-			break;
-		case "masters_key": //自定义表单保留字
-			return inputUnit.includes(unitName);
-			break;
-		case "creater": //自定义表单保留字
-			return inputUnit.includes(unitName);
-			break;
-		case "creater_time": //自定义表单保留字
-			return timeUnit.includes(unitName);
-			break;
-		case "edit_time": //自定义表单保留字
-			return timeUnit.includes(unitName);
-			break;
-		case "flow_id": //自定义表单保留字
-			return inputUnit.includes(unitName);
-			break;
-		case "baidumap":		//自定义表单保留字
-			return inputUnit.includes(unitName);
-			break;
-		case "input":		//自定义表单保留字
-			return inputUnit.includes(unitName);
-			break;
-		case "radio":		//自定义表单保留字
-			return choiceUnit.includes(unitName);
-			break;
-		case "switch":		//自定义表单保留字
-			return switchUnit.includes(unitName);
-			break;
-		case "orgCentent":		//自定义表单保留字
-			return orgUnit.includes(unitName);
-			break;
-		case "varchar":		//自定义表单保留字
-			return inputUnit.includes(unitName);
-			break;
-		case "checkbox":
-			return checkboxUnit.includes(unitName);
-			break;
-		default:
-			if(val.fieldClass != "datePicker" && val.fieldClass != "timePicker"){
-				return inputUnit.includes(unitName);
-			}
-			break;
-	}
-}
+const unitIsShow = (val: tableButton, unitName: string) => {
+  // val.pattern
+  switch (val.fieldClass) {
+    case "id": //自定义表单保留字
+      return inputUnit.includes(unitName);
+      break;
+    case "masters_key": //自定义表单保留字
+      return inputUnit.includes(unitName);
+      break;
+    case "creater": //自定义表单保留字
+      return inputUnit.includes(unitName);
+      break;
+    case "creater_time": //自定义表单保留字
+      return timeUnit.includes(unitName);
+      break;
+    case "edit_time": //自定义表单保留字
+      return timeUnit.includes(unitName);
+      break;
+    case "flow_id": //自定义表单保留字
+      return inputUnit.includes(unitName);
+      break;
+    case "baidumap": //自定义表单保留字
+      return inputUnit.includes(unitName);
+      break;
+    case "input": //自定义表单保留字
+      return inputUnit.includes(unitName);
+      break;
+    case "radio": //自定义表单保留字
+      return choiceUnit.includes(unitName);
+      break;
+    case "switch": //自定义表单保留字
+      return switchUnit.includes(unitName);
+      break;
+    case "orgCentent": //自定义表单保留字
+      return orgUnit.includes(unitName);
+      break;
+    case "varchar": //自定义表单保留字
+      return inputUnit.includes(unitName);
+      break;
+    case "checkbox":
+      return checkboxUnit.includes(unitName);
+      break;
+    default:
+      if (val.fieldClass != "datePicker" && val.fieldClass != "timePicker") {
+        return inputUnit.includes(unitName);
+      }
+      break;
+  }
+};
 
 /**
 @ 作者: 秦东
 @ 时间: 2024-03-28 13:17:46
 @ 功能: 重置表单
 */
-const ruleSearchForm = ref()
+const ruleSearchForm = ref();
 const resetFields = (formEl: FormInstance | undefined) => {
-	
-	// formEl.resetFields()
-	// console.log("formEl",formEl,formEl.resetFields())
-    // if (!formEl) return
-  	// formEl.resetFields()
-	if(props.searchData && props.searchData.length > 0){
-		props.searchData.forEach((item:any)=>{
-			item.value="";
-		})
-	}
-}
+  // formEl.resetFields()
+  // console.log("formEl",formEl,formEl.resetFields())
+  // if (!formEl) return
+  // formEl.resetFields()
+  if (props.searchData && props.searchData.length > 0) {
+    props.searchData.forEach((item: any) => {
+      item.value = "";
+    });
+  }
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-01 11:36:07
 @ 功能: 功能按钮动作
 */
-const setUpClick = (val:string,id:string) =>{
-	// console.log("功能按钮动作",val,"----id----->",props.versionid,"-----formId---->",props.versiontitle)
-	if(val.key == "newAdd"){
-		drawerWith.value = container.value?.clientWidth
-		openTaskDrawer.value = true
-	}else{
-		if(idList.value.length > 0){
-			ElMessageBox.confirm("确认删除此数据项?删除后不可恢复！", "警告", {
-				confirmButtonText: "确定",
-				cancelButtonText: "取消",
-				type: "warning",
-			}).then(() => {
-				let sendData = {
-					id:idList.value,
-					isTrue:2
-				}
-				softDeletion(sendData)
-					.then((data)=>{
-						// console.log('cancel!',data)
-						ElNotification({
-							title: '提示信息！',
-							message: data.mag,
-							type: 'success',
-						})
-						getPageData()
-					})
-			});
-		}else{
-			ElMessage.error("你还未选中要删除的项目！");
-		}
-		
-	}
-	
-}
+const setUpClick = (val: string, id: string) => {
+  // console.log("功能按钮动作",val,"----id----->",props.versionid,"-----formId---->",props.versiontitle)
+  if (val.key == "newAdd") {
+    drawerWith.value = container.value?.clientWidth;
+    openTaskDrawer.value = true;
+  } else {
+    if (idList.value.length > 0) {
+      ElMessageBox.confirm("确认删除此数据项?删除后不可恢复！", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        let sendData = {
+          id: idList.value,
+          isTrue: 2,
+        };
+        softDeletion(sendData).then((data) => {
+          // console.log('cancel!',data)
+          ElNotification({
+            title: "提示信息！",
+            message: data.mag,
+            type: "success",
+          });
+          getPageData();
+        });
+      });
+    } else {
+      ElMessage.error("你还未选中要删除的项目！");
+    }
+  }
+};
 
 /**
 @ 作者: 秦东
@@ -236,48 +247,47 @@ const setUpClick = (val:string,id:string) =>{
 @ 功能: 表格选择操作
 */
 const selectionChange = (row: any) => {
-    state.selectionChecked = row
-    emits('selectionChange', row)
-	// console.log('selectionChange', row)
-	idList.value.length = 0
-	// console.log('idList.value-1-->', idList.value)
-	if(row && row.length>0){
-		row.forEach((item:any) => {
-			// console.log('item', item.masters_key)
-			idList.value.push(item.masters_key.toString())
-		})
-	}
-	// console.log('idList.value--->', idList.value)
-}
+  state.selectionChecked = row;
+  emits("selectionChange", row);
+  // console.log('selectionChange', row)
+  idList.value.length = 0;
+  // console.log('idList.value-1-->', idList.value)
+  if (row && row.length > 0) {
+    row.forEach((item: any) => {
+      // console.log('item', item.masters_key)
+      idList.value.push(item.masters_key.toString());
+    });
+  }
+  // console.log('idList.value--->', idList.value)
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-01 13:31:37
 @ 功能: 获取表格头内容
 */
 const columnsFilter = computed(() => {
-	console.log("获取表格头内容",props.data.columns)
-    if (!state.columnsCheck?.length) {
-      	return props.data.columns
-    } else {
-		return props.data.columns.filter((item: any) => {
-			return state.columnsCheck.includes(item.prop || item.type)
-		})
-    }
-	
-})
+  console.log("获取表格头内容", props.data.columns);
+  if (!state.columnsCheck?.length) {
+    return props.data.columns;
+  } else {
+    return props.data.columns.filter((item: any) => {
+      return state.columnsCheck.includes(item.prop || item.type);
+    });
+  }
+});
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-01 14:14:36
 @ 功能: 翻页操作
 */
 const handleSizeChange = (page: number) => {
-	// console.log("翻页操作",page)
-    state.pageSize = page
-    getListData(1)
-}
+  // console.log("翻页操作",page)
+  state.pageSize = page;
+  getListData(1);
+};
 const handleCurrentChange = (page: number) => {
-    getListData(page)
-}
+  getListData(page);
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-01 14:15:16
@@ -285,313 +295,305 @@ const handleCurrentChange = (page: number) => {
 */
 // 筛选查询列表数据
 const getListData = (page?: number) => {
-	if (page) {
-      	state.currentPage = page
+  if (page) {
+    state.currentPage = page;
+  }
+  console.log("筛选查询列表数据--->", page);
+  getPageData();
+};
+watch(
+  () => props.lookPageIsShow,
+  (val: boolean) => {
+    if (val && props.formId != "") {
+      getPageData();
     }
-	console.log("筛选查询列表数据--->",page)
-	getPageData()
-}
-watch(()=>props.lookPageIsShow,(val:boolean)=>{
-	if(val && props.formId != ""){
-		getPageData()
-		
-	}
-})
+  }
+);
 
-const timeAxisRef = ref(null)
-const calendarPageRef = ref(null)
-const cardPageRef = ref(null)
+const timeAxisRef = ref(null);
+const calendarPageRef = ref(null);
+const cardPageRef = ref(null);
 const searchSend = reactive({
-	formId:props.formId,
-	page:state.currentPage,
-	pagesize:state.pageSize,
-	searchData:json2string(props.searchData),
-	viewClass:{}
-})
+  formId: props.formId,
+  page: state.currentPage,
+  pagesize: state.pageSize,
+  searchData: json2string(props.searchData),
+  viewClass: {},
+});
 
-let asfDetails = []
-let asfQueryParams: any[] = []
+let asfDetails = [];
+let asfQueryParams: any[] = [];
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-01 15:51:32
 @ 功能: 获取数据
 */
 const getPageData = () => {
-	state.loading = true;
-	let sendData = {
-		formId:props.formId,
-		page:state.currentPage,
-		pagesize:state.pageSize,
-		searchData:json2string(props.searchData)
-		//searchData:"id:1"
-	}
-	// console.log("获取列表详细信息",sendData)
+  state.loading = true;
+  let sendData = {
+    formId: props.formId,
+    page: state.currentPage,
+    pagesize: state.pageSize,
+    searchData: json2string(props.searchData),
+    //searchData:"id:1"
+  };
+  // console.log("获取列表详细信息",sendData)
 
-	switch(viewType.value){
-		case 2:
-			nextTick(()=>{
-				state.loading = false
-				// console.log("获取列表详细信息-------555---------->",calendarPageRef.value)
-				calendarPageRef.value.calendarSearchData(sendData)
-			})
-			// calendarPageRef.value.calendarSearchData()
-			break;
-		case 3:
-			nextTick(()=>{
-				state.loading = false
-				// console.log("获取列表详细信息-------222---------->",timeAxisRef.value)
-				timeAxisRef.value.searchTimeList(sendData,1)
-			})
-			
-			break;
-		case 4:
-			state.loading = false
-			break;
-		case 5:
-			state.loading = false
-			break;
-		case 6:
-			nextTick(()=>{
-				state.loading = false
-				cardPageRef.value.getCardList(sendData)
-			})
-			break;
-		default:
+  switch (viewType.value) {
+    case 2:
+      nextTick(() => {
+        state.loading = false;
+        // console.log("获取列表详细信息-------555---------->",calendarPageRef.value)
+        calendarPageRef.value.calendarSearchData(sendData);
+      });
+      // calendarPageRef.value.calendarSearchData()
+      break;
+    case 3:
+      nextTick(() => {
+        state.loading = false;
+        // console.log("获取列表详细信息-------222---------->",timeAxisRef.value)
+        timeAxisRef.value.searchTimeList(sendData, 1);
+      });
 
-			gainFormPageListCont(sendData)
-				.then((data)=>{
-					
-					//console.log("获取列表详细信息----------------->",data)
-					//liwenxuan 关联表单数据获取 start
-					
-					let dataList = data
-					//console.log(dataList)
-					asfDetails = props.data.columns.filter((item: any) => {
-						return item.fieldClass=="associatedForms"
-					})
-					
-					
-					if(asfDetails.length>0&&data.data.list!=null){
-						//console.log(data.data.list)
-						//拼装参数,asf值对象数组
-						asfQueryParams = []
-						for(let j = 0;j< asfDetails.length;j++){
-							let asfQueryParamsItem :any = {}
-							//console.log(asfDetails[j])
-							asfQueryParamsItem.formId = asfDetails[j].control.formid
-							asfQueryParamsItem.field = asfDetails[j].field
-							
-							let asfToSelectIds = []
-							for(let i = 0;i<data.data.list.length;i++){
-								let asfMasterAndAsfId:any = {}
-								asfMasterAndAsfId.asfId = data.data.list[i][asfDetails[j].field]
-								asfMasterAndAsfId.asfMasterId = data.data.list[i].id
-								
-								asfToSelectIds.push(asfMasterAndAsfId)
-							}
-							asfQueryParamsItem.asfToSelectIds = asfToSelectIds
-							asfQueryParams.push(asfQueryParamsItem)
-						}
-						let queryCount = 0
-						for(let i = 0;i<asfQueryParams[0].asfToSelectIds.length;i++){
-							if(asfQueryParams[0].asfToSelectIds[i].asfId!=""){
-								queryCount++
-							}
-						}
-						//console.log(asfQueryParams)
-						if(queryCount>0){
-							getAsfDataTitlesByIds(asfQueryParams).then(({ data }) => {   
-								//console.log(data)
-								for(let i = 0;i<dataList.data.list.length; i++){
-									//console.log(dataList.data.list[i])
-									for(let j = 0;j<data.length;j++){
-										//console.log(data[j])
-										for(let n = 0;n<data[j].list.length;n++){
-											if(dataList.data.list[i].id==data[j].list[n].asfMasterId){
-												dataList.data.list[i][data[j].field] = data[j].list[n].label
-											}
-											//console.log(data[j].list[n])
-										}
-										
-										
-									}
-								}
-								tableDataList.value = dataList.data.list
-								
-							});
-						}else{
-							tableDataList.value = data.data.list
-						}
-						
-					}else{
-						tableDataList.value = data.data.list
-						
-					}
-					//liwenxuan 关联表单数据获取 end
-					state.total = data.data.total
-					state.loading = false;
-				})
-				.finally(()=>{
-					state.loading = false;
-				})
+      break;
+    case 4:
+      state.loading = false;
+      break;
+    case 5:
+      state.loading = false;
+      break;
+    case 6:
+      nextTick(() => {
+        state.loading = false;
+        cardPageRef.value.getCardList(sendData);
+      });
+      break;
+    default:
+      gainFormPageListCont(sendData)
+        .then((data) => {
+          //console.log("获取列表详细信息----------------->",data)
+          //liwenxuan 关联表单数据获取 start
 
-	}
-}
+          let dataList = data;
+          //console.log(dataList)
+          asfDetails = props.data.columns.filter((item: any) => {
+            return item.fieldClass == "associatedForms";
+          });
 
+          if (asfDetails.length > 0 && data.data.list != null) {
+            //console.log(data.data.list)
+            //拼装参数,asf值对象数组
+            asfQueryParams = [];
+            for (let j = 0; j < asfDetails.length; j++) {
+              let asfQueryParamsItem: any = {};
+              //console.log(asfDetails[j])
+              asfQueryParamsItem.formId = asfDetails[j].control.formid;
+              asfQueryParamsItem.field = asfDetails[j].field;
 
-const asfGetPageData = (asfFormId: any,asfToSelectMastersKey: any) => {
-	let searchData = [{"id":"id","label":"Id","field":"id","type":"bigint(20)","attribute":"","pattern":"bigint","fieldClass":"id","activeValue":"","inactiveValue":"","config":{"optionsType":0},"control":{"optionsValue3Formid":"","optionsValue3Field":""},"options":[],"isSearch":true,"value":asfToSelectMastersKey}]
-	//state.loading = true;
-	let sendData = {
-		formId:asfFormId,
-		page:1,
-		pagesize:1,
-		searchData:json2string(searchData)
-	}
-	//console.log("asf获取列表详细信息",sendData)
-	gainFormPageListCont(sendData)
-		.then((data)=>{
-			
-			//console.log("获取列表详细信息----------------->",data)
-			//liwenxuan 关联表单数据获取 start
-			
-			let dataList = data
-			//console.log(dataList)
-			asfDetails = props.data.columns.filter((item: any) => {
-				return item.fieldClass=="associatedForms"
-			})
-			
-			
-			if(asfDetails.length>0){
-				//console.log(data.data.list)
-				//拼装参数,asf值对象数组
-				let asfAsfQueryParams = []
-				for(let j = 0;j< asfDetails.length;j++){
-					let asfQueryParamsItem :any = {}
-					//console.log(asfDetails[j])
-					asfQueryParamsItem.formId = asfDetails[j].control.formid
-					asfQueryParamsItem.field = asfDetails[j].field
-					
-					let asfToSelectIds = []
-					for(let i = 0;i<data.data.list.length;i++){
-						let asfMasterAndAsfId:any = {}
-						asfMasterAndAsfId.asfId = data.data.list[i][asfDetails[j].field]
-						asfMasterAndAsfId.asfMasterId = data.data.list[i].id
-						
-						asfToSelectIds.push(asfMasterAndAsfId)
-					}
-					asfQueryParamsItem.asfToSelectIds = asfToSelectIds
-					asfAsfQueryParams.push(asfQueryParamsItem)
-				}
-				let queryCount = 0
-				for(let i = 0;i<asfAsfQueryParams[0].asfToSelectIds.length;i++){
-					if(asfAsfQueryParams[0].asfToSelectIds[i].asfId!=undefined&&asfAsfQueryParams[0].asfToSelectIds[i].asfId!=""){
-						queryCount++
-					}
-				}
-				
-				//console.log(asfAsfQueryParams)
-				if(queryCount>0){
-					getAsfDataTitlesByIds(asfAsfQueryParams).then(({ data }) => {   
-						//console.log(data)
-						for(let i = 0;i<dataList.data.list.length; i++){
-							//console.log(dataList.data.list[i])
-							for(let j = 0;j<data.length;j++){
-								//console.log(data[j])
-								for(let n = 0;n<data[j].list.length;n++){
-									if(dataList.data.list[i].id==data[j].list[n].asfMasterId){
-										dataList.data.list[i][data[j].field] = data[j].list[n].label
-									}
-									//console.log(data[j].list[n])
-								}
-								
-								
-							}
-						}
-						currentAsfTableDataList.value = dataList.data.list
+              let asfToSelectIds = [];
+              for (let i = 0; i < data.data.list.length; i++) {
+                let asfMasterAndAsfId: any = {};
+                asfMasterAndAsfId.asfId = data.data.list[i][asfDetails[j].field];
+                asfMasterAndAsfId.asfMasterId = data.data.list[i].id;
 
-					});
-				}else{
-					currentAsfTableDataList.value = data.data.list
+                asfToSelectIds.push(asfMasterAndAsfId);
+              }
+              asfQueryParamsItem.asfToSelectIds = asfToSelectIds;
+              asfQueryParams.push(asfQueryParamsItem);
+            }
+            let queryCount = 0;
+            for (let i = 0; i < asfQueryParams[0].asfToSelectIds.length; i++) {
+              if (asfQueryParams[0].asfToSelectIds[i].asfId != "") {
+                queryCount++;
+              }
+            }
+            //console.log(asfQueryParams)
+            if (queryCount > 0) {
+              getAsfDataTitlesByIds(asfQueryParams).then(({ data }) => {
+                //console.log(data)
+                for (let i = 0; i < dataList.data.list.length; i++) {
+                  //console.log(dataList.data.list[i])
+                  for (let j = 0; j < data.length; j++) {
+                    //console.log(data[j])
+                    for (let n = 0; n < data[j].list.length; n++) {
+                      if (dataList.data.list[i].id == data[j].list[n].asfMasterId) {
+                        dataList.data.list[i][data[j].field] = data[j].list[n].label;
+                      }
+                      //console.log(data[j].list[n])
+                    }
+                  }
+                }
+                tableDataList.value = dataList.data.list;
+              });
+            } else {
+              tableDataList.value = data.data.list;
+            }
+          } else {
+            tableDataList.value = data.data.list;
+          }
+          //liwenxuan 关联表单数据获取 end
+          state.total = data.data.total;
+          state.loading = false;
+        })
+        .finally(() => {
+          state.loading = false;
+        });
+  }
+};
 
-					
-				}
-				
-			}else{
-				currentAsfTableDataList.value = data.data.list
+const asfGetPageData = (asfFormId: any, asfToSelectMastersKey: any) => {
+  let searchData = [
+    {
+      id: "id",
+      label: "Id",
+      field: "id",
+      type: "bigint(20)",
+      attribute: "",
+      pattern: "bigint",
+      fieldClass: "id",
+      activeValue: "",
+      inactiveValue: "",
+      config: { optionsType: 0 },
+      control: { optionsValue3Formid: "", optionsValue3Field: "" },
+      options: [],
+      isSearch: true,
+      value: asfToSelectMastersKey,
+    },
+  ];
+  //state.loading = true;
+  let sendData = {
+    formId: asfFormId,
+    page: 1,
+    pagesize: 1,
+    searchData: json2string(searchData),
+  };
+  //console.log("asf获取列表详细信息",sendData)
+  gainFormPageListCont(sendData)
+    .then((data) => {
+      //console.log("获取列表详细信息----------------->",data)
+      //liwenxuan 关联表单数据获取 start
 
-				
-				
-			}
-			/* //liwenxuan 关联表单数据获取 end
-			state.total = data.data.total
-			state.loading = false; */
-		})
-		.finally(()=>{
-			/* state.loading = false; */
+      let dataList = data;
+      //console.log(dataList)
+      asfDetails = props.data.columns.filter((item: any) => {
+        return item.fieldClass == "associatedForms";
+      });
 
-			//显示关联表单本条详情
-			tablePageClass.value = 4;	
-			drawerWith.value = container.value?.clientWidth
-			asflookPageInfoIsShow.value = true;
-						
+      if (asfDetails.length > 0) {
+        //console.log(data.data.list)
+        //拼装参数,asf值对象数组
+        let asfAsfQueryParams = [];
+        for (let j = 0; j < asfDetails.length; j++) {
+          let asfQueryParamsItem: any = {};
+          //console.log(asfDetails[j])
+          asfQueryParamsItem.formId = asfDetails[j].control.formid;
+          asfQueryParamsItem.field = asfDetails[j].field;
 
-		})
-		
-}
+          let asfToSelectIds = [];
+          for (let i = 0; i < data.data.list.length; i++) {
+            let asfMasterAndAsfId: any = {};
+            asfMasterAndAsfId.asfId = data.data.list[i][asfDetails[j].field];
+            asfMasterAndAsfId.asfMasterId = data.data.list[i].id;
 
+            asfToSelectIds.push(asfMasterAndAsfId);
+          }
+          asfQueryParamsItem.asfToSelectIds = asfToSelectIds;
+          asfAsfQueryParams.push(asfQueryParamsItem);
+        }
+        let queryCount = 0;
+        for (let i = 0; i < asfAsfQueryParams[0].asfToSelectIds.length; i++) {
+          if (
+            asfAsfQueryParams[0].asfToSelectIds[i].asfId != undefined &&
+            asfAsfQueryParams[0].asfToSelectIds[i].asfId != ""
+          ) {
+            queryCount++;
+          }
+        }
+
+        //console.log(asfAsfQueryParams)
+        if (queryCount > 0) {
+          getAsfDataTitlesByIds(asfAsfQueryParams).then(({ data }) => {
+            //console.log(data)
+            for (let i = 0; i < dataList.data.list.length; i++) {
+              //console.log(dataList.data.list[i])
+              for (let j = 0; j < data.length; j++) {
+                //console.log(data[j])
+                for (let n = 0; n < data[j].list.length; n++) {
+                  if (dataList.data.list[i].id == data[j].list[n].asfMasterId) {
+                    dataList.data.list[i][data[j].field] = data[j].list[n].label;
+                  }
+                  //console.log(data[j].list[n])
+                }
+              }
+            }
+            currentAsfTableDataList.value = dataList.data.list;
+          });
+        } else {
+          currentAsfTableDataList.value = data.data.list;
+        }
+      } else {
+        currentAsfTableDataList.value = data.data.list;
+      }
+      /* //liwenxuan 关联表单数据获取 end
+			state.total = data.data.total
+			state.loading = false; */
+    })
+    .finally(() => {
+      /* state.loading = false; */
 
+      //显示关联表单本条详情
+      tablePageClass.value = 4;
+      drawerWith.value = container.value?.clientWidth;
+      asflookPageInfoIsShow.value = true;
+    });
+};
 
-onMounted(()=>{
-	getPageData()
-	nextTick(()=>{
-		drawerWith.value = container.value?.clientWidth
-	})
-})
+onMounted(() => {
+  getPageData();
+  nextTick(() => {
+    drawerWith.value = container.value?.clientWidth;
+  });
+});
 //liwenxuan 关联表单数据获取 start
 function getAsfDataTitlesByIds(asfQueryParams: any[]) {
-	return request({ 
-		url: '/javasys/lowCode/AssociatedForms/getAsfDataTitlesByIds',
-		method: 'post',
-		data: asfQueryParams,
-	});
+  return request({
+    url: "/javasys/lowCode/AssociatedForms/getAsfDataTitlesByIds",
+    method: "post",
+    data: asfQueryParams,
+  });
 }
 //liwenxuan 关联表单数据获取 end
-const asfShowDetailsFlag = ref(false)
+const asfShowDetailsFlag = ref(false);
 //liwenxuan 关联表单详情弹窗 start
-function showAsfDetailDialog(item: any,scope: any,asfQueryParams: any){
-	let val = scope.row
-	//asfShowDetailsFlag.value= true
-	/* console.log("item----------------->",item)
+function showAsfDetailDialog(item: any, scope: any, asfQueryParams: any) {
+  let val = scope.row;
+  //asfShowDetailsFlag.value= true
+  /* console.log("item----------------->",item)
 	console.log("scope----------------->",scope)
 	console.log("asfQueryParams----------------->",asfQueryParams)
 	console.log("val----------------->",val) */
-	let asfFormId = item.control.formid//关联表单在customer_form中的id
-	//alert("asfFormId:"+asfFormId)
-	let scopeColumnProperty = scope.column.property//exp:associatedForms1720570283525
-
-	let asfQueryParamsNAsfToSelectIdsNAsfMasterId = val.id
-	//alert(asfQueryParamsNAsfToSelectIdsNAsfMasterId)
-	let asfToSelectMastersKey = ""
-	for(let i = 0;i<asfQueryParams.length;i++){
-		if(asfQueryParams[i].field == scopeColumnProperty){
-			
-			for(let j = 0;j<asfQueryParams[i].asfToSelectIds.length;j++){
-				
-				if(asfQueryParams[i].asfToSelectIds[j].asfMasterId==asfQueryParamsNAsfToSelectIdsNAsfMasterId){
-					asfToSelectMastersKey = asfQueryParams[i].asfToSelectIds[j].asfId
-					
-				}
-			}
-		}
-	}
-	//alert("asfToSelectMastersKey:"+asfToSelectMastersKey)
+  let asfFormId = item.control.formid; //关联表单在customer_form中的id
+  //alert("asfFormId:"+asfFormId)
+  let scopeColumnProperty = scope.column.property; //exp:associatedForms1720570283525
 
+  let asfQueryParamsNAsfToSelectIdsNAsfMasterId = val.id;
+  //alert(asfQueryParamsNAsfToSelectIdsNAsfMasterId)
+  let asfToSelectMastersKey = "";
+  for (let i = 0; i < asfQueryParams.length; i++) {
+    if (asfQueryParams[i].field == scopeColumnProperty) {
+      for (let j = 0; j < asfQueryParams[i].asfToSelectIds.length; j++) {
+        if (
+          asfQueryParams[i].asfToSelectIds[j].asfMasterId ==
+          asfQueryParamsNAsfToSelectIdsNAsfMasterId
+        ) {
+          asfToSelectMastersKey = asfQueryParams[i].asfToSelectIds[j].asfId;
+        }
+      }
+    }
+  }
+  //alert("asfToSelectMastersKey:"+asfToSelectMastersKey)
 
-	
-	
-	asfGetPageData(asfFormId,asfToSelectMastersKey)
-	
+  asfGetPageData(asfFormId, asfToSelectMastersKey);
 }
 //liwenxuan 关联表单详情弹窗 end
 
@@ -601,759 +603,946 @@ function showAsfDetailDialog(item: any,scope: any,asfQueryParams: any){
 @ 功能: 判断单选值
 */
 const judjeRadio = (val: any, options: any[]) => {
-	// console.log("判断单选值",val, options)
-	if(options && options.length > 0){
-		options.forEach((item)=>{
-			if(item.value == val){
-				// console.log("判断单选值",val, item.value,item.label)
-				val =  item.label
-			}
-		})
-	}
-	if(val == 0 || val == "0"){
-		val = ""
-	}
-	return val
-}
+  // console.log("判断单选值",val, options)
+  if (options && options.length > 0) {
+    options.forEach((item) => {
+      if (item.value == val) {
+        // console.log("判断单选值",val, item.value,item.label)
+        val = item.label;
+      }
+    });
+  }
+  if (val == 0 || val == "0") {
+    val = "";
+  }
+  return val;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-02 14:49:40
 @ 功能: 判断开关类型
 */
-const judjeSwitch = (val:any,yesVal:any) => {
-	if(val == yesVal) return true;
-	return false;
-}
+const judjeSwitch = (val: any, yesVal: any) => {
+  if (val == yesVal) return true;
+  return false;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-03 13:13:56
 @ 功能: 列表信息删除信息
 */
-const confirmEvent = (val:any) => {
-	let sendData = {
-		id:[val.masters_key],
-		isTrue:2
-	}
-	softDeletion(sendData)
-		.then((data)=>{
-			// console.log('cancel!',data)
-			ElNotification({
-				title: '系统提示！',
-				message: data.mag?data.mag:"删除成功",
-				type: 'success',
-			})
-			getPageData()
-		})
-}
-const cancelEvent = (val:any) => {
-//   console.log('cancel!',val)
-}
-const container = ref()	//实例化内容容器
-const drawerWith = ref();	//编辑表单时抽屉宽度
+const confirmEvent = (val: any) => {
+  let sendData = {
+    id: [val.masters_key],
+    isTrue: 2,
+  };
+  softDeletion(sendData).then((data) => {
+    // console.log('cancel!',data)
+    ElNotification({
+      title: "系统提示！",
+      message: data.mag ? data.mag : "删除成功",
+      type: "success",
+    });
+    getPageData();
+  });
+};
+const cancelEvent = (val: any) => {
+  //   console.log('cancel!',val)
+};
+const container = ref(); //实例化内容容器
+const drawerWith = ref(); //编辑表单时抽屉宽度
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-03 13:24:06
 @ 功能: 查看详细内容
 */
-const tablePageClass = ref(1)
-const lookPageInfoIsShow = ref(false)
-const asflookPageInfoIsShow = ref(false)
-const pageInfoCont = ref<any>()
-const lookPageInfo = (val:any) => {
-	tablePageClass.value = 4;
-	pageInfoCont.value = val
-	drawerWith.value = container.value?.clientWidth
-	lookPageInfoIsShow.value = true;
-	
-}
+const tablePageClass = ref(1);
+const lookPageInfoIsShow = ref(false);
+const asflookPageInfoIsShow = ref(false);
+const pageInfoCont = ref<any>();
+const lookPageInfo = (val: any) => {
+  tablePageClass.value = 4;
+  pageInfoCont.value = val;
+  drawerWith.value = container.value?.clientWidth;
+  lookPageInfoIsShow.value = true;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-05 11:29:50
 @ 功能: 编辑表单内容
 */
 
-const editInfo = (val:any) => {
-	// console.log('修改数据!',val)
-	operState.value = 5;
-	tablePageClass.value = 2;
-	pageInfoCont.value = val
-	drawerWith.value = container.value?.clientWidth
-	lookPageInfoIsShow.value = true;
-}
+const editInfo = (val: any) => {
+  // console.log('修改数据!',val)
+  operState.value = 5;
+  tablePageClass.value = 2;
+  pageInfoCont.value = val;
+  drawerWith.value = container.value?.clientWidth;
+  lookPageInfoIsShow.value = true;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-10 15:32:55
 @ 功能: 提交审批
 */
-const submitApproval = (val:any) => {
-	operState.value = 4
-	tablePageClass.value = 2;
-	pageInfoCont.value = val
-	drawerWith.value = container.value?.clientWidth
-	lookPageInfoIsShow.value = true;
-}
+const submitApproval = (val: any) => {
+  operState.value = 4;
+  tablePageClass.value = 2;
+  pageInfoCont.value = val;
+  drawerWith.value = container.value?.clientWidth;
+  lookPageInfoIsShow.value = true;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-11 09:36:59
 @ 功能: 撤回申请
 */
-const withdrawApplication  = (val:any) => {
-	// console.log("撤回申请", val);
-	let sendInfo = {
-		id: val.masters_key,
-	}
-	retractRunWorkFlow(sendInfo)
-		.then((data)=>{
-			ElMessage({
-				message: '撤回成功！',
-				type: 'success'
-			})
-			getPageData()
-		})
-}
+const withdrawApplication = (val: any) => {
+  // console.log("撤回申请", val);
+  let sendInfo = {
+    id: val.masters_key,
+  };
+  retractRunWorkFlow(sendInfo).then((data) => {
+    ElMessage({
+      message: "撤回成功！",
+      type: "success",
+    });
+    getPageData();
+  });
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-11 11:17:42
 @ 功能: 重新提交申请
 */
-const afreshSendFlow = (val:any) => {
-	operState.value = 2
-	tablePageClass.value = 2;
-	pageInfoCont.value = val
-	drawerWith.value = container.value?.clientWidth
-	lookPageInfoIsShow.value = true;
-}
+const afreshSendFlow = (val: any) => {
+  operState.value = 2;
+  tablePageClass.value = 2;
+  pageInfoCont.value = val;
+  drawerWith.value = container.value?.clientWidth;
+  lookPageInfoIsShow.value = true;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-11 11:19:21
 @ 功能: 申请修改数据
 */
-const editFormSendFlow = (val:any) => {
-	operState.value = 3
-	tablePageClass.value = 2;
-	pageInfoCont.value = val
-	drawerWith.value = container.value?.clientWidth
-	lookPageInfoIsShow.value = true;
-}
+const editFormSendFlow = (val: any) => {
+  operState.value = 3;
+  tablePageClass.value = 2;
+  pageInfoCont.value = val;
+  drawerWith.value = container.value?.clientWidth;
+  lookPageInfoIsShow.value = true;
+};
 
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-08 09:39:52
 @ 功能: 切换视图展示方式
 */
-const tabsView = (val:any,types:number) => {
-	viewType.value = types
-	val.isClick = true
-	viewLayout.value = val
-	// console.log("切换视图展示方式",val)
-	switch(types){
-		case 2:
-			props.viewPage.list.isClick = false
-			props.viewPage.time.isClick = false
-			props.viewPage.gantt.isClick = false
-			props.viewPage.map.isClick = false
-			props.viewPage.card.isClick = false
-			break;
-		case 3:
-			props.viewPage.list.isClick = false
-			props.viewPage.date.isClick = false
-			props.viewPage.gantt.isClick = false
-			props.viewPage.map.isClick = false
-			props.viewPage.card.isClick = false
-			getPageData()
-			break;
-		case 4:
-			props.viewPage.list.isClick = false
-			props.viewPage.date.isClick = false
-			props.viewPage.time.isClick = false
-			props.viewPage.map.isClick = false
-			props.viewPage.card.isClick = false
-			break;
-		case 5:
-			props.viewPage.list.isClick = false
-			props.viewPage.date.isClick = false
-			props.viewPage.time.isClick = false
-			props.viewPage.gantt.isClick = false
-			props.viewPage.card.isClick = false
-			break;
-		case 6:
-			props.viewPage.list.isClick = false
-			props.viewPage.date.isClick = false
-			props.viewPage.time.isClick = false
-			props.viewPage.gantt.isClick = false
-			props.viewPage.map.isClick = false
-			break;
-		default:
-			props.viewPage.date.isClick = false
-			props.viewPage.card.isClick = false
-			props.viewPage.time.isClick = false
-			props.viewPage.gantt.isClick = false
-			props.viewPage.map.isClick = false
-			break;
-	}
-}
+const tabsView = (val: any, types: number) => {
+  viewType.value = types;
+  val.isClick = true;
+  viewLayout.value = val;
+  // console.log("切换视图展示方式",val)
+  switch (types) {
+    case 2:
+      props.viewPage.list.isClick = false;
+      props.viewPage.time.isClick = false;
+      props.viewPage.gantt.isClick = false;
+      props.viewPage.map.isClick = false;
+      props.viewPage.card.isClick = false;
+      break;
+    case 3:
+      props.viewPage.list.isClick = false;
+      props.viewPage.date.isClick = false;
+      props.viewPage.gantt.isClick = false;
+      props.viewPage.map.isClick = false;
+      props.viewPage.card.isClick = false;
+      getPageData();
+      break;
+    case 4:
+      props.viewPage.list.isClick = false;
+      props.viewPage.date.isClick = false;
+      props.viewPage.time.isClick = false;
+      props.viewPage.map.isClick = false;
+      props.viewPage.card.isClick = false;
+      break;
+    case 5:
+      props.viewPage.list.isClick = false;
+      props.viewPage.date.isClick = false;
+      props.viewPage.time.isClick = false;
+      props.viewPage.gantt.isClick = false;
+      props.viewPage.card.isClick = false;
+      break;
+    case 6:
+      props.viewPage.list.isClick = false;
+      props.viewPage.date.isClick = false;
+      props.viewPage.time.isClick = false;
+      props.viewPage.gantt.isClick = false;
+      props.viewPage.map.isClick = false;
+      break;
+    default:
+      props.viewPage.date.isClick = false;
+      props.viewPage.card.isClick = false;
+      props.viewPage.time.isClick = false;
+      props.viewPage.gantt.isClick = false;
+      props.viewPage.map.isClick = false;
+      break;
+  }
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-25 08:30:49
 @ 功能: 判断是否有标题
 */
-const writeListTitle = (val:any,viewConfig:any) => {
-	// console.log("判断是否有标题--1-->",val)
-	// console.log("判断是否有标题--2-->",viewConfig)
-	var titleAry = [];
-	if(viewConfig.form && viewConfig.form.title){
-		if(viewConfig.form.title.length > 0){
-			viewConfig.form.title.forEach((item,index)=>{
-				// console.log("判断是否有标题--"+index+"-->",val[item])
-				if(val[item]){
-					titleAry.push(val[item])
-				}
-			})
-		}
-	}
-	if(titleAry.length > 0){
-		return titleAry.join()
-	}else{
-		let firstWord = ""
-				let powerAry = ["id","creater_time","edit_time","masters_key","states","flow_id"];
-				for (let key in val) {
-					if (val.hasOwnProperty(key)) {
-						if(!powerAry.includes(key)){
-							if(val[key] != '' && val[key] != null){
-								firstWord = val[key]
-							}
-						}
-					}
-				}
-				return firstWord
-	}
-	
-}
+const writeListTitle = (val: any, viewConfig: any) => {
+  // console.log("判断是否有标题--1-->",val)
+  // console.log("判断是否有标题--2-->",viewConfig)
+  var titleAry = [];
+  if (viewConfig.form && viewConfig.form.title) {
+    if (viewConfig.form.title.length > 0) {
+      viewConfig.form.title.forEach((item, index) => {
+        // console.log("判断是否有标题--"+index+"-->",val[item])
+        if (val[item]) {
+          titleAry.push(val[item]);
+        }
+      });
+    }
+  }
+  if (titleAry.length > 0) {
+    return titleAry.join();
+  } else {
+    let firstWord = "";
+    let powerAry = [
+      "id",
+      "creater_time",
+      "edit_time",
+      "masters_key",
+      "states",
+      "flow_id",
+    ];
+    for (let key in val) {
+      if (val.hasOwnProperty(key)) {
+        if (!powerAry.includes(key)) {
+          if (val[key] != "" && val[key] != null) {
+            firstWord = val[key];
+          }
+        }
+      }
+    }
+    return firstWord;
+  }
+};
 
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-25 10:27:21
 @ 功能: 判断是否有标题
 */
-const judgeListTitle = (val:any,viewConfig:any) => {
-	// console.log("判断是否有标题--3-->",val)
-	// console.log("判断是否有标题--4-->",viewConfig)
-	if(val && val.fieldClass=='_lableTitle'){
-		if(viewConfig.form && viewConfig.form.title){
-			if(viewConfig.form.title.length > 0){
-				return true
-			}
-		}
-	}
-	return false
-}
+const judgeListTitle = (val: any, viewConfig: any) => {
+  // console.log("判断是否有标题--3-->",val)
+  // console.log("判断是否有标题--4-->",viewConfig)
+  if (val && val.fieldClass == "_lableTitle") {
+    if (viewConfig.form && viewConfig.form.title) {
+      if (viewConfig.form.title.length > 0) {
+        return true;
+      }
+    }
+  }
+  return false;
+};
 // 选择数据转换，默认尝试转数字
 const transformOption = (val: string | number, type?: string) => {
-    
-    return formatNumber(val)
- }
+  return formatNumber(val);
+};
 
-
- function optionsValue4Get4(data:any,fieldName:any){
-	//console.log("tableListPage/index","optionsValue4Get4")
-	emits('optionsValue5Get5',data,fieldName)
+function optionsValue4Get4(data: any, fieldName: any) {
+  //console.log("tableListPage/index","optionsValue4Get4")
+  emits("optionsValue5Get5", data, fieldName);
 }
+/**
+@ 作者: 秦东
+@ 时间: 2024-11-29 13:46:36
+@ 功能: 获取级联选择值
+*/
+const judjeCascader = (val: any[], options: any[]) => {
+  if (val.length < 0) return "";
+  let valAry = stringToObj(val);
+  console.log("获取级联选择值", stringToObj(val), val.length, options);
+  if (!Array.isArray(valAry)) return "";
+  let title = "";
+  valAry.forEach((item: any) => {
+    // console.log("item", item);
+
+    console.log(item + "=============:", item, diGuiJilian(item, options));
+    if (title == "") {
+      title = title + diGuiJilian(item, options);
+    } else {
+      title = title + " / " + diGuiJilian(item, options);
+    }
+  });
+  return title;
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-11-29 13:57:04
+@ 功能: 递归查询数据
+*/
+const diGuiJilian = (val: any, options: any[]) => {
+  if (!Array.isArray(options)) return "";
+  let dataVal = "";
+  options.forEach((item: any) => {
+    if (item.value == val) {
+      // console.log(val + "=======递归查询数据======:", item.value, item.label);
+      dataVal = item.label;
+      // return dataVal;
+      // return item.label;
+    }
 
+    if (item.children && item.children.length > 0) {
+      // console.log(
+      //   val + "=======递归查询数据====1==:",
+      //   item.children,
+      //   item.children.length
+      // );
+      let gdVal = diGuiJilian(val, item.children);
+      if (gdVal != "") {
+        dataVal = gdVal;
+      }
+    }
+  });
+  return dataVal;
+};
 </script>
 <template>
-	<div ref="container" v-loading="state.loading" class="table-list-comm">
-		<el-row class="rowBox">
-			<el-col :span="24">
-				<el-form  v-if="config.searchIsShow" ref="ruleSearchForm" class="seacherForm">
-					<template v-for="(item, index) in searchData" :key="index">
-						<div class="group group-input">
-							<el-form-item :label="item.label"  class="form_cont">
-								<el-input
-									v-model="item.value"
-									:placeholder="'请输入'+item.label"
-									clearable
-									v-if="unitIsShow(item,'input')"
-								/>
-								<el-date-picker
-									v-model="item.value"
-									type="datetime"
-									:placeholder="'请选择'+item.label"
-									:shortcuts="shortcuts"
-									v-if="unitIsShow(item,'time')"
-								/>
-								<SearchSelect
-									v-if="unitIsShow(item,'radio')"
-									:data="item"
-									:disabled="false"
-									:transform-option="transformOption"
-									v-model:model-value="item.value"
-								/>
-								<el-select
-									v-model="item.value"
-									clearable
-									:placeholder="'请选择'+item.label"
-									v-if="unitIsShow(item,'switch')"
-								>
-									<el-option
-										:key="item.activeValue"
-										label="是"
-										:value="item.activeValue"
-									/>
-									<el-option
-										:key="item.inactiveValue"
-										label="否"
-										:value="item.inactiveValue"
-									/>
-								</el-select>
-								<SearchSelect
-									v-if="unitIsShow(item,'checkbox')"
-									:data="item"
-									:disabled="false"
-									:is-checkbox="true"
-									:transform-option="transformOption"
-									v-model:model-value="item.value"
-								/>
-								<el-date-picker
-									v-if="item.fieldClass == 'datePicker'"
-									v-model="item.value"
-									:type="item.auxiliary"
-									:placeholder="'请选择'+item.label"
-									value-format="x"
-								/>
-								<el-time-picker
-									v-if="item.fieldClass == 'timePicker'"
-									v-model="item.value"
-									arrow-control
-									:placeholder="'请选择'+item.label"
-									value-format="x"
-								/>
-								<el-select
-									v-model="item.value"
-									clearable
-									:placeholder="'请选择'+item.label"
-									v-if="unitIsShow(item,'org')"
-								>
-								</el-select>
-							</el-form-item>
-						</div>
-						
-					</template>
-					<div class="group group-btn" v-if="searchData.length">
-						<el-button type="primary" @click="getPageData"><el-icon><Search /></el-icon>查询</el-button>
-						<el-button @click="resetFields(ruleSearchForm)"><el-icon><Refresh /></el-icon>重置</el-button>
-					</div>
-				</el-form>
-			</el-col>
-			<el-col :span="24">
-				<div class="operateButArea">
-					<div class="operatLeft">
-						<el-text v-if="data.controlBtn.length === 0" class="mx-1 tipBox" type="info">操作按钮区域</el-text>
-						<el-button
-							v-for="item in data.controlBtn"
-							v-bind="item"
-							:key="item.type"
-							@click="setUpClick(item)"
-						>
-							{{ item.label }}
-						</el-button>
-					</div>
-					<div>
-						<el-button-group class="ml-4">
-							<el-tooltip
-								class="box-item"
-								effect="dark"
-								content="折叠查询表单"
-								placement="bottom"
-							>
-								<el-button size="small" @click="config.searchIsShow=!config.searchIsShow" class="fa fa-search" />
-							</el-tooltip>
-							<el-tooltip
-								v-if="viewPage.list.status"
-								class="box-item"
-								effect="dark"
-								content="列表视图"
-								placement="top"
-							>
-								<el-button size="small" class="fa fa-table"  :color="viewPage.list.isClick?'#a0cfff':''" @click="tabsView(viewPage.list,1)" />
-							</el-tooltip>
-							<el-tooltip
-								v-if="props.viewPage.card&&props.viewPage.card.status"
-								class="box-item"
-								effect="dark"
-								content="卡片视图"
-								placement="top"
-							>
-								<el-button size="small" class="fa fa-id-card-o"  :color="props.viewPage.card&&props.viewPage.card.isClick?'#a0cfff':''" @click="tabsView(props.viewPage.card,6)" />
-							</el-tooltip>
-							<el-tooltip
-								v-if="viewPage.date.status"
-								class="box-item"
-								effect="dark"
-								content="日历视图"
-								placement="top"
-							>
-								<el-button size="small" class="fa fa-calendar"  :color="viewPage.date.isClick?'#a0cfff':''" @click="tabsView(viewPage.date,2)" />
-							</el-tooltip>
-							<el-tooltip
-								v-if="viewPage.time.status"
-								class="box-item"
-								effect="dark"
-								content="时间轴"
-								placement="top"
-							>
-								<el-button size="small" class="fa fa-clock-o"  :color="viewPage.time.isClick?'#a0cfff':''" @click="tabsView(viewPage.time,3)" />
-							</el-tooltip>
-							<el-tooltip
-								v-if="viewPage.gantt.status"
-								class="box-item"
-								effect="dark"
-								content="甘特图"
-								placement="top"
-							>
-								<el-button size="small" class="fa fa-bar-chart"  :color="viewPage.gantt.isClick?'#a0cfff':''" @click="tabsView(viewPage.gantt,4)" />
-							</el-tooltip>
-							<el-tooltip
-								v-if="viewPage.map.status"
-								class="box-item"
-								effect="dark"
-								content="地图视图"
-								placement="top"
-							>
-								<el-button size="small" class="fa fa-map-signs"  :color="viewPage.map.isClick?'#a0cfff':''" @click="tabsView(viewPage.map,5)" />
-							</el-tooltip>
-							
-						</el-button-group>
-					</div>
-				</div>
-			</el-col>
-			<el-col v-if="viewType==1" :span="24">
-				<el-table
-					v-bind="data.tableProps"
-					ref="table"
-					:data="tableDataList"
-					@selection-change="selectionChange"
-					table-layout="fixed"
-				>
-					<template
-						v-for="item in columnsFilter"
-						:key="item.id || item.label"
-					>
-					
-						<el-table-column v-if="['-'].includes(item.fieldClass)" :type="item.type" :prop="item.field" :label="item.label" config="" width="60" fixed>
-							<template v-if="item.help" #header="scope">
-								{{ scope.column.label }}
-								<tooltip :content="item.help" />
-							</template>
-						</el-table-column>
-						<el-table-column v-else-if="item.fieldClass=='__control'"  :prop="item.field" :label="item.label" config="" width="200"  align="center"  fixed="right" >
-							<template #default="scope">
-								<el-button-group>
-									<el-tooltip
-										v-if="scope.row.flowIsOpen==1&&scope.row.taskStatus==1"
-										class="box-item"
-										effect="dark"
-										content="提交审批"
-										placement="top-end"
-									>
-										<el-button type="success" size="small" class="fa fa-send-o"   @click="submitApproval(scope.row)" />
-									</el-tooltip>
+  <div ref="container" v-loading="state.loading" class="table-list-comm">
+    <el-row class="rowBox">
+      <el-col :span="24">
+        <el-form v-if="config.searchIsShow" ref="ruleSearchForm" class="seacherForm">
+          <template v-for="(item, index) in searchData" :key="index">
+            <div class="group group-input">
+              <el-form-item :label="item.label" class="form_cont">
+                <el-input
+                  v-model="item.value"
+                  :placeholder="'请输入' + item.label"
+                  clearable
+                  v-if="unitIsShow(item, 'input')"
+                />
+                <el-date-picker
+                  v-model="item.value"
+                  type="datetime"
+                  :placeholder="'请选择' + item.label"
+                  :shortcuts="shortcuts"
+                  v-if="unitIsShow(item, 'time')"
+                />
+                <SearchSelect
+                  v-if="unitIsShow(item, 'radio')"
+                  :data="item"
+                  :disabled="false"
+                  :transform-option="transformOption"
+                  v-model:model-value="item.value"
+                />
+                <el-select
+                  v-model="item.value"
+                  clearable
+                  :placeholder="'请选择' + item.label"
+                  v-if="unitIsShow(item, 'switch')"
+                >
+                  <el-option
+                    :key="item.activeValue"
+                    label="是"
+                    :value="item.activeValue"
+                  />
+                  <el-option
+                    :key="item.inactiveValue"
+                    label="否"
+                    :value="item.inactiveValue"
+                  />
+                </el-select>
+                <SearchSelect
+                  v-if="unitIsShow(item, 'checkbox')"
+                  :data="item"
+                  :disabled="false"
+                  :is-checkbox="true"
+                  :transform-option="transformOption"
+                  v-model:model-value="item.value"
+                />
+                <el-date-picker
+                  v-if="item.fieldClass == 'datePicker'"
+                  v-model="item.value"
+                  :type="item.auxiliary"
+                  :placeholder="'请选择' + item.label"
+                  value-format="x"
+                />
+                <el-time-picker
+                  v-if="item.fieldClass == 'timePicker'"
+                  v-model="item.value"
+                  arrow-control
+                  :placeholder="'请选择' + item.label"
+                  value-format="x"
+                />
+                <el-select
+                  v-model="item.value"
+                  clearable
+                  :placeholder="'请选择' + item.label"
+                  v-if="unitIsShow(item, 'org')"
+                >
+                </el-select>
+              </el-form-item>
+            </div>
+          </template>
+          <div class="group group-btn" v-if="searchData.length">
+            <el-button type="primary" @click="getPageData"
+              ><el-icon><Search /></el-icon>查询</el-button
+            >
+            <el-button @click="resetFields(ruleSearchForm)"
+              ><el-icon><Refresh /></el-icon>重置</el-button
+            >
+          </div>
+        </el-form>
+      </el-col>
+      <el-col :span="24">
+        <div class="operateButArea">
+          <div class="operatLeft">
+            <el-text v-if="data.controlBtn.length === 0" class="mx-1 tipBox" type="info"
+              >操作按钮区域</el-text
+            >
+            <el-button
+              v-for="item in data.controlBtn"
+              v-bind="item"
+              :key="item.type"
+              @click="setUpClick(item)"
+            >
+              {{ item.label }}
+            </el-button>
+          </div>
+          <div>
+            <el-button-group class="ml-4">
+              <el-tooltip
+                class="box-item"
+                effect="dark"
+                content="折叠查询表单"
+                placement="bottom"
+              >
+                <el-button
+                  size="small"
+                  @click="config.searchIsShow = !config.searchIsShow"
+                  class="fa fa-search"
+                />
+              </el-tooltip>
+              <el-tooltip
+                v-if="viewPage.list.status"
+                class="box-item"
+                effect="dark"
+                content="列表视图"
+                placement="top"
+              >
+                <el-button
+                  size="small"
+                  class="fa fa-table"
+                  :color="viewPage.list.isClick ? '#a0cfff' : ''"
+                  @click="tabsView(viewPage.list, 1)"
+                />
+              </el-tooltip>
+              <el-tooltip
+                v-if="props.viewPage.card && props.viewPage.card.status"
+                class="box-item"
+                effect="dark"
+                content="卡片视图"
+                placement="top"
+              >
+                <el-button
+                  size="small"
+                  class="fa fa-id-card-o"
+                  :color="
+                    props.viewPage.card && props.viewPage.card.isClick ? '#a0cfff' : ''
+                  "
+                  @click="tabsView(props.viewPage.card, 6)"
+                />
+              </el-tooltip>
+              <el-tooltip
+                v-if="viewPage.date.status"
+                class="box-item"
+                effect="dark"
+                content="日历视图"
+                placement="top"
+              >
+                <el-button
+                  size="small"
+                  class="fa fa-calendar"
+                  :color="viewPage.date.isClick ? '#a0cfff' : ''"
+                  @click="tabsView(viewPage.date, 2)"
+                />
+              </el-tooltip>
+              <el-tooltip
+                v-if="viewPage.time.status"
+                class="box-item"
+                effect="dark"
+                content="时间轴"
+                placement="top"
+              >
+                <el-button
+                  size="small"
+                  class="fa fa-clock-o"
+                  :color="viewPage.time.isClick ? '#a0cfff' : ''"
+                  @click="tabsView(viewPage.time, 3)"
+                />
+              </el-tooltip>
+              <el-tooltip
+                v-if="viewPage.gantt.status"
+                class="box-item"
+                effect="dark"
+                content="甘特图"
+                placement="top"
+              >
+                <el-button
+                  size="small"
+                  class="fa fa-bar-chart"
+                  :color="viewPage.gantt.isClick ? '#a0cfff' : ''"
+                  @click="tabsView(viewPage.gantt, 4)"
+                />
+              </el-tooltip>
+              <el-tooltip
+                v-if="viewPage.map.status"
+                class="box-item"
+                effect="dark"
+                content="地图视图"
+                placement="top"
+              >
+                <el-button
+                  size="small"
+                  class="fa fa-map-signs"
+                  :color="viewPage.map.isClick ? '#a0cfff' : ''"
+                  @click="tabsView(viewPage.map, 5)"
+                />
+              </el-tooltip>
+            </el-button-group>
+          </div>
+        </div>
+      </el-col>
+      <el-col v-if="viewType == 1" :span="24">
+        <el-table
+          v-bind="data.tableProps"
+          ref="table"
+          :data="tableDataList"
+          @selection-change="selectionChange"
+          table-layout="fixed"
+        >
+          <template v-for="item in columnsFilter" :key="item.id || item.label">
+            <el-table-column
+              v-if="['-'].includes(item.fieldClass)"
+              :type="item.type"
+              :prop="item.field"
+              :label="item.label"
+              config=""
+              width="60"
+              fixed
+            >
+              <template v-if="item.help" #header="scope">
+                {{ scope.column.label }}
+                <tooltip :content="item.help" />
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-else-if="item.fieldClass == '__control'"
+              :prop="item.field"
+              :label="item.label"
+              config=""
+              width="200"
+              align="center"
+              fixed="right"
+            >
+              <template #default="scope">
+                <el-button-group>
+                  <el-tooltip
+                    v-if="scope.row.flowIsOpen == 1 && scope.row.taskStatus == 1"
+                    class="box-item"
+                    effect="dark"
+                    content="提交审批"
+                    placement="top-end"
+                  >
+                    <el-button
+                      type="success"
+                      size="small"
+                      class="fa fa-send-o"
+                      @click="submitApproval(scope.row)"
+                    />
+                  </el-tooltip>
+
+                  <el-tooltip
+                    v-if="scope.row.flowIsOpen == 1 && scope.row.taskStatus == 2"
+                    class="box-item"
+                    effect="dark"
+                    content="重新申请"
+                    placement="top-end"
+                  >
+                    <el-button
+                      type="warning"
+                      size="small"
+                      class="fa fa-retweet"
+                      @click="afreshSendFlow(scope.row)"
+                    />
+                  </el-tooltip>
+                  <el-tooltip
+                    class="box-item"
+                    effect="dark"
+                    content="查看详情"
+                    placement="top-end"
+                  >
+                    <el-button
+                      @click="lookPageInfo(scope.row)"
+                      type="primary"
+                      size="small"
+                      class="fa fa-eye"
+                    />
+                  </el-tooltip>
+                  <el-popconfirm
+                    v-if="scope.row.flowIsOpen == 1 && scope.row.isRetract"
+                    confirm-button-text="确定"
+                    cancel-button-text="取消"
+                    :icon="QuestionFilled"
+                    icon-color="#F56C6C"
+                    title="您确定要撤回此次申请？一经撤回！需要此流程重新提交申请！"
+                    @confirm="withdrawApplication(scope.row)"
+                    @cancel="cancelEvent(scope.row)"
+                  >
+                    <template #reference>
+                      <el-button size="small" class="fa fa-reply-all" />
+                    </template>
+                  </el-popconfirm>
+                  <el-tooltip
+                    v-if="scope.row.flowIsOpen == 2"
+                    class="box-item"
+                    effect="dark"
+                    content="编辑"
+                    placement="top-end"
+                  >
+                    <el-button
+                      @click="editInfo(scope.row)"
+                      type="info"
+                      size="small"
+                      class="fa fa-edit"
+                    />
+                  </el-tooltip>
+                  <el-popconfirm
+                    v-if="scope.row.taskStatus == 2 || scope.row.taskStatus == 1"
+                    confirm-button-text="确定"
+                    cancel-button-text="取消"
+                    :icon="QuestionFilled"
+                    icon-color="#F56C6C"
+                    title="您确定要删除此条记录?一经删除！数据将不可恢复！"
+                    @confirm="confirmEvent(scope.row)"
+                    @cancel="cancelEvent(scope.row)"
+                  >
+                    <template #reference>
+                      <el-button type="danger" size="small" class="fa fa-trash-o" />
+                    </template>
+                  </el-popconfirm>
 
-									<el-tooltip
-										v-if="scope.row.flowIsOpen==1&&scope.row.taskStatus==2"
-										class="box-item"
-										effect="dark"
-										content="重新申请"
-										placement="top-end"
-									>
-										<el-button type="warning" size="small" class="fa fa-retweet"  @click="afreshSendFlow(scope.row)" />
-									</el-tooltip>
-									<el-tooltip
-										class="box-item"
-										effect="dark"
-										content="查看详情"
-										placement="top-end"
-									>
-										<el-button @click="lookPageInfo(scope.row)" type="primary" size="small" class="fa fa-eye"  />
-									</el-tooltip>
-									<el-popconfirm
-										v-if="scope.row.flowIsOpen==1&&scope.row.isRetract"
-										confirm-button-text="确定"
-										cancel-button-text="取消"
-										:icon="QuestionFilled"
-										icon-color="#F56C6C"
-										title="您确定要撤回此次申请？一经撤回！需要此流程重新提交申请！"
-										@confirm="withdrawApplication (scope.row)"
-										@cancel="cancelEvent(scope.row)"
-									>
-										<template #reference>
-											<el-button  size="small" class="fa fa-reply-all"  />
-										</template>
-									</el-popconfirm>
-									<el-tooltip
-										v-if="scope.row.flowIsOpen==2"
-										class="box-item"
-										effect="dark"
-										content="编辑"
-										placement="top-end"
-									>
-										<el-button @click="editInfo(scope.row)" type="info" size="small" class="fa fa-edit"  />
-									</el-tooltip>
-									<el-popconfirm
-										v-if="scope.row.taskStatus==2||scope.row.taskStatus==1"
-										confirm-button-text="确定"
-										cancel-button-text="取消"
-										:icon="QuestionFilled"
-										icon-color="#F56C6C"
-										title="您确定要删除此条记录?一经删除！数据将不可恢复！"
-										@confirm="confirmEvent(scope.row)"
-										@cancel="cancelEvent(scope.row)"
-									>
-										<template #reference>
-											<el-button type="danger" size="small" class="fa fa-trash-o"  />
-										</template>
-									</el-popconfirm>
+                  <el-tooltip
+                    v-if="scope.row.flowIsOpen == 1 && scope.row.taskStatus == 4"
+                    class="box-item"
+                    effect="dark"
+                    content="申请修改"
+                    placement="top-end"
+                  >
+                    <el-button
+                      type="info"
+                      size="small"
+                      class="fa fa-edit"
+                      @click="editFormSendFlow(scope.row)"
+                    />
+                  </el-tooltip>
+                </el-button-group>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-else-if="item.fieldClass == '_lableTitle'"
+              label="标题"
+              config=""
+              min-width="320"
+            >
+              <template #default="scope">
+                {{ writeListTitle(scope.row, viewPage.list) }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-else-if="item.fieldClass == ''"
+              :prop="item.field"
+              :label="item.label"
+              min-width="320"
+            >
+            </el-table-column>
+            <el-table-column
+              v-else
+              :prop="item.field"
+              :label="item.label"
+              config=""
+              min-width="220"
+            >
+              <template v-if="item.help" #header="scope">
+                {{ scope.column.label }}
+                <tooltip :content="item.help" />
+              </template>
 
-									<el-tooltip
-										v-if="scope.row.flowIsOpen==1&&scope.row.taskStatus==4"
-										class="box-item"
-										effect="dark"
-										content="申请修改"
-										placement="top-end"
-									>
-										<el-button type="info" size="small" class="fa fa-edit" @click="editFormSendFlow(scope.row)" />
-									</el-tooltip>
-								</el-button-group>
-							</template>
-						</el-table-column>
-						<el-table-column v-else-if="item.fieldClass=='_lableTitle'" label="标题" config="" min-width="320">
-							<template #default="scope">
-								{{writeListTitle(scope.row,viewPage.list)}}
-							</template>
-						</el-table-column>
-						<el-table-column v-else-if="item.fieldClass==''" :prop="item.field" :label="item.label" min-width="320">
-							
-						</el-table-column>
-						<el-table-column v-else  :prop="item.field" :label="item.label" config=""  min-width="220">
-							<template v-if="item.help" #header="scope">
-								{{ scope.column.label }}
-								<tooltip :content="item.help" />
-							</template>
-							
-							<template v-if="item.fieldClass=='select'" #default="scope"> 
-								{{ scope.row[scope.column.property] }}
-							</template>
-							<template v-if="item.fieldClass==''" #default="scope">
-								<!-- {{scope.row[scope.column.property]}}{{item}} -->
-								<el-tag v-if="scope.row[scope.column.property]==1" type="success">启用</el-tag>
-								<el-tag v-if="scope.row[scope.column.property]==2" type="danger">已禁用</el-tag>
-								<el-tag v-if="scope.row[scope.column.property]==3" type="info">已删除</el-tag>
-							</template>
-							<template v-if="item.fieldClass=='deptOrg'" #default="scope">
-								<!-- {{scope.row[scope.column.property]}}{{item}} -->
-								{{ scope.row[scope.column.property] }}
-							</template>
-							<template v-if="item.fieldClass=='owner'" #default="scope"> 
-								<!-- {{scope.row[scope.column.property]}}{{item}}拥有者 -->
-								{{ scope.row[scope.column.property] }}
-							</template>
-							<template v-if="item.fieldClass=='lowcodeImage'" #default="scope"> 
-								<el-image style="width: 30px; height: 30px" :src="scope.row[scope.column.property]" :fit="fit" />
-							</template>
-							<template v-if="item.fieldClass=='expand-user'" #default="scope"> 
-								{{ scope.row[scope.column.property] }} <!--选择用户-->
-							</template>
-							<template v-if="item.fieldClass=='radio'" #default="scope">
-								<!-- {{scope.row[scope.column.property]}}{{item}} -->
-								{{ judjeRadio(scope.row[scope.column.property],item.options) }}
-							</template>
-							<template v-if="item.fieldClass=='upload'" #default="scope" >
-							<div class="demo-image__error">
-								<el-image
-									style="width: 30px; height: 30px"
-									:src="scope.row[scope.column.property]"
-								>
-									<template #error>
-										<div class="image-slot">
-											<el-icon><Picture /></el-icon>
-										</div>
-									</template>
-								</el-image>
-							</div>
-							</template>
-							<template v-if="item.fieldClass=='switch'" #default="scope">	
-								
-								<el-tag
-									v-if="judjeSwitch(scope.row[scope.column.property],item.activeValue)"
-									type="success"
-									effect="light"
-								>
-									启用
-								</el-tag>
-								<el-tag
-									v-else
-									type="danger"
-									effect="light"
-								>
-									禁用
-								</el-tag>
-							</template>
-							<template v-if="item.fieldClass=='baidumap'" #default="scope">
-								{{scope.row[scope.column.property]}}
-							</template>
-							<template v-if="item.fieldClass=='associatedForms'" #default="scope">
-								<el-link
-									key="primary"
-									type="primary"
-									@click="showAsfDetailDialog(item,scope,asfQueryParams)"
-									>
-									
-									{{scope.row[scope.column.property]}}
-								</el-link>
-							</template>
-						</el-table-column>
-					</template>
-				</el-table>
-			</el-col>
-			<el-col v-if="viewType==1&&state.total > 0" :span="24">
-				<div class="pageBox">
-					<el-pagination
-						v-model:currentPage="state.currentPage"
-						v-model:page-size="state.pageSize"
-						:page-sizes="[20, 30, 40, 50] as any"
-						:total="state.total"
-						layout="total, sizes, prev, pager, next, jumper"
-						@size-change="handleSizeChange"
-						@current-change="handleCurrentChange"
-					/>
-				</div>
-			</el-col>
-			<el-col  v-if="viewType==2" :span="24">
-				<CalendarPage  ref="calendarPageRef"  :search-send="searchSend" :body-hight="265" :drawer-with="drawerWith" :view-setup="viewPage.card"  />
-			</el-col>
-			<el-col  v-if="viewType==3" :span="24">
-				<TimeAxisPage  ref="timeAxisRef" :data="tableDataList" :view-layout="viewLayout" :columns-filter="columnsFilter" :search-send="searchSend" :drawer-with="drawerWith" :view-setup="viewPage.time" />
-			</el-col>
-			<el-col  v-if="viewType==4" :span="24">
-				<GanttPage ref="ganttPageRef" :search-send="searchSend" :drawer-with="drawerWith" :view-setup="viewPage.gantt" />
-			</el-col>
-			<el-col  v-if="viewType==5" :span="24">
-				<MapPage ref="mapPageRef" :search-send="searchSend" :drawer-with="drawerWith" :view-setup="viewPage.map" />
-			</el-col>
-			<el-col  v-if="viewType==6" :span="24">
-				<CardPage ref="cardPageRef" :search-send="searchSend" :drawer-with="drawerWith" :view-setup="viewPage.card"  :columns-filter="columnsFilter"  />
-			</el-col>
-			<el-col :span="24"  style="display:none">
-			
-				{{ tableDataList}}
-			</el-col>
-			<el-col :span="24" style="display:none">
-				<el-button-group>
-							<el-tooltip
-								
-								class="box-item"
-								effect="dark"
-								content="提交审批"
-								placement="top-end"
-							>
-								<el-button type="success" size="small" class="fa fa-send-o" />
-							</el-tooltip>
+              <template v-if="item.fieldClass == 'select'" #default="scope">
+                {{ scope.row[scope.column.property] }}
+              </template>
+              <template v-if="item.fieldClass == ''" #default="scope">
+                <!-- {{scope.row[scope.column.property]}}{{item}} -->
+                <el-tag v-if="scope.row[scope.column.property] == 1" type="success"
+                  >启用</el-tag
+                >
+                <el-tag v-if="scope.row[scope.column.property] == 2" type="danger"
+                  >已禁用</el-tag
+                >
+                <el-tag v-if="scope.row[scope.column.property] == 3" type="info"
+                  >已删除</el-tag
+                >
+              </template>
+              <template v-if="item.fieldClass == 'deptOrg'" #default="scope">
+                <!-- {{scope.row[scope.column.property]}}{{item}} -->
+                {{ scope.row[scope.column.property] }}
+              </template>
+              <template v-if="item.fieldClass == 'owner'" #default="scope">
+                <!-- {{scope.row[scope.column.property]}}{{item}}拥有者 -->
+                {{ scope.row[scope.column.property] }}
+              </template>
+              <template v-if="item.fieldClass == 'lowcodeImage'" #default="scope">
+                <el-image
+                  style="width: 30px; height: 30px"
+                  :src="scope.row[scope.column.property]"
+                  :fit="fit"
+                />
+              </template>
+              <template v-if="item.fieldClass == 'expand-user'" #default="scope">
+                {{ scope.row[scope.column.property] }}
+                <!--选择用户-->
+              </template>
+              <template v-if="item.fieldClass == 'cascader'" #default="scope">
+                {{ judjeCascader(scope.row[scope.column.property], item.options) }}
+              </template>
+              <template v-if="item.fieldClass == 'radio'" #default="scope">
+                <!-- {{scope.row[scope.column.property]}}{{item}} -->
+                {{ judjeRadio(scope.row[scope.column.property], item.options) }}
+              </template>
+              <template v-if="item.fieldClass == 'upload'" #default="scope">
+                <div class="demo-image__error">
+                  <el-image
+                    style="width: 30px; height: 30px"
+                    :src="scope.row[scope.column.property]"
+                  >
+                    <template #error>
+                      <div class="image-slot">
+                        <el-icon><Picture /></el-icon>
+                      </div>
+                    </template>
+                  </el-image>
+                </div>
+              </template>
+              <template v-if="item.fieldClass == 'switch'" #default="scope">
+                <el-tag
+                  v-if="judjeSwitch(scope.row[scope.column.property], item.activeValue)"
+                  type="success"
+                  effect="light"
+                >
+                  启用
+                </el-tag>
+                <el-tag v-else type="danger" effect="light"> 禁用 </el-tag>
+              </template>
+              <template v-if="item.fieldClass == 'baidumap'" #default="scope">
+                {{ scope.row[scope.column.property] }}
+              </template>
+              <template v-if="item.fieldClass == 'associatedForms'" #default="scope">
+                <el-link
+                  key="primary"
+                  type="primary"
+                  @click="showAsfDetailDialog(item, scope, asfQueryParams)"
+                >
+                  {{ scope.row[scope.column.property] }}
+                </el-link>
+              </template>
+            </el-table-column>
+          </template>
+        </el-table>
+      </el-col>
+      <el-col v-if="viewType == 1 && state.total > 0" :span="24">
+        <div class="pageBox">
+          <el-pagination
+            v-model:currentPage="state.currentPage"
+            v-model:page-size="state.pageSize"
+            :page-sizes="[20, 30, 40, 50] as any"
+            :total="state.total"
+            layout="total, sizes, prev, pager, next, jumper"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div>
+      </el-col>
+      <el-col v-if="viewType == 2" :span="24">
+        <CalendarPage
+          ref="calendarPageRef"
+          :search-send="searchSend"
+          :body-hight="265"
+          :drawer-with="drawerWith"
+          :view-setup="viewPage.card"
+        />
+      </el-col>
+      <el-col v-if="viewType == 3" :span="24">
+        <TimeAxisPage
+          ref="timeAxisRef"
+          :data="tableDataList"
+          :view-layout="viewLayout"
+          :columns-filter="columnsFilter"
+          :search-send="searchSend"
+          :drawer-with="drawerWith"
+          :view-setup="viewPage.time"
+        />
+      </el-col>
+      <el-col v-if="viewType == 4" :span="24">
+        <GanttPage
+          ref="ganttPageRef"
+          :search-send="searchSend"
+          :drawer-with="drawerWith"
+          :view-setup="viewPage.gantt"
+        />
+      </el-col>
+      <el-col v-if="viewType == 5" :span="24">
+        <MapPage
+          ref="mapPageRef"
+          :search-send="searchSend"
+          :drawer-with="drawerWith"
+          :view-setup="viewPage.map"
+        />
+      </el-col>
+      <el-col v-if="viewType == 6" :span="24">
+        <CardPage
+          ref="cardPageRef"
+          :search-send="searchSend"
+          :drawer-with="drawerWith"
+          :view-setup="viewPage.card"
+          :columns-filter="columnsFilter"
+        />
+      </el-col>
+      <el-col :span="24" style="display: none">
+        {{ tableDataList }}
+      </el-col>
+      <el-col :span="24" style="display: none">
+        <el-button-group>
+          <el-tooltip
+            class="box-item"
+            effect="dark"
+            content="提交审批"
+            placement="top-end"
+          >
+            <el-button type="success" size="small" class="fa fa-send-o" />
+          </el-tooltip>
 
-							<el-tooltip
-								
-								class="box-item"
-								effect="dark"
-								content="重新申请"
-								placement="top-end"
-							>
-								<el-button type="warning" size="small" class="fa fa-retweet"   />
-							</el-tooltip>
-							<el-tooltip
-								class="box-item"
-								effect="dark"
-								content="查看详情"
-								placement="top-end"
-							>
-								<el-button type="primary" size="small" class="fa fa-eye"  />
-							</el-tooltip>
-							<el-tooltip
-								
-								class="box-item"
-								effect="dark"
-								content="撤回"
-								placement="top-end"
-							>
-								<el-button  size="small" class="fa fa-reply-all"  />
-							</el-tooltip>
-							<el-tooltip
-								
-								class="box-item"
-								effect="dark"
-								content="删除"
-								placement="top-end"
-							>
-								<el-button type="danger" size="small" class="fa fa-trash-o"  />
-							</el-tooltip>
+          <el-tooltip
+            class="box-item"
+            effect="dark"
+            content="重新申请"
+            placement="top-end"
+          >
+            <el-button type="warning" size="small" class="fa fa-retweet" />
+          </el-tooltip>
+          <el-tooltip
+            class="box-item"
+            effect="dark"
+            content="查看详情"
+            placement="top-end"
+          >
+            <el-button type="primary" size="small" class="fa fa-eye" />
+          </el-tooltip>
+          <el-tooltip class="box-item" effect="dark" content="撤回" placement="top-end">
+            <el-button size="small" class="fa fa-reply-all" />
+          </el-tooltip>
+          <el-tooltip class="box-item" effect="dark" content="删除" placement="top-end">
+            <el-button type="danger" size="small" class="fa fa-trash-o" />
+          </el-tooltip>
 
-							<el-tooltip
-								
-								class="box-item"
-								effect="dark"
-								content="申请修改"
-								placement="top-end"
-							>
-								<el-button type="info" size="small" class="fa fa-edit"  />
-							</el-tooltip>
-				</el-button-group>
-			
-			
-			</el-col>
-		</el-row>
-		<FormPageCont v-model:is-show="lookPageInfoIsShow" :drawer-with="drawerWith" :page-info="pageInfoCont" :table-page-class="tablePageClass" :oper-state="operState" @getPageData="getPageData" @optionsValue4Get4="optionsValue4Get4"/>
-		
-		<FormPageCont v-model:is-show="asflookPageInfoIsShow" :drawer-with="drawerWith" :page-info="currentAsfTableDataList[0]" :table-page-class="tablePageClass" :oper-state="operState" @getPageData="getPageData" @optionsValue4Get4="optionsValue4Get4"/>
-		<TableFlow  v-model:isopen="openTaskDrawer" :versionid="props.versionid" :versiontitle="props.versiontitle" :drawerwith="drawerWith" @searchquery="getListData" />
+          <el-tooltip
+            class="box-item"
+            effect="dark"
+            content="申请修改"
+            placement="top-end"
+          >
+            <el-button type="info" size="small" class="fa fa-edit" />
+          </el-tooltip>
+        </el-button-group>
+      </el-col>
+    </el-row>
+    <FormPageCont
+      v-model:is-show="lookPageInfoIsShow"
+      :drawer-with="drawerWith"
+      :page-info="pageInfoCont"
+      :table-page-class="tablePageClass"
+      :oper-state="operState"
+      @getPageData="getPageData"
+      @optionsValue4Get4="optionsValue4Get4"
+    />
 
+    <FormPageCont
+      v-model:is-show="asflookPageInfoIsShow"
+      :drawer-with="drawerWith"
+      :page-info="currentAsfTableDataList[0]"
+      :table-page-class="tablePageClass"
+      :oper-state="operState"
+      @getPageData="getPageData"
+      @optionsValue4Get4="optionsValue4Get4"
+    />
+    <TableFlow
+      v-model:isopen="openTaskDrawer"
+      :versionid="props.versionid"
+      :versiontitle="props.versiontitle"
+      :drawerwith="drawerWith"
+      @searchquery="getListData"
+    />
 
-		<el-dialog v-model="asfShowDetailsFlag" title="关联表单详情查看" top="20px" style="margin-top:70px,margin-left:270px">
-                
-        </el-dialog>
-	
-	</div>
+    <el-dialog
+      v-model="asfShowDetailsFlag"
+      title="关联表单详情查看"
+      top="20px"
+      style="margin-top:70px,margin-left:270px"
+    >
+    </el-dialog>
+  </div>
 </template>
-<style  lang='scss' scoped>
-.rowBox{
-	width:100%;
+<style lang="scss" scoped>
+.rowBox {
+  width: 100%;
 }
-.table-list-comm{
-	padding:0px 15px 15px 15px;
+.table-list-comm {
+  padding: 0px 15px 15px 15px;
 }
-.seacherForm{
-	min-height: auto;
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: flex-start;
+.seacherForm {
+  min-height: auto;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: flex-start;
 }
-.pageBox{
-	width:100%;
-	margin-top:20px;
-	text-align: center;
-	display: flex;
-  	justify-content: center;
+.pageBox {
+  width: 100%;
+  margin-top: 20px;
+  text-align: center;
+  display: flex;
+  justify-content: center;
 }
-.operateButArea{
-		width: 100%;
-		display: flex;
-		align-items: center;
-  		justify-content: space-between;
-		margin-top:15px;
-		margin-bottom:15px;
-		.operatLeft{
-			padding-bottom: 2px;
-		}
+.operateButArea {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-top: 15px;
+  margin-bottom: 15px;
+  .operatLeft {
+    padding-bottom: 2px;
+  }
 }
-.group{
-	width: auto;
-    margin-right: 10px;
+.group {
+  width: auto;
+  margin-right: 10px;
 }
 .demo-image__error .block {
   padding: 0px 0;
diff --git a/src/components/IconSelect/appMenuSvgPage.vue b/src/components/IconSelect/appMenuSvgPage.vue
index 571da0e..5838414 100644
--- a/src/components/IconSelect/appMenuSvgPage.vue
+++ b/src/components/IconSelect/appMenuSvgPage.vue
@@ -3,107 +3,112 @@
 @ 时间: 2024-04-22 14:39:07
 @ 备注: 选择图标弹窗
 -->
-<script lang='ts' setup>
+<script lang="ts" setup>
 import SvgIcon from "@/components/SvgIcon/index.vue";
 import SvgPage from "@/components/IconSelect/svgPage.vue";
 
 const props = defineProps({
-	isShow:{
-		type: Boolean,
-		default: false,
-	},
-	svgName:{
-		type:String,
-		require: false,
-		default:""
-	},
-	svgId:{
-		type:String,
-		require: false,
-		default:""
-	},
-	iconList:{
-		type:Object,
-		default(){
-			return {}
-		}
-	}
+  isShow: {
+    type: Boolean,
+    default: false,
+  },
+  svgName: {
+    type: String,
+    require: false,
+    default: "",
+  },
+  svgId: {
+    type: String,
+    require: false,
+    default: "",
+  },
+  iconList: {
+    type: Object,
+    default() {
+      return {};
+    },
+  },
 });
 const visible = ref(false); // 弹窗显示状态
 const iconSelectorRef = ref();
 const iconSelectorDialogRef = ref();
-const emits = defineEmits(["update:isShow","update:svgName"]);
-const filterIconNames = ref<string[]>([]); 
+const emits = defineEmits(["update:isShow", "update:svgName"]);
+const filterIconNames = ref<string[]>([]);
 //点击窗外。取消显示
 onClickOutside(iconSelectorRef, () => (visible.value = false), {
   ignore: [iconSelectorDialogRef],
 });
 
-
-watch(() => props.isShow, (val:boolean) =>{
-	if(val){
-		filterIconNames.value = props.iconList
-	}
-})
+watch(
+  () => props.isShow,
+  (val: boolean) => {
+    if (val) {
+      filterIconNames.value = props.iconList;
+    }
+  }
+);
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-22 16:43:49
 @ 功能: 关闭
 */
 const handleClose = () => {
-	emits("update:isShow",false)
-}
+  emits("update:isShow", false);
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-22 16:54:03
 @ 功能: 确定
 */
-const handleSelect = (svgName:string) => {
-	console.log("确定",props.svgId,svgName)
-	emits("update:svgName",svgName)
-	handleClose()
-}
+const handleSelect = (svgName: string) => {
+  console.log("确定", props.svgId, svgName);
+  emits("update:svgName", svgName);
+  handleClose();
+};
 </script>
 <template>
-	<el-dialog
-		v-model="props.isShow"
-		title="选择图标"
-		width="500"
-		:before-close="handleClose"
-	>
-		<el-input
-			v-model="filterValue"
-			class="p-2"
-			placeholder="搜索图标"
-			clearable
-			@input="handleFilter"
-		/>
-		<el-divider border-style="dashed" style="margin:0px;" />
-
-		<el-scrollbar height="250px">
-			<ul class="icon_list">
-				<li
-					v-for="(iconName, index) in filterIconNames"
-					:key="index"
-					class="icon-item"
-					@click="handleSelect(iconName)"
-				>
-					<el-tooltip :content="iconName" placement="bottom" effect="light">
-						<svg-icon color="var(--el-text-color-regular)" :icon-class="iconName" />
-					</el-tooltip>
-				</li>
-			</ul>
-		</el-scrollbar>
+  <el-dialog
+    v-model="props.isShow"
+    title="选择图标"
+    width="500"
+    :before-close="handleClose"
+  >
+    <el-input
+      v-model="filterValue"
+      class="p-2"
+      placeholder="搜索图标"
+      clearable
+      @input="handleFilter"
+    />
+    <el-divider border-style="dashed" style="margin: 0px" />
 
-	</el-dialog>
+    <el-scrollbar height="250px">
+      <ul class="icon_list">
+        <li
+          v-for="(iconName, index) in filterIconNames"
+          :key="index"
+          class="icon-item"
+          @click="handleSelect(iconName)"
+        >
+          <el-tooltip :content="iconName" placement="bottom" effect="light">
+            <svg-icon
+              color="var(--el-text-color-regular)"
+              :size="40"
+              :icon-class="iconName"
+            />
+          </el-tooltip>
+        </li>
+      </ul>
+    </el-scrollbar>
+  </el-dialog>
 </template>
-<style  lang='scss' scoped>
+<style lang="scss" scoped>
 .icon_list {
   display: flex;
   flex-wrap: wrap;
   padding-left: 0px;
   margin-top: 10px;
-  
+
   .icon-item {
     display: flex;
     flex-direction: column;
@@ -114,7 +119,7 @@ const handleSelect = (svgName:string) => {
     margin: 0 5px 5px 0;
     cursor: pointer;
     border: 1px solid #ccc;
-	padding: 5px 10px;
+    padding: 5px 10px;
     &:hover {
       color: var(--el-color-primary);
       border-color: var(--el-color-primary);
@@ -123,9 +128,9 @@ const handleSelect = (svgName:string) => {
     }
   }
 }
-.svgBox{
-	:deep(.el-popper){
-	padding:0px;
+.svgBox {
+  :deep(.el-popper) {
+    padding: 0px;
   }
 }
 </style>
diff --git a/src/views/sysworkflow/codepage/index.vue b/src/views/sysworkflow/codepage/index.vue
index 5932cb8..42dbf43 100644
--- a/src/views/sysworkflow/codepage/index.vue
+++ b/src/views/sysworkflow/codepage/index.vue
@@ -3,114 +3,114 @@
 @ 时间: 2023-08-28 14:47:07
 @ 备注: 表单设计
 -->
-<script lang='ts' setup>
-import { SearchForm,customerFormCont,customerFormConfig } from "@/api/DesignForm/type";
-import { getCustomerFormList,getProductionMarkForm,editProductionFormStatus } from '@/api/DesignForm/requestapi'
+<script lang="ts" setup>
+import { SearchForm, customerFormCont, customerFormConfig } from "@/api/DesignForm/type";
+import {
+  getCustomerFormList,
+  getProductionMarkForm,
+  editProductionFormStatus,
+} from "@/api/DesignForm/requestapi";
 //引入页面
-import CreateForm from '@/views/sysworkflow/codepage/createform.vue'
-import SetupConfig from '@/views/sysworkflow/codepage/setupconfig.vue'
-import DataTableStructure from '@/views/sysworkflow/codepage/datatablestructure.vue'
+import CreateForm from "@/views/sysworkflow/codepage/createform.vue";
+import SetupConfig from "@/views/sysworkflow/codepage/setupconfig.vue";
+import DataTableStructure from "@/views/sysworkflow/codepage/datatablestructure.vue";
 
-import FlowDrawingBoard from '@/views/sysworkflow/flow/flowDrawingBoard.vue'
+import FlowDrawingBoard from "@/views/sysworkflow/flow/flowDrawingBoard.vue";
 
-const contbody = ref()
+const contbody = ref();
 const queryParams = reactive<SearchForm>({
-	page: 1,
-	pagesize:15
+  page: 1,
+  pagesize: 15,
 });
-const ids = ref<number[]>([]);		//记录总数
-const editIds = reactive<string[]>([]);		//记录总数
-const loading =ref(false);		//加载表单
-const show =ref(false);		//加载表单
+const ids = ref<number[]>([]); //记录总数
+const editIds = reactive<string[]>([]); //记录总数
+const loading = ref(false); //加载表单
+const show = ref(false); //加载表单
 const drawerOpenOrClose = ref(false);
-const total = ref(0);					//记录总数
-const contList = ref<customerFormCont[]>()
+const total = ref(0); //记录总数
+const contList = ref<customerFormCont[]>();
 const drawerWith = ref();
-const editid = ref<string>("")
+const editid = ref<string>("");
 const formConfigCont = reactive<customerFormConfig>({
-	formname:"",
-	formlogo:""
-})
+  formname: "",
+  formlogo: "",
+});
 const formId = ref<string>("");
 //搜索表单
-function handleQuery(){
-	getCustomerFormList(queryParams)
-		.then(({ data }) => {
-			// console.log("搜索表单-->",data);
-			total.value = data.total
-			contList.value = data.list
-		})
-		.finally(() => {})
+function handleQuery() {
+  getCustomerFormList(queryParams)
+    .then(({ data }) => {
+      // console.log("搜索表单-->",data);
+      total.value = data.total;
+      contList.value = data.list;
+    })
+    .finally(() => {});
 }
 //重置搜索条件
-function resetQuery(){
-	queryParams.page = 1;
-	queryParams.keywords = "";
+function resetQuery() {
+  queryParams.page = 1;
+  queryParams.keywords = "";
 }
 //新增表单
-function openDialog(){
-	formId.value = ""
-	drawerWith.value = contbody.value?.clientWidth
-	getProductionMarkForm()
-		.then(({data})=>{
-			formConfigCont.formlogo = data.formlogo
-			formConfigCont.formname = data.formname
-			// console.log("新增表单",formConfigCont)
-		})
-		.finally(()=>{
-			drawerOpenOrClose.value = true;
-		})
-	
+function openDialog() {
+  formId.value = "";
+  drawerWith.value = contbody.value?.clientWidth;
+  getProductionMarkForm()
+    .then(({ data }) => {
+      formConfigCont.formlogo = data.formlogo;
+      formConfigCont.formname = data.formname;
+      // console.log("新增表单",formConfigCont)
+    })
+    .finally(() => {
+      drawerOpenOrClose.value = true;
+    });
 }
 //删除表单
-function handleDelete(){
-	if(ids.value.length < 1){
-		ElMessage.error('没有选中要删除得数据！')
-	}else{
-		ElMessageBox.confirm(
-						'请问是否真的删除？删除后数据将无法找回！',
-						'温馨提示！',
-					{
-						confirmButtonText: '删除',
-						cancelButtonText: '取消',
-						type: 'warning',
-						draggable: true,
-					})
-					.then(() => {
-						editProductionFormStatus({id:ids.value.map(String),status:3,is_delete:false})
-						.then(({data})=>{
-							handleQuery()
-						})
-					})
-					.catch(() => {
-						handleQuery()
-					})
-		
-	}
+function handleDelete() {
+  if (ids.value.length < 1) {
+    ElMessage.error("没有选中要删除得数据！");
+  } else {
+    ElMessageBox.confirm("请问是否真的删除？删除后数据将无法找回！", "温馨提示！", {
+      confirmButtonText: "删除",
+      cancelButtonText: "取消",
+      type: "warning",
+      draggable: true,
+    })
+      .then(() => {
+        editProductionFormStatus({
+          id: ids.value.map(String),
+          status: 3,
+          is_delete: false,
+        }).then(({ data }) => {
+          handleQuery();
+        });
+      })
+      .catch(() => {
+        handleQuery();
+      });
+  }
 }
 //删除单一自定义表单
-function editCustomerFormState(cont:customerFormCont){
-	// console.log("删除单一自定义表单",cont)
-	editIds.push(cont.id)
-	ElMessageBox.confirm(
-						'请问是否真的删除？删除后数据将无法找回！',
-						'温馨提示！',
-					{
-						confirmButtonText: '删除',
-						cancelButtonText: '取消',
-						type: 'warning',
-						draggable: true,
-					})
-					.then(() => {
-						editProductionFormStatus({id:editIds,status:3,is_delete:false})
-						.then(({data})=>{
-							handleQuery()
-							editIds.splice(0,editIds.length);
-						})
-					})
-					.catch(() => {
-						handleQuery()
-					})
+function editCustomerFormState(cont: customerFormCont) {
+  // console.log("删除单一自定义表单",cont)
+  editIds.push(cont.id);
+  ElMessageBox.confirm("请问是否真的删除？删除后数据将无法找回！", "温馨提示！", {
+    confirmButtonText: "删除",
+    cancelButtonText: "取消",
+    type: "warning",
+    draggable: true,
+  })
+    .then(() => {
+      editProductionFormStatus({ id: editIds, status: 3, is_delete: false }).then(
+        ({ data }) => {
+          handleQuery();
+          editIds.splice(0, editIds.length);
+        }
+      );
+    })
+    .catch(() => {
+      handleQuery();
+    });
 }
 /**
  * 行checkbox change事件
@@ -119,181 +119,191 @@ function handleSelectionChange(selection: any) {
   ids.value = selection.map((item: any) => item.id);
 }
 //设置自定义表单
-function setupCustomerForm(cont:customerFormCont){
-	editid.value = cont.id
-	show.value = true
+function setupCustomerForm(cont: customerFormCont) {
+  editid.value = cont.id;
+  show.value = true;
 }
-onMounted(()=>{
-	handleQuery();
-	// drawerWith.value = window.innerWidth - 220
+onMounted(() => {
+  handleQuery();
+  // drawerWith.value = window.innerWidth - 220
+});
+window.addEventListener("resize", function () {
+  // drawerWith.value = window.innerWidth -220
+  // console.log("搜索表单-->",window.innerWidth);
 });
-window.addEventListener("resize", function(){
-	// drawerWith.value = window.innerWidth -220
-	// console.log("搜索表单-->",window.innerWidth);
-})
 //编辑表单
-function editCustomerForm(cont:customerFormCont){
-	drawerWith.value = contbody.value?.clientWidth
-	formId.value = cont.id.toString();
-	drawerOpenOrClose.value = true;
+function editCustomerForm(cont: customerFormCont) {
+  drawerWith.value = contbody.value?.clientWidth;
+  formId.value = cont.id.toString();
+  drawerOpenOrClose.value = true;
 }
-const dataTableIsShow = ref(false)
-const formCont = ref<customerFormCont>()
+const dataTableIsShow = ref(false);
+const formCont = ref<customerFormCont>();
 //打开数据表结构图
-const openDataTableStructure = (cont:customerFormCont) =>{
-	formCont.value = cont
-	dataTableIsShow.value = true;
-	// console.log("打开数据表结构图",cont)
-}
+const openDataTableStructure = (cont: customerFormCont) => {
+  formCont.value = cont;
+  dataTableIsShow.value = true;
+  // console.log("打开数据表结构图",cont)
+};
 //设置工作流
-const drawer = ref(false)
-const drawerWidht = ref()
-const isFormFlow = ref(false)
-const customerFormKey = ref<string>()
-const customerFormName = ref<string>()
-const flowKey = ref<string>()
-const setupWorkFlow = (cont:customerFormCont) => {
-	drawerWidht.value = contbody.value?.clientWidth
-	// console.log("clientHeight--->",cont)
-	drawer.value = true
-	isFormFlow.value = true;
-	customerFormName.value = cont.name
-	customerFormKey.value = cont.id.toString()
-	flowKey.value = cont.flowkey.toString()
-}
-
+const drawer = ref(false);
+const drawerWidht = ref();
+const isFormFlow = ref(false);
+const customerFormKey = ref<string>();
+const customerFormName = ref<string>();
+const flowKey = ref<string>();
+const setupWorkFlow = (cont: customerFormCont) => {
+  drawerWidht.value = contbody.value?.clientWidth;
+  // console.log("clientHeight--->",cont)
+  drawer.value = true;
+  isFormFlow.value = true;
+  customerFormName.value = cont.name;
+  customerFormKey.value = cont.id.toString();
+  flowKey.value = cont.flowkey.toString();
+};
 </script>
 <template>
-	<div  ref="contbody">
-	
-		<div class="app-container">
-			<div class="search">
-				<el-form ref="queryFormRef" :model="queryParams" :inline="true">
-					<el-form-item label="关键字" prop="keywords">
-					<el-input
-						v-model="queryParams.keywords"
-						placeholder="表单名称"
-						clearable
-						@keyup.enter="handleQuery"
-					/>
-					</el-form-item>
-					<el-form-item>
-					<el-button type="primary" @click="handleQuery">
-						<template #icon><i-ep-search /></template>搜索
-					</el-button>
-					<el-button @click="resetQuery">
-						<template #icon>
-							<i-ep-refresh /></template>重置
-						</el-button>
-					</el-form-item>
-				</el-form>
-			</div>
-			<el-card shadow="never">
-				<template #header>
-					<el-button type="success" @click="openDialog()"><i-ep-plus />新增表单</el-button>
-					<el-button
-					type="danger"
-					:disabled="ids.length === 0"
-					@click="handleDelete()"
-					>
-						<i-ep-delete />删除表单
-					</el-button>
-				</template>
-				<el-table
-					v-loading="loading"
-					highlight-current-row
-							:data="contList"
-					border
-							@selection-change="handleSelectionChange"
-				>
-					<el-table-column fixed type="selection" width="55" align="center" />
-					<el-table-column fixed label="表单名称" prop="name" width="350"  />
-					<el-table-column label="分类" align="center" width="150">
-						<template #default="scope">
-							<el-tag  v-if="scope.row.classify === 1" effect="plain">表单</el-tag>
-							<el-tag v-else effect="plain">流程表单</el-tag>
-						</template>
-					</el-table-column>
-					<el-table-column label="状态" align="center" width="100">
-						<template #default="scope">
-							<el-tag v-if="scope.row.states === 1" type="success">启用</el-tag>
-							<el-tag v-else type="info">禁用</el-tag>
-						</template>
-					</el-table-column>
-					<el-table-column label="创建人" prop="creatername" width="140" />
-					<el-table-column label="创建时间" prop="creatertime"  /> 
-					<el-table-column fixed="right" label="操作" align="center" width="350">
-						<template #default="scope">
-							<!-- <el-button
+  <div ref="contbody">
+    <div class="app-container">
+      <div class="search">
+        <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+          <el-form-item label="关键字" prop="keywords">
+            <el-input
+              v-model="queryParams.keywords"
+              placeholder="表单名称"
+              clearable
+              @keyup.enter="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="handleQuery">
+              <template #icon><i-ep-search /></template>搜索
+            </el-button>
+            <el-button @click="resetQuery">
+              <template #icon> <i-ep-refresh /></template>重置
+            </el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-card shadow="never">
+        <template #header>
+          <el-button type="success" @click="openDialog()"
+            ><i-ep-plus />新增表单</el-button
+          >
+          <el-button type="danger" :disabled="ids.length === 0" @click="handleDelete()">
+            <i-ep-delete />删除表单
+          </el-button>
+        </template>
+        <el-table
+          v-loading="loading"
+          highlight-current-row
+          :data="contList"
+          border
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column fixed type="selection" width="55" align="center" />
+          <el-table-column fixed label="表单名称" prop="name" width="350" />
+          <el-table-column label="分类" align="center" width="150">
+            <template #default="scope">
+              <el-tag v-if="scope.row.classify === 1" effect="plain">表单</el-tag>
+              <el-tag v-else effect="plain">流程表单</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="状态" align="center" width="100">
+            <template #default="scope">
+              <el-tag v-if="scope.row.states === 1" type="success">启用</el-tag>
+              <el-tag v-else type="info">禁用</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建人" prop="creatername" width="140" />
+          <el-table-column label="创建时间" prop="creatertime" />
+          <el-table-column fixed="right" label="操作" align="center" width="350">
+            <template #default="scope">
+              <!-- <el-button
 							type="success"
 							link
 							size="small"
 							@click.stop="setupCustomerForm(scope.row)"
 							><i-ep-Share />版本</el-button> -->
-							<el-button
-								type="success"
-								link
-								size="small"
-								@click.stop="setupCustomerForm(scope.row)"
-							>
-								<i-ep-Setting />设置
-							</el-button>
-							<el-button
-								type="warning"
-								link
-								size="small"
-								@click.stop="openDataTableStructure(scope.row)"
-							>
-								<i-ep-MessageBox />数据结构
-							</el-button>
-							<el-button			
-								type="primary"
-								link
-								size="small"
-								@click.stop="editCustomerForm(scope.row)"
-							>
-								<i-ep-edit />编辑
-							</el-button>
-							<el-button			
-								type="danger"
-								link
-								size="small"
-								@click.stop="editCustomerFormState(scope.row)"
-							>
-								<i-ep-delete />删除
-							</el-button>
-							<el-button			
-								type="info"
-								link
-								size="small"
-								@click.stop="setupWorkFlow(scope.row)"
-							>
-								<i-ep-operation />流程
-							</el-button>
-						</template>
-					</el-table-column>
-				</el-table>
-				<pagination
-					v-if="total > 0"
-					v-model:total="total"
-					v-model:page="queryParams.page"
-					v-model:limit="queryParams.pagesize"
-					@pagination="handleQuery"
-				/>
-			</el-card>
-		</div>
-	</div>
-	<el-drawer  v-model="drawerOpenOrClose" title="设置/编辑自定义表单" :with-header="false" :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :size="drawerWith" class="drawerClass">
-    	<CreateForm v-model:draweropenclose="drawerOpenOrClose" :formid="formId" :formconfigcont="formConfigCont" @handlequery="handleQuery" />
-  	</el-drawer>
-	<SetupConfig v-model:show="show" :editid="editid" @handle_query="handleQuery" />
-	<DataTableStructure  v-model:isshow="dataTableIsShow" :formcont="formCont" />
-	<FlowDrawingBoard v-model:open-drawer="drawer" :drawer-widht="drawerWidht" :is-form-flow="isFormFlow"  :customer-form-name="customerFormName" :customer-form-key="customerFormKey" :flow-key="flowKey" @chanerequest="handleQuery" />
+              <el-button
+                type="success"
+                link
+                size="small"
+                @click.stop="setupCustomerForm(scope.row)"
+              >
+                <i-ep-Setting />设置
+              </el-button>
+              <el-button
+                type="warning"
+                link
+                size="small"
+                @click.stop="openDataTableStructure(scope.row)"
+              >
+                <i-ep-MessageBox />数据结构
+              </el-button>
+              <el-button
+                type="primary"
+                link
+                size="small"
+                @click.stop="editCustomerForm(scope.row)"
+              >
+                <i-ep-edit />编辑
+              </el-button>
+              <el-button
+                type="danger"
+                link
+                size="small"
+                @click.stop="editCustomerFormState(scope.row)"
+              >
+                <i-ep-delete />删除
+              </el-button>
+              <el-button
+                type="info"
+                link
+                size="small"
+                @click.stop="setupWorkFlow(scope.row)"
+              >
+                <i-ep-operation />流程
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
+    </div>
+  </div>
+  <el-drawer
+    v-model="drawerOpenOrClose"
+    title="设置/编辑自定义表单"
+    :with-header="false"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    :destroy-on-close="true"
+    :size="drawerWith"
+    class="drawerClass"
+  >
+    <CreateForm
+      v-model:draweropenclose="drawerOpenOrClose"
+      :formid="formId"
+      :formconfigcont="formConfigCont"
+      @handlequery="handleQuery"
+    />
+  </el-drawer>
+  <SetupConfig v-model:show="show" :editid="editid" @handle_query="handleQuery" />
+  <DataTableStructure v-model:isshow="dataTableIsShow" :formcont="formCont" />
+  <FlowDrawingBoard
+    v-model:open-drawer="drawer"
+    :drawer-widht="drawerWidht"
+    :is-form-flow="isFormFlow"
+    :customer-form-name="customerFormName"
+    :customer-form-key="customerFormKey"
+    :flow-key="flowKey"
+    @chanerequest="handleQuery"
+  />
 </template>
-<style  lang='scss' scoped>
-.drawerClass{
-	.el-drawer__body{
-		padding: 0;
-	}
+<style lang="scss" scoped>
+.drawerClass {
+  .el-drawer__body {
+    padding: 0;
+  }
 }
 </style>
diff --git a/src/views/sysworkflow/lowcodepage/appCardPage.vue b/src/views/sysworkflow/lowcodepage/appCardPage.vue
index 2cbc809..733b50e 100644
--- a/src/views/sysworkflow/lowcodepage/appCardPage.vue
+++ b/src/views/sysworkflow/lowcodepage/appCardPage.vue
@@ -3,471 +3,521 @@
 @ 时间: 2024-07-22 08:53:50
 @ 备注: 自定义应用卡片视图
 -->
-<script lang='ts' setup>
-import { json2string,objToStringify,string2json,stringToObj } from '@/utils/DesignForm/form'
+<script lang="ts" setup>
+import {
+  json2string,
+  objToStringify,
+  string2json,
+  stringToObj,
+} from "@/utils/DesignForm/form";
 import { customerFormCont } from "@/api/DesignForm/type";
-import { getCustomerFormList,editProductionFormStatus,appJwtPower,getFieldRecord } from '@/api/DesignForm/requestapi'
+import {
+  getCustomerFormList,
+  editProductionFormStatus,
+  appJwtPower,
+  getFieldRecord,
+} from "@/api/DesignForm/requestapi";
 
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-22 11:30:11
 @ 功能: 引入组件
 */
-import AppContainer from '@/views/sysworkflow/lowcodepage/newLowCode/appLayout/appContainer.vue'
-import AppContainerPage  from '@/views/sysworkflow/lowcodepage/newLowCode/appLayoutEdit/appContainerPage.vue' //自建应用编辑
-import LowCodeFormPage from "@/views/sysworkflow/lowcodepage/lowCodeFormPage.vue"
-import TableFlow from '@/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue'
+import AppContainer from "@/views/sysworkflow/lowcodepage/newLowCode/appLayout/appContainer.vue";
+import AppContainerPage from "@/views/sysworkflow/lowcodepage/newLowCode/appLayoutEdit/appContainerPage.vue"; //自建应用编辑
+import LowCodeFormPage from "@/views/sysworkflow/lowcodepage/lowCodeFormPage.vue";
+import TableFlow from "@/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue";
 
 const props = defineProps({
-	searchQuery:{
-		type:Object,
-		default(){
-			return {}
-		}
-	},
-	appGroup:{
-		type:String,
-		default:""
-	},
-	drawerWith:{
-		type:Number,
-		default:true
-	}
+  searchQuery: {
+    type: Object,
+    default() {
+      return {};
+    },
+  },
+  appGroup: {
+    type: String,
+    default: "",
+  },
+  drawerWith: {
+    type: Number,
+    default: true,
+  },
 });
 
 const emits = defineEmits(["getRongQiAttr"]);
-const openTaskDrawer = ref(false) //新增任务
+const openTaskDrawer = ref(false); //新增任务
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-22 09:09:29
 @ 功能: 总记录数
 */
-const pageTotal = ref(0)
-const contList = ref<customerFormCont[]>()	//记录
-const loadingApp = ref(false)
-const runIsOpen = ref(false)
-const pickAppInfo = ref<customerFormCont>()			//应用或表单内容
+const pageTotal = ref(0);
+const contList = ref<customerFormCont[]>(); //记录
+const loadingApp = ref(false);
+const runIsOpen = ref(false);
+const pickAppInfo = ref<customerFormCont>(); //应用或表单内容
 /**
 @ 作者: 秦东
 @ 时间: 2024-03-21 10:54:23
 @ 功能: 获取表单列表
 */
-const getFormAppList = (val:any) => {
-	loadingApp.value = true
-	let sendInfo = {
-		page:val.page,
-		pagesize:val.pagesize,
-		keywords:val.searchWork,
-		groupId:props.appGroup
-	}
-	getCustomerFormList(sendInfo)
-		.then(({ data }) => {
-			// console.log("打开应用-->",data);
-			pageTotal.value = data.total
-			contList.value = data.list
-		})
-		.finally(() => {
-			loadingApp.value = false
-		})
-}
+const getFormAppList = (val: any) => {
+  loadingApp.value = true;
+  let sendInfo = {
+    page: val.page,
+    pagesize: val.pagesize,
+    keywords: val.searchWork,
+    groupId: props.appGroup,
+  };
+  getCustomerFormList(sendInfo)
+    .then(({ data }) => {
+      // console.log("打开应用-->",data);
+      pageTotal.value = data.total;
+      contList.value = data.list;
+    })
+    .finally(() => {
+      loadingApp.value = false;
+    });
+};
 
 onMounted(() => {
-	nextTick(() => {
-		getFormAppList(props.searchQuery);
-	})
-})
-watch(()=>props.appGroup,()=>{
-	getFormAppList(props.searchQuery);
-})
-const srcList = (val:string) =>{
-	if(val){
-		return [val]
-	}else{
-		return ["https://docu.hxgk.group/images/2024_04/482167d1bf2b75a5717bcf68e18235f7.png"]
-	}
-}
+  nextTick(() => {
+    getFormAppList(props.searchQuery);
+  });
+});
+watch(
+  () => props.appGroup,
+  () => {
+    getFormAppList(props.searchQuery);
+  }
+);
+const srcList = (val: string) => {
+  if (val) {
+    return [val];
+  } else {
+    return [
+      "https://docu.hxgk.group/images/2024_04/482167d1bf2b75a5717bcf68e18235f7.png",
+    ];
+  }
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-22 09:57:45
 @ 功能: 编辑应用
 */
-const editIsOpen = ref(false)
-const appKey = ref<string>("")
-const editForm = (val:any) => {
-	emits("getRongQiAttr")
-	pickAppInfo.value = val
-	editIsOpen.value = true;
-}
+const editIsOpen = ref(false);
+const appKey = ref<string>("");
+const editForm = (val: any) => {
+  emits("getRongQiAttr");
+  pickAppInfo.value = val;
+  editIsOpen.value = true;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-22 09:58:19
 @ 功能: 编辑应用状态
 */
-const eidtStatus = (val:any) => {
-	emits("getRongQiAttr")
-	ElMessageBox.confirm(
-		'请问是否真的删除？删除后数据将无法找回！',
-		'温馨提示！',
-		{
-			confirmButtonText: '删除',
-			cancelButtonText: '取消',
-			type: 'warning',
-			draggable: true,
-		}
-	)
-	.then(() => {
-		editProductionFormStatus({id:[val.id.toString()],status:3,is_delete:false})
-			.then(({data})=>{
-				getFormAppList(props.searchQuery);
-			})
-	})
-	.catch(() => {
-		getFormAppList(props.searchQuery);
-	})
-}
+const eidtStatus = (val: any) => {
+  emits("getRongQiAttr");
+  ElMessageBox.confirm("请问是否真的删除？删除后数据将无法找回！", "温馨提示！", {
+    confirmButtonText: "删除",
+    cancelButtonText: "取消",
+    type: "warning",
+    draggable: true,
+  })
+    .then(() => {
+      editProductionFormStatus({
+        id: [val.id.toString()],
+        status: 3,
+        is_delete: false,
+      }).then(({ data }) => {
+        getFormAppList(props.searchQuery);
+      });
+    })
+    .catch(() => {
+      getFormAppList(props.searchQuery);
+    });
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-22 10:01:17
 @ 功能: 打开应用
 */
-const openApp = (val:any) => {
-	emits("getRongQiAttr")
-	pickAppInfo.value = val
-	appJwtPower({id:val.signCodeStr,types:1})
-		.then(({data})=>{
-			// console.log("打开应用------>data:",data)
-			if(data){
-				runIsOpen.value = true
-			}else{
-				ElMessage({
-					message: '对不起！您不可使用此App！请联系管理员进行授权！',
-					type: 'error',
-					plain: true,
-				})
-			}
-		})
-}
+const openApp = (val: any) => {
+  emits("getRongQiAttr");
+  pickAppInfo.value = val;
+  appJwtPower({ id: val.signCodeStr, types: 1 }).then(({ data }) => {
+    // console.log("打开应用------>data:",data)
+    if (data) {
+      runIsOpen.value = true;
+    } else {
+      ElMessage({
+        message: "对不起！您不可使用此App！请联系管理员进行授权！",
+        type: "error",
+        plain: true,
+      });
+    }
+  });
+};
 defineExpose({
-	getFormAppList
-})
+  getFormAppList,
+});
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-23 15:27:51
 @ 功能: 表单数据
 */
 const state = reactive({
-    tableData: {
-      // tableProps: {}, //表格所有参数
-      columns: [],
-      config: {},
-	  controlBtn:[],
-	  operateBtn:[]
+  tableData: {
+    // tableProps: {}, //表格所有参数
+    columns: [],
+    config: {},
+    controlBtn: [],
+    operateBtn: [],
+  },
+  searchData: [],
+  loading: false,
+  attrObj: {},
+  config: {
+    pageSize: 10,
+    searchIsShow: true,
+    searchFormIsShow: true,
+    openPageMode: "drawer",
+  },
+  tagList: {},
+  formId: props.formKey || "",
+  formList: [], // 所有可选表单数据源
+  name: "",
+  treeData: {}, // 左侧树相关
+  previewVisible: false,
+  tabsName: "second",
+  formFieldList: [], // 表单数据源所有可选字段
+  formApi: {
+    type: "1",
+    addApiUrl: "",
+    editApiUrl: "",
+    delApiUrl: "",
+    lookApiUrl: "",
+  },
+  dict: {},
+  refreshTable: true,
+  view: {
+    list: {
+      status: true,
+      isClick: false,
+      form: {
+        sortWord: "",
+        sortClass: 1,
+        title: [],
+      },
+    },
+    date: {
+      status: false,
+      isClick: false,
+      form: {
+        startTime: "",
+        endTime: "",
+        dayType: 1,
+        title: [],
+      },
+    },
+    time: {
+      status: false,
+      isClick: false,
+      form: {
+        sortWord: "",
+        sort: 1,
+        title: [],
+      },
+    },
+    gantt: {
+      status: false,
+      isClick: false,
+      form: {
+        startTime: "",
+        endTime: "",
+        dayType: 2,
+        sortWord: "",
+        sort: 1,
+        title: [],
+      },
     },
-    searchData: [],
-    loading: false,
-    attrObj: {},
-    config: {
-		pageSize:10,
-		searchIsShow:true,
-		searchFormIsShow:true,
-		openPageMode:"drawer"
-	},
-    tagList: {},
-    formId: props.formKey || '',
-    formList: [], // 所有可选表单数据源
-    name: '',
-    treeData: {}, // 左侧树相关
-    previewVisible: false,
-    tabsName: 'second',
-    formFieldList: [], // 表单数据源所有可选字段
-	formApi:{
-		type:"1",
-		addApiUrl:"",
-		editApiUrl:"",
-		delApiUrl:"",
-		lookApiUrl:""
-	},
-    dict: {},
-    refreshTable: true,
-	view:{
-		list:{
-			status:true,
-			isClick:false,
-			form:{
-				sortWord:"",
-				sortClass:1,
-				title:[]
-			}
-		},
-		date:{
-			status:false,
-			isClick:false,
-			form:{
-				startTime:"",
-				endTime:"",
-				dayType:1,
-				title:[]
-			}
-		}
-		,
-		time:{
-			status:false,
-			isClick:false,
-			form:{
-				sortWord:"",
-				sort:1,
-				title:[]
-			}
-		}
-		,
-		gantt:{
-			status:false,
-			isClick:false,
-			form:{
-				startTime:"",
-				endTime:"",
-				dayType:2,
-				sortWord:"",
-				sort:1,
-				title:[]
-			}
-		}
-		,
-		map:{
-			status:false,
-			isClick:false,
-			form:{
-				mapWord:"",
-				sortWord:"",
-				sort:1,
-				title:[]
-			}
-		},
-		card:{
-			status:false,
-			isClick:false,
-			form:{
-				sort:1,
-				sortWord:"",
-				imgWork:"",
-				imgWidth:50,
-				imgHeight:50,
-				imgBorderRadius:5,
-				imgPadding:2,
-				titleWork:"",
-				describe:"",
-				ranks:3,
-				title:[]
-			}
-		}
-	}
-})
-const lookPageIsShow = ref(false)
-const versionTitle = ref<string>("")	//表单名称
-const versionId = ref<string>("")	//表单版本号
-const formId = ref<string>("")
-const addFormIsShow = ref(false)
+    map: {
+      status: false,
+      isClick: false,
+      form: {
+        mapWord: "",
+        sortWord: "",
+        sort: 1,
+        title: [],
+      },
+    },
+    card: {
+      status: false,
+      isClick: false,
+      form: {
+        sort: 1,
+        sortWord: "",
+        imgWork: "",
+        imgWidth: 50,
+        imgHeight: 50,
+        imgBorderRadius: 5,
+        imgPadding: 2,
+        titleWork: "",
+        describe: "",
+        ranks: 3,
+        title: [],
+      },
+    },
+  },
+});
+const lookPageIsShow = ref(false);
+const versionTitle = ref<string>(""); //表单名称
+const versionId = ref<string>(""); //表单版本号
+const formId = ref<string>("");
+const addFormIsShow = ref(false);
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-01 14:32:18
 @ 功能: 查看表单列表
 */
-const lookFormList = (val:any) => {
-	emits('getRongQiAttr')
-	// console.log("查看表单列表aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", val)
-	
+const lookFormList = (val: any) => {
+  emits("getRongQiAttr");
+  // console.log("查看表单列表aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", val)
 
-	versionId.value = val.versionId
-	versionTitle.value = val.name
+  versionId.value = val.versionId;
+  versionTitle.value = val.name;
 
-	if(val.listjson != "" && val.listjson != null){
-			lookPageIsShow.value = true
-			state.formId = val.idStr
-			let stateData = string2json(val.listjson)
-			// console.log(val.listjson)
-			// console.log("查看表单列表---->",stateData)
-			//let holeControlAndConfigStateData = string2json(data.data.appForm.mastesformjson)
-			if(stateData.tableData.columns&&stateData.tableData.columns.length>0){
-				for(let i = 0;i<stateData.tableData.columns.length;i++){
-					if(stateData.tableData.columns[i].config!=undefined && stateData.tableData.columns[i].control!=undefined){
-						// console.log(stateData.tableData.columns[i])
-						let paramx:string = ""+stateData.tableData.columns[i].control.optionsValue3Field
-						/*
+  if (val.listjson != "" && val.listjson != null) {
+    lookPageIsShow.value = true;
+    state.formId = val.idStr;
+    let stateData = string2json(val.listjson);
+    // console.log(val.listjson)
+    // console.log("查看表单列表---->",stateData)
+    //let holeControlAndConfigStateData = string2json(data.data.appForm.mastesformjson)
+    if (stateData.tableData.columns && stateData.tableData.columns.length > 0) {
+      for (let i = 0; i < stateData.tableData.columns.length; i++) {
+        if (
+          stateData.tableData.columns[i].config != undefined &&
+          stateData.tableData.columns[i].control != undefined
+        ) {
+          // console.log(stateData.tableData.columns[i])
+          let paramx: string =
+            "" + stateData.tableData.columns[i].control.optionsValue3Field;
+          /*
 							在这里请求后台获取字段
 						*/
-						console.log("addCardPage---298",paramx)
-						if(paramx && paramx != "" && paramx != null && paramx != "undefined"){
-							getFieldRecord(paramx).then(({ data }) => {
-								stateData.tableData.columns[i].options = data
-								if(stateData.searchData.length>0){
-									for(let j = 0;j<stateData.searchData.length;j++){
-										// console.log(stateData.searchData[j])
-										if(stateData.searchData[j].id==stateData.tableData.columns[i].id){
-											stateData.searchData[j].options = data
-										}
-									}
-								}
-							})
-						}
-					}
-				}
-			}
-			state.tableData = stateData.tableData
-			state.searchData = stateData.searchData
-			state.loading = stateData.loading
-			state.attrObj = stateData.attrObj
-			state.config = stateData.config
-			state.tagList = stateData.tagList
-			
-			state.formList = stateData.formList
-			state.name = stateData.name
-			state.treeData = stateData.treeData
-			state.previewVisible = stateData.previewVisible
-			state.formFieldList = stateData.formFieldList
-			state.formApi = stateData.formApi
-			state.dict = stateData.dict
-			state.refreshTable = stateData.refreshTable
-	}else{
-		openTaskDrawer.value = true
-	}
+          console.log("addCardPage---298", paramx);
+          if (paramx && paramx != "" && paramx != null && paramx != "undefined") {
+            getFieldRecord(paramx).then(({ data }) => {
+              stateData.tableData.columns[i].options = data;
+              if (stateData.searchData.length > 0) {
+                for (let j = 0; j < stateData.searchData.length; j++) {
+                  // console.log(stateData.searchData[j])
+                  if (stateData.searchData[j].id == stateData.tableData.columns[i].id) {
+                    stateData.searchData[j].options = data;
+                  }
+                }
+              }
+            });
+          }
+        }
+      }
+    }
+    state.tableData = stateData.tableData;
+    state.searchData = stateData.searchData;
+    state.loading = stateData.loading;
+    state.attrObj = stateData.attrObj;
+    state.config = stateData.config;
+    state.tagList = stateData.tagList;
 
-
-	
-
-
-}
+    state.formList = stateData.formList;
+    state.name = stateData.name;
+    state.treeData = stateData.treeData;
+    state.previewVisible = stateData.previewVisible;
+    state.formFieldList = stateData.formFieldList;
+    state.formApi = stateData.formApi;
+    state.dict = stateData.dict;
+    state.refreshTable = stateData.refreshTable;
+  } else {
+    openTaskDrawer.value = true;
+  }
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-03-21 10:57:11
 @ 功能: 编辑表单
 */
-const editFormApp = (val:any) => {
-	emits('getRongQiAttr')
-	formId.value = val.id.toString()
-	addFormIsShow.value= true
-	// console.log("编辑表单",val.id,"-",formId.value,"-",addFormIsShow.value)
-}
+const editFormApp = (val: any) => {
+  emits("getRongQiAttr");
+  formId.value = val.id.toString();
+  addFormIsShow.value = true;
+  // console.log("编辑表单",val.id,"-",formId.value,"-",addFormIsShow.value)
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-03-09 09:06:44
 @ 功能: 刷新页面
 */
-const refreshPage = (pageType:string) =>{
-	addFormIsShow.value = false;
-	getFormAppList(props.searchQuery);
-}
+const refreshPage = (pageType: string) => {
+  addFormIsShow.value = false;
+  getFormAppList(props.searchQuery);
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-09 11:28:39
 @ 功能: 翻页
 */
-const handleCurrentChange = (val:any) =>{
-	// console.log("翻页",val)
-	props.searchQuery.page = val
-	getFormAppList(props.searchQuery);
-}
+const handleCurrentChange = (val: any) => {
+  // console.log("翻页",val)
+  props.searchQuery.page = val;
+  getFormAppList(props.searchQuery);
+};
 </script>
 <template>
-	<div>
-		<div v-loading="loadingApp" class="content1 flex flex-wrap gap-4">
-			<el-card v-for="item in contList" :key="item.id" class="cardBox">
-				
-					<template #header>
-						<el-dropdown  v-if="item.classify==3">
-							<span class="el-dropdown-link">
-								<el-icon><MoreFilled /></el-icon>
-							</span>
-							<template #dropdown>
-								<el-dropdown-menu>
-									<el-dropdown-item @click="editForm(item)" >编辑</el-dropdown-item>
-									<el-dropdown-item @click="eidtStatus(item)" divided>删除</el-dropdown-item>
-								</el-dropdown-menu>
-							</template>
-						</el-dropdown>
-						<el-dropdown  v-else>
-							<span class="el-dropdown-link">
-								<el-icon><MoreFilled /></el-icon>
-							</span>
-							<template #dropdown>
-								<el-dropdown-menu>
-									<el-dropdown-item @click="editFormApp(item)" >编辑</el-dropdown-item>
-									<el-dropdown-item @click="eidtStatus(item)" divided>删除</el-dropdown-item>
-								</el-dropdown-menu>
-							</template>
-						</el-dropdown>
-					</template>
-					<div  v-if="item.classify==3" class="cardContBox" @click="openApp(item)">
-						<el-image
-							style="width: 100px; height: 100px"
-							:src="item.icon?item.icon:'https://docu.hxgk.group/images/2024_04/482167d1bf2b75a5717bcf68e18235f7.png'"
-							:zoom-rate="1.2"
-							:max-scale="7"
-							:min-scale="0.2"
-							:initial-index="4"
-							fit="cover"
-						/>
-						<div class="cardInfo" :style="'width: calc(100% - 100px); height: 100px; overflow: hidden;' ">
-							<div class="title">{{item.name}}</div>
-							<div class="content">{{item.describe}}</div>
-						</div>
-					</div>
-					<div  v-else class="cardContBox" @click="lookFormList(item)">
-						<el-image
-							style="width: 100px; height: 100px"
-							:src="item.icon?item.icon:'https://docu.hxgk.group/images/2024_04/482167d1bf2b75a5717bcf68e18235f7.png'"
-							:zoom-rate="1.2"
-							:max-scale="7"
-							:min-scale="0.2"
-							:initial-index="4"
-							fit="cover"
-						/>
-						<div class="cardInfo" :style="'width: calc(100% - 100px); height: 100px; overflow: hidden;' ">
-							<div class="title">{{item.name}}</div>
-							<div class="content">{{item.describe}}</div>
-						</div>
-					</div>
-			</el-card>
-			
-		</div>
-		<div class="pagination-box">
-            <el-pagination background v-if="pageTotal > 0" v-model:current-page="props.searchQuery.page"
-            v-model:page-size="props.searchQuery.pagesize"
-            :total="pageTotal" @current-change="handleCurrentChange" />
+  <div>
+    <div v-loading="loadingApp" class="content1 flex flex-wrap gap-4">
+      <el-card v-for="item in contList" :key="item.id" class="cardBox">
+        <template #header>
+          <el-dropdown v-if="item.classify == 3">
+            <span class="el-dropdown-link">
+              <el-icon><MoreFilled /></el-icon>
+            </span>
+            <template #dropdown>
+              <el-dropdown-menu>
+                <el-dropdown-item @click="editForm(item)">编辑</el-dropdown-item>
+                <el-dropdown-item @click="eidtStatus(item)" divided
+                  >删除</el-dropdown-item
+                >
+              </el-dropdown-menu>
+            </template>
+          </el-dropdown>
+          <el-dropdown v-else>
+            <span class="el-dropdown-link">
+              <el-icon><MoreFilled /></el-icon>
+            </span>
+            <template #dropdown>
+              <el-dropdown-menu>
+                <el-dropdown-item @click="editFormApp(item)">编辑</el-dropdown-item>
+                <el-dropdown-item @click="eidtStatus(item)" divided
+                  >删除</el-dropdown-item
+                >
+              </el-dropdown-menu>
+            </template>
+          </el-dropdown>
+        </template>
+        <div v-if="item.classify == 3" class="cardContBox" @click="openApp(item)">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="
+              item.icon
+                ? item.icon
+                : 'https://docu.hxgk.group/images/2024_04/482167d1bf2b75a5717bcf68e18235f7.png'
+            "
+            :zoom-rate="1.2"
+            :max-scale="7"
+            :min-scale="0.2"
+            :initial-index="4"
+            fit="cover"
+          />
+          <div
+            class="cardInfo"
+            :style="'width: calc(100% - 100px); height: 100px; overflow: hidden;'"
+          >
+            <div class="title">{{ item.name }}</div>
+            <div class="content">{{ item.describe }}</div>
+          </div>
         </div>
-		<AppContainer v-model:run-is-open="runIsOpen" :pick-app-info="pickAppInfo" :drawer-with="props.drawerWith" :search-query="props.searchQuery" @refreshPage="getFormAppList" />
-		<AppContainerPage v-model:edit-is-open="editIsOpen" :pick-app-info="pickAppInfo" :drawer-with="props.drawerWith" :search-query="props.searchQuery" :group-key="props.appGroup" @refreshPage="getFormAppList" />
-
-
-		<el-drawer
-			v-model="lookPageIsShow"
-			title="列表预览"
-			direction="rtl"
-			:before-close="handlePreviewClose"
-			:size="props.drawerWith"
-		>
-			<ak-page-list
-				:data="state.tableData"
-				:search-data="state.searchData"
-				:config="state.config"
-				:form-id="state.formId"
-				:versionid="versionId" 
-				:viewPage="state.view"
-				:versiontitle="versionTitle"
-				
-				v-model:look-page-is-show="lookPageIsShow"
-			/>
-		</el-drawer>
-		<LowCodeFormPage v-if="addFormIsShow" :drawer-with="props.drawerWith" v-model:form-key="formId" @refreshPage="refreshPage" />
+        <div v-else class="cardContBox" @click="lookFormList(item)">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="
+              item.icon
+                ? item.icon
+                : 'https://docu.hxgk.group/images/2024_04/482167d1bf2b75a5717bcf68e18235f7.png'
+            "
+            :zoom-rate="1.2"
+            :max-scale="7"
+            :min-scale="0.2"
+            :initial-index="4"
+            fit="cover"
+          />
+          <div
+            class="cardInfo"
+            :style="'width: calc(100% - 100px); height: 100px; overflow: hidden;'"
+          >
+            <div class="title">{{ item.name }}</div>
+            <div class="content">{{ item.describe }}</div>
+          </div>
+        </div>
+      </el-card>
+    </div>
+    <div class="pagination-box">
+      <el-pagination
+        background
+        v-if="pageTotal > 0"
+        v-model:current-page="props.searchQuery.page"
+        v-model:page-size="props.searchQuery.pagesize"
+        :total="pageTotal"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+    <AppContainer
+      v-model:run-is-open="runIsOpen"
+      :pick-app-info="pickAppInfo"
+      :drawer-with="props.drawerWith"
+      :search-query="props.searchQuery"
+      @refreshPage="getFormAppList"
+    />
+    <AppContainerPage
+      v-model:edit-is-open="editIsOpen"
+      :pick-app-info="pickAppInfo"
+      :drawer-with="props.drawerWith"
+      :search-query="props.searchQuery"
+      :group-key="props.appGroup"
+      @refreshPage="getFormAppList"
+    />
 
+    <el-drawer
+      v-model="lookPageIsShow"
+      title="列表预览"
+      direction="rtl"
+      :before-close="handlePreviewClose"
+      :size="props.drawerWith"
+    >
+      <ak-page-list
+        :data="state.tableData"
+        :search-data="state.searchData"
+        :config="state.config"
+        :form-id="state.formId"
+        :versionid="versionId"
+        :viewPage="state.view"
+        :versiontitle="versionTitle"
+        v-model:look-page-is-show="lookPageIsShow"
+      />
+    </el-drawer>
+    <LowCodeFormPage
+      v-if="addFormIsShow"
+      :drawer-with="props.drawerWith"
+      v-model:form-key="formId"
+      @refreshPage="refreshPage"
+    />
 
-		<TableFlow  v-model:isopen="openTaskDrawer" :versionid="versionId" :versiontitle="versionTitle" :drawerwith="props.drawerWith" @searchquery="getFormAppList" />
-	</div>
+    <TableFlow
+      v-model:isopen="openTaskDrawer"
+      :versionid="versionId"
+      :versiontitle="versionTitle"
+      :drawerwith="props.drawerWith"
+      @searchquery="getFormAppList"
+    />
+  </div>
 </template>
-<style  lang='scss' scoped>
-.pagination-box{
-    display: flex;
-    justify-content: center;
-    margin-top: 15px;
+<style lang="scss" scoped>
+.pagination-box {
+  display: flex;
+  justify-content: center;
+  margin-top: 15px;
 }
 .el-row:last-child {
   margin-bottom: 0;
@@ -483,47 +533,46 @@ const handleCurrentChange = (val:any) =>{
   background-color: #eeeeee;
 }
 
-
-.content1{
-	padding:1rem 1rem 0 1rem;
-	::v-deep .el-card__body{
-		padding:5px 10px 10px 10px;
-	}
-	::v-deep .el-card__header{
-		border-bottom: 0;
-		padding: 0;
-		height: 10px;
-		display:flex;
-		justify-content: right;
-	}
-	.el-dropdown-link{
-		margin-top: 4px;
-		margin-right: 10px;
-		cursor: pointer;
-	}
+.content1 {
+  padding: 1rem 1rem 0 1rem;
+  ::v-deep .el-card__body {
+    padding: 5px 10px 10px 10px;
+  }
+  ::v-deep .el-card__header {
+    border-bottom: 0;
+    padding: 0;
+    height: 10px;
+    display: flex;
+    justify-content: right;
+  }
+  .el-dropdown-link {
+    margin-top: 4px;
+    margin-right: 10px;
+    cursor: pointer;
+  }
 }
-.cardBox{
-	width:306px;
-	.cardContBox{
-		display: flex;
-		width: 100%;
-		justify-content: flex-start;
-		cursor: pointer;
-	}
-	.cardInfo{
-		padding-left: 5px;
-	}
-	.title{
-		font-size:14px;
-		font-weight:bold;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-	}
-	.content{
-		color: #909399;
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
+.cardBox {
+  width: 306px;
+  .cardContBox {
+    display: flex;
+    width: 100%;
+    justify-content: flex-start;
+    cursor: pointer;
+  }
+  .cardInfo {
+    padding-left: 5px;
+  }
+  .title {
+    font-size: 14px;
+    font-weight: bold;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .content {
+    color: #909399;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
 }
 </style>
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
index 58a8480..8a7cf0c 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
@@ -3,268 +3,302 @@
 @ 时间: 2024-05-07 15:05:29
 @ 备注: 自定义表单
 -->
-<script lang='ts' setup>
-import { useDesignFormStore } from '@/store/DesignForm/designForm'
-import { useRoute, useRouter } from 'vue-router'
-import { json2string,objToStringify,string2json,stringToObj } from '@/utils/DesignForm/form'
-import { customerFormVersionCont } from '@/api/DesignForm/type'
-import { FormData,formStruct,DrawerStruct, VideoMsg } from '@/api/DesignForm/types'
-import { saveProductionForm,getOneProductionForm,haveCustomerFormVersion,editCustomerFormInfo,saveAsNewVersion,enableVersion,judgeSubmitCancel,createAppForm,editAppPageInfo,saveOtherVersion,previewAppFormVersion } from '@/api/DesignForm/requestapi'
-import { treeStruct } from '@/api/DesignForm/type' 
+<script lang="ts" setup>
+import { useDesignFormStore } from "@/store/DesignForm/designForm";
+import { useRoute, useRouter } from "vue-router";
+import {
+  json2string,
+  objToStringify,
+  string2json,
+  stringToObj,
+} from "@/utils/DesignForm/form";
+import { customerFormVersionCont } from "@/api/DesignForm/type";
+import { FormData, formStruct, DrawerStruct, VideoMsg } from "@/api/DesignForm/types";
+import {
+  saveProductionForm,
+  getOneProductionForm,
+  haveCustomerFormVersion,
+  editCustomerFormInfo,
+  saveAsNewVersion,
+  enableVersion,
+  judgeSubmitCancel,
+  createAppForm,
+  editAppPageInfo,
+  saveOtherVersion,
+  previewAppFormVersion,
+} from "@/api/DesignForm/requestapi";
+import { treeStruct } from "@/api/DesignForm/type";
 
 //引入页面
-import DragControlApp from '@/components/DesignForm/dragControlApp.vue';
-import HeadToolsApp from '@/components/DesignForm/public/headToolsApp.vue';
-import FormDesign from '@/components/DesignForm/public/form/form.vue'
-import PreviewPage from '@/views/sysworkflow/lowcodepage/appPage/appPageForm/previewPage.vue'
-import AceDrawerPage from '@/components/DesignForm/aceDrawerPage.vue'
+import DragControlApp from "@/components/DesignForm/dragControlApp.vue";
+import HeadToolsApp from "@/components/DesignForm/public/headToolsApp.vue";
+import FormDesign from "@/components/DesignForm/public/form/form.vue";
+import PreviewPage from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/previewPage.vue";
+import AceDrawerPage from "@/components/DesignForm/aceDrawerPage.vue";
 
 const props = defineProps({
-	appCont:{
-		type:Object,
-		default(){
-			return {}
-		}
-	},
-	formKey:{
-		type:String,
-		default:""
-	},
-	appPageKey:{
-		type:String,
-		default:""
-	},
-	groupKey:{
-		type:String,
-		default:""
-	},
-	formVersion:{
-		type:String,
-		default:""
-	},
-	menuId:{
-		type:String,
-		default:""
-	},
-  	formconfigcont:{
-		type:Object,
-		default(){
-			return {}
-		}
-	},
-	state:{
-		type:Object,
-		default(){
-			return {}
-		}
-	}
+  appCont: {
+    type: Object,
+    default() {
+      return {};
+    },
+  },
+  formKey: {
+    type: String,
+    default: "",
+  },
+  appPageKey: {
+    type: String,
+    default: "",
+  },
+  groupKey: {
+    type: String,
+    default: "",
+  },
+  formVersion: {
+    type: String,
+    default: "",
+  },
+  menuId: {
+    type: String,
+    default: "",
+  },
+  formconfigcont: {
+    type: Object,
+    default() {
+      return {};
+    },
+  },
+  state: {
+    type: Object,
+    default() {
+      return {};
+    },
+  },
 });
 
 const emits = defineEmits<{
-    (e: 'update:state', val: formStruct): void
-	(e: 'update:formKey', val: string): void
-	(e: 'update:appPageKey', val: string): void
-	(e: 'update:formVersion', val: string): void
-	(e: 'judgeFormIsEdit', val: boolean): void
-	(e: 'runNextWindows', val: number): void
-	(e: 'closeFormPage'): void
-}>()
+  (e: "update:state", val: formStruct): void;
+  (e: "update:formKey", val: string): void;
+  (e: "update:appPageKey", val: string): void;
+  (e: "update:formVersion", val: string): void;
+  (e: "judgeFormIsEdit", val: boolean): void;
+  (e: "runNextWindows", val: number): void;
+  (e: "closeFormPage"): void;
+}>();
 
-const state =  computed({
-	get() {
-		return props.state
-	},
-	set(val: formStruct) {
-		emits('update:state', val)
-	}
+const state = computed({
+  get() {
+    return props.state;
+  },
+  set(val: formStruct) {
+    emits("update:state", val);
+  },
 });
 
-const formControlAttrEl = ref(null)
+const formControlAttrEl = ref(null);
 
-provide('formDesignType', state.value.designType)
-const appFormKeyVal =  computed({
-	get() {
-		return props.formKey
-	},
-	set(val: formStruct) {
-		emits('update:formKey', val)
-	}
+provide("formDesignType", state.value.designType);
+const appFormKeyVal = computed({
+  get() {
+    return props.formKey;
+  },
+  set(val: formStruct) {
+    emits("update:formKey", val);
+  },
 });
 
-
-const appPageKey =  computed({
-	get() {
-		return props.appPageKey
-	},
-	set(val: string) {
-		emits('update:appPageKey', val)
-	}
+const appPageKey = computed({
+  get() {
+    return props.appPageKey;
+  },
+  set(val: string) {
+    emits("update:appPageKey", val);
+  },
 });
 
-
-const isEdit = ref(false)
-const route: any = useRoute().query || {}
-const versionCont = ref<customerFormVersionCont[]>([])			//版本内容列表
-const tableKey = ref("")
-const versionId = ref<string>("")		//版本号
+const isEdit = ref(false);
+const route: any = useRoute().query || {};
+const versionCont = ref<customerFormVersionCont[]>([]); //版本内容列表
+const tableKey = ref("");
+const versionId = ref<string>(""); //版本号
 // const store = useDesignFormStore()
-const store = useDesignFormStore() as any
+const store = useDesignFormStore() as any;
 
 const controlData = computed(() => {
-        // console.log("注册自定义事件----------------->",props.formInfo)
-        // console.log("注册自定义事件--------1--------->",store.controlAttr)
-		// console.log("注册自定义事件---------3-------->",controlData.value.customRules)
-        return store.controlAttr
-})
+  // console.log("注册自定义事件----------------->",props.formInfo)
+  // console.log("注册自定义事件--------1--------->",store.controlAttr)
+  // console.log("注册自定义事件---------3-------->",controlData.value.customRules)
+  return store.controlAttr;
+});
 const drawer = reactive<DrawerStruct>({
-    visible: false,
-    type: '',
-    title: '',
-    codeType: '',
-    direction: undefined, //弹出方向rtl / ltr
-    callback: ''
-})
-const formFieldAry = ref<string[]>([])
+  visible: false,
+  type: "",
+  title: "",
+  codeType: "",
+  direction: undefined, //弹出方向rtl / ltr
+  callback: "",
+});
+const formFieldAry = ref<string[]>([]);
 // 搜索设计时左侧快速添加字段
 const searchCheckField = (data: FormData) => {
-    state.value.formData.list.push(data)
-}
+  state.value.formData.list.push(data);
+};
 // 选择模板
 const selectTemplate = (data: FormData) => {
-	state.value.formData = stringToObj(objToStringify(data))
-}
+  state.value.formData = stringToObj(objToStringify(data));
+};
 //编辑版本状态
-const editversionstaus = (id:string) =>{
-
-}
+const editversionstaus = (id: string) => {};
 //打开脚本预览
 const openAceEditDrawer = (params: any) => {
-	const { type, direction, codeType, title, callback, content } = params
-	drawer.direction = direction // 窗口位置ltr/rtl
-    drawer.type = type // 作为窗口唯一标识，在窗口关闭时可根据type作不同处理
-    drawer.codeType = codeType || '' // 显示代码类型
-    drawer.title = title ? `提示：${title}` : ''
-    drawer.visible = true
-    drawer.callback = callback
-    let editData =codeType === 'json'? json2string(content, true): objToStringify(content, true)
-	switch (type) {
-		case 'css':
-			editData = state.value.formData.config?.style || ''
-			break
-		case 'dict':
-			// 格式化一下
-			editData = json2string(state.value.formDict, true)
-			break
-		case 'beforeRequest':
-		case 'beforeSubmit':
-		case 'afterResponse':
-		case 'afterSubmit':
-		case 'change':
-			// eslint-disable-next-line no-case-declarations
-			const beforeData = state.value.formData.events || {}
-			if (beforeData[type]) {
-				editData = objToStringify(beforeData[type], true)
-			} else {
-				if (['afterResponse', 'afterSubmit'].includes(type)) {
-					editData = afterResponse
-				} else if (type === 'change') {
-					editData = onChange
-				} else {
-					editData = beforeRequest
-				}
-			}
-			break
-		// case 'afterResponse':
-		// case 'afterSubmit':
-		//   const newData = state.formData.events || {}
-		//   if (newData[type]) {
-		//     editData = objToStringify(newData[type], true)
-		//   } else {
-		//     editData = afterResponse
-		//   }
-		//   break
+  console.log("打开脚本预览====:", params);
+  const { type, direction, codeType, title, callback, content } = params;
+  drawer.direction = direction; // 窗口位置ltr/rtl
+  drawer.type = type; // 作为窗口唯一标识，在窗口关闭时可根据type作不同处理
+  drawer.codeType = codeType || ""; // 显示代码类型
+  drawer.title = title ? `提示：${title}` : "";
+  drawer.visible = true;
+  drawer.callback = callback;
+  let editData =
+    codeType === "json" ? json2string(content, true) : objToStringify(content, true);
 
-		case 'optionsParams':
-			if (!content) {
-				editData = beforeRequest
-			}
-			break
-		case 'optionsResult':
-			if (!content) {
-				editData = afterResponse
-			}
-			break
-    }
-    drawer.content = editData
-}
+  console.log("打开脚本预览===1=:", type, editData);
+  switch (type) {
+    case "css":
+      editData = state.value.formData.config?.style || "";
+      break;
+    case "dict":
+      // 格式化一下
+      editData = json2string(state.value.formDict, true);
+      break;
+    case "cascader":
+      //   console.log("打开脚本预览==2=2=:", stringToObj(editData));
+      editData = stringToObj(editData);
+      break;
+    case "treeSelect":
+      let kvjData = stringToObj(editData);
+      //   console.log("打开脚本预览==2=2=:", editData, kvjData);
+      //   editData = stringToObj(editData);
+      if (kvjData == "" || kvjData == null || kvjData == undefined) {
+        editData = [];
+        // console.log("打开脚本预览==2=4=:", kvjData);
+      } else {
+        editData = stringToObj(editData);
+        // console.log("打开脚本预览==2=5=:", editData);
+      }
+      //   console.log("打开脚本预览==2=3=:", editData);
+      break;
+    case "beforeRequest":
+    case "beforeSubmit":
+    case "afterResponse":
+    case "afterSubmit":
+    case "change":
+      // eslint-disable-next-line no-case-declarations
+      const beforeData = state.value.formData.events || {};
+      if (beforeData[type]) {
+        editData = objToStringify(beforeData[type], true);
+      } else {
+        if (["afterResponse", "afterSubmit"].includes(type)) {
+          editData = afterResponse;
+        } else if (type === "change") {
+          editData = onChange;
+        } else {
+          editData = beforeRequest;
+        }
+      }
+      break;
+    // case 'afterResponse':
+    // case 'afterSubmit':
+    //   const newData = state.formData.events || {}
+    //   if (newData[type]) {
+    //     editData = objToStringify(newData[type], true)
+    //   } else {
+    //     editData = afterResponse
+    //   }
+    //   break
+
+    case "optionsParams":
+      if (!content) {
+        editData = beforeRequest;
+      }
+      break;
+    case "optionsResult":
+      if (!content) {
+        editData = afterResponse;
+      }
+      break;
+  }
+  drawer.content = editData;
+  console.log("打开脚本预览==2=222=:", drawer.content);
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-15 13:28:57
 @ 功能: 关闭脚本预览窗，并初始化脚本预览参数
 */
 const dialogCancel = () => {
-    drawer.visible = false
-    drawer.type = ''
-    drawer.title = ''
-    drawer.codeType = ''
-    drawer.callback = ''
-    drawer.content = ''
-}
-const isWeb = ref(false)
+  drawer.visible = false;
+  drawer.type = "";
+  drawer.title = "";
+  drawer.codeType = "";
+  drawer.callback = "";
+  drawer.content = "";
+};
+const isWeb = ref(false);
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-13 14:40:40
 @ 功能: 表单编辑功能按钮回调事件
 */
 const buttonCallbackEvent = (type: string) => {
-	// console.log("表单编辑功能按钮回调事件", type)
-	switch (type) {
-		case 'del':	//清空
-			state.value.formData.list = []
-			store.setActiveKey('')
-			store.setControlAttr({})
-			break
-		case 'eye':	//预览
-			store.setActiveKey('')
-			store.setControlAttr({})
-			let stringPreview = objToStringify(state.value.formData) // 防止预览窗口数据修改影响
-			const formName = state.value.formData.form.name
-			const reg = new RegExp(`get${formName}ControlByName`, 'g')
-			stringPreview = stringPreview.replace(
-				reg,
-				`getPreview${formName}ControlByName`
-			)
-			state.value.formDataPreview = stringToObj(stringPreview)
-			state.value.formDataPreview.form.name = `Preview${formName}` // 修改下表单名
-			// console.log("预览数据",state.value.formDataPreview);
-			state.value.previewVisible = true
-			break
-		case 'json':	//生成脚本预览
-			openAceEditDrawer({
-				direction: 'rtl',
-				content: state.value.formData,
-				title: '可编辑修改或将已生成的脚本粘贴进来'
-			})
-			break
-		case 'save':	//保存
-			if(props.appPageKey && props.appPageKey != ""){	//存在，进行编辑操作
-				editAppFormTable()
-			}else{ //不存在，进行新增操作
-				saveAppFormData();
-			}
-			break
-		case 'branch':	//另存为新版
-			saveOtherVersionIng();
-		case 'monitor':
-			isWeb.value = false;
-			// console.log("monitor",isWeb); //
-			break
-		case 'iphone':
-			isWeb.value = true;
-			// console.log("iphone",isWeb); //
-			break
-	}
-}
+  // console.log("表单编辑功能按钮回调事件", type)
+  switch (type) {
+    case "del": //清空
+      state.value.formData.list = [];
+      store.setActiveKey("");
+      store.setControlAttr({});
+      break;
+    case "eye": //预览
+      store.setActiveKey("");
+      store.setControlAttr({});
+      let stringPreview = objToStringify(state.value.formData); // 防止预览窗口数据修改影响
+      const formName = state.value.formData.form.name;
+      const reg = new RegExp(`get${formName}ControlByName`, "g");
+      stringPreview = stringPreview.replace(reg, `getPreview${formName}ControlByName`);
+      state.value.formDataPreview = stringToObj(stringPreview);
+      state.value.formDataPreview.form.name = `Preview${formName}`; // 修改下表单名
+      // console.log("预览数据",state.value.formDataPreview);
+      state.value.previewVisible = true;
+      break;
+    case "json": //生成脚本预览
+      openAceEditDrawer({
+        direction: "rtl",
+        content: state.value.formData,
+        title: "可编辑修改或将已生成的脚本粘贴进来",
+      });
+      break;
+    case "save": //保存
+      if (props.appPageKey && props.appPageKey != "") {
+        //存在，进行编辑操作
+        editAppFormTable();
+      } else {
+        //不存在，进行新增操作
+        saveAppFormData();
+      }
+      break;
+    case "branch": //另存为新版
+      saveOtherVersionIng();
+    case "monitor":
+      isWeb.value = false;
+      // console.log("monitor",isWeb); //
+      break;
+    case "iphone":
+      isWeb.value = true;
+      // console.log("iphone",isWeb); //
+      break;
+  }
+};
 
 /**
 @ 作者: 秦东
@@ -272,391 +306,414 @@ const buttonCallbackEvent = (type: string) => {
 @ 功能: 获取表单内容
 */
 const gainTableForm = () => {
-	if(props.appPageKey){
-		isEdit.value = true;
-		state.value.loading = true
-		getOneProductionForm({id: props.appPageKey.toString()})
-			.then((res:any) => {
-				if(res.code == 0){
-					const result = res.data
-					console.log("初始设计搜索时--1--->",result)
-					formFieldAry.value = result.formField
-					// 初始设计搜索时res.data=''
-					if (result.mastesform) {
-						state.value.formData = stringToObj(result.mastesform)
-					}
-					// console.log("初始设计搜索时",state.value.formData)
-					if(result.mastesformjson){
-						let kjdkjksd = string2json(result.mastesformjson)
-						// console.log("初始设计搜索时-begin-->",state.value.formData.purview)
-						state.value.formData.purview=kjdkjksd.purview
-						// console.log("初始设计搜索时--->",kjdkjksd)
-					}
-					state.value.formData.config.groupKey = result.groupKey
-					state.value.formData.config.classify = result.classify
-					// console.log("初始设计搜索时--end->",state.value.formData)
-					state.value.formDict = string2json(result.dict)
-					// 恢复表单名称
-					state.value.formOtherData.source = result.source
-					state.value.formOtherData.formName = result.name
+  if (props.appPageKey) {
+    isEdit.value = true;
+    state.value.loading = true;
+    getOneProductionForm({ id: props.appPageKey.toString() })
+      .then((res: any) => {
+        if (res.code == 0) {
+          const result = res.data;
+          console.log("初始设计搜索时--1--->", result);
+          formFieldAry.value = result.formField;
+          // 初始设计搜索时res.data=''
+          if (result.mastesform) {
+            state.value.formData = stringToObj(result.mastesform);
+          }
+          // console.log("初始设计搜索时",state.value.formData)
+          if (result.mastesformjson) {
+            let kjdkjksd = string2json(result.mastesformjson);
+            // console.log("初始设计搜索时-begin-->",state.value.formData.purview)
+            state.value.formData.purview = kjdkjksd.purview;
+            // console.log("初始设计搜索时--->",kjdkjksd)
+          }
+          state.value.formData.config.groupKey = result.groupKey;
+          state.value.formData.config.classify = result.classify;
+          // console.log("初始设计搜索时--end->",state.value.formData)
+          state.value.formDict = string2json(result.dict);
+          // 恢复表单名称
+          state.value.formOtherData.source = result.source;
+          state.value.formOtherData.formName = result.name;
 
-					state.value.formOtherData.formName = result.name
-					state.value.formData.form.name = result.tablekey
-					state.value.formData.form.formName = result.name
-					if (result.source && state.value.designType !== 'search') {
-						// 加载属性侧边栏的字段标识，搜索时不需要请求
-						formControlAttrEl.value.getFormFieldBySource(result.source)
-					}
-					if(result.flowIsOpen != 1){
-						emits('judgeFormIsEdit', false,false)
-					}else{
-						emits('judgeFormIsEdit', false,true)
-					}
-					emits('update:formVersion', result.id.toString())
-				}else{
-					ElMessage.error(res.msg || '加载异常')
-				}
-				state.value.loading = false
-			})
-			.finally(()=>{
-				
-				haveCustomerFormVersion({id:state.value.formData.form.name})
-					.then(({data})=>{
-						versionCont.value = data
-						if(data.length > 0){
-							data.forEach((item:any) => {
-								if(item.status == 1){
-									versionId.value = item.id.toString()
-									emits('update:formVersion', item.id.toString())
-								}
-							});
-						}
-					})
-			})
-			.catch((res: any) => {
-				// console.log(res)
-				ElMessage.error(res.msg || '加载异常')
-				state.value.loading = false
-			})
-	}
-}
+          state.value.formOtherData.formName = result.name;
+          state.value.formData.form.name = result.tablekey;
+          state.value.formData.form.formName = result.name;
+          if (result.source && state.value.designType !== "search") {
+            // 加载属性侧边栏的字段标识，搜索时不需要请求
+            formControlAttrEl.value.getFormFieldBySource(result.source);
+          }
+          if (result.flowIsOpen != 1) {
+            emits("judgeFormIsEdit", false, false);
+          } else {
+            emits("judgeFormIsEdit", false, true);
+          }
+          emits("update:formVersion", result.id.toString());
+        } else {
+          ElMessage.error(res.msg || "加载异常");
+        }
+        state.value.loading = false;
+      })
+      .finally(() => {
+        haveCustomerFormVersion({ id: state.value.formData.form.name }).then(
+          ({ data }) => {
+            versionCont.value = data;
+            if (data.length > 0) {
+              data.forEach((item: any) => {
+                if (item.status == 1) {
+                  versionId.value = item.id.toString();
+                  emits("update:formVersion", item.id.toString());
+                }
+              });
+            }
+          }
+        );
+      })
+      .catch((res: any) => {
+        // console.log(res)
+        ElMessage.error(res.msg || "加载异常");
+        state.value.loading = false;
+      });
+  }
+};
 
-
-function saveRefreshFormControlAttr1(){
-	
-		formControlAttrEl.value.saveRefreshFormControlAttr()
-	
+function saveRefreshFormControlAttr1() {
+  formControlAttrEl.value.saveRefreshFormControlAttr();
 }
 
-
 onMounted(() => {
-    if (route.source) {
-      	formControlAttrEl.value.getFormFieldBySource(route.source)
-    }
-	gainTableForm()
-})
+  if (route.source) {
+    formControlAttrEl.value.getFormFieldBySource(route.source);
+  }
+  gainTableForm();
+});
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-09 14:29:06
 @ 功能: 根据启用版本进行加载页面
 */
-const versionUpdateForm = (val:string) => {
-	// console.log("加载异常-------111------->",val)
-	versionId.value = val
-	gainTableForm()
-	// getInitData()
-}
+const versionUpdateForm = (val: string) => {
+  // console.log("加载异常-------111------->",val)
+  versionId.value = val;
+  gainTableForm();
+  // getInitData()
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-15 13:14:40
 @ 功能: 关闭预览
 */
-const closePreviewPage = (val:boolean) => {
-	// console.log("关闭预览",val)
-	state.value.previewVisible = val
-}
+const closePreviewPage = (val: boolean) => {
+  // console.log("关闭预览",val)
+  state.value.previewVisible = val;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-15 13:58:21
 @ 功能: 写入自建应用App表单
 */
 const saveAppFormData = () => {
-	let sendData: any = {
-		jsondata:JSON.stringify(state.value.formData),
-		data: objToStringify(state.value.formData),
-		source: state.value.formOtherData.source, // 数据源允许在表单属性设置里修改的
-		name: state.value.formOtherData.formName, // 表单名称，用于在显示所有已创建的表单列表里显示
-		type: 4, // 1表单 2列表 3:app 4：app表单
-		dict: json2string(state.value.formDict),
-		appKey:appFormKeyVal.value,
-		groupKey:props.groupKey,
-		menuId:props.menuId,
-		appSignCode:props.formconfigcont.signCode
-	}
-	state.value.loading = true
-	// console.log("写入自建应用App表单",sendData)
-	createAppForm(sendData)
-		.then((data:any) => {
-			state.value.loading = false
-			// console.log("写入自建应用App表单--->",data)
-			// appPageKey.value = data.data.customerFormCont.id
-			// appPageKey.set(data.data.customerFormCont.id.toString())
-			versionId.value = data.data.formVersion.id.toString()
-			emits('update:formVersion', data.data.formVersion.id.toString())
-			emits('update:appPageKey', data.data.customerFormCont.id.toString())
-			// emits('update:formVersion', data.data.version.toString())
-			// console.log("写入自建应用App表单-11111-->",data.data.customerFormCont.id)
-			// console.log("写入自建应用App表单-2222-->",props.appPageKey)
-			// emits('update:appPageKey', data.data.customerFormCont.id.toString())
-			gainTableForm()
-		})
-		.finally(() => {
-			state.value.loading=false;
-		})
-}
+  let sendData: any = {
+    jsondata: JSON.stringify(state.value.formData),
+    data: objToStringify(state.value.formData),
+    source: state.value.formOtherData.source, // 数据源允许在表单属性设置里修改的
+    name: state.value.formOtherData.formName, // 表单名称，用于在显示所有已创建的表单列表里显示
+    type: 4, // 1表单 2列表 3:app 4：app表单
+    dict: json2string(state.value.formDict),
+    appKey: appFormKeyVal.value,
+    groupKey: props.groupKey,
+    menuId: props.menuId,
+    appSignCode: props.formconfigcont.signCode,
+  };
+  state.value.loading = true;
+  // console.log("写入自建应用App表单",sendData)
+  createAppForm(sendData)
+    .then((data: any) => {
+      state.value.loading = false;
+      // console.log("写入自建应用App表单--->",data)
+      // appPageKey.value = data.data.customerFormCont.id
+      // appPageKey.set(data.data.customerFormCont.id.toString())
+      versionId.value = data.data.formVersion.id.toString();
+      emits("update:formVersion", data.data.formVersion.id.toString());
+      emits("update:appPageKey", data.data.customerFormCont.id.toString());
+      // emits('update:formVersion', data.data.version.toString())
+      // console.log("写入自建应用App表单-11111-->",data.data.customerFormCont.id)
+      // console.log("写入自建应用App表单-2222-->",props.appPageKey)
+      // emits('update:appPageKey', data.data.customerFormCont.id.toString())
+      gainTableForm();
+    })
+    .finally(() => {
+      state.value.loading = false;
+    });
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-15 14:07:39
 @ 功能: 编辑App自定义表单
 */
 const editAppFormTable = () => {
-	let sendData: any = {
-		jsondata:JSON.stringify(state.value.formData),
-		data: objToStringify(state.value.formData),
-		source: state.value.formOtherData.source, // 数据源允许在表单属性设置里修改的
-		name: state.value.formOtherData.formName, // 表单名称，用于在显示所有已创建的表单列表里显示
-		type: 4, // 1表单 2列表
-		dict: json2string(state.value.formDict),
-		appKey:appFormKeyVal.value,
-		groupKey:props.groupKey,
-		id:props.appPageKey.toString(),
-		version:versionId.value.toString(),
-		menuId:props.menuId,
-	}
-	state.value.loading = true
-	// console.log("编辑App自定义表单",sendData)
-	editAppPageInfo(sendData)
-		.then((data:any) => {
-			state.value.loading = false
-			// console.log("编辑App自定义表单--->",data)
-			emits('update:formVersion', versionId.value.toString())
-			gainTableForm()
-		})
-		.finally(() => {
-			state.value.loading=false;
-			saveRefreshFormControlAttr1()
-		})
-}
+  let sendData: any = {
+    jsondata: JSON.stringify(state.value.formData),
+    data: objToStringify(state.value.formData),
+    source: state.value.formOtherData.source, // 数据源允许在表单属性设置里修改的
+    name: state.value.formOtherData.formName, // 表单名称，用于在显示所有已创建的表单列表里显示
+    type: 4, // 1表单 2列表
+    dict: json2string(state.value.formDict),
+    appKey: appFormKeyVal.value,
+    groupKey: props.groupKey,
+    id: props.appPageKey.toString(),
+    version: versionId.value.toString(),
+    menuId: props.menuId,
+  };
+  state.value.loading = true;
+  // console.log("编辑App自定义表单",sendData)
+  editAppPageInfo(sendData)
+    .then((data: any) => {
+      state.value.loading = false;
+      // console.log("编辑App自定义表单--->",data)
+      emits("update:formVersion", versionId.value.toString());
+      gainTableForm();
+    })
+    .finally(() => {
+      state.value.loading = false;
+      saveRefreshFormControlAttr1();
+    });
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-20 16:24:23
 @ 功能: 保存为其他版本
 */
-const saveOtherVersionIng = () =>{
-	let sendData: any = {
-		jsondata:JSON.stringify(state.value.formData),
-		data: objToStringify(state.value.formData),
-		source: state.value.formOtherData.source, // 数据源允许在表单属性设置里修改的
-		name: state.value.formOtherData.formName, // 表单名称，用于在显示所有已创建的表单列表里显示
-		type: 4, // 1表单 2列表 3:app 4：app表单
-		dict: json2string(state.value.formDict),
-		appKey:appFormKeyVal.value,
-		groupKey:props.groupKey,
-		menuId:props.menuId,
-		appSignCode:props.formconfigcont.signCode
-	}
-	state.value.loading = true
-	saveOtherVersion(sendData)
-		.then((data:any) => {
-			state.value.loading = false
-			// console.log("保存为其他版本--->",data)
-			emits('update:formVersion', data.data.version.toString())
-			gainTableForm()
-		})
-		.finally(() => {
-			state.value.loading=false;
-		})
-}
+const saveOtherVersionIng = () => {
+  let sendData: any = {
+    jsondata: JSON.stringify(state.value.formData),
+    data: objToStringify(state.value.formData),
+    source: state.value.formOtherData.source, // 数据源允许在表单属性设置里修改的
+    name: state.value.formOtherData.formName, // 表单名称，用于在显示所有已创建的表单列表里显示
+    type: 4, // 1表单 2列表 3:app 4：app表单
+    dict: json2string(state.value.formDict),
+    appKey: appFormKeyVal.value,
+    groupKey: props.groupKey,
+    menuId: props.menuId,
+    appSignCode: props.formconfigcont.signCode,
+  };
+  state.value.loading = true;
+  saveOtherVersion(sendData)
+    .then((data: any) => {
+      state.value.loading = false;
+      // console.log("保存为其他版本--->",data)
+      emits("update:formVersion", data.data.version.toString());
+      gainTableForm();
+    })
+    .finally(() => {
+      state.value.loading = false;
+    });
+};
 defineExpose({
-	gainTableForm
-})
+  gainTableForm,
+});
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-21 09:01:30
 @ 功能: 预览版本
 */
-const versionPreviewPage = (val:string) => {
-	if(val){
-		versionId.value = val
-		previewAppFormVersion({id:val})
-		.then((res:any) => {
-				if(res.code == 0){
-					const result = res.data
-					// console.log("初始设计搜索时--1--->",result)
-					formFieldAry.value = result.formField
-					// 初始设计搜索时res.data=''
-					if (result.mastesform) {
-						state.value.formData = stringToObj(result.mastesform)
-					}
-					// console.log("初始设计搜索时",state.value.formData)
-					if(result.mastesformjson){
-						let kjdkjksd = string2json(result.mastesformjson)
-						// console.log("初始设计搜索时-begin-->",state.value.formData.purview)
-						state.value.formData.purview=kjdkjksd.purview
-						// console.log("初始设计搜索时--->",kjdkjksd)
-					}
-					state.value.formData.config.groupKey = result.groupKey
-					// console.log("初始设计搜索时--end->",state.value.formData)
-					state.value.formDict = string2json(result.dict)
-					// 恢复表单名称
-					state.value.formOtherData.source = result.source
-					state.value.formOtherData.formName = result.name
+const versionPreviewPage = (val: string) => {
+  if (val) {
+    versionId.value = val;
+    previewAppFormVersion({ id: val }).then((res: any) => {
+      if (res.code == 0) {
+        const result = res.data;
+        // console.log("初始设计搜索时--1--->",result)
+        formFieldAry.value = result.formField;
+        // 初始设计搜索时res.data=''
+        if (result.mastesform) {
+          state.value.formData = stringToObj(result.mastesform);
+        }
+        // console.log("初始设计搜索时",state.value.formData)
+        if (result.mastesformjson) {
+          let kjdkjksd = string2json(result.mastesformjson);
+          // console.log("初始设计搜索时-begin-->",state.value.formData.purview)
+          state.value.formData.purview = kjdkjksd.purview;
+          // console.log("初始设计搜索时--->",kjdkjksd)
+        }
+        state.value.formData.config.groupKey = result.groupKey;
+        // console.log("初始设计搜索时--end->",state.value.formData)
+        state.value.formDict = string2json(result.dict);
+        // 恢复表单名称
+        state.value.formOtherData.source = result.source;
+        state.value.formOtherData.formName = result.name;
 
-					state.value.formOtherData.formName = result.name
-					state.value.formData.form.name = result.tablekey
-					state.value.formData.form.formName = result.name
-					if (result.source && state.value.designType !== 'search') {
-						// 加载属性侧边栏的字段标识，搜索时不需要请求
-						formControlAttrEl.value.getFormFieldBySource(result.source)
-					}
-					if(result.flowIsOpen != 1){
-						emits('judgeFormIsEdit', false,false)
-					}else{
-						emits('judgeFormIsEdit', false,true)
-					}
-					
-				}else{
-					ElMessage.error(res.msg || '加载异常')
-				}
-				state.value.loading = false
-			})
-	}
-	
-}
+        state.value.formOtherData.formName = result.name;
+        state.value.formData.form.name = result.tablekey;
+        state.value.formData.form.formName = result.name;
+        if (result.source && state.value.designType !== "search") {
+          // 加载属性侧边栏的字段标识，搜索时不需要请求
+          formControlAttrEl.value.getFormFieldBySource(result.source);
+        }
+        if (result.flowIsOpen != 1) {
+          emits("judgeFormIsEdit", false, false);
+        } else {
+          emits("judgeFormIsEdit", false, true);
+        }
+      } else {
+        ElMessage.error(res.msg || "加载异常");
+      }
+      state.value.loading = false;
+    });
+  }
+};
 
 //liwenxuan		关联选项设置	修复bug:当字段标识改变时，关联选项设置的字段标识未同步更改  start
-const formNameChanged = (param1: any)=>{
-	for(let i = 0; i < state.value.formData.list.length; i++){
-		if(state.value.formData.list[i].type=="radio"||state.value.formData.list[i].type=="select"||state.value.formData.list[i].type=="checkbox"){
-			if(state.value.formData.list[i].control.glxxsz!=undefined&&state.value.formData.list[i].control.glxxsz.length>0){
-				state.value.formData.list[i].control.glxxsz = []
-				state.value.formData.list[i].options.push({
-					label: '',
-					value: ''
-                })
-				state.value.formData.list[i].options.pop();
-			}
-			if(state.value.formData.list[i].control.glxxszForCheckBox!=undefined&&state.value.formData.list[i].control.glxxszForCheckBox.length>0){
-				state.value.formData.list[i].control.glxxszForCheckBox = []
-			}
-		}
-	}
-	// ElMessage({
-	// 	message: '因字段标识改变，本表单的所有单选、多选、下拉的关联选项设置已重置，请重新设置。',
-	// 	type: 'warning',
-	// })
-}
+const formNameChanged = (param1: any) => {
+  for (let i = 0; i < state.value.formData.list.length; i++) {
+    if (
+      state.value.formData.list[i].type == "radio" ||
+      state.value.formData.list[i].type == "select" ||
+      state.value.formData.list[i].type == "checkbox"
+    ) {
+      if (
+        state.value.formData.list[i].control.glxxsz != undefined &&
+        state.value.formData.list[i].control.glxxsz.length > 0
+      ) {
+        state.value.formData.list[i].control.glxxsz = [];
+        state.value.formData.list[i].options.push({
+          label: "",
+          value: "",
+        });
+        state.value.formData.list[i].options.pop();
+      }
+      if (
+        state.value.formData.list[i].control.glxxszForCheckBox != undefined &&
+        state.value.formData.list[i].control.glxxszForCheckBox.length > 0
+      ) {
+        state.value.formData.list[i].control.glxxszForCheckBox = [];
+      }
+    }
+  }
+  // ElMessage({
+  // 	message: '因字段标识改变，本表单的所有单选、多选、下拉的关联选项设置已重置，请重新设置。',
+  // 	type: 'warning',
+  // })
+};
 //liwenxuan		关联选项设置	修复bug:当字段标识改变时，关联选项设置的字段标识未同步更改  end
 
-function optionsValue3Get3(data: any,fieldName: string){
-	console.log("pageForm","optionsValue3Get3")
-	console.log(state.value.formData.list)
-	console.log(data)
-	console.log(fieldName)
-	for(let i = 0; i < state.value.formData.list.length; i++){
-		
-		if(state.value.formData.list[i].name==fieldName){
-			state.value.formData.list[i].options = []
-			for(let j = 0;j<data.length;j++){
-				state.value.formData.list[i].options.push(data[j])
-			}
-		}
-	}
+function optionsValue3Get3(data: any, fieldName: string) {
+  console.log("pageForm", "optionsValue3Get3");
+  console.log(state.value.formData.list);
+  console.log(data);
+  console.log(fieldName);
+  for (let i = 0; i < state.value.formData.list.length; i++) {
+    if (state.value.formData.list[i].name == fieldName) {
+      state.value.formData.list[i].options = [];
+      for (let j = 0; j < data.length; j++) {
+        state.value.formData.list[i].options.push(data[j]);
+      }
+    }
+  }
 }
 
 // 弹窗确认3174.15    2924.57     3326.15   3119.33
 const dialogConfirm = (editVal: string) => {
-    // 生成脚本预览和导入json，都是将编辑器内容更新至state.formData
-	console.log("生成脚本预览和导入",editVal)
-	console.log("生成脚本预览和导入----->",drawer.type,"==========",drawer.callback,"==========",drawer)
-	console.log("生成脚本预览和导入===========>",state.value.formData)
-	
-    try {
-      	if (typeof drawer.callback === 'function') {
-			console.log("1======2========>",drawer.codeType,stringToObj(editVal))
-			// callback
-			const newObj =
-			drawer.codeType === 'json'? string2json(editVal): stringToObj(editVal)
-			drawer.callback(newObj)
-			console.log("1==============>",)
-      	} else {
-			switch (drawer.type) {
-				case 'css':
-					// 表单属性－编辑表单样式
-					if (!state.value.formData.config) {
-						state.value.formData.config = {}
-					}
-					state.value.formData.config.style = editVal
-					console.log("2==============>",)
-					break
-				case 'dict':
-					state.value.formDict = string2json(editVal)
-					break
-				case 'beforeRequest':
-				case 'beforeSubmit':
-				case 'afterResponse':
-				case 'afterSubmit':
-				case 'closeSubmit':
-				case 'change':
-					if (!state.value.formData.events) {
-						state.value.formData.events = {}
-					}
-					state.value.formData.events[drawer.type] = stringToObj(editVal)
-					console.log("3==============>",)
-					break
-				default:
-					state.value.formData = stringToObj(editVal)
-					console.log("4==============>",)
-			}
-      	}
-      	dialogCancel()
-    } catch (res) {
-		// console.log(res.message)
-		ElMessage.error(res.message)
+  // 生成脚本预览和导入json，都是将编辑器内容更新至state.formData
+  console.log("生成脚本预览和导入", editVal);
+  console.log(
+    "生成脚本预览和导入----->",
+    drawer.type,
+    "==========",
+    drawer.callback,
+    "==========",
+    drawer
+  );
+  console.log("生成脚本预览和导入===========>", state.value.formData);
+
+  try {
+    if (typeof drawer.callback === "function") {
+      console.log("1======2========>", drawer.codeType, stringToObj(editVal));
+      // callback
+      const newObj =
+        drawer.codeType === "json" ? string2json(editVal) : stringToObj(editVal);
+      drawer.callback(newObj);
+      console.log("1==============>");
+    } else {
+      switch (drawer.type) {
+        case "css":
+          // 表单属性－编辑表单样式
+          if (!state.value.formData.config) {
+            state.value.formData.config = {};
+          }
+          state.value.formData.config.style = editVal;
+          console.log("2==============>");
+          break;
+        case "dict":
+          state.value.formDict = string2json(editVal);
+          break;
+        case "beforeRequest":
+        case "beforeSubmit":
+        case "afterResponse":
+        case "afterSubmit":
+        case "closeSubmit":
+        case "change":
+          if (!state.value.formData.events) {
+            state.value.formData.events = {};
+          }
+          state.value.formData.events[drawer.type] = stringToObj(editVal);
+          console.log("3==============>");
+          break;
+        default:
+          state.value.formData = stringToObj(editVal);
+          console.log("4==============>");
+      }
     }
-}
+    dialogCancel();
+  } catch (res) {
+    // console.log(res.message)
+    ElMessage.error(res.message);
+  }
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-09-27 16:53:30
 @ 功能: 级联选择与树
 */
-const dialogConfirmTree = (val:treeStruct[]) => {
-	// console.log("级联选择与树",val)
-	// const newObj =
-	// 		drawer.codeType === 'json'? string2json(val): stringToObj(val)
-	// 		drawer.callback(newObj)
-			controlData.value.options = val
-	// console.log("级联选择与树--->",controlData)
-}
-
-
+const dialogConfirmTree = (val: treeStruct[], types: string) => {
+  console.log("级联选择与树", types);
+  console.log("级联选择与树", val);
+  // const newObj =
+  // 		drawer.codeType === 'json'? string2json(val): stringToObj(val)
+  // 		drawer.callback(newObj)
+  //   controlData.value.options = val;
+  // console.log("级联选择与树--->",controlData)
+  switch (types) {
+    case "treeSelect":
+      controlData.value.control.data = val;
+      break;
+    case "cascader":
+      controlData.value.options = val;
+      break;
+    default:
+      controlData.value.control = {};
+      Object.assign(controlData.value.control, val);
+      break;
+  }
+};
 </script>
 <template>
-	<el-aside class="asideBox leftBox">
-		<DragControlApp
-			:table-key="state.formData.form.name"
-			@versionUpdateForm="versionUpdateForm"
-			@versionPreviewPage="versionPreviewPage"
-		/>
-	</el-aside>
-	<el-main class="mainBox rightBox">
+  <el-aside class="asideBox leftBox">
+    <DragControlApp
+      :table-key="state.formData.form.name"
+      @versionUpdateForm="versionUpdateForm"
+      @versionPreviewPage="versionPreviewPage"
+    />
+  </el-aside>
+  <el-main class="mainBox rightBox">
+    <HeadToolsApp
+      v-loading="state.loading"
+      :customerformid="props.appPageKey"
+      @click="buttonCallbackEvent"
+    />
 
-		<HeadToolsApp  v-loading="state.loading"  :customerformid="props.appPageKey" @click="buttonCallbackEvent" />
-		
-		<div v-loading="state.loading" class="main_form">
-				<div v-if="state.formData.list.length === 0" class="empty-tips">
-					从左侧拖拽来添加组件<br>
-					<!-- appCont：{{ props.appCont }} <br>
+    <div v-loading="state.loading" class="main_form">
+      <div v-if="state.formData.list.length === 0" class="empty-tips">
+        从左侧拖拽来添加组件<br />
+        <!-- appCont：{{ props.appCont }} <br>
 					formKey：{{ props.formKey }} <br>
 					appPageKey：{{ props.appPageKey }} <br>
 					groupKey：{{ props.groupKey }} <br>
@@ -664,79 +721,78 @@ const dialogConfirmTree = (val:treeStruct[]) => {
 					formconfigcont：{{ props.formconfigcont }} <br>
 					state：{{ props.state }} <br>
 					menuId：{{ props.menuId }} <br> -->
-				</div>
-				<FormDesign 
-					:type="5"
-					:form-data="state.formData"
-					:dict="state.formDict"
-					v-model:is-web="isWeb"
-					@optionsValue3Get3="optionsValue3Get3"
-				/>
-		</div>
-	</el-main>
-	<el-aside class="asideBox">
-		
-		<formControlPropertiNew
-			ref="formControlAttrEl"
-			v-model:formOtherData="state.formOtherData"
-			:form-data="state.formData.form"
-			:form-config="state.formData.config"
-			:customerformid="props.appPageKey"
-			:form-list="state.formData.list"
-			:form-info="state.formData"
-			:is-edit="isEdit"
-			:form-field="formFieldAry"
-			@open-dialog="openAceEditDrawer"
-			@form-name-change="formNameChanged"
-		/>
-	</el-aside>
-	
-	<ace-drawer
-		v-model="drawer.visible"
-		:title="drawer.title"
-		:direction="drawer.direction"
-		:content="drawer.content"
-		:code-type="drawer.codeType"
-		:data="drawer"
-		@before-close="dialogCancel"
-		@confirm="dialogConfirm"
-		@confirmTree="dialogConfirmTree"
-	/>
-	<PreviewPage v-model:state="state" :is-web="isWeb"  @clickClose="closePreviewPage" />
+      </div>
+      <FormDesign
+        :type="5"
+        :form-data="state.formData"
+        :dict="state.formDict"
+        v-model:is-web="isWeb"
+        @optionsValue3Get3="optionsValue3Get3"
+      />
+    </div>
+  </el-main>
+  <el-aside class="asideBox">
+    <formControlPropertiNew
+      ref="formControlAttrEl"
+      v-model:formOtherData="state.formOtherData"
+      :form-data="state.formData.form"
+      :form-config="state.formData.config"
+      :customerformid="props.appPageKey"
+      :form-list="state.formData.list"
+      :form-info="state.formData"
+      :is-edit="isEdit"
+      :form-field="formFieldAry"
+      @open-dialog="openAceEditDrawer"
+      @form-name-change="formNameChanged"
+    />
+  </el-aside>
+
+  <ace-drawer
+    v-model="drawer.visible"
+    :title="drawer.title"
+    :direction="drawer.direction"
+    :content="drawer.content"
+    :code-type="drawer.codeType"
+    :data="drawer"
+    @beforeClose="dialogCancel"
+    @confirm="dialogConfirm"
+    @confirmTree="dialogConfirmTree"
+  />
+  <PreviewPage v-model:state="state" :is-web="isWeb" @clickClose="closePreviewPage" />
 </template>
-<style  lang='scss' scoped>
-.asideBox{
-	height: calc(100vh - 40px);
-	
-	overflow-y : auto;
-	.leftBox{
-		width: 250px;
-	}
-	.rightBox{
-		width: 300px;
-	}
+<style lang="scss" scoped>
+.asideBox {
+  height: calc(100vh - 40px);
+
+  overflow-y: auto;
+  .leftBox {
+    width: 250px;
+  }
+  .rightBox {
+    width: 300px;
+  }
 }
-.mainBox{
-	border-left: 1px solid #ECECEC;
-	border-right: 1px solid #ECECEC;
-	padding: 0;
-	overflow-y : auto;
+.mainBox {
+  border-left: 1px solid #ececec;
+  border-right: 1px solid #ececec;
+  padding: 0;
+  overflow-y: auto;
 }
-.scr_form_box{
-	height: calc(100vh - 80px);
+.scr_form_box {
+  height: calc(100vh - 80px);
 }
 .main_form {
-    background: #EDEFF3;
-	padding: 10px 0 0 0;
-	height: calc(100vh - 80px);
+  background: #edeff3;
+  padding: 10px 0 0 0;
+  height: calc(100vh - 80px);
 }
 .main_form .empty-tips {
-    text-align: center;
-    width: 100%;
-    font-size: 20px;
-    color: #ccc;
-    position: absolute;
-    left: 0;
-    top: 100px;
+  text-align: center;
+  width: 100%;
+  font-size: 20px;
+  color: #ccc;
+  position: absolute;
+  left: 0;
+  top: 100px;
 }
 </style>
diff --git a/src/views/sysworkflow/lowcodepage/newLowCode/appLayoutEdit/appContainerPage.vue b/src/views/sysworkflow/lowcodepage/newLowCode/appLayoutEdit/appContainerPage.vue
index 3bfb826..68d37c0 100644
--- a/src/views/sysworkflow/lowcodepage/newLowCode/appLayoutEdit/appContainerPage.vue
+++ b/src/views/sysworkflow/lowcodepage/newLowCode/appLayoutEdit/appContainerPage.vue
@@ -3,337 +3,392 @@
 @ 时间: 2024-07-22 13:57:57
 @ 备注: 编辑App
 -->
-<script lang='ts' setup>
-import { appMenuTreeInfo,appSetInfo } from "@/api/date/type"
-import { gainAppEditPsge } from '@/api/DesignForm/requestapi'
+<script lang="ts" setup>
+import { appMenuTreeInfo, appSetInfo } from "@/api/date/type";
+import { gainAppEditPsge } from "@/api/DesignForm/requestapi";
 
 import SvgIcon from "@/components/SvgIcon/index.vue";
-import AppMenus from "@/views/sysworkflow/lowcodepage/appPage/appMenus.vue"
-import AppMenuGroup from "@/views/sysworkflow/lowcodepage/appPage/appMenuGroup.vue"
-import CreateAppFormPage from "@/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue"
-import OpenAppFormPage from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue"
-import AppSetUp from "@/views/sysworkflow/lowcodepage/appPage/appSetUp/index.vue"
-import ReleaseApp from '@/views/sysworkflow/lowcodepage/appPage/releaseApp/index.vue'
+import AppMenus from "@/views/sysworkflow/lowcodepage/appPage/appMenus.vue";
+import AppMenuGroup from "@/views/sysworkflow/lowcodepage/appPage/appMenuGroup.vue";
+import CreateAppFormPage from "@/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue";
+import OpenAppFormPage from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue";
+import AppSetUp from "@/views/sysworkflow/lowcodepage/appPage/appSetUp/index.vue";
+import ReleaseApp from "@/views/sysworkflow/lowcodepage/appPage/releaseApp/index.vue";
 
 const props = defineProps({
-	drawerWith:{
-		type:Number,
-		default:0
-	},
-	editIsOpen:{
-		type: Boolean,
-		default: false,
-	},
-	pickAppInfo:{
-		type:Object,
-		default(){
-			return {}
-		}
-	},
-	searchQuery:{
-		type:Object,
-		default(){
-			return {}
-		}
-	},
-	groupKey:{
-		type:String,
-		default:""
-	}
+  drawerWith: {
+    type: Number,
+    default: 0,
+  },
+  editIsOpen: {
+    type: Boolean,
+    default: false,
+  },
+  pickAppInfo: {
+    type: Object,
+    default() {
+      return {};
+    },
+  },
+  searchQuery: {
+    type: Object,
+    default() {
+      return {};
+    },
+  },
+  groupKey: {
+    type: String,
+    default: "",
+  },
 });
-const emits = defineEmits(["update:editIsOpen","refreshPage"]);
-const tabsActive = ref(1)
-const menusTree = ref<appMenuTreeInfo[]>([])		//菜单树
-const checkedMenu = ref<appMenuTreeInfo>("")
-const appPageKey = ref<string>("")	//自定义App表单Id
-const isNew = ref(false)
-const saveAppFormIsShow = ref(false)
-const menuParentKey = ref<string>("")
-const menuGroupShow = ref(false) //添加菜单分组
+const emits = defineEmits(["update:editIsOpen", "refreshPage"]);
+const tabsActive = ref(1);
+const menusTree = ref<appMenuTreeInfo[]>([]); //菜单树
+const checkedMenu = ref<appMenuTreeInfo>("");
+const appPageKey = ref<string>(""); //自定义App表单Id
+const isNew = ref(false);
+const saveAppFormIsShow = ref(false);
+const menuParentKey = ref<string>("");
+const menuGroupShow = ref(false); //添加菜单分组
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-22 11:40:06
 @ 功能: 应用进出配置
 */
 const appCont = reactive<appSetInfo>({
-	appKey:"1",	
-	appName:"未知应用",	
-	appSvg:"",	
-	state:1,	
-	uuid:"1",
-	describe:""
-})
+  appKey: "1",
+  appName: "未知应用",
+  appSvg: "",
+  state: 1,
+  uuid: "1",
+  describe: "",
+});
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-23 15:23:31
 @ 功能: 获取app信息
 */
-const gainAppContent = () =>{
-	let sendInfo = {
-		id:props.pickAppInfo.signCodeStr
-	}
-	gainAppEditPsge(sendInfo)
-		.then((data)=>{
-			// console.log("获取app信息---》",data)	
-			menusTree.value = data.data.menuTree
-			appCont.appKey = data.data.appKey;	
-			appCont.appName = data.data.appName;	
-			appCont.appSvg = data.data.appSvg;	
-			appCont.state = data.data.state;	
-			appCont.uuid = data.data.uuid;
-		})
-}
+const gainAppContent = () => {
+  let sendInfo = {
+    id: props.pickAppInfo.signCodeStr,
+  };
+  gainAppEditPsge(sendInfo).then((data) => {
+    // console.log("获取app信息---》",data)
+    menusTree.value = data.data.menuTree;
+    appCont.appKey = data.data.appKey;
+    appCont.appName = data.data.appName;
+    appCont.appSvg = data.data.appSvg;
+    appCont.state = data.data.state;
+    appCont.uuid = data.data.uuid;
+  });
+};
 
-watch(()=>props.editIsOpen,(val:boolean)=>{
-	if(val){
-		gainAppContent()
-	}
-})
-const closeAppDraw = () =>{
-	emits("update:editIsOpen",false)
-	emits("refreshPage",props.searchQuery)
-	tabsActive.value = 1
-	checkedMenu.value = ""
-	appPageKey.value = ""
-	checkedMenu.appkey=""
-	isNew.value = false
-}
+watch(
+  () => props.editIsOpen,
+  (val: boolean) => {
+    if (val) {
+      gainAppContent();
+    }
+  }
+);
+const closeAppDraw = () => {
+  emits("update:editIsOpen", false);
+  emits("refreshPage", props.searchQuery);
+  tabsActive.value = 1;
+  checkedMenu.value = "";
+  appPageKey.value = "";
+  checkedMenu.appkey = "";
+  isNew.value = false;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-18 09:00:00
 @ 功能: 操作表单页面
 */
-const openAppPageForm = (val:appMenuTreeInfo) => {
-	checkedMenu.value = val
-	console.log("操作表单页面",val)
-}
+const openAppPageForm = (val: appMenuTreeInfo) => {
+  checkedMenu.value = val;
+  console.log("操作表单页面", val);
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-20 13:27:37
 @ 功能: 编辑app页面
 */
-const editAppInfo = (id:string) => {
-	appPageKey.value = id
-	saveAppFormIsShow.value = true
-	isNew.value = false
-}
+const editAppInfo = (id: string) => {
+  appPageKey.value = id;
+  saveAppFormIsShow.value = true;
+  isNew.value = false;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-19 15:47:12
 @ 功能: 选择选项
 */
-const handleClick = () =>{}
+const handleClick = () => {};
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-23 14:49:15
 @ 功能: 创建页面
 */
-const addAppPageForm = (key?:string) => {
-	saveAppFormIsShow.value = true
-	isNew.value = true
-	// console.log("新建-->")	
-}
-
+const addAppPageForm = (key?: string) => {
+  saveAppFormIsShow.value = true;
+  isNew.value = true;
+  // console.log("新建-->")
+};
 
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-23 16:57:39
 @ 功能: 添加菜单分组
 */
-const addMenu = (key?:string) => {
-	if(key){
-		menuParentKey.value = key;
-	}else{
-		menuParentKey.value = "";
-	}
-	menuGroupShow.value = true;
-}
-const openAppPageInit = ref(null)
+const addMenu = (key?: string) => {
+  if (key) {
+    menuParentKey.value = key;
+  } else {
+    menuParentKey.value = "";
+  }
+  menuGroupShow.value = true;
+};
+const openAppPageInit = ref(null);
 const updataPageInit = () => {
-	
-	openAppPageInit.value.gainAppFormPageInit()
-}
+  openAppPageInit.value.gainAppFormPageInit();
+};
 </script>
 <template>
-	<el-drawer  v-model="props.editIsOpen" :with-header="false" :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :size="props.drawerWith">
-
-		<div class="common-layout">
-			<el-container>
-				<el-header  class="headerEditBox">
-					<div>
-						<el-space wrap>
-							<el-avatar shape="square" :size="25" :src="appCont.appSvg" />
-							<el-text>{{ appCont.appName }}</el-text>
-							<el-tag v-if="appCont.state==1" type="success">已启用</el-tag>
-							<el-tag v-else type="danger">已禁用</el-tag>
-						</el-space>
-					</div>
-					<div>
-						<el-tabs v-model="tabsActive" @tab-click="handleClick" :stretch="true" class="tabsMain">
-								<el-tab-pane label="① 页面管理" :name="1">
-								</el-tab-pane>
-								<el-tab-pane label="② 集成&自动化" :name="2">
-								</el-tab-pane>
-								<el-tab-pane label="③ 应用设置" :name="3">
-								</el-tab-pane>
-								<el-tab-pane label="④ 应用发布" :name="4">
-								</el-tab-pane>
-						</el-tabs>
-					</div>
-					<div>
-						<el-button-group>
-							<el-button plain size="small" class="fa fa-paper-plane-o" @click="accessRunApp">访问</el-button>
-							<el-button type="danger" size="small" class="fa fa-times" @click="closeAppDraw">关闭</el-button>
-						</el-button-group>
-					</div>
-				</el-header>
-				<el-container  v-show="tabsActive==1">
-					<el-aside class="asideBox">
-						<el-row>
-							<el-col :span="24" class="asideBoxSearch">
-								<el-input
-									v-model="input2"
-									style="width: 180px"
-									placeholder="搜索"
-									:suffix-icon="Search"
-								/>
-								<el-dropdown>
-									<el-button type="primary" class="fa fa-plus" />
-									<template #dropdown>
-										<el-dropdown-menu>
-											<el-dropdown-item  @click="addAppPageForm">
-												<el-row>
-													<el-col :span="24">
-														<el-space wrap>
-															<svg-icon style="color: #eebe77;" prefix="icon" icon-class="liuChengBiaoDan" />
-															新建页面
-														</el-space>
-													</el-col>
-													<el-col :span="24" style="padding-left:20px; font-size:12px;">
-														数据收集、事件记录<br>任务协同、业务审批
-													</el-col>
-												</el-row>
-											</el-dropdown-item>
-											<el-dropdown-item divided @click="addMenu">
-												<el-row>
-													<el-col :span="24">
-														<el-space wrap>
-															<svg-icon style="color: #337ecc;" prefix="icon" icon-class="fenZhu" />
-															新建分组
-														</el-space>
-													</el-col>
-													<el-col :span="24" style="padding-left:20px; font-size:12px;">
-														应用项目管理
-													</el-col>
-												</el-row>
-											</el-dropdown-item>
-										</el-dropdown-menu>
-									</template>
-								</el-dropdown>
-							</el-col>
-						</el-row>
-						<el-scrollbar class="scroBox">
-
-							<AppMenus :form-Key="appCont.uuid" v-model:menus-tree="menusTree" v-model:app-page-key="appPageKey"  :group-key="props.groupKey" :app-cont="appCont" :drawer-with="props.drawerWith" @openAppPageForm="openAppPageForm" />
-
-							<CreateAppFormPage v-if="saveAppFormIsShow" v-model:is-show="saveAppFormIsShow" :is-new="isNew" :drawer-with="props.drawerWith"  :form-Key="appCont.uuid" :app-cont="appCont"  :group-key="props.groupKey" :menu-id="appCont.uuid" v-model:app-page-key="appPageKey" @gainSunAppContent="gainAppContent" @updateInit="updataPageInit"  />
+  <el-drawer
+    v-model="props.editIsOpen"
+    :with-header="false"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    :destroy-on-close="true"
+    :size="props.drawerWith"
+  >
+    <div class="common-layout">
+      <el-container>
+        <el-header class="headerEditBox">
+          <div>
+            <el-space wrap>
+              <el-avatar shape="square" :size="25" :src="appCont.appSvg" />
+              <el-text>{{ appCont.appName }}</el-text>
+              <el-tag v-if="appCont.state == 1" type="success">已启用</el-tag>
+              <el-tag v-else type="danger">已禁用</el-tag>
+            </el-space>
+          </div>
+          <div>
+            <el-tabs
+              v-model="tabsActive"
+              @tab-click="handleClick"
+              :stretch="true"
+              class="tabsMain"
+            >
+              <el-tab-pane label="① 页面管理" :name="1"> </el-tab-pane>
+              <el-tab-pane label="② 集成&自动化" :name="2"> </el-tab-pane>
+              <el-tab-pane label="③ 应用设置" :name="3"> </el-tab-pane>
+              <el-tab-pane label="④ 应用发布" :name="4"> </el-tab-pane>
+            </el-tabs>
+          </div>
+          <div>
+            <el-button-group>
+              <el-button
+                plain
+                size="small"
+                class="fa fa-paper-plane-o"
+                @click="accessRunApp"
+                >访问</el-button
+              >
+              <el-button
+                type="danger"
+                size="small"
+                class="fa fa-times"
+                @click="closeAppDraw"
+                >关闭</el-button
+              >
+            </el-button-group>
+          </div>
+        </el-header>
+        <el-container v-show="tabsActive == 1">
+          <el-aside class="asideBox">
+            <el-row>
+              <el-col :span="24" class="asideBoxSearch">
+                <el-input
+                  v-model="input2"
+                  style="width: 180px"
+                  placeholder="搜索"
+                  :suffix-icon="Search"
+                />
+                <el-dropdown>
+                  <el-button type="primary" class="fa fa-plus" />
+                  <template #dropdown>
+                    <el-dropdown-menu>
+                      <el-dropdown-item @click="addAppPageForm">
+                        <el-row>
+                          <el-col :span="24">
+                            <el-space wrap>
+                              <svg-icon
+                                style="color: #eebe77"
+                                prefix="icon"
+                                icon-class="liuChengBiaoDan"
+                              />
+                              新建页面
+                            </el-space>
+                          </el-col>
+                          <el-col :span="24" style="padding-left: 20px; font-size: 12px">
+                            数据收集、事件记录<br />任务协同、业务审批
+                          </el-col>
+                        </el-row>
+                      </el-dropdown-item>
+                      <el-dropdown-item divided @click="addMenu">
+                        <el-row>
+                          <el-col :span="24">
+                            <el-space wrap>
+                              <svg-icon
+                                style="color: #337ecc"
+                                prefix="icon"
+                                icon-class="fenZhu"
+                              />
+                              新建分组
+                            </el-space>
+                          </el-col>
+                          <el-col :span="24" style="padding-left: 20px; font-size: 12px">
+                            应用项目管理
+                          </el-col>
+                        </el-row>
+                      </el-dropdown-item>
+                    </el-dropdown-menu>
+                  </template>
+                </el-dropdown>
+              </el-col>
+            </el-row>
+            <el-scrollbar class="scroBox">
+              <AppMenus
+                :form-Key="appCont.uuid"
+                v-model:menus-tree="menusTree"
+                v-model:app-page-key="appPageKey"
+                :group-key="props.groupKey"
+                :app-cont="appCont"
+                :drawer-with="props.drawerWith"
+                @openAppPageForm="openAppPageForm"
+              />
 
-						</el-scrollbar>
-					</el-aside>
-					<el-main  class="mainBox">
-						<el-scrollbar class="scroBox">
-							<OpenAppFormPage ref="openAppPageInit" :form-Key="checkedMenu.appkey" :group-key="props.groupKey" :app-cont="appCont" :drawer-with="props.drawerWith" :menus-info="checkedMenu" @editAppInfo="editAppInfo" />
-						</el-scrollbar>
-					</el-main>
-				</el-container>
-				<el-container v-if="tabsActive==2">
-					集成与自动化
-				</el-container>
-				<el-container v-if="tabsActive==3">
-					<AppSetUp :app-cont="appCont" :group-key="props.groupKey" />
-				</el-container>
-				<el-container v-if="tabsActive==4">
-					<ReleaseApp :app-cont="appCont" :group-key="props.groupKey"  />
-				</el-container>
-			</el-container>
-		</div>
-		<AppMenuGroup v-model:is-show="menuGroupShow" :menu-parent-key="menuParentKey" :app-cont="appCont" @updateMenu="gainAppContent" />
-	</el-drawer>
+              <CreateAppFormPage
+                v-if="saveAppFormIsShow"
+                v-model:is-show="saveAppFormIsShow"
+                :is-new="isNew"
+                :drawer-with="props.drawerWith"
+                :form-Key="appCont.uuid"
+                :app-cont="appCont"
+                :group-key="props.groupKey"
+                :menu-id="appCont.uuid"
+                v-model:app-page-key="appPageKey"
+                @gainSunAppContent="gainAppContent"
+                @updateInit="updataPageInit"
+              />
+            </el-scrollbar>
+          </el-aside>
+          <el-main class="mainBox">
+            <el-scrollbar class="scroBox">
+              <OpenAppFormPage
+                ref="openAppPageInit"
+                :form-Key="checkedMenu.appkey"
+                :group-key="props.groupKey"
+                :app-cont="appCont"
+                :drawer-with="props.drawerWith"
+                :menus-info="checkedMenu"
+                @editAppInfo="editAppInfo"
+              />
+            </el-scrollbar>
+          </el-main>
+        </el-container>
+        <el-container v-if="tabsActive == 2"> 集成与自动化 </el-container>
+        <el-container v-if="tabsActive == 3">
+          <AppSetUp :app-cont="appCont" :group-key="props.groupKey" />
+        </el-container>
+        <el-container v-if="tabsActive == 4">
+          <ReleaseApp :app-cont="appCont" :group-key="props.groupKey" />
+        </el-container>
+      </el-container>
+    </div>
+    <AppMenuGroup
+      v-model:is-show="menuGroupShow"
+      :menu-parent-key="menuParentKey"
+      :app-cont="appCont"
+      @updateMenu="gainAppContent"
+    />
+  </el-drawer>
 </template>
-<style  lang='scss' scoped>
-.common-layout{
-	.el-header{
-		padding-left:10px;
-		padding-right:10px;
-	}
-	.headerEditBox{
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		border-bottom: 1px solid #F1F2F3;
-		:deep(.el-tabs){
-			width: 100%;
-			height: 40px;
-		}
-		:deep(.el-tabs__nav) {
-			height: 40px;
-		}
-		:deep(.el-tabs__item) {
-			margin-top: 0px;
-		}
-		:deep(.el-tabs__nav-prev) {
-			margin-top: 16px;
-		}
-		:deep(.el-tabs__nav-next) {
-			margin-top: 16px;
-		}
-		:deep(.el-tabs__nav-wrap::after) {
-			position: static !important;
-		}
-		:deep(.el-tabs__header){
-			margin:0 0 1px 0;
-		}
-		:deep .el-card__body{
-			padding: 0px 0;
-		}
-	}
-	.asideBox{
-		width:250px;
-		border-right: 1px solid #F1F2F3;
-		height: calc(100vh - 40px);
-		.asideBoxSearch{
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			padding: 10px 10px;
-			
-		}
-		.appMenuTitle{
-			width: 100%;
-			padding-right: 5px;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			.svgBox{
-				display: none;
-			}
-		}
-		.appMenuTitle:hover .svgBox{
-			display: block;
-		}
-		.scroBox{
-			height: calc(100vh - 92px);
-		}
-	}
-	.el-main {
-		padding: 0px;
-	}
-	.mainBox{
-		background-color: #F1F2F3;
-		padding:0px;
-		.scroBox{
-			height: calc(100vh - 40px);
-		}
-	}
+<style lang="scss" scoped>
+.common-layout {
+  .el-header {
+    padding-left: 10px;
+    padding-right: 10px;
+  }
+  .headerEditBox {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    border-bottom: 1px solid #f1f2f3;
+    :deep(.el-tabs) {
+      width: 100%;
+      height: 40px;
+    }
+    :deep(.el-tabs__nav) {
+      height: 40px;
+    }
+    :deep(.el-tabs__item) {
+      margin-top: 0px;
+    }
+    :deep(.el-tabs__nav-prev) {
+      margin-top: 16px;
+    }
+    :deep(.el-tabs__nav-next) {
+      margin-top: 16px;
+    }
+    :deep(.el-tabs__nav-wrap::after) {
+      position: static !important;
+    }
+    :deep(.el-tabs__header) {
+      margin: 0 0 1px 0;
+    }
+    :deep .el-card__body {
+      padding: 0px 0;
+    }
+  }
+  .asideBox {
+    width: 250px;
+    border-right: 1px solid #f1f2f3;
+    height: calc(100vh - 40px);
+    .asideBoxSearch {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 10px 10px;
+    }
+    .appMenuTitle {
+      width: 100%;
+      padding-right: 5px;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      .svgBox {
+        display: none;
+      }
+    }
+    .appMenuTitle:hover .svgBox {
+      display: block;
+    }
+    .scroBox {
+      height: calc(100vh - 92px);
+    }
+  }
+  .el-main {
+    padding: 0px;
+  }
+  .mainBox {
+    background-color: #f1f2f3;
+    padding: 0px;
+    .scroBox {
+      height: calc(100vh - 40px);
+    }
+  }
 }
 </style>
diff --git a/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue b/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
index 8b29bc8..fbd8540 100644
--- a/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
+++ b/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
@@ -204,7 +204,7 @@ const initLoadData = () => {
       versionTitle.value = data.data.appForm.name;
       if (data.data.pageList) {
         let stateData = string2json(data.data.appForm.listjson);
-        // console.log("接邂逅的数",stateData)
+        console.log("接邂逅的数", stateData);
         let holeControlAndConfigStateData = string2json(data.data.appForm.mastesformjson);
         if (stateData.tableData.columns && stateData.tableData.columns.length > 0) {
           for (let i = 0; i < stateData.tableData.columns.length; i++) {
@@ -325,7 +325,7 @@ watch(
 );
 
 function optionsValue3Get3(data: any, fieldName: string) {
-  console.log("runAppForm","optionsValue3Get3")
+  console.log("runAppForm", "optionsValue3Get3");
   for (let i = 0; i < stateForm.formData.list.length; i++) {
     if (stateForm.formData.list[i].name == fieldName) {
       stateForm.formData.list[i].options = [];
diff --git a/src/widget/number/index.vue b/src/widget/number/index.vue
index 9daaf8b..da7f4d0 100644
--- a/src/widget/number/index.vue
+++ b/src/widget/number/index.vue
@@ -3,204 +3,208 @@
 @ 时间: 2023-12-05 09:40:32
 @ 备注: 链接地址组件
 -->
-<script lang='ts' setup>
-import { 
-	constControlChange,
-    constFormProps,
-    constGetControlByName
-} from '@/api/DesignForm/utils'
-import validate from '@/api/DesignForm/validate'
-import { useRoute } from 'vue-router'
-import { FormItem, FormList } from '@/api/DesignForm/types'
-import { gainNumber } from '@/api/DesignForm/requestapi'
-import Tooltips from '@/components/DesignForm/tooltip.vue'
+<script lang="ts" setup>
+import {
+  constControlChange,
+  constFormProps,
+  constGetControlByName,
+} from "@/api/DesignForm/utils";
+import validate from "@/api/DesignForm/validate";
+import { useRoute } from "vue-router";
+import { FormItem, FormList } from "@/api/DesignForm/types";
+import { gainNumber } from "@/api/DesignForm/requestapi";
+import Tooltips from "@/components/DesignForm/tooltip.vue";
 
 const props = withDefaults(
-    defineProps<{
-		data: FormList
-		tablekey: any
-		numrun?: number
-		modelValue?: any // 子表和弹性布局时时有传
-		tProp?: string // 子表时的form-item的prop值，用于子表校验用
-    }>(),
-    {}
-)
+  defineProps<{
+    data: FormList;
+    tablekey: any;
+    numrun?: number;
+    modelValue?: any; // 子表和弹性布局时时有传
+    tProp?: string; // 子表时的form-item的prop值，用于子表校验用
+  }>(),
+  {}
+);
 const emits = defineEmits<{
-    (e: 'update:modelValue', numVal: any): void
-}>()
-const route = useRoute()
-const formProps = inject(constFormProps, {}) as any
+  (e: "update:modelValue", numVal: any): void;
+}>();
+const route = useRoute();
+const formProps = inject(constFormProps, {}) as any;
 const type = computed(() => {
-    return formProps.value.type
-})
+  return formProps.value.type;
+});
 const config = computed(() => {
-    return props.data.config || {}
-})
+  return props.data.config || {};
+});
 const control = computed(() => {
-	
-    return props.data.control
-	// return props.data
-})
-const options = ref(props.data.options)
-const changeEvent = inject(constControlChange, '') as any
+  return props.data.control;
+  // return props.data
+});
+const options = ref(props.data.options);
+const changeEvent = inject(constControlChange, "") as any;
 
-watch(() => props.tablekey,() => {
-	// console.log("编码组件1---》",props.tablekey)
-})
-const editDisabled = ref(false);			//是否手动编辑
+watch(
+  () => props.tablekey,
+  () => {
+    // console.log("编码组件1---》",props.tablekey)
+  }
+);
+const editDisabled = ref(false); //是否手动编辑
 
 const value = computed({
-    get() {
-		if (props.tProp) {
-			// 表格和弹性布局
-			return props.modelValue
-		} else {
-			return formProps.value.model[props.data.name]
-		}
-    },
-    set(newVal: any) {
-		if (props.tProp) {
-			emits('update:modelValue', newVal)
-		}
-		updateModel(newVal)
+  get() {
+    if (props.tProp) {
+      // 表格和弹性布局
+      return props.modelValue;
+    } else {
+      return formProps.value.model[props.data.name];
     }
-})
+  },
+  set(newVal: any) {
+    if (props.tProp) {
+      emits("update:modelValue", newVal);
+    }
+    updateModel(newVal);
+  },
+});
 const updateModel = (val: any) => {
-	let controlAttribute = ""
-	if(props.data.control){
-		if(props.data.control.type){
-			controlAttribute = props.data.control.type
-		}
-	}
-    changeEvent &&
+  let controlAttribute = "";
+  if (props.data.control) {
+    if (props.data.control.type) {
+      controlAttribute = props.data.control.type;
+    }
+  }
+  changeEvent &&
     changeEvent({
-        key: props.data.name,
-        value: val,
-        data: props.data,
-        tProp: props.tProp,
-		type: props.data.type,
-		attribute: controlAttribute
-    })
-}
+      key: props.data.name,
+      value: val,
+      data: props.data,
+      tProp: props.tProp,
+      type: props.data.type,
+      attribute: controlAttribute,
+    });
+};
 onMounted(() => {
-	// console.log("编码组件---》",props.numrun,props.data,props.data.control.config)
-	if(props.numrun == 2){
-		getNumber()
-	}
-})
+  console.log("编码组件---》", props.numrun, props.data, props.data.control.config);
+  //   if (props.numrun == 2) {
+  //     getNumber();
+  //   }
+  if (props.data.config && props.data.config.automatic) {
+    getNumber();
+    editDisabled.value = true;
+  } else {
+    editDisabled.value = false;
+  }
+});
 
 //获取编号
 const getNumber = () => {
-	let sendData = {
-		table:props.tablekey,
-		automatic:props.data.config.automatic,
-		customRules:props.data.config.customRules
-	}
-	editDisabled.value = props.data.config.automatic
-	gainNumber(sendData)
-		.then((data:any) =>{
-			// console.log("编码组件2---》",data,sendData)
-			value.value = data.data
-		})
-}
+  let sendData = {
+    table: props.tablekey,
+    automatic: props.data.config.automatic,
+    customRules: props.data.config.customRules,
+  };
+  editDisabled.value = props.data.config.automatic;
+  gainNumber(sendData).then((data: any) => {
+    // console.log("编码组件2---》",data,sendData)
+    value.value = data.data;
+  });
+};
 // 当通用修改属性功能添加新字段时，数组更新但toRefs没更新
-const getControlByName = inject(constGetControlByName) as any
+const getControlByName = inject(constGetControlByName) as any;
 const sourceFunKey = computed(() => {
-    const iReg = new RegExp('(?<=\\${)(.*?)(?=})', 'g')
-    //const iReg = new RegExp('\\${.*?}', 'g') // 结果会包含开头和结尾=>${name}
-    const apiUrl = config.value.optionsFun
-    const replace = apiUrl?.match(iReg)
-    return replace && replace[0]
-})
+  const iReg = new RegExp("(?<=\\${)(.*?)(?=})", "g");
+  //const iReg = new RegExp('\\${.*?}', 'g') // 结果会包含开头和结尾=>${name}
+  const apiUrl = config.value.optionsFun;
+  const replace = apiUrl?.match(iReg);
+  return replace && replace[0];
+});
 const getLabel = (ele: FormItem) => {
-    const showColon = formProps.value.showColon ? '：' : ''
-    if (ele) {
-    	return ele.showLabel ? '' : ele.label + showColon
-    } else {
-      	return ''
-    }
-}
+  const showColon = formProps.value.showColon ? "：" : "";
+  if (ele) {
+    return ele.showLabel ? "" : ele.label + showColon;
+  } else {
+    return "";
+  }
+};
 
 // 返回当前item项的校验规则
 const itemRules = computed(() => {
-    let temp
-    const itemR: any = props.data.item?.rules || []
-    const customR = formatCustomRules()
-    // 如果三个都没有设置，则返回undefined
-    if (itemR?.length || customR?.length) {
-      	temp = [...customR, ...itemR]
-    }
-    return temp
-})
+  let temp;
+  const itemR: any = props.data.item?.rules || [];
+  const customR = formatCustomRules();
+  // 如果三个都没有设置，则返回undefined
+  if (itemR?.length || customR?.length) {
+    temp = [...customR, ...itemR];
+  }
+  return temp;
+});
 // 处理自定义校验规则，将customRules转换后追加到rules里
 const formatCustomRules = () => {
-    const rulesReg: any = {}
-    validate &&
-    validate.forEach(item => {
-        rulesReg[item.type] = item.regExp
-    })
+  const rulesReg: any = {};
+  validate &&
+    validate.forEach((item) => {
+      rulesReg[item.type] = item.regExp;
+    });
 
-    // 获取校验方法 父级使用provide方法注入
-    const temp: any = []
-    props.data.customRules?.forEach((item: any) => {
-		if (!item.message && item.type !== 'methods') {
-			return // 方法时允许提示信息为空
-		}
-		let obj = {}
-		if (item.type === 'required') {
-			obj = { required: true }
-		} else if (item.type === 'rules') {
-			// 自定义表达式
-			obj = { pattern: item.rules }
-		} else if (item.type === 'methods') {
-			// 方法时
-			const methods: any = item.methods
-			if (methods) {
-			obj = { validator: inject(methods, {}) }
-			}
-		} else if (item.type) {
-			obj = { pattern: rulesReg[item.type as string] }
-		}
-		// 这里判断下防某些条件下重复push的可能或存重复校验类型
-		let message: any = { message: item.message }
-		if (!item.message) {
-			// 当使用validator校验时，如果存在message字段则不能使用 callback(new Error('x'));的提示
-			message = {}
-		}
-		temp.push(
-			Object.assign(
-				{
-					trigger: item.trigger || 'blur'
-				},
-				obj,
-				message
-			)
-		)
-    })
-    return temp
-  }
+  // 获取校验方法 父级使用provide方法注入
+  const temp: any = [];
+  props.data.customRules?.forEach((item: any) => {
+    if (!item.message && item.type !== "methods") {
+      return; // 方法时允许提示信息为空
+    }
+    let obj = {};
+    if (item.type === "required") {
+      obj = { required: true };
+    } else if (item.type === "rules") {
+      // 自定义表达式
+      obj = { pattern: item.rules };
+    } else if (item.type === "methods") {
+      // 方法时
+      const methods: any = item.methods;
+      if (methods) {
+        obj = { validator: inject(methods, {}) };
+      }
+    } else if (item.type) {
+      obj = { pattern: rulesReg[item.type as string] };
+    }
+    // 这里判断下防某些条件下重复push的可能或存重复校验类型
+    let message: any = { message: item.message };
+    if (!item.message) {
+      // 当使用validator校验时，如果存在message字段则不能使用 callback(new Error('x'));的提示
+      message = {};
+    }
+    temp.push(
+      Object.assign(
+        {
+          trigger: item.trigger || "blur",
+        },
+        obj,
+        message
+      )
+    );
+  });
+  return temp;
+};
 </script>
 <template>
-	
-	<el-form-item 
-		v-bind="data.item"
-		:prop="tProp || data.name"
-		:class="config.className"
-		:rules="itemRules as any"
-		:label="getLabel(data.item as FormItem)"
-	>
-		<template v-if="config.help" #label >
-			{{ getLabel(data.item) }}
-			<Tooltips :content="config.help" />
-		</template>
-		<div  v-if="type === 4"  class="form-value" v-html="value"></div>
-		<template v-else>
-			<el-input v-model="value" :disabled="editDisabled" placeholder="请输入编码">
-				<template #prefix >NO.</template>
-			</el-input>
-		</template>
-    </el-form-item>                             
+  <el-form-item
+    v-bind="data.item"
+    :prop="tProp || data.name"
+    :class="config.className"
+    :rules="itemRules as any"
+    :label="getLabel(data.item as FormItem)"
+  >
+    <template v-if="config.help" #label>
+      {{ getLabel(data.item) }}
+      <Tooltips :content="config.help" />
+    </template>
+    <div v-if="type === 4" class="form-value" v-html="value"></div>
+    <template v-else>
+      <el-input v-model="value" :disabled="editDisabled" placeholder="请输入编码">
+        <template #prefix>NO.</template>
+      </el-input>
+    </template>
+  </el-form-item>
 </template>
-<style  lang='scss' scoped>
-
-</style>
+<style lang="scss" scoped></style>