diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts
index 4074d41..a5d0618 100644
--- a/src/components/DesignForm/assembly/index.ts
+++ b/src/components/DesignForm/assembly/index.ts
@@ -17,6 +17,146 @@ const config: { optionsType: number } = {
 	optionsType: 0 // 0固定 1数据源 2 接口字典 3系统表单字段
 }
 export default [
+	{
+		title: '布局字段',
+		children: [
+			{
+				type: 'grid',
+				label: '格栅布局',
+				unitName: '格栅布局',
+				icon: 'grid',
+				iconFont: 'fa-th-large',
+				columns: [
+					// 格栅列数据
+					{
+						attr: { span: 12 },
+						list: []
+					},
+					{
+						attr: { span: 12 },
+						list: []
+					}
+				],
+				control: {},
+				config: {},
+				styles: {
+					divStyle: {
+						// marginBot: "15"
+					},
+					labelStyle: {
+						// paddingLeft: "7",
+					},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'card',
+				label: '卡片布局',
+				unitName: '卡片布局',
+				icon: 'card',
+				iconFont: 'fa-credit-card',
+				list: [],
+				control: {},
+				config: {},
+				item: {}, // label标题相关
+				styles: {
+					divStyle: {
+						// marginBot: "15"
+					},
+					labelStyle: {
+						// paddingLeft: "7",
+					},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'flex',
+				label: '弹性布局',
+				unitName: '弹性布局',
+				icon: 'flex',
+				iconFont: 'fa-file-text-o',
+				list: [],
+				tableData: [], // 值集合
+				control: {},
+				config: {
+					addBtnText: '添加一行'
+				},
+				styles: {
+					divStyle: {
+						// marginBot: "15"
+					},
+					labelStyle: {
+						// paddingLeft: "7",
+					},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'div',
+				label: '容器',
+				unitName: '容器',
+				icon: 'div',
+				iconFont: '',
+				control: {},
+				config: {},
+				list: [],
+				styles: {
+					divStyle: {
+						// marginBot: "15"
+					},
+					labelStyle: {
+						// paddingLeft: "7",
+					},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'tabs',
+				label: '标签页',
+				unitName: '标签页',
+				icon: 'tabs',
+				iconFont: 'fa-folder-o',
+				columns: [
+					{
+						label: 'Tab1',
+						unitName: '',
+						list: []
+					}
+				],
+				control: {},
+				config: {},
+				styles: {
+					divStyle: {
+						marginBot: "15"
+					},
+					labelStyle: {
+						paddingLeft: "7",
+					},
+					inputStyle: {}
+				}
+			},
+
+			{
+				type: 'divider',
+				label: '分割线',
+				unitName: '分割线',
+				icon: 'divider',
+				iconFont: '',
+				control: {},
+				config: {},
+				styles: {
+					divStyle: {
+						marginBot: "15"
+					},
+					labelStyle: {
+						paddingLeft: "7",
+					},
+					inputStyle: {}
+				}
+			},
+
+		]
+	},
 	{
 		title: '基础字段',
 		children: [
@@ -391,146 +531,7 @@ export default [
 
 		]
 	},
-	{
-		title: '布局字段',
-		children: [
-			{
-				type: 'grid',
-				label: '格栅布局',
-				unitName: '格栅布局',
-				icon: 'grid',
-				iconFont: 'fa-th-large',
-				columns: [
-					// 格栅列数据
-					{
-						attr: { span: 12 },
-						list: []
-					},
-					{
-						attr: { span: 12 },
-						list: []
-					}
-				],
-				control: {},
-				config: {},
-				styles: {
-					divStyle: {
-						marginBot: "15"
-					},
-					labelStyle: {
-						paddingLeft: "7",
-					},
-					inputStyle: {}
-				}
-			},
-			{
-				type: 'card',
-				label: '卡片布局',
-				unitName: '卡片布局',
-				icon: 'card',
-				iconFont: 'fa-credit-card',
-				list: [],
-				control: {},
-				config: {},
-				item: {}, // label标题相关
-				styles: {
-					divStyle: {
-						marginBot: "15"
-					},
-					labelStyle: {
-						paddingLeft: "7",
-					},
-					inputStyle: {}
-				}
-			},
-			{
-				type: 'flex',
-				label: '弹性布局',
-				unitName: '弹性布局',
-				icon: 'flex',
-				iconFont: 'fa-file-text-o',
-				list: [],
-				tableData: [], // 值集合
-				control: {},
-				config: {
-					addBtnText: '添加一行'
-				},
-				styles: {
-					divStyle: {
-						marginBot: "15"
-					},
-					labelStyle: {
-						paddingLeft: "7",
-					},
-					inputStyle: {}
-				}
-			},
-			{
-				type: 'div',
-				label: '容器',
-				unitName: '容器',
-				icon: 'div',
-				iconFont: '',
-				control: {},
-				config: {},
-				list: [],
-				styles: {
-					divStyle: {
-						marginBot: "15"
-					},
-					labelStyle: {
-						paddingLeft: "7",
-					},
-					inputStyle: {}
-				}
-			},
-			{
-				type: 'tabs',
-				label: '标签页',
-				unitName: '标签页',
-				icon: 'tabs',
-				iconFont: 'fa-folder-o',
-				columns: [
-					{
-						label: 'Tab1',
-						unitName: '',
-						list: []
-					}
-				],
-				control: {},
-				config: {},
-				styles: {
-					divStyle: {
-						marginBot: "15"
-					},
-					labelStyle: {
-						paddingLeft: "7",
-					},
-					inputStyle: {}
-				}
-			},
-
-			{
-				type: 'divider',
-				label: '分割线',
-				unitName: '分割线',
-				icon: 'divider',
-				iconFont: '',
-				control: {},
-				config: {},
-				styles: {
-					divStyle: {
-						marginBot: "15"
-					},
-					labelStyle: {
-						paddingLeft: "7",
-					},
-					inputStyle: {}
-				}
-			},
-
-		]
-	},
+	
 
 	{
 		title: '高级控件',
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 43c8fac..1331a1a 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,432 +836,438 @@ 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
-        }
-    }
-    // 属性设置相关结束
-
+  if (val !== undefined) {
+    tempObj[key] = val;
+  }
+  return {
+    obj: tempObj,
+    key: key,
+    value: value,
+  };
+};
+// 属性设置相关结束
+
+<<<<<<< HEAD
     
 
     //关联表单数据填充时无法获取当前表单新增且保存的字段，只有关闭重启后方能获取----bug修改
@@ -1276,1253 +1283,1327 @@ const getPropByPath = (obj: any, path: string, val: any) => {
             showAssociatedFormsFillRole.value = true;
         }, 200);
     };
+=======
+const showAssociatedFormsFillRole = ref(true);
 
-    // 多选固定选项删除
-const delSelectOption = (index: number, type?: string) => {
-        //liwenxuan 20240508 checkbox 删除选项时提醒  start
-        let delflag = true
-        let breakFlag = 0
-        if(controlData.value.type === 'checkbox'&& 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
-            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
-                        }
-                    }
-                }
+//关联表单数据填充时无法获取当前表单新增且保存的字段，只有关闭重启后方能获取----bug修改
+const saveRefreshFormControlAttr = () => {
+  //啊啊啊
 
-                
-            }
-        }
-        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)
-            } else {
-                    controlData.value.options.splice(index, 1)
-            }
-        }
-        
-    }
-    // 多选固定选项增加
-const addSelectOption = (type: any) => {
+  //setTimeout(() => {
+>>>>>>> qin_v6
 
+  getAssociatedFormsCurrentFieldTree1();
 
-        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()
-                })
-            }
-        }
+  showAssociatedFormsFillRole.value = false;
+  // 等待一个短时间的延迟，确保组件卸载完成
+  setTimeout(() => {
+    showAssociatedFormsFillRole.value = true;
+  }, 200);
+  //}, 13000);
+};
+
+// 多选固定选项删除
+const delSelectOption = (index: number, type?: string) => {
+  //liwenxuan 20240508 checkbox 删除选项时提醒  start
+  let delflag = true;
+  let breakFlag = 0;
+  if (
+    controlData.value.type === "checkbox" &&
+    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;
+      }
     }
-    // 更多属性弹窗
-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)
-                }
-            }
+    //多选删除时,当前index并不是索引而是value,需找出选择的多选框实际的索引作为index     liwenxuan    多选选择框选项拖动功能 20240815 end
+    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;
+          }
         }
-        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)
+  }
+  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 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)
+    //liwenxuan 20240508 checkbox 删除选项时提醒  end
+    if (type === "tabs") {
+      controlData.value.columns.splice(index, 1);
+    } else {
+      controlData.value.options.splice(index, 1);
     }
-    // 根据不同类型判断是否显示当前属性
-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
+  }
+};
+// 多选固定选项增加
+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";
+  }
+  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);
+};
+// 必填校验
+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);
+};
+// 根据不同类型判断是否显示当前属性
+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;
+};
+// 子表时添加序号和操作列
 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;
+    // }
+  } else if (val.label == "字段标识") {
+    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
-        },
-    });
+function getAsfasfFieldTree() {
+  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 asfasfChildTableFields = ref<Tree[]>()
+const asfasfFieldTree = ref<Tree[]>();
 
-const asfasfFieldTreeOptionsValue3 = ref<Tree[]>()
+const asfasfMasterFieldTree = ref<Tree[]>();
 
-let currentChildTableCount = 0
+const asfasfChildTableList = ref<Tree[]>();
 
-function removeFirstNumElements(arr: string | any[],num:number) {
-    if (arr.length < num) {
-        return [];
-    }
-    return arr.slice(num);
-}
+const asfasfChildTableFields = ref<Tree[]>();
 
-function formidChanged(){
+const asfasfFieldTreeOptionsValue3 = ref<Tree[]>();
 
-    //需设置关联关联表单的表单
-    controlData.value.control.glbbddbd=formData.value.name
-    if(controlData.value.control.formid===''){
+let currentChildTableCount = 0;
 
-    }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)
-            }
-        });
-        //在此组装当前表单子表字段数据
-        currentFormChildTableFields = currentFormChildTableFields.filter( (item: { type: string }) => item.type == "table" )
-        currentFormChildTableFields.forEach((element: any) => {
-            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);
         });
-        
-        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,
+        },
+      ];
 
+      resDataNoTable = resDataNoTable.filter(
+        (item: { type: string | null }) => item.type != "table"
+      );
 
-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]
-    }]
-});
+      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();
+  });
 }
 
+<<<<<<< HEAD
 
 
 function associatedFormsDataRangeDialoghandle(){
@@ -2594,652 +2675,746 @@ function associatedFormsDataRangeDialoghandle(){
                 }]
             }
         });
+=======
+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,
+        },
+      ];
+    }
+  });
+>>>>>>> qin_v6
 
+  associatedFormsDataRangeDialogFlag.value = true;
+  controlData.value.control.dataRangeConditionHtmlCopy =
+    controlData.value.control.dataRangeConditionHtml;
 
-
-        associatedFormsDataRangeDialogFlag.value = true
-        controlData.value.control.dataRangeConditionHtmlCopy = controlData.value.control.dataRangeConditionHtml
-        
-        nextTick(() => {
-            aftRange.value.focusEditor()
-        })
-
+  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);
-    }
-})
-
-
-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+" 张子表,不可再添加")
+    } 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 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 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 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) => {
+  console.log("判断是否是组件", val);
+  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();
+});
 
 /**
 @ 作者: 秦东
@@ -3249,61 +3424,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)=>{
-				
+
 // 			})
 // 		}
 // 	}
@@ -3315,224 +3491,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"
@@ -3552,68 +3746,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"
@@ -3626,7 +3849,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" 
@@ -3637,7 +3860,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="选项数据源"
@@ -3659,7 +3882,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"
@@ -3724,7 +3947,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'">
@@ -3748,422 +3971,479 @@ const radioChangeSet = (val:any) => {
 								</el-row>
 
 								<el-row v-else-if="item.type === 'lowcodeImage_float'">
-									<el-switch v-model="controlData.control.floatFlag" style="margin-right: 15px;"/>
-									
-									<el-select
-										v-if="controlData.control.floatFlag"
-										v-model="controlData.control.floatValue"
-										
-										style="width: 150px; height:20px">
-										<el-option
-										v-for="showModeSelected1 in floatSelectOptions"
-										:key="showModeSelected1.value"
-										:label="showModeSelected1.label"
-										:value="showModeSelected1.value"
-										/>
-										
-									</el-select>
-									
-								</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-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'">
-                                    <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-switch v-model="controlData.control.floatFlag" style="margin-right: 15px;"/>
+									
+									<el-select
+										v-if="controlData.control.floatFlag"
+										v-model="controlData.control.floatValue"
+										
+										style="width: 150px; height:20px">
+										<el-option
+										v-for="showModeSelected1 in floatSelectOptions"
+										:key="showModeSelected1.value"
+										:label="showModeSelected1.label"
+										:value="showModeSelected1.value"
+										/>
+										
+									</el-select>
+									
+								</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-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'"
+              >
+                <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'">
-                                    <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'"
+              >
+                <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"
@@ -4217,23 +4497,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">
                             
     
@@ -4248,365 +4525,99 @@ 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-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>
+
+<<<<<<< HEAD
 
 
     <el-dialog  v-model="associatedFormsChooseDialogFlag" class="glxxsztc" top="150px" :close-on-click-modal="false" title="选择关联表单" :show-close="false" style="margin-top:70px;" width="50%" >
@@ -4629,8 +4640,728 @@ const radioChangeSet = (val:any) => {
         <div class="dialog-footer">
             <el-button type="primary" @click="handleDetermineAssociatedFormsChooseDialog">
             确定
+=======
+          <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>
+>>>>>>> qin_v6
+            </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
+          @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
+						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
+						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;">
+                            <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>
+    </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
+						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
+						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"
+                @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="50%"
+  >
+    <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>
+<<<<<<< HEAD
         </template> 
     </el-dialog>
 
@@ -4922,228 +5653,380 @@ const radioChangeSet = (val:any) => {
                 确定
                 </el-button>
             </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
+          >
+>>>>>>> qin_v6
         </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
-                        @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
+          @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/layout/components/Top.vue b/src/layout/components/Top.vue
index 5dde36f..bffe2e3 100644
--- a/src/layout/components/Top.vue
+++ b/src/layout/components/Top.vue
@@ -1,39 +1,39 @@
 <script setup lang="ts">
-import {storeToRefs} from "pinia";
+import { storeToRefs } from "pinia";
 import EditMyPassword from "@/layout/components/myconst/editmypassword.vue";
-import {useUserStore} from "@/store/modules/user";
-import {useAppStore} from "@/store/modules/app";
-import {Position} from "@element-plus/icons-vue";
+import { useUserStore } from "@/store/modules/user";
+import { useAppStore } from "@/store/modules/app";
+import { Position } from "@element-plus/icons-vue";
 
 const userStore = useUserStore();
 const appStore = useAppStore();
-const {device} = storeToRefs(appStore); // 设备类型：desktop-宽屏设备 || mobile-窄屏设备
+const { device } = storeToRefs(appStore); // 设备类型：desktop-宽屏设备 || mobile-窄屏设备
 
 const myPasswordBoxIsShow = ref(false);
 
 const date: Date = new Date();
 
-const tipsType = ref<number>(1)
+const tipsType = ref<number>(1);
 //
 const greetings = computed(() => {
   if (date.getHours() >= 6 && date.getHours() < 8) {
-    tipsType.value = 1
+    tipsType.value = 1;
     return "晨起披衣出草堂，轩窗已自喜微凉🌅！";
   } else if (date.getHours() >= 8 && date.getHours() < 12) {
-    tipsType.value = 2
+    tipsType.value = 2;
     return "上午好🌞！";
   } else if (date.getHours() >= 12 && date.getHours() < 18) {
-    tipsType.value = 3
+    tipsType.value = 3;
     return "下午好☕！";
   } else if (date.getHours() >= 18 && date.getHours() < 24) {
-    tipsType.value = 4
+    tipsType.value = 4;
     return "晚上好🌃！";
   } else if (date.getHours() >= 0 && date.getHours() < 6) {
-    tipsType.value = 5
+    tipsType.value = 5;
     return "偷偷向银河要了一把碎星，只等你闭上眼睛撒入你的梦中，晚安🌛！";
   }
 });
-const {isFullscreen, toggle} = useFullscreen();
+const { isFullscreen, toggle } = useFullscreen();
 
 /**
  * 注销
@@ -45,22 +45,20 @@ function logout() {
     type: "warning",
   }).then(() => {
     userStore
-        .logout()
-        .then(() => {
-          tagsViewStore.delAllViews();
-        })
-        .then(() => {
-          router.push(`/login?redirect=${route.fullPath}`);
-        });
+      .logout()
+      .then(() => {
+        tagsViewStore.delAllViews();
+      })
+      .then(() => {
+        router.push(`/login?redirect=${route.fullPath}`);
+      });
   });
 }
 
 /**
  * 打开个人资料
  */
-const openMyContBox = () => {
-
-}
+const openMyContBox = () => {};
 /**
  * 修改个人密码
  */
@@ -68,17 +66,15 @@ const editMyPasswordForm = () => {
   // console.log("修改个人密码");
   myPasswordBoxIsShow.value = true;
   // console.log("修改个人密码",myPasswordBoxIsShow.value );
-}
-
+};
 </script>
 
 <template>
   <div class="top">
     <div class="logo">
-      <img src="../../assets/images/logo.png">
+      <img src="../../assets/images/logo.png" />
     </div>
     <div class="flex">
-
       <!--			&lt;!&ndash; 导航栏设置(窄屏隐藏)&ndash;&gt;-->
       <div v-if="device !== 'mobile'" class="setting-container">
         <!--				<el-text v-if="tipsType==1" class="mx-1" type="success">{{ greetings }}</el-text>-->
@@ -88,22 +84,20 @@ const editMyPasswordForm = () => {
         <!--				<el-text v-if="tipsType==5" class="mx-1">{{ greetings }}</el-text>-->
         <!--全屏 -->
         <div class="setting-item" @click="toggle">
-          <svg-icon
-              :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'"
-          />
+          <svg-icon :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'" />
         </div>
         <!-- 布局大小 -->
         <el-tooltip content="布局大小" effect="dark" placement="bottom">
-          <size-select class="setting-item"/>
+          <size-select class="setting-item" />
         </el-tooltip>
         <!--语言选择-->
-        <lang-select class="setting-item"/>
+        <lang-select class="setting-item" />
       </div>
 
       <!--			&lt;!&ndash; 用户头像 &ndash;&gt;-->
       <el-dropdown trigger="click">
         <div class="avatar-container">
-          <img :src="userStore.avatar + '?imageView2/1/w/80/h/80'"/>
+          <img :src="userStore.avatar + '?imageView2/1/w/80/h/80'" />
           <span style="padding: 0 10px">{{ userStore.nickname }}</span>
           <arrow-down class="w-3 h-3"></arrow-down>
         </div>
@@ -112,8 +106,12 @@ const editMyPasswordForm = () => {
             <router-link to="/">
               <el-dropdown-item>{{ $t("navbar.dashboard") }}</el-dropdown-item>
             </router-link>
-            <el-dropdown-item @click="openMyContBox">{{ $t("navbar.archives") }}</el-dropdown-item>
-            <el-dropdown-item @click="editMyPasswordForm">{{ $t("navbar.password") }}</el-dropdown-item>
+            <el-dropdown-item @click="openMyContBox">{{
+              $t("navbar.archives")
+            }}</el-dropdown-item>
+            <el-dropdown-item @click="editMyPasswordForm">{{
+              $t("navbar.password")
+            }}</el-dropdown-item>
             <el-dropdown-item divided @click="logout">
               {{ $t("navbar.logout") }}
             </el-dropdown-item>
@@ -121,14 +119,14 @@ const editMyPasswordForm = () => {
         </template>
       </el-dropdown>
     </div>
-    <EditMyPassword v-model:editPasswordIsShow="myPasswordBoxIsShow"/>
+    <EditMyPassword v-model:editPasswordIsShow="myPasswordBoxIsShow" />
   </div>
 </template>
 
 <style scoped lang="scss">
 .top {
   height: 68px;
-  background: #1E5EFF;
+  background: #1e5eff;
   position: fixed;
   padding: 0 20px;
   top: 0;
diff --git a/src/layout/index.vue b/src/layout/index.vue
index bbc382b..772aab8 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,15 +1,15 @@
 <script setup lang="ts">
-import {computed, watchEffect} from "vue";
-import {useWindowSize} from "@vueuse/core";
-import {AppMain, Navbar, Settings, TagsView} from "./components/index";
+import { computed, watchEffect } from "vue";
+import { useWindowSize } from "@vueuse/core";
+import { AppMain, Navbar, Settings, TagsView } from "./components/index";
 import Sidebar from "./components/Sidebar/index.vue";
 import RightPanel from "@/components/RightPanel/index.vue";
-import Top from './components/Top.vue'
+import Top from "./components/Top.vue";
 
-import {useAppStore} from "@/store/modules/app";
-import {useSettingsStore} from "@/store/modules/settings";
+import { useAppStore } from "@/store/modules/app";
+import { useSettingsStore } from "@/store/modules/settings";
 
-const {width} = useWindowSize();
+const { width } = useWindowSize();
 
 /**
  * 响应式布局容器固定宽度
@@ -28,109 +28,105 @@ const showTagsView = computed(() => settingsStore.tagsView);
 const showSettings = computed(() => settingsStore.showSettings);
 
 const classObj = computed(() => ({
-	hideSidebar: !appStore.sidebar.opened,
-	openSidebar: appStore.sidebar.opened,
-	withoutAnimation: appStore.sidebar.withoutAnimation,
-	mobile: appStore.device === "mobile",
+  hideSidebar: !appStore.sidebar.opened,
+  openSidebar: appStore.sidebar.opened,
+  withoutAnimation: appStore.sidebar.withoutAnimation,
+  mobile: appStore.device === "mobile",
 }));
 
 watchEffect(() => {
-	if (width.value < WIDTH) {
-		appStore.toggleDevice("mobile");
-		appStore.closeSideBar(true);
-	} else {
-		appStore.toggleDevice("desktop");
-
-		if (width.value >= 1200) {
-			//大屏
-			appStore.openSideBar(true);
-		} else {
-			appStore.closeSideBar(true);
-		}
-	}
+  if (width.value < WIDTH) {
+    appStore.toggleDevice("mobile");
+    appStore.closeSideBar(true);
+  } else {
+    appStore.toggleDevice("desktop");
+
+    if (width.value >= 1200) {
+      //大屏
+      appStore.openSideBar(true);
+    } else {
+      appStore.closeSideBar(true);
+    }
+  }
 });
 
 function handleOutsideClick() {
-	appStore.closeSideBar(false);
+  appStore.closeSideBar(false);
 }
 </script>
 
 <template>
-
-	<div :class="classObj" class="app-wrapper">
-
-		<!-- 手机设备侧边栏打开遮罩层 -->
-		<div
-				v-if="classObj.mobile && classObj.openSidebar"
-				class="drawer-bg"
-				@click="handleOutsideClick"
-		></div>
-		<top></top>
-
-
-		<Sidebar class="sidebar-container"/>
-
-		<div :class="{ hasTagsView: showTagsView }" class="main-container">
-			<div :class="{ 'fixed-header': fixedHeader }" style="margin: 10px 20px 0 20px;">
-				<navbar></navbar>
-				<tags-view v-if="showTagsView"/>
-			</div>
-
-			<!--主页面-->
-			<app-main/>
-
-			<!-- 设置面板 -->
-			<RightPanel v-if="showSettings">
-				<settings/>
-			</RightPanel>
-		</div>
-	</div>
+  <div :class="classObj" class="app-wrapper">
+    <!-- 手机设备侧边栏打开遮罩层 -->
+    <div
+      v-if="classObj.mobile && classObj.openSidebar"
+      class="drawer-bg"
+      @click="handleOutsideClick"
+    ></div>
+    <top></top>
+
+    <Sidebar class="sidebar-container" />
+
+    <div :class="{ hasTagsView: showTagsView }" class="main-container">
+      <div :class="{ 'fixed-header': fixedHeader }" style="margin: 10px 20px 0 20px">
+        <navbar></navbar>
+        <tags-view v-if="showTagsView" />
+      </div>
+
+      <!--主页面-->
+      <app-main />
+
+      <!-- 设置面板 -->
+      <RightPanel v-if="showSettings">
+        <settings />
+      </RightPanel>
+    </div>
+  </div>
 </template>
 
 <style lang="scss" scoped>
 .app-wrapper {
-	background: #F5F6FA;
-	position: relative;
-	width: 100%;
-	height: 100%;
-
-	// &::after {
-	// 	display: table;
-	// 	clear: both;
-	// 	content: "";
-	// }
-
-
-	&.mobile.openSidebar {
-		position: fixed;
-		top: 0;
-	}
+  background: #f5f6fa;
+  position: relative;
+  width: 100%;
+  height: 100%;
+
+  // &::after {
+  // 	display: table;
+  // 	clear: both;
+  // 	content: "";
+  // }
+
+  &.mobile.openSidebar {
+    position: fixed;
+    top: 0;
+  }
 }
 
 .fixed-header {
-	position: fixed;
-	top: 0;
-	right: 0;
-	z-index: 9;
-	width: calc(100% - #{$sideBarWidth});
-	transition: width 0.28s;
+  position: fixed;
+  top: 0;
+  right: 0;
+  z-index: 9;
+  width: calc(100% - #{$sideBarWidth});
+  transition: width 0.28s;
 }
 
 .hideSidebar .fixed-header {
-	width: calc(100% - 54px);
+  width: calc(100% - 54px);
 }
 
 .mobile .fixed-header {
-	width: 100%;
+  width: 100%;
 }
 
 .drawer-bg {
-	position: absolute;
-	top: 0;
-	z-index: 999;
-	width: 100%;
-	height: 100%;
-	background: #000;
-	opacity: 0.3;
+  position: absolute;
+  top: 0;
+  z-index: 999;
+  width: 100%;
+  height: 100%;
+  background: #000;
+  opacity: 0.3;
 }
 </style>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 855aacd..0526a95 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -3,127 +3,123 @@
 @ 时间: 2023-11-06 13:39:13
 @ 备注: 首页
 -->
-<script lang='ts' setup>
-import * as echarts from 'echarts';	//引入图形界面
+<script lang="ts" setup>
+import * as echarts from "echarts"; //引入图形界面
 
 import { useUserStore } from "@/store/modules/user";
 
-
-import { orgInfo } from '@/api/displayboardapi/types'
-import { getOrgChiled,getCompanyDeparment,targetListForDepartment } from '@/api/displayboardapi/indexapi'
+import { orgInfo } from "@/api/displayboardapi/types";
+import {
+  getOrgChiled,
+  getCompanyDeparment,
+  targetListForDepartment,
+} from "@/api/displayboardapi/indexapi";
 
 import UserInfo from "@/views/dashboard/components/userinfo.vue";
 import SanLianpIng from "@/views/dashboard/components/sanlianping.vue";
 import EducationChart from "@/views/dashboard/components/education.vue";
 import AllOrgYear from "@/views/dashboard/components/allorgyear.vue";
-import OrgUserAge from "@/views/dashboard/components/orguserage.vue"; 
-import OrgEducation from "@/views/dashboard/components/orgeducation.vue"; 
-import Application from "@/views/dashboard/components/application.vue";  
+import OrgUserAge from "@/views/dashboard/components/orguserage.vue";
+import OrgEducation from "@/views/dashboard/components/orgeducation.vue";
+import Application from "@/views/dashboard/components/application.vue";
 import HostNews from "@/views/dashboard/components/hostnews.vue";
 
 const userStore = useUserStore();
-const orgListCont = ref<orgInfo[]>([])
-const educationOrgId = ref<number>(309)
-const masterBody = ref<any>(null)
-const drawerWidht = ref<any>()
+const orgListCont = ref<orgInfo[]>([]);
+const educationOrgId = ref<number>(309);
+const masterBody = ref<any>(null);
+const drawerWidht = ref<any>();
 /**
  * 获取行政组织
  */
-function getOrgList(){
-	getOrgChiled({id:313})
-		.then(( {data} )=>{
-			// console.log("获取行政组织-2-->",data)
-			orgListCont.value = data.list
-			educationOrgId.value = data.current
-		})
+function getOrgList() {
+  getOrgChiled({ id: 313 }).then(({ data }) => {
+    // console.log("获取行政组织-2-->",data)
+    orgListCont.value = data.list;
+    educationOrgId.value = data.current;
+  });
 }
 
+const orgAllYears = ref<any>(); //当前年
 
-
-const orgAllYears = ref<any>()	//当前年
-
-const oenOrg = ref<any>() //单一行政组织
-
+const oenOrg = ref<any>(); //单一行政组织
 
 //渲染完页面再执行
 onMounted(() => {
-	
-	drawerWidht.value = masterBody.value?.clientWidth
-	getOrgList();
-	// console.log("热门新闻----100---->",drawerWidht.value)
-})
+  drawerWidht.value = masterBody.value?.clientWidth;
+  getOrgList();
+  // console.log("热门新闻----100---->",drawerWidht.value)
+});
 </script>
 <template>
-		<div ref="masterBody" class="app_container">
-            <div class="first-main">
-                <div class="main-width74">
-                    <AllOrgYear :org-list-cont="orgListCont" :education-org-id="educationOrgId" />
-                </div>
-                <div class="main-width26">
-                    <HostNews v-model:drawer-widht="drawerWidht" />
-                </div>
-            </div>
-            <div class="cart_top_juLi first-main">
-                <div class="main-width74 first-main">
-                    <div class="main-width50">
-                        <OrgUserAge :org-list-cont="orgListCont" :education-org-id="educationOrgId" />
-                    </div>
-                    <div class="main-width50">
-                        <OrgEducation :org-list-cont="orgListCont" :education-org-id="educationOrgId" />	
-                    </div>
-                </div>
-                <div class="main-width26">
-                    <Application :org-list-cont="orgListCont" :education-org-id="educationOrgId" />
-                </div>
-            </div>
-			<el-row :gutter="10" class="cart_top_juLi" >
-				<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="readback">			
-					<SanLianpIng />
-				</el-col>
-			</el-row>
-			
-		</div>
+  <div ref="masterBody" class="app_container">
+    <div class="first-main">
+      <div class="main-width74">
+        <AllOrgYear :org-list-cont="orgListCont" :education-org-id="educationOrgId" />
+      </div>
+      <div class="main-width26">
+        <HostNews v-model:drawer-widht="drawerWidht" />
+      </div>
+    </div>
+    <div class="cart_top_juLi first-main">
+      <div class="main-width74 first-main">
+        <div class="main-width50">
+          <OrgUserAge :org-list-cont="orgListCont" :education-org-id="educationOrgId" />
+        </div>
+        <div class="main-width50">
+          <OrgEducation :org-list-cont="orgListCont" :education-org-id="educationOrgId" />
+        </div>
+      </div>
+      <div class="main-width26">
+        <Application :org-list-cont="orgListCont" :education-org-id="educationOrgId" />
+      </div>
+    </div>
+    <el-row :gutter="10" class="cart_top_juLi">
+      <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="readback">
+        <SanLianpIng />
+      </el-col>
+    </el-row>
+  </div>
 </template>
-<style  lang='scss' scoped>
-.app_container{
-	padding: 10px 20px 0px 20px;
-    height: calc(100% - 10px);
-	overflow: hidden;
-	overflow-y: auto;
-    width: 100%;
+<style lang="scss" scoped>
+.app_container {
+  padding: 10px 20px 0px 20px;
+  height: calc(100% - 10px);
+  overflow: hidden;
+  overflow-y: auto;
+  width: 100%;
 }
-.orgAllMothsTitle{
-	width:100%;
-	display: flex;
-	align-items: center;
-	justify-content:space-between;
-		
+.orgAllMothsTitle {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
 }
-.span_icon_left{
-	margin-right:10px;
+.span_icon_left {
+  margin-right: 10px;
 }
-.cart_top_juLi{
-	margin-top:20px;
+.cart_top_juLi {
+  margin-top: 20px;
 }
-.titleInfo{
-	font-size: 20px;
-	font-weight: bold;
+.titleInfo {
+  font-size: 20px;
+  font-weight: bold;
 }
-.first-main{
-    display: flex;
-    justify-content: space-between;
-    height: 330px;
+.first-main {
+  display: flex;
+  justify-content: space-between;
+  height: 330px;
 }
-.main-width74{
-    width: calc(100% - 370px);
-    height: 100%;
+.main-width74 {
+  width: calc(100% - 370px);
+  height: 100%;
 }
-.main-width26{
-    width: 350px;
-    height: 100%;
+.main-width26 {
+  width: 350px;
+  height: 100%;
 }
-.main-width50{
-    width: calc(50% - 10px);
-    height: 100%;
+.main-width50 {
+  width: calc(50% - 10px);
+  height: 100%;
 }
 </style>
diff --git a/src/views/hr/userBox.vue b/src/views/hr/userBox.vue
index 6615bc0..c4d1d6e 100644
--- a/src/views/hr/userBox.vue
+++ b/src/views/hr/userBox.vue
@@ -3,59 +3,59 @@
 @ 时间: 2024-05-23 13:50:03
 @ 备注: 行政组织及角色选择器
 -->
-<script lang='ts' setup>
-import { Search,ArrowRight  } from '@element-plus/icons-vue'	//搜索图标
-import { userOrgRole,crumb } from '@/api/hr/search/types'
-const circleUrl = ref('https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png')
-
+<script lang="ts" setup>
+import { Search, ArrowRight } from "@element-plus/icons-vue"; //搜索图标
+import { userOrgRole, crumb } from "@/api/hr/search/types";
+const circleUrl = ref(
+  "https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png"
+);
 
 //引入页面
-import OrgPage from '@/views/hr/orgUserRole/org.vue'
-import OrgRolePage  from '@/views/hr/orgUserRole/orgrole.vue'
-import RolePageIng  from '@/views/hr/orgUserRole/rolePage.vue'
-
+import OrgPage from "@/views/hr/orgUserRole/org.vue";
+import OrgRolePage from "@/views/hr/orgUserRole/orgrole.vue";
+import RolePageIng from "@/views/hr/orgUserRole/rolePage.vue";
 
 const props = defineProps({
-	isOpen:{
-		type:Boolean,
-		default:false 
-	},
-	types:{
-		type:Number,
-		default:1
-	},
-	orgTrue:{
-		type:Number,
-		default:1
-	},
-	pickList:{
-		type:Object,
-		default(){
-			return {}
-		}
-	}
+  isOpen: {
+    type: Boolean,
+    default: false,
+  },
+  types: {
+    type: Number,
+    default: 1,
+  },
+  orgTrue: {
+    type: Number,
+    default: 1,
+  },
+  pickList: {
+    type: Object,
+    default() {
+      return {};
+    },
+  },
 });
-const taotleLog = ref(0)
-const pickListAry = ref<userOrgRole[]>([])	//已选择数据
-const emits = defineEmits(["update:isOpen","update:types","pickInfo"]);
-const searchQuery = ref<any>("")
-const orgUs = ref(null)
-const orgUsRole = ref(null)
-const rolePage = ref(null)
+const taotleLog = ref(0);
+const pickListAry = ref<userOrgRole[]>([]); //已选择数据
+const emits = defineEmits(["update:isOpen", "update:types", "pickInfo"]);
+const searchQuery = ref<any>("");
+const orgUs = ref(null);
+const orgUsRole = ref(null);
+const rolePage = ref(null);
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-23 13:56:28
 @ 功能: 对话框状态
 */
-const isShow =  computed({
-	get() {
-		// console.log("对话框状态",props.isOpen);
-		return props.isOpen
-	},
-	set(val: boolean) {
-		// console.log("对话框状态",props.isOpen);
-		emits('update:isOpen', val)
-	}
+const isShow = computed({
+  get() {
+    // console.log("对话框状态",props.isOpen);
+    return props.isOpen;
+  },
+  set(val: boolean) {
+    // console.log("对话框状态",props.isOpen);
+    emits("update:isOpen", val);
+  },
 });
 /**
 @ 作者: 秦东
@@ -63,219 +63,248 @@ const isShow =  computed({
 @ 功能: 人员选择范围
 */
 const userTypes = computed({
-	get() {
-		// console.log("对话框状态",props.isOpen);
-		return props.types
-	},
-	set(val: boolean) {
-		// console.log("对话框状态",props.isOpen);
-		emits('update:types', val)
-	}
-})
+  get() {
+    // console.log("对话框状态",props.isOpen);
+    return props.types;
+  },
+  set(val: boolean) {
+    // console.log("对话框状态",props.isOpen);
+    emits("update:types", val);
+  },
+});
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-23 14:15:10
 @ 功能: 关闭弹出对话框
 */
 const handleClose = () => {
-	emits('update:isOpen', false)
-}
+  emits("update:isOpen", false);
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-24 08:21:58
 @ 功能: 根据条件搜索数据
 */
 const searchData = () => {
-	// console.log("userTypes----->",userTypes);
-	if(userTypes.value == 1){
-		orgUs.value.searchOrgUs(searchQuery.value)
-	}else if(userTypes.value == 2){
-		orgUsRole.value.searchOrgRolePeople(searchQuery.value)
-	}else{
-		rolePage.value.searchOrgRolePeople(searchQuery.value)
-	}
-}
+  // console.log("userTypes----->",userTypes);
+  if (userTypes.value == 1) {
+    orgUs.value.searchOrgUs(searchQuery.value);
+  } else if (userTypes.value == 2) {
+    orgUsRole.value.searchOrgRolePeople(searchQuery.value);
+  } else {
+    rolePage.value.searchOrgRolePeople(searchQuery.value);
+  }
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-24 15:29:20
 @ 功能: 更新数据
 */
-const updataPickLog = (val:userOrgRole[]) => {
-	
-	pickListAry.value = val
-	taotleLog.value = val.length
-}
+const updataPickLog = (val: userOrgRole[]) => {
+  pickListAry.value = val;
+  taotleLog.value = val.length;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-24 15:36:07
 @ 功能: 删除选中项目
 */
-const delPickCont = (val:userOrgRole) => {
-	pickListAry.value.forEach((item:userOrgRole,index:number)=>{
-		if(item.id == val.id){
-			pickListAry.value.splice(index,1)
-		}
-	})
-}
+const delPickCont = (val: userOrgRole) => {
+  pickListAry.value.forEach((item: userOrgRole, index: number) => {
+    if (item.id == val.id) {
+      pickListAry.value.splice(index, 1);
+    }
+  });
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-24 15:52:58
 @ 功能: 清空选项
 */
 const clearVal = () => {
-	pickListAry.value = [];
-	taotleLog.value = 0
-}
+  pickListAry.value = [];
+  taotleLog.value = 0;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-24 15:59:11
 @ 功能: 提交数据
 */
 const submitSend = () => {
-	emits('pickInfo', pickListAry,props.types)
-	
-}
-watch(()=>props.isOpen,(val:boolean)=>{
-	if(!val){
-		clearVal()
-	}else{
-		if(props.pickList.length > 0){
-			pickListAry.value = props.pickList
-			taotleLog.value = props.pickList.length
-		}
-	}
-	// console.log("对话框状态",val);
-})
-onMounted(()=>{
-	taotleLog.value = props.pickList.length
-})
+  emits("pickInfo", pickListAry, props.types);
+};
+watch(
+  () => props.isOpen,
+  (val: boolean) => {
+    if (!val) {
+      clearVal();
+    } else {
+      if (props.pickList.length > 0) {
+        pickListAry.value = props.pickList;
+        taotleLog.value = props.pickList.length;
+      }
+    }
+    // console.log("对话框状态",val);
+  }
+);
+onMounted(() => {
+  taotleLog.value = props.pickList.length;
+});
 </script>
 <template>
-	<el-dialog v-model="isShow" title="选择成员" width="700" draggable :before-close="handleClose">
-		<el-row class="allBianLink">
-			<el-col :span="12">
-				<el-input
-					v-model="searchQuery"
-					:prefix-icon="Search"
-					size="large"
-					class="inputDeep"
-					@input="searchData"
-				/>
-				<OrgPage ref="orgUs" v-if="userTypes==1" :org-true="orgTrue" :pick-list="pickListAry" @updataPickLog="updataPickLog" />
-				<OrgRolePage ref="orgUsRole" v-if="userTypes==2" :org-true="orgTrue" :pick-list="pickListAry" @updataPickLog="updataPickLog" />
-				<RolePageIng ref="rolePage" v-if="userTypes==3" :org-true="orgTrue" :pick-list="pickListAry" @updataPickLog="updataPickLog" />
-			</el-col>
-			
-			<el-col :span="12" class="leftLink">
-				<el-row>
-					<el-col :span="24" class="pickTitle">
-						<el-text>已选（{{ taotleLog }}）</el-text>
-						<el-button type="danger" link @click="clearVal">清空</el-button>
-					</el-col>
-					<el-col :span="24">
-						<el-scrollbar class="pickBox">
-							<ul>
-								<li v-for="item in pickListAry" :key="item.id">
-									<el-space wrap>
-										<svg-icon v-if="item.types==2" icon-class="fenZhu" :size="20" />
-										<svg-icon v-if="item.types==3" icon-class="tasp" :size="20" />
-										<el-avatar v-if="item.types==1" shape="square" :size="20" :src="circleUrl" />
-										<el-text>{{ item.title }}</el-text>
-									</el-space>
-									<div >
-										<svg-icon  icon-class="cwkx" @click="delPickCont(item)" />
-									</div>
-								</li>
-							</ul>
+  <el-dialog
+    v-model="isShow"
+    title="选择成员"
+    width="700"
+    draggable
+    :before-close="handleClose"
+  >
+    <el-row class="allBianLink">
+      <el-col :span="12">
+        <el-input
+          v-model="searchQuery"
+          :prefix-icon="Search"
+          size="large"
+          class="inputDeep"
+          @input="searchData"
+        />
+        <OrgPage
+          ref="orgUs"
+          v-if="userTypes == 1"
+          :org-true="orgTrue"
+          :pick-list="pickListAry"
+          @updataPickLog="updataPickLog"
+        />
+        <OrgRolePage
+          ref="orgUsRole"
+          v-if="userTypes == 2"
+          :org-true="orgTrue"
+          :pick-list="pickListAry"
+          @updataPickLog="updataPickLog"
+        />
+        <RolePageIng
+          ref="rolePage"
+          v-if="userTypes == 3"
+          :org-true="orgTrue"
+          :pick-list="pickListAry"
+          @updataPickLog="updataPickLog"
+        />
+      </el-col>
 
-						</el-scrollbar>
-					</el-col>
-				</el-row>
-			</el-col>
-		</el-row>
-		<template #footer>
-			<div class="dialog-footer">
-				<el-button @click="handleClose">取消</el-button>
-				<el-button type="primary" @click="submitSend">确定</el-button>
-			</div>
-		</template>
-	</el-dialog>
+      <el-col :span="12" class="leftLink">
+        <el-row>
+          <el-col :span="24" class="pickTitle">
+            <el-text>已选（{{ taotleLog }}）</el-text>
+            <el-button type="danger" link @click="clearVal">清空</el-button>
+          </el-col>
+          <el-col :span="24">
+            <el-scrollbar class="pickBox">
+              <ul>
+                <li v-for="item in pickListAry" :key="item.id">
+                  <el-space wrap>
+                    <svg-icon v-if="item.types == 2" icon-class="fenZhu" :size="20" />
+                    <svg-icon v-if="item.types == 3" icon-class="tasp" :size="20" />
+                    <el-avatar
+                      v-if="item.types == 1"
+                      shape="square"
+                      :size="20"
+                      :src="circleUrl"
+                    />
+                    <el-text>{{ item.title }}</el-text>
+                  </el-space>
+                  <div>
+                    <svg-icon icon-class="cwkx" @click="delPickCont(item)" />
+                  </div>
+                </li>
+              </ul>
+            </el-scrollbar>
+          </el-col>
+        </el-row>
+      </el-col>
+    </el-row>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="handleClose">取消</el-button>
+        <el-button type="primary" @click="submitSend">确定</el-button>
+      </div>
+    </template>
+  </el-dialog>
 </template>
-<style  lang='scss' scoped>
-.allBianLink{
-	border: 1px solid #E6E8EB;
-	.leftLink{
-		border-left: 1px solid #E6E8EB;
-	}
-	.pickTitle{
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		padding: 10px 10px;
-		border-bottom: 1px solid #E6E8EB;
-	}
+<style lang="scss" scoped>
+.allBianLink {
+  border: 1px solid #e6e8eb;
+  .leftLink {
+    border-left: 1px solid #e6e8eb;
+  }
+  .pickTitle {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 10px 10px;
+    border-bottom: 1px solid #e6e8eb;
+  }
 }
-.mianbaoxue{
-	display: flex;
-	white-space: nowrap;
-	padding: 10px 5px;
-	overflow: auto;
-	cursor: pointer;
+.mianbaoxue {
+  display: flex;
+  white-space: nowrap;
+  padding: 10px 5px;
+  overflow: auto;
+  cursor: pointer;
 }
-.contentBox{
-	height: 400px;
-	padding: 0 5px;
-	li {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		width: 100%;
-		padding: 5px 5px;
-		cursor: pointer;
-		i {
-			font-size: 15px;
-		}
-	}
-	li:hover {
-		background-color: #EBEEF5;
-		color: #409EFF;
-		.el-text{
-			color: #409EFF;
-		}
-	}
-	li.active{
-		background-color: #EBEDF0;
-		color: #409EFF;
-		
-		.el-text{
-			color: #409EFF;
-		}
-	}
+.contentBox {
+  height: 400px;
+  padding: 0 5px;
+  li {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+    padding: 5px 5px;
+    cursor: pointer;
+    i {
+      font-size: 15px;
+    }
+  }
+  li:hover {
+    background-color: #ebeef5;
+    color: #409eff;
+    .el-text {
+      color: #409eff;
+    }
+  }
+  li.active {
+    background-color: #ebedf0;
+    color: #409eff;
+
+    .el-text {
+      color: #409eff;
+    }
+  }
 }
-.contentLiLeft{
-	border-left: 1px dashed #909399;
-	padding-left: 10px;
+.contentLiLeft {
+  border-left: 1px dashed #909399;
+  padding-left: 10px;
 }
-.pickBox{
-	height: 420px;
-	padding: 10px 0px 0px 0px;
-	li {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		width: 100%;
-		padding: 5px 5px;
-		cursor: pointer;
-		i {
-			font-size: 15px;
-		}
-	}
-	li:hover {
-		background-color: #F56C6C;
-		color: #FFFFFF;
-		.el-text{
-			color: #FFFFFF;
-		}
-	}
+.pickBox {
+  height: 420px;
+  padding: 10px 0px 0px 0px;
+  li {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+    padding: 5px 5px;
+    cursor: pointer;
+    i {
+      font-size: 15px;
+    }
+  }
+  li:hover {
+    background-color: #f56c6c;
+    color: #ffffff;
+    .el-text {
+      color: #ffffff;
+    }
+  }
 }
 </style>
diff --git a/src/views/sysworkflow/lowcodepage/newLowCode/appLayout/appContainer.vue b/src/views/sysworkflow/lowcodepage/newLowCode/appLayout/appContainer.vue
index 0802705..b188e6e 100644
--- a/src/views/sysworkflow/lowcodepage/newLowCode/appLayout/appContainer.vue
+++ b/src/views/sysworkflow/lowcodepage/newLowCode/appLayout/appContainer.vue
@@ -3,252 +3,274 @@
 @ 时间: 2024-07-22 11:28:18
 @ 备注: 自定义App主容器
 -->
-<script lang='ts' setup>
-import { appMenuTreeInfo,appSetInfo } from "@/api/date/type"
+<script lang="ts" setup>
+import { appMenuTreeInfo, appSetInfo } from "@/api/date/type";
 import { useUserStore } from "@/store/modules/user";
-import { gainAppEditPsge } from '@/api/DesignForm/requestapi'
+import { gainAppEditPsge } from "@/api/DesignForm/requestapi";
 
-import  RegularPage  from "@/views/sysworkflow/lowcodepage/runApp/regularPage.vue"
-import  RunAppForm  from "@/views/sysworkflow/lowcodepage/runApp/runAppForm.vue"
+import RegularPage from "@/views/sysworkflow/lowcodepage/runApp/regularPage.vue";
+import RunAppForm from "@/views/sysworkflow/lowcodepage/runApp/runAppForm.vue";
 
 const props = defineProps({
-	drawerWith:{
-		type:Number,
-		default:0
-	},
-	runIsOpen:{
-		type: Boolean,
-		default: false,
-	},
-	pickAppInfo:{
-		type:Object,
-		default(){
-			return {}
-		}
-	},
-	searchQuery:{
-		type:Object,
-		default(){
-			return {}
-		}
-	}
+  drawerWith: {
+    type: Number,
+    default: 0,
+  },
+  runIsOpen: {
+    type: Boolean,
+    default: false,
+  },
+  pickAppInfo: {
+    type: Object,
+    default() {
+      return {};
+    },
+  },
+  searchQuery: {
+    type: Object,
+    default() {
+      return {};
+    },
+  },
 });
-const emits = defineEmits(["update:runIsOpen","refreshPage"]);
+const emits = defineEmits(["update:runIsOpen", "refreshPage"]);
 const userStore = useUserStore();
-const menusTree = ref<appMenuTreeInfo[]>([])		//菜单树
-const pickAppMenu = ref("")   //选中的菜单
-const switchPAge = ref(1)     //页面类型 1：执行页面，2：表单页面
-const pickAppMenuSel = ref("")  //下拉框选中的值
+const menusTree = ref<appMenuTreeInfo[]>([]); //菜单树
+const pickAppMenu = ref(""); //选中的菜单
+const switchPAge = ref(1); //页面类型 1：执行页面，2：表单页面
+const pickAppMenuSel = ref(""); //下拉框选中的值
 /**
 @ 作者: 秦东
 @ 时间: 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
-	}
-	// console.log("获取app信息---》",props.pickAppInfo)	
-	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;
-			let isIn = true;
-			data.data.menuTree.forEach((item)=>{
-				if(item.isLock == 1 && item.isMain == 1){
-					pickAppMenu.value = item;
-					isIn = false;
-					switchPAge.value = 1
-				}
-			})
-			if(isIn){
-				pickAppMenu.value = data.data.menuTree[0];
-				if (pickAppMenu.value.type == 2){
-					switchPAge.value = 2
-				}
-			}
-		})
-}
+const gainAppContent = () => {
+  let sendInfo = {
+    id: props.pickAppInfo.signCodeStr,
+  };
+  // console.log("获取app信息---》",props.pickAppInfo)
+  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;
+    let isIn = true;
+    data.data.menuTree.forEach((item) => {
+      if (item.isLock == 1 && item.isMain == 1) {
+        pickAppMenu.value = item;
+        isIn = false;
+        switchPAge.value = 1;
+      }
+    });
+    if (isIn) {
+      pickAppMenu.value = data.data.menuTree[0];
+      if (pickAppMenu.value.type == 2) {
+        switchPAge.value = 2;
+      }
+    }
+  });
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-30 15:17:29
 @ 功能: 退出应用
 */
 const closeRunApp = () => {
-	emits("update:runIsOpen",false)
-	emits("refreshPage",props.searchQuery)
-}
+  emits("update:runIsOpen", false);
+  emits("refreshPage", props.searchQuery);
+};
 
-watch(()=>props.runIsOpen,(val:boolean)=>{
-	if(val){
-		gainAppContent()
-	}
-})
+watch(
+  () => props.runIsOpen,
+  (val: boolean) => {
+    if (val) {
+      gainAppContent();
+    }
+  }
+);
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-17 16:45:40
 @ 功能: 打开app表单
 */
-const openAppPage = (val:any) =>{
-	// console.log("打开app表单------>",val)
-	if(val.type!=1){
-		if(val.isLock==1){
-			switchPAge.value = 1
-		}else{
-			switchPAge.value = 2
-		}
-		pickAppMenu.value = val
-	}
-}
+const openAppPage = (val: any) => {
+  // console.log("打开app表单------>",val)
+  if (val.type != 1) {
+    if (val.isLock == 1) {
+      switchPAge.value = 1;
+    } else {
+      switchPAge.value = 2;
+    }
+    pickAppMenu.value = val;
+  }
+};
 </script>
 <template>
-	<el-drawer  v-model="props.runIsOpen" :with-header="false" :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :size="props.drawerWith">
-		<el-container  class="common-layout">
-			<el-header  class="headerBox">
-				<div>
-					<el-space wrap>
-						<el-avatar shape="square" :size="25" :src="appCont.appSvg" />
-						<el-text>{{ appCont.appName }}</el-text>
-					</el-space>
-				</div>
-				<div>
-					<el-dropdown>
-						<el-avatar shape="square" :size="25" :src="userStore.avatar" />
-						<template #dropdown>
-							<el-dropdown-item>
-								<table class="userTabel">
-									<tr>
-										<td rowspan="2"><el-avatar shape="square" :size="55" :src="userStore.avatar" /></td>
-										<td>{{ userStore.nickname }}({{ userStore.userInfoCont.number }})</td>
-									</tr>
-									<tr>
-										<td>{{ userStore.userInfoCont.companyname }}/{{ userStore.userInfoCont.departmentname }}</td>
-									</tr>
-								</table>
-							</el-dropdown-item>
-							<el-dropdown-item @click="closeRunApp()" divided>
-								<i class="fa fa-sign-out"></i>
-								<el-text class="mx-1" type="danger">退出</el-text>
-							</el-dropdown-item>
-						</template>
-					</el-dropdown>
-				</div>
-			</el-header>
-			<el-container>
-				<el-aside class="asideBox">
-					<el-row>
-						<el-col :span="24" class="asideBoxSearch">
-							<el-tree-select
-								v-model="pickAppMenuSel"
-								:data="menusTree"
-								:render-after-expand="false"
-								:suffix-icon="Search"
-								node-key="id"
-								clearable
-								filterable
-							/>
-						</el-col>
-					</el-row>
-					<el-tree
-						:data="menusTree"
-						node-key="id"
-						:allow-drop="allowDrop"
-						:expand-on-click-node="true"
-					>
-						<template #default="{ node, data }">
-							<div class="appMenuTitle" @click="openAppPage(data)">
-								<el-space wrap>
-									<svg-icon  prefix="icon" :icon-class="data.svg"  />
-									<el-tooltip :content="node.label" placement="top" effect="dark">
-										<el-text class="w-120px mb-2" truncated >{{node.label}}</el-text>
-									</el-tooltip>
-								</el-space>
-							</div>
-						</template>
-					</el-tree>
-				</el-aside>
-				<el-main  class="mainBox">
-					<RegularPage v-if="switchPAge==1" :pick-app-menu="pickAppMenu" :drawer-with="props.drawerWith" />
-					<RunAppForm v-else  :pick-app-menu="pickAppMenu" :drawer-with="props.drawerWith" />
-				</el-main>
-			</el-container>
-		</el-container>
-	</el-drawer>
+  <el-drawer
+    v-model="props.runIsOpen"
+    :with-header="false"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    :destroy-on-close="true"
+    :size="props.drawerWith"
+  >
+    <el-container class="common-layout">
+      <el-header class="headerBox">
+        <div>
+          <el-space wrap>
+            <el-avatar shape="square" :size="25" :src="appCont.appSvg" />
+            <el-text>{{ appCont.appName }}</el-text>
+          </el-space>
+        </div>
+        <div>
+          <el-dropdown>
+            <el-avatar shape="square" :size="25" :src="userStore.avatar" />
+            <template #dropdown>
+              <el-dropdown-item>
+                <table class="userTabel">
+                  <tr>
+                    <td rowspan="2">
+                      <el-avatar shape="square" :size="55" :src="userStore.avatar" />
+                    </td>
+                    <td>{{ userStore.nickname }}({{ userStore.userInfoCont.number }})</td>
+                  </tr>
+                  <tr>
+                    <td>
+                      {{ userStore.userInfoCont.companyname }}/{{
+                        userStore.userInfoCont.departmentname
+                      }}
+                    </td>
+                  </tr>
+                </table>
+              </el-dropdown-item>
+              <el-dropdown-item @click="closeRunApp()" divided>
+                <i class="fa fa-sign-out"></i>
+                <el-text class="mx-1" type="danger">退出</el-text>
+              </el-dropdown-item>
+            </template>
+          </el-dropdown>
+        </div>
+      </el-header>
+      <el-container>
+        <el-aside class="asideBox">
+          <el-row>
+            <el-col :span="24" class="asideBoxSearch">
+              <el-tree-select
+                v-model="pickAppMenuSel"
+                :data="menusTree"
+                :render-after-expand="false"
+                :suffix-icon="Search"
+                node-key="id"
+                clearable
+                filterable
+              />
+            </el-col>
+          </el-row>
+          <el-tree
+            :data="menusTree"
+            node-key="id"
+            :allow-drop="allowDrop"
+            :expand-on-click-node="true"
+          >
+            <template #default="{ node, data }">
+              <div class="appMenuTitle" @click="openAppPage(data)">
+                <el-space wrap>
+                  <svg-icon prefix="icon" :icon-class="data.svg" />
+                  <el-tooltip :content="node.label" placement="top" effect="dark">
+                    <el-text class="w-120px mb-2" truncated>{{ node.label }}</el-text>
+                  </el-tooltip>
+                </el-space>
+              </div>
+            </template>
+          </el-tree>
+        </el-aside>
+        <el-main class="mainBox">
+          <RegularPage
+            v-if="switchPAge == 1"
+            :pick-app-menu="pickAppMenu"
+            :drawer-with="props.drawerWith"
+          />
+          <RunAppForm
+            v-else
+            :pick-app-menu="pickAppMenu"
+            :drawer-with="props.drawerWith"
+          />
+        </el-main>
+      </el-container>
+    </el-container>
+  </el-drawer>
 </template>
-<style  lang='scss' scoped>
-.common-layout{
-	.el-header{
-		padding-left:10px;
-		padding-right:10px;
-	}
-	.headerBox{
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		border-bottom: 1px solid #F1F2F3;
-		: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;
-		}
-	}
-	.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;
+  }
+  .headerBox {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    border-bottom: 1px solid #f1f2f3;
+    :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;
+    }
+  }
+  .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 b263bee..abdb379 100644
--- a/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
+++ b/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
@@ -3,162 +3,174 @@
 @ 时间: 2024-05-31 09:22:06
 @ 备注: 执行表格
 -->
-<script lang='ts' setup>
-import { json2string,objToStringify,string2json,stringToObj } from '@/utils/DesignForm/form'
-import { judgeSubmitCancel,gainAppPageInfo,getFieldRecord  } from '@/api/DesignForm/requestapi'
-import {  Edit,Picture as IconPicture  } from '@element-plus/icons-vue'
-import { appPageDataInit,appWorkFlow } from "@/api/date/type"
-import { notAsA_BasisForJudgment,asAnApprovalActionControl,fixedValueControl,timeControl,timeEquation,submitButton, afreshSubmitButton } from '@/utils/workflow/const'
+<script lang="ts" setup>
+import {
+  json2string,
+  objToStringify,
+  string2json,
+  stringToObj,
+} from "@/utils/DesignForm/form";
+import {
+  judgeSubmitCancel,
+  gainAppPageInfo,
+  getFieldRecord,
+} from "@/api/DesignForm/requestapi";
+import { Edit, Picture as IconPicture } from "@element-plus/icons-vue";
+import { appPageDataInit, appWorkFlow } from "@/api/date/type";
+import {
+  notAsA_BasisForJudgment,
+  asAnApprovalActionControl,
+  fixedValueControl,
+  timeControl,
+  timeEquation,
+  submitButton,
+  afreshSubmitButton,
+} from "@/utils/workflow/const";
 
 const props = defineProps({
-	pickAppMenu:{
-		type:Object,
-		default(){
-			return {}
-		}
-	}
+  pickAppMenu: {
+    type: Object,
+    default() {
+      return {};
+    },
+  },
 });
-const activePage = ref(0)	//默认选择的页面
-const appInitData = ref<appPageDataInit>("")
+const activePage = ref(0); //默认选择的页面
+const appInitData = ref<appPageDataInit>("");
 //app表单
 const stateForm = reactive<any>({
-	type: 1, // 1新增；2修改；3查看（表单模式） ；4查看； 5设计
-    formData: {
-      list: [],
-      form: {},
-      config: {},
-	  powerstr:{}
-    },
-    dict: {},
-    formId: "1",
-    id: 0,
-	formId: 0,
-	versionId: 0,
-    loading: true
-})
+  type: 1, // 1新增；2修改；3查看（表单模式） ；4查看； 5设计
+  formData: {
+    list: [],
+    form: {},
+    config: {},
+    powerstr: {},
+  },
+  dict: {},
+  formId: "1",
+  id: 0,
+  formId: 0,
+  versionId: 0,
+  loading: true,
+});
 //表单列表
 const stateList = 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: [],
+      },
+    },
+    map: {
+      status: false,
+      isClick: false,
+      form: {
+        mapWord: "",
+        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 appFormTitle = ref("")
-const versionTitle = ref<string>("")	//表单名称
-const versionId = ref<string>("")	//表单版本号
-const appFlowInfo = ref<appWorkFlow>("")	//流程
-const isFlow = ref(2)
-const mastesformjson = ref("")	//
+    card: {
+      status: false,
+      isClick: false,
+      form: {
+        sort: 1,
+        sortWord: "",
+        imgWork: "",
+        imgWidth: 50,
+        imgHeight: 50,
+        imgBorderRadius: 5,
+        imgPadding: 2,
+        titleWork: "",
+        describe: "",
+        ranks: 3,
+        title: [],
+      },
+    },
+  },
+});
+const appFormTitle = ref("");
+const versionTitle = ref<string>(""); //表单名称
+const versionId = ref<string>(""); //表单版本号
+const appFlowInfo = ref<appWorkFlow>(""); //流程
+const isFlow = ref(2);
+const mastesformjson = ref(""); //
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-03 09:54:30
 @ 功能: 加载页面
 */
 onMounted(() => {
-	initLoadData()
-
+  initLoadData();
 });
 /**
 @ 作者: 秦东
@@ -166,174 +178,184 @@ onMounted(() => {
 @ 功能: 初始化数据
 */
 const initLoadData = () => {
-	// console.log("initLoadData",props.pickAppMenu.type,props.pickAppMenu.type != 1)
-	if(props.pickAppMenu.type != 1){
-		appFormTitle.value = props.pickAppMenu.label
-		gainAppPageInfo({id:props.pickAppMenu.id})
-		.then((data)=>{
-			// console.log("获取初始化表单数据bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",data)
-			appInitData.value = data.data
-			// console.log("获取初始化表单数据---!",appInitData.value)
-			mastesformjson.value = data.data.appForm.mastesformjson
-			isFlow.value = data.data.appForm.flowIsOpen
-			if (data.data.page && data.data.pageList  && data.data.appFlow){
-				activePage.value = 1
-			}else if (data.data.page && !data.data.pageList  && data.data.appFlow){
-				activePage.value = 2
-			}else if (!data.data.page && !data.data.pageList  && data.data.appFlow){
-				activePage.value = 3
-			}else if (!data.data.page && data.data.pageList  && data.data.appFlow){
-				activePage.value = 1
-			}else if (data.data.page && !data.data.pageList  && !data.data.appFlow){
-				activePage.value = 2
-			}else{
-				activePage.value = 1
-			}
-			versionId.value = data.data.appForm.id.toString()
-			versionTitle.value = data.data.appForm.name
-			if(data.data.pageList){
-				let stateData = string2json(data.data.appForm.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++){
-						for(let u = 0;u<holeControlAndConfigStateData.list.length;u++){
-							if(stateData.tableData.columns[i].id==holeControlAndConfigStateData.list[u].name){
-								stateData.tableData.columns[i].control = holeControlAndConfigStateData.list[u].control
-								stateData.tableData.columns[i].config = holeControlAndConfigStateData.list[u].config
-							}
-							
-						}
-
+  // console.log("initLoadData",props.pickAppMenu.type,props.pickAppMenu.type != 1)
+  if (props.pickAppMenu.type != 1) {
+    appFormTitle.value = props.pickAppMenu.label;
+    gainAppPageInfo({ id: props.pickAppMenu.id }).then((data) => {
+      // console.log("获取初始化表单数据bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",data)
+      appInitData.value = data.data;
+      // console.log("获取初始化表单数据---!",appInitData.value)
+      mastesformjson.value = data.data.appForm.mastesformjson;
+      isFlow.value = data.data.appForm.flowIsOpen;
+      if (data.data.page && data.data.pageList && data.data.appFlow) {
+        activePage.value = 1;
+      } else if (data.data.page && !data.data.pageList && data.data.appFlow) {
+        activePage.value = 2;
+      } else if (!data.data.page && !data.data.pageList && data.data.appFlow) {
+        activePage.value = 3;
+      } else if (!data.data.page && data.data.pageList && data.data.appFlow) {
+        activePage.value = 1;
+      } else if (data.data.page && !data.data.pageList && !data.data.appFlow) {
+        activePage.value = 2;
+      } else {
+        activePage.value = 1;
+      }
+      versionId.value = data.data.appForm.id.toString();
+      versionTitle.value = data.data.appForm.name;
+      if (data.data.pageList) {
+        let stateData = string2json(data.data.appForm.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++) {
+            for (let u = 0; u < holeControlAndConfigStateData.list.length; u++) {
+              if (
+                stateData.tableData.columns[i].id ==
+                holeControlAndConfigStateData.list[u].name
+              ) {
+                stateData.tableData.columns[i].control =
+                  holeControlAndConfigStateData.list[u].control;
+                stateData.tableData.columns[i].config =
+                  holeControlAndConfigStateData.list[u].config;
+              }
+            }
 
-						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 (
+              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("runAppForm-----214",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
-											}
-										}
-									}
-								})
-							}
-							if(stateData.searchData && 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){
-										
-										
-										// console.log(stateData.tableData.columns[i])
-										stateData.searchData[j].control = stateData.tableData.columns[i].control
-										stateData.searchData[j].config = stateData.tableData.columns[i].config
-										// console.log(stateData.searchData[j])
-									}
-								}
-							}
-						}
-					}
-				}
-				stateList.tableData = stateData.tableData
-				stateList.searchData = stateData.searchData
-				if(stateList.searchData == null){
-					stateList.searchData = new Array()
-				}
-				stateList.loading = stateData.loading
-				stateList.attrObj = stateData.attrObj
-				stateList.config = stateData.config
-				stateList.tagList = stateData.tagList
-				stateList.formList = stateData.formList
-				stateList.name = stateData.name
-				stateList.treeData = stateData.treeData
-				stateList.previewVisible = stateData.previewVisible
-				stateList.formFieldList = stateData.formFieldList
-				stateList.formApi = stateData.formApi
-				stateList.dict = stateData.dict
-				stateList.refreshTable = stateData.refreshTable
-				if(stateData.view){
-					stateList.view = stateData.view
-				}
-				
-			}
-			if(data.data.page){
-				// console.log("data.data.mastesform", data.data)
-				stateForm.id=data.data.appForm.version.toString()
-				stateForm.formId =data.data.appForm.cfid.toString()
-				stateForm.versionId =data.data.appForm.id.toString()
-				stateForm.formData = stringToObj(data.data.appForm.mastesform)
-				stateForm.dict = string2json(data.data.appForm.dict)
-				stateForm.formData.powerstr = string2json(data.data.appForm.powerstr)
-				// console.log("data.data.mastesform", stateForm.formData)
-				
-				judgeSubmitCancel({"name":data.data.appForm.mastesformjson})
-					.then((datajud:any) =>{
-						if(datajud.code == 0){
-							if (datajud.data == 3 || datajud.data == 4){
-								stateForm.formData.list.push(submitButton)
-							}
-						}
-					})
-			}
-			if(data.data.appFlow){
-				appFlowInfo.value = data.data.workFlow
-			}
-		})
-	}
-	
-}
+              //console.log("runAppForm-----214",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;
+                      }
+                    }
+                  }
+                });
+              }
+              if (stateData.searchData && 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) {
+                    // console.log(stateData.tableData.columns[i])
+                    stateData.searchData[j].control =
+                      stateData.tableData.columns[i].control;
+                    stateData.searchData[j].config =
+                      stateData.tableData.columns[i].config;
+                    // console.log(stateData.searchData[j])
+                  }
+                }
+              }
+            }
+          }
+        }
+        stateList.tableData = stateData.tableData;
+        stateList.searchData = stateData.searchData;
+        if (stateList.searchData == null) {
+          stateList.searchData = new Array();
+        }
+        stateList.loading = stateData.loading;
+        stateList.attrObj = stateData.attrObj;
+        stateList.config = stateData.config;
+        stateList.tagList = stateData.tagList;
+        stateList.formList = stateData.formList;
+        stateList.name = stateData.name;
+        stateList.treeData = stateData.treeData;
+        stateList.previewVisible = stateData.previewVisible;
+        stateList.formFieldList = stateData.formFieldList;
+        stateList.formApi = stateData.formApi;
+        stateList.dict = stateData.dict;
+        stateList.refreshTable = stateData.refreshTable;
+        if (stateData.view) {
+          stateList.view = stateData.view;
+        }
+      }
+      if (data.data.page) {
+        // console.log("data.data.mastesform", data.data)
+        stateForm.id = data.data.appForm.version.toString();
+        stateForm.formId = data.data.appForm.cfid.toString();
+        stateForm.versionId = data.data.appForm.id.toString();
+        stateForm.formData = stringToObj(data.data.appForm.mastesform);
+        stateForm.dict = string2json(data.data.appForm.dict);
+        stateForm.formData.powerstr = string2json(data.data.appForm.powerstr);
+        // console.log("data.data.mastesform", stateForm.formData)
+
+        judgeSubmitCancel({ name: data.data.appForm.mastesformjson }).then(
+          (datajud: any) => {
+            if (datajud.code == 0) {
+              if (datajud.data == 3 || datajud.data == 4) {
+                stateForm.formData.list.push(submitButton);
+              }
+            }
+          }
+        );
+      }
+      if (data.data.appFlow) {
+        appFlowInfo.value = data.data.workFlow;
+      }
+    });
+  }
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-03 09:26:17
 @ 功能: 监听菜单数据变化
 */
-watch(() => props.pickAppMenu,(val:any) => {
-	initLoadData()
-},{
-    deep: true
-})
+watch(
+  () => props.pickAppMenu,
+  (val: any) => {
+    initLoadData();
+  },
+  {
+    deep: true,
+  }
+);
 
-function optionsValue3Get3(data: any,fieldName: string){
-	
-	for(let i = 0; i < stateForm.formData.list.length; i++){
-		if(stateForm.formData.list[i].name==fieldName){
-			stateForm.formData.list[i].options = []
-			for(let j = 0;j<data.length;j++){
-				stateForm.formData.list[i].options.push(data[j])
-			}
-		}
-	}
+function optionsValue3Get3(data: any, fieldName: string) {
+  for (let i = 0; i < stateForm.formData.list.length; i++) {
+    if (stateForm.formData.list[i].name == fieldName) {
+      stateForm.formData.list[i].options = [];
+      for (let j = 0; j < data.length; j++) {
+        stateForm.formData.list[i].options.push(data[j]);
+      }
+    }
+  }
 }
 </script>
 <template>
-	<el-row>
-		<el-col :span="24" class="pageBox pageHeader">
-			<el-text class="wordFont">{{ appFormTitle}}</el-text>
-		</el-col>
-		<el-col :span="24">
-			<el-scrollbar class="scroBox">
-				<el-card class="tispMsg"  shadow="always">
-		
-					<AppPageList v-if="appInitData.pageList"
-						:data="stateList.tableData"
-						:search-data="stateList.searchData"
-						:config="stateList.config"
-						:form-id="appInitData.appForm.cfid.toString()"
-						:versionid="appInitData.versionId" 
-						:versiontitle="versionTitle"
-						:sign-code="appInitData.signCode"
-						:pickAppMenu="props.pickAppMenu"
-						:viewPage="stateList.view"
-					/>
-					<!-- <AppFormPage
+  <el-row>
+    <el-col :span="24" class="pageBox pageHeader">
+      <el-text class="wordFont">{{ appFormTitle }}</el-text>
+    </el-col>
+    <el-col :span="24">
+      <el-scrollbar class="scroBox">
+        <el-card class="tispMsg" shadow="always">
+          <AppPageList
+            v-if="appInitData.pageList"
+            :data="stateList.tableData"
+            :search-data="stateList.searchData"
+            :config="stateList.config"
+            :form-id="appInitData.appForm.cfid.toString()"
+            :versionid="appInitData.versionId"
+            :versiontitle="versionTitle"
+            :sign-code="appInitData.signCode"
+            :pickAppMenu="props.pickAppMenu"
+            :viewPage="stateList.view"
+          />
+          <!-- <AppFormPage
 						v-else
 						ref="formEl"
 						:number="props.pickAppMenu.id"
@@ -348,48 +370,46 @@ function optionsValue3Get3(data: any,fieldName: string){
 						add-url="addData"
 						@optionsValue3Get3="optionsValue3Get3"
 					/> -->
-					<ak-form
-						v-else
-						ref="formEl"
-						:number="props.pickAppMenu.id"
-						:isWorkFlow="isFlow"
-						:form-data="stateForm.formData"
-						:type="1"
-						:mastesformjson="mastesformjson"
-						:flowkey="appInitData.flowkey"
-						:groupid="appInitData.groupid"
-						:sign-code="appInitData.signCode"
-						:version-id="appInitData.versionId"
-						add-url="addData"
-						@optionsValue3Get3="optionsValue3Get3"
-					/>
-
-				</el-card>
-			</el-scrollbar>
-		</el-col>
-	</el-row>
-	
+          <ak-form
+            v-else
+            ref="formEl"
+            :number="props.pickAppMenu.id"
+            :isWorkFlow="isFlow"
+            :form-data="stateForm.formData"
+            :type="1"
+            :mastesformjson="mastesformjson"
+            :flowkey="appInitData.flowkey"
+            :groupid="appInitData.groupid"
+            :sign-code="appInitData.signCode"
+            :version-id="appInitData.versionId"
+            add-url="addData"
+            @optionsValue3Get3="optionsValue3Get3"
+          />
+        </el-card>
+      </el-scrollbar>
+    </el-col>
+  </el-row>
 </template>
-<style  lang='scss' scoped>
-.pageBox{
-	padding: 0 15px;
-	.wordFont{
-		font-size: 20px;
-	}
+<style lang="scss" scoped>
+.pageBox {
+  padding: 0 15px;
+  .wordFont {
+    font-size: 20px;
+  }
 }
-.pageHeader{
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	background-color: #FFFFFF;
-	padding:15px 15px 5px 15px;
-	margin-bottom: 15px;
+.pageHeader {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background-color: #ffffff;
+  padding: 15px 15px 5px 15px;
+  margin-bottom: 15px;
 }
-.scroBox{
-	padding:0 15px;
-	height: calc(100vh - 110px);
-	.tispMsg{
-		margin:0 auto 15px auto;
-	}
+.scroBox {
+  padding: 0 15px;
+  height: calc(100vh - 110px);
+  .tispMsg {
+    margin: 0 auto 15px auto;
+  }
 }
 </style>