diff --git a/assets/myToDoPage-952c20f8.js b/assets/myToDoPage-952c20f8.js
index 2efa7b1..c7c19b6 100644
--- a/assets/myToDoPage-952c20f8.js
+++ b/assets/myToDoPage-952c20f8.js
@@ -1 +1 @@
-import{d as W,r as d,ao as C,ax as q,G as H,a as r,f as F,h as l,c as i,I as D,$ as L,q as v,e as o,b as t,as as Y,H as s,Y as J,t as m,F as X,g as Z,f_ as ee,aj as te,an as oe,ab as ae,b3 as ne,aF as le,cz as se,N as re,b4 as ie,aA as pe,at as de,p as ce,m as _e,_ as ue}from"./index-e450010e.js";import{_ as fe}from"./index-c5018719.js";import{_ as me}from"./refresh-f1723430.js";import{_ as ge}from"./search-71444aff.js";import we from"./lookFlowInfoApp-293e6f1f.js";import"./runFlowStepApp-c2ddd4a0.js";const ye=c=>(ce("data-v-7bd64948"),c=c(),_e(),c),be={ref:"myappbox",class:"app_box"},ke={class:"app-container"},ve={class:"search"},xe=ye(()=>v("div",{class:"titleBox"}," 代办事宜 ",-1)),he=W({__name:"myToDoPage",props:{pickAppMenu:{type:Object,default(){return{}}},drawerWith:{type:Number,default:0}},setup(c){const x=c,V=d(!1),h=d(C),T=d([]),n=q({page:1,pagesize:20,class:2,id:x.pickAppMenu.appkey}),g=d(0),z=()=>{n.page=1,n.pagesize=15,n.title="",n.class=2,n.state=0},A=()=>{h.value.resetFields(),z()},I=()=>{ee(n).then(u=>{g.value=u.data.total,T.value=u.data.list})};H(()=>{I()});const w=()=>{I()},E=d(),_=d(!1),B=(u,a)=>{E.value=u,_.value=!0},U=()=>{};return(u,a)=>{const S=te,N=oe,M=ge,y=ae,O=me,P=C,p=ne,b=le,f=se,$=re,R=ie,j=fe,G=pe,K=de;return r(),F("div",be,[l(_)?(r(),i(we,{key:0,isshow:l(_),"onUpdate:isshow":a[0]||(a[0]=e=>D(_)?_.value=e:null),"flow-log-info":l(E),"drawer-with":x.drawerWith,onGetmytodolist:w},null,8,["isshow","flow-log-info","drawer-with"])):L("",!0),v("div",ke,[v("div",ve,[xe,o(P,{ref_key:"searckFormRefTd",ref:h,model:l(n),inline:!0},{default:t(()=>[o(N,{label:"任务标题",prop:"name"},{default:t(()=>[o(S,{modelValue:l(n).title,"onUpdate:modelValue":a[1]||(a[1]=e=>l(n).title=e),placeholder:"请输入任务标题",clearable:"",onKeyup:Y(U,["enter"])},null,8,["modelValue"])]),_:1}),o(N,null,{default:t(()=>[o(y,{type:"primary",onClick:a[2]||(a[2]=e=>w())},{default:t(()=>[o(M),s("搜索")]),_:1}),o(y,{onClick:a[3]||(a[3]=e=>A())},{default:t(()=>[o(O),s("重置")]),_:1})]),_:1})]),_:1},8,["model"])]),o(G,{shadow:"never"},{default:t(()=>[J((r(),i(R,{"element-loading-text":"Loading...","highlight-current-row":"",data:l(T),border:"",class:"table_box"},{default:t(()=>[o(p,{fixed:"",label:"标题",prop:"title",width:"500"}),o(p,{label:"创建人",prop:"creater",width:"150",align:"center"},{default:t(e=>[s(m(e.row.creatorInfo.name)+"（",1),o(b,{type:"info"},{default:t(()=>[s(m(e.row.creatorInfo.number),1)]),_:2},1024),s("） ")]),_:1}),o(p,{label:"发起日期",prop:"startDate",align:"center","min-width":"200"}),o(p,{label:"状态",prop:"status",align:"center",width:"120"},{default:t(e=>[e.row.status==1?(r(),i(f,{key:0,class:"mx-1",effect:"plain",round:""},{default:t(()=>[s(" 草稿 ")]),_:1})):e.row.status==2?(r(),i(f,{key:1,type:"danger",class:"mx-1",effect:"plain",round:""},{default:t(()=>[s(" 驳回 ")]),_:1})):e.row.status==3?(r(),i(f,{key:2,type:"success",class:"mx-1",effect:"plain",round:""},{default:t(()=>[s(" 审批中 ")]),_:1})):e.row.status==4?(r(),i(f,{key:3,type:"info",class:"mx-1",effect:"plain",round:""},{default:t(()=>[s(" 归档 ")]),_:1})):(r(),i(f,{key:4,type:"info",class:"mx-1",effect:"plain",round:""},{default:t(()=>[s(" 删除 ")]),_:1}))]),_:1}),o(p,{label:"当前节点及操作人",prop:"currentStep",width:"200"},{default:t(e=>[e.row.currentNodeName?(r(),i(b,{key:0,type:"success"},{default:t(()=>[s(m(e.row.currentNodeName)+"：",1)]),_:2},1024)):L("",!0),(r(!0),F(X,null,Z(e.row.currentNodeUser,(k,Q)=>(r(),i(b,{key:Q,type:"warning"},{default:t(()=>[s(m(k.name)+"("+m(k.number)+")",1)]),_:2},1024))),128))]),_:1}),o(p,{fixed:"right",align:"center",label:"操作",width:"100"},{default:t(e=>[o($,{class:"box-item",effect:"dark",content:"查看详情",placement:"top-end"},{default:t(()=>[o(y,{type:"primary",size:"small",class:"fa fa-eye",onClick:k=>B(e.row,2)},null,8,["onClick"])]),_:2},1024)]),_:1})]),_:1},8,["data"])),[[K,l(V)]]),o(j,{total:l(g),"onUpdate:total":a[4]||(a[4]=e=>D(g)?g.value=e:null),page:l(n).page,"onUpdate:page":a[5]||(a[5]=e=>l(n).page=e),limit:l(n).pagesize,"onUpdate:limit":a[6]||(a[6]=e=>l(n).pagesize=e),onPagination:w},null,8,["total","page","limit"])]),_:1})])],512)}}});const De=ue(he,[["__scopeId","data-v-7bd64948"]]);export{De as default};
+import{d as W,r as d,ao as C,ax as q,G as H,a as r,f as F,h as l,c as i,I as D,$ as L,q as v,e as o,b as t,as as Y,H as s,Y as J,t as m,F as X,g as Z,f_ as ee,aj as te,an as oe,ab as ae,b3 as ne,aF as le,cz as se,N as re,b4 as ie,aA as pe,at as de,p as ce,m as _e,_ as ue}from"./index-e450010e.js";import{_ as fe}from"./index-c5018719.js";import{_ as me}from"./refresh-f1723430.js";import{_ as ge}from"./search-71444aff.js";import we from"./lookFlowInfoApp-293e6f1f.js";import"./runFlowStepApp-c2ddd4a0.js";const ye=c=>(ce("data-v-7bd64948"),c=c(),_e(),c),be={ref:"myappbox",class:"app_box"},ke={class:"app-container"},ve={class:"search"},xe=ye(()=>v("div",{class:"titleBox"}," 待办事宜 ",-1)),he=W({__name:"myToDoPage",props:{pickAppMenu:{type:Object,default(){return{}}},drawerWith:{type:Number,default:0}},setup(c){const x=c,V=d(!1),h=d(C),T=d([]),n=q({page:1,pagesize:20,class:2,id:x.pickAppMenu.appkey}),g=d(0),z=()=>{n.page=1,n.pagesize=15,n.title="",n.class=2,n.state=0},A=()=>{h.value.resetFields(),z()},I=()=>{ee(n).then(u=>{g.value=u.data.total,T.value=u.data.list})};H(()=>{I()});const w=()=>{I()},E=d(),_=d(!1),B=(u,a)=>{E.value=u,_.value=!0},U=()=>{};return(u,a)=>{const S=te,N=oe,M=ge,y=ae,O=me,P=C,p=ne,b=le,f=se,$=re,R=ie,j=fe,G=pe,K=de;return r(),F("div",be,[l(_)?(r(),i(we,{key:0,isshow:l(_),"onUpdate:isshow":a[0]||(a[0]=e=>D(_)?_.value=e:null),"flow-log-info":l(E),"drawer-with":x.drawerWith,onGetmytodolist:w},null,8,["isshow","flow-log-info","drawer-with"])):L("",!0),v("div",ke,[v("div",ve,[xe,o(P,{ref_key:"searckFormRefTd",ref:h,model:l(n),inline:!0},{default:t(()=>[o(N,{label:"任务标题",prop:"name"},{default:t(()=>[o(S,{modelValue:l(n).title,"onUpdate:modelValue":a[1]||(a[1]=e=>l(n).title=e),placeholder:"请输入任务标题",clearable:"",onKeyup:Y(U,["enter"])},null,8,["modelValue"])]),_:1}),o(N,null,{default:t(()=>[o(y,{type:"primary",onClick:a[2]||(a[2]=e=>w())},{default:t(()=>[o(M),s("搜索")]),_:1}),o(y,{onClick:a[3]||(a[3]=e=>A())},{default:t(()=>[o(O),s("重置")]),_:1})]),_:1})]),_:1},8,["model"])]),o(G,{shadow:"never"},{default:t(()=>[J((r(),i(R,{"element-loading-text":"Loading...","highlight-current-row":"",data:l(T),border:"",class:"table_box"},{default:t(()=>[o(p,{fixed:"",label:"标题",prop:"title",width:"500"}),o(p,{label:"创建人",prop:"creater",width:"150",align:"center"},{default:t(e=>[s(m(e.row.creatorInfo.name)+"（",1),o(b,{type:"info"},{default:t(()=>[s(m(e.row.creatorInfo.number),1)]),_:2},1024),s("） ")]),_:1}),o(p,{label:"发起日期",prop:"startDate",align:"center","min-width":"200"}),o(p,{label:"状态",prop:"status",align:"center",width:"120"},{default:t(e=>[e.row.status==1?(r(),i(f,{key:0,class:"mx-1",effect:"plain",round:""},{default:t(()=>[s(" 草稿 ")]),_:1})):e.row.status==2?(r(),i(f,{key:1,type:"danger",class:"mx-1",effect:"plain",round:""},{default:t(()=>[s(" 驳回 ")]),_:1})):e.row.status==3?(r(),i(f,{key:2,type:"success",class:"mx-1",effect:"plain",round:""},{default:t(()=>[s(" 审批中 ")]),_:1})):e.row.status==4?(r(),i(f,{key:3,type:"info",class:"mx-1",effect:"plain",round:""},{default:t(()=>[s(" 归档 ")]),_:1})):(r(),i(f,{key:4,type:"info",class:"mx-1",effect:"plain",round:""},{default:t(()=>[s(" 删除 ")]),_:1}))]),_:1}),o(p,{label:"当前节点及操作人",prop:"currentStep",width:"200"},{default:t(e=>[e.row.currentNodeName?(r(),i(b,{key:0,type:"success"},{default:t(()=>[s(m(e.row.currentNodeName)+"：",1)]),_:2},1024)):L("",!0),(r(!0),F(X,null,Z(e.row.currentNodeUser,(k,Q)=>(r(),i(b,{key:Q,type:"warning"},{default:t(()=>[s(m(k.name)+"("+m(k.number)+")",1)]),_:2},1024))),128))]),_:1}),o(p,{fixed:"right",align:"center",label:"操作",width:"100"},{default:t(e=>[o($,{class:"box-item",effect:"dark",content:"查看详情",placement:"top-end"},{default:t(()=>[o(y,{type:"primary",size:"small",class:"fa fa-eye",onClick:k=>B(e.row,2)},null,8,["onClick"])]),_:2},1024)]),_:1})]),_:1},8,["data"])),[[K,l(V)]]),o(j,{total:l(g),"onUpdate:total":a[4]||(a[4]=e=>D(g)?g.value=e:null),page:l(n).page,"onUpdate:page":a[5]||(a[5]=e=>l(n).page=e),limit:l(n).pagesize,"onUpdate:limit":a[6]||(a[6]=e=>l(n).pagesize=e),onPagination:w},null,8,["total","page","limit"])]),_:1})])],512)}}});const De=ue(he,[["__scopeId","data-v-7bd64948"]]);export{De as default};
diff --git a/src/api/DesignForm/types.ts b/src/api/DesignForm/types.ts
index 40bf9f7..df72444 100644
--- a/src/api/DesignForm/types.ts
+++ b/src/api/DesignForm/types.ts
@@ -52,6 +52,11 @@ export interface FormData {
 	  beforeSubmit?: Function
 	  afterSubmit?: Function
 	  change?: Function
+	  saveEditFormInfo?: Function
+	  saveDraftPage?: Function
+	  sendDraftSubmit?: Function
+	  submitEdit?: Function
+	  anewSubmit?: Function
 	}
 	styles:{
 		divStyle:{},
@@ -153,6 +158,8 @@ export interface formOtherData{
 }
 //表单结构体
 export interface formStruct{
+    tooltip: any
+    isSearch: any
 	formData:formData;
 	editor: any;
     loading: boolean;
@@ -196,6 +203,8 @@ export interface PublicAtrr{
 	isNum?:boolean;
 	inputStyle?:string;
 	vIf?:any;
+	selectvalue?:any;
+	control?:any;
 }
 //低代码视频单个属性对象
 export interface VideoMsg  {
diff --git a/src/api/doc/space.ts b/src/api/doc/space.ts
index 3d3a850..381df27 100644
--- a/src/api/doc/space.ts
+++ b/src/api/doc/space.ts
@@ -356,4 +356,4 @@ export function newShareChat(data: any){
       },
     data: data
   });
-}
\ No newline at end of file
+}
diff --git a/src/api/javaRequest.ts b/src/api/javaRequest.ts
new file mode 100644
index 0000000..0ab5ae4
--- /dev/null
+++ b/src/api/javaRequest.ts
@@ -0,0 +1,125 @@
+import request from "@/utils/request";
+
+const getAssociatedFormsCurrentFieldTree = (data:any) => {
+  return request({
+    url: "/javasys/lowCode/AssociatedForms/getFieldTree",
+    method: "post",
+    data: {
+      //cfid:'13'
+      cfid: data,
+    },
+  });
+}
+
+const getAssociatedFormsOrgAndManTree = () => {
+  return request({
+    url: "/javasys/lowCode/transfer/getOrgAndManTree",
+    method: "post",
+  });
+}
+
+const getCustomerFormList = () => {
+  return request({
+    url: "/javasys/lowCode/AssociatedForms/getCustomerFormList",
+    method: "post",
+  });
+}
+const getAssociatedFormsRoleTree = () => {
+  return request({
+    url: "/javasys/lowCode/AssociatedForms/getRoleList",
+    method: "post",
+  });
+}
+
+const getAsfasfFieldTree = (data:any) => {
+  return request({
+    url: "/javasys/lowCode/AssociatedForms/getFieldTree",
+    method: "post",
+    data: {
+      //cfid:'13'
+      cfid: data,
+    },
+  });
+}
+
+const getAsfasfFieldTreeOptionsValue3 = (data:any) => {
+  return request({
+    url: "/javasys/lowCode/AssociatedForms/getFieldTree",
+    method: "post",
+    data: {
+      //cfid:'13'
+      cfid: data,
+    },
+  });
+}
+const getQrCodeImgInside = (data:any) => {
+  return request({
+    url: "/javasys/lowCode/QrCode/getQrCodeImgInside",
+    method: "post",
+    data: {
+      cfid: data,
+    },
+  });
+}
+const getAllRole = () => {
+  return request({
+    url: "/javasys/lowCode/manCont/getAllRole",
+    method: "get",
+  });
+}
+const getPersonByRoleId = (id:any,pageNum:any,pageSize:any,number:any,names:any) => {
+    return request({
+        url: "/javasys/lowCode/manCont/getPersonByRoleId",
+        method: "post",
+        data: {
+            id: id,
+            pageNum: pageNum,
+            pageSize: pageSize,
+            number:number,
+            name:names
+        },
+    });
+}
+const queryIfOrgOrPerson = (obj: { left: string; operator: string; right: string }) => {
+  return request({
+    url: "/javasys/lowCode/AssociatedForms/queryIfOrgOrPerson",
+    method: "post",
+    data: obj,
+  });
+}
+const queryHideRoleCondition = (obj: { left: string; operator: string; right: string }) => {
+  return request({
+    url: "/javasys/lowCode/AssociatedForms/queryHideRoleCondition",
+    method: "post",
+    data: obj,
+  });
+}
+const getMainOrgByWorkNumber = (obj: { workNumber: string}) => {
+  return request({
+    url: "/javasys/lowCode/manCont/getMainOrgByWorkNumber",
+    method: "post",
+    data: obj,
+  });
+}
+const treeUrl = '/javasys/lowCode/transfer/getOrgAndManTree'
+const getOrgAndManTree = () => {
+    return request({
+        url: treeUrl,
+        method: 'post',
+    });
+}
+export {
+  getAssociatedFormsCurrentFieldTree,
+  getAssociatedFormsOrgAndManTree,
+  getCustomerFormList,
+  getAssociatedFormsRoleTree,
+  getAsfasfFieldTree,
+  getAsfasfFieldTreeOptionsValue3,
+  getQrCodeImgInside,
+  getAllRole,
+  getPersonByRoleId,
+  queryIfOrgOrPerson,
+  queryHideRoleCondition,
+  getMainOrgByWorkNumber,
+  getOrgAndManTree
+}
diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue
index 80cff12..14767f7 100644
--- a/src/components/DesignForm/app/index.vue
+++ b/src/components/DesignForm/app/index.vue
@@ -1137,10 +1137,10 @@ watch(
 
 
 
-const timeAxisRef = ref(null);
-const groupPageRef = ref(null);
-const calendarPageRef = ref(null);
-const cardPageRef = ref(null);
+const timeAxisRef = ref();
+const groupPageRef = ref();
+const calendarPageRef = ref();
+const cardPageRef = ref();
 const searchSend = reactive({
   formId: props.formId,
   page: state.currentPage,
@@ -2476,9 +2476,9 @@ const getNonValue = () => {
               sortable="custom"
               align="center"
             >
-              <template #default="scope">
-                <template v-for="sunItem in item.children" v-if="item.pattern == 'table'"> 
-                  <el-table-column  v-if="sunItem.fieldClass == ''" :prop="sunItem.field" :label="sunItem.label"  header-align="center"  align="center" :min-width="readerColumnSun(sunItem)">
+              <template v-if="item.pattern == 'table'" #default>
+                <template  v-for="sunItem in item.children" :key="sunItem.field"> 
+                  <el-table-column v-if="sunItem.fieldClass == ''"   v-bind="sunItem" :prop="sunItem.field" :label="sunItem.label"  header-align="center"  align="center" :min-width="readerColumnSun(sunItem)">
                     <template #default="scopeChilder">
                       <div v-html="tableChildren(sunItem.field,scopeChilder.row[item.field])"></div>
                     </template>
diff --git a/src/components/DesignForm/app/index_20260129.vue b/src/components/DesignForm/app/index_20260129.vue
index bce9adb..383f81a 100644
--- a/src/components/DesignForm/app/index_20260129.vue
+++ b/src/components/DesignForm/app/index_20260129.vue
@@ -51,7 +51,7 @@ const props = withDefaults(
         formBasicConfig?: any;
         fieldsDetailList?: any;
         orgAndManTree?: any;
-        echatsViews: echatsViewStruct;
+        echatsViews: echatsViewStruct[];
     }>(),
     {
         showPage: true,
@@ -173,6 +173,9 @@ const props = withDefaults(
         pickAppMenu: () => {
             return {};
         },
+        echatsViews: () => {
+            return [];
+        },
         beforeRequest: (params: any, rout: any):any => {
             return
         },
diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts
index 36282c1..19c9fb2 100644
--- a/src/components/DesignForm/assembly/index.ts
+++ b/src/components/DesignForm/assembly/index.ts
@@ -306,97 +306,97 @@ export default [
 					inputStyle: {}
 				}
 			},
-			// {
-			// 	type: 'select',
-			// 	label: '下拉选择框',
-			// 	unitName: '下拉选择框',
-			// 	icon: 'select',
-			// 	iconFont: 'fa-toggle-down',
-			// 	control: {
-			// 		modelValue: '',
-			// 		appendToBody: true,
-			// 		glxxsz: [],
-			// 		zdtcsz: {
-			// 			tbx: '',
-			// 			tby: ''
-			// 		},
-			// 		optionsValue3Formid:'',
-			// 		optionsValue3Field:'',
-			// 	},
-			// 	options: selectOption,
-			// 	config: config,
-			// 	styles: {
-			// 		divStyle: {
-			// 			marginBot: "15"
-			// 		},
-			// 		labelStyle: {
-			// 			//paddingLeft: "7",
-			// 		},
-			// 		inputStyle: {}
-			// 	}
-			// },
-			// {
-			// 	type: 'cascader',
-			// 	label: '级联选择器',
-			// 	unitName: '级联选择器',
-			// 	icon: 'cascader',
-			// 	iconFont: 'fa-sitemap',
-			// 	control: {
-			// 		modelValue: []
-			// 	},
-			// 	options: [],
-			// 	config: config,
-			// 	styles: {
-			// 		divStyle: {
-			// 			marginBot: "15"
-			// 		},
-			// 		labelStyle: {
-			// 			//paddingLeft: "7",
-			// 		},
-			// 		inputStyle: {}
-			// 	}
-			// },
-			// {
-			// 	type: 'datePicker',
-			// 	label: '日期选择器',
-			// 	unitName: '日期选择器',
-			// 	icon: 'todo',
-			// 	iconFont: 'fa-calendar',
-			// 	control: {
-			// 		modelValue: '',
-			// 		type: 'date'
-			// 	},
-			// 	config: {},
-			// 	styles: {
-			// 		divStyle: {
-			// 			marginBot: "15"
-			// 		},
-			// 		labelStyle: {
-			// 			//paddingLeft: "7",
-			// 		},
-			// 		inputStyle: {}
-			// 	}
-			// },
-			// {
-			// 	type: 'timePicker',
-			// 	label: '时间选择器',
-			// 	unitName: '时间选择器',
-			// 	icon: 'time',
-			// 	iconFont: 'fa-clock-o',
-			// 	control: {
-			// 		modelValue: ''
-			// 	},
-			// 	config: {},
-			// 	styles: {
-			// 		divStyle: {
-			// 			marginBot: "15"
-			// 		},
-			// 		labelStyle: {
-			// 			//paddingLeft: "7",
-			// 		},
-			// 		inputStyle: {}
-			// 	}
-			// },
+			{
+				type: 'select',
+				label: '下拉选择框',
+				unitName: '下拉选择框',
+				icon: 'select',
+				iconFont: 'fa-toggle-down',
+				control: {
+					modelValue: '',
+					appendToBody: true,
+					glxxsz: [],
+					zdtcsz: {
+						tbx: '',
+						tby: ''
+					},
+					optionsValue3Formid:'',
+					optionsValue3Field:'',
+				},
+				options: selectOption,
+				config: config,
+				styles: {
+					divStyle: {
+						marginBot: "15"
+					},
+					labelStyle: {
+						//paddingLeft: "7",
+					},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'cascader',
+				label: '级联选择器',
+				unitName: '级联选择器',
+				icon: 'cascader',
+				iconFont: 'fa-sitemap',
+				control: {
+					modelValue: []
+				},
+				options: [],
+				config: config,
+				styles: {
+					divStyle: {
+						marginBot: "15"
+					},
+					labelStyle: {
+						//paddingLeft: "7",
+					},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'datePicker',
+				label: '日期选择器',
+				unitName: '日期选择器',
+				icon: 'todo',
+				iconFont: 'fa-calendar',
+				control: {
+					modelValue: '',
+					type: 'date'
+				},
+				config: {},
+				styles: {
+					divStyle: {
+						marginBot: "15"
+					},
+					labelStyle: {
+						//paddingLeft: "7",
+					},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'timePicker',
+				label: '时间选择器',
+				unitName: '时间选择器',
+				icon: 'time',
+				iconFont: 'fa-clock-o',
+				control: {
+					modelValue: ''
+				},
+				config: {},
+				styles: {
+					divStyle: {
+						marginBot: "15"
+					},
+					labelStyle: {
+						//paddingLeft: "7",
+					},
+					inputStyle: {}
+				}
+			},
 			{
 				type: 'txt',
 				label: '文字描述',
diff --git a/src/components/DesignForm/dragControlApp.vue b/src/components/DesignForm/dragControlApp.vue
index 7c3d6fd..58c6c52 100644
--- a/src/components/DesignForm/dragControlApp.vue
+++ b/src/components/DesignForm/dragControlApp.vue
@@ -117,6 +117,7 @@ const clone = (origin: any) => {
 </script>
 <template>
   <div class="components-list">
+    {{props}}
     <div v-for="(list, index) in controlList" :key="index" v-memo="[index]">
       <div class="title">
         {{ list.title }}
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index e5e3a84..3717997 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -8,7 +8,7 @@ import { reactive, computed, toRefs, ref, watch, inject, onBeforeMount, onMounte
 import { getRequest } from "@/api/DesignForm";
 import { useDesignFormStore } from "@/store/DesignForm/designForm";
 import validate from "./validate";
-import validateText from "./validateText";
+import { validateTextConfig } from "./validateText";
 import validateInt from "./validateInt";
 import { ValidateTextTypes } from "@/components/DesignForm/validateText";
 import { ElMessage } from "element-plus";
@@ -180,7 +180,7 @@ const ValidateText = reactive<ValidateTextTypes>({
 */
 const radioVerify = reactive<ValidateTextTypes>({});
 
-const textUinrVerfy = reactive([...validateText]);
+const textUinrVerfy = reactive([...validateTextConfig]);
 const numberUinrVerfy = reactive([...validateInt]);
 
 const formAttr = computed(() => {
@@ -6453,7 +6453,7 @@ const formatTooltip = (val: number) => {
           <!-- <div class=""><h3>通用属性</h3></div> -->
           <el-divider content-position="left">通用属性</el-divider>
 
-          <template v-for="(item, index) in attrList" :key="index">
+          <template v-for="(item, index) in attrList" :key="icndex">
             <!-- <template v-if="item.label == '添加时间水印'">
 
                   <el-form-item :label="item.label" v-if="controlData.control.onSiteShot=='1'" class="form_cont">
diff --git a/src/components/DesignForm/formVersion.vue b/src/components/DesignForm/formVersion.vue
index 4966d52..8e5efe7 100644
--- a/src/components/DesignForm/formVersion.vue
+++ b/src/components/DesignForm/formVersion.vue
@@ -137,16 +137,24 @@ const setColor = (val:number) => {
 </template>
 <style  lang='scss' scoped>
 .use-template{
-	width:250px;
+	width:310px;
 	top: 40px;
 	.list{
 		padding: 30px 5px;
+		:deep .el-timeline-item__node--normal{
+			left: 5px;
+			top: 10px;
+		}
+		:deep .el-card__body{
+			padding:15px;
+			// color: #FFF;
+		}
 	}
 }
 .timeLineBox{
 	height: calc(100vh - 80px);
-	::v-deep .el-card__body{
-		padding:5px;
+	:deep .el-card__body{
+		padding:15px;
 		// color: #FFF;
 	}
 }
diff --git a/src/components/DesignForm/public/expand/rangedUserTree.vue b/src/components/DesignForm/public/expand/rangedUserTree.vue
index 6e01a22..a8e88ed 100644
--- a/src/components/DesignForm/public/expand/rangedUserTree.vue
+++ b/src/components/DesignForm/public/expand/rangedUserTree.vue
@@ -25,7 +25,7 @@ const treeData = ref([]) // 存储懒加载的数据
 const isDataLoaded = ref(false) // 标记数据是否已加载
 const loading = ref(false) // 是否正在加载
 const treeSelectRef = ref() // 树选择器引用
-const { location, updateLocation } = inject('location')
+// const { location, updateLocation } = inject('location')
 
 // 上一次选择的值，用于比较
 const lastSelectedValue = ref(null)
diff --git a/src/components/DesignForm/public/form/childTable.vue b/src/components/DesignForm/public/form/childTable.vue
index 172cff3..58d3ff5 100644
--- a/src/components/DesignForm/public/form/childTable.vue
+++ b/src/components/DesignForm/public/form/childTable.vue
@@ -387,7 +387,7 @@ function optionsValue3Get1(data: any, fieldName: string) {
 */
 const jisuanTableWidth = (data: any) => {
   let width = 0;
-  console.log("jisuanTableWidth--->计算宽度",data.item.label.length,"---------->",data)
+  // console.log("jisuanTableWidth--->计算宽度",data.item.label.length,"---------->",data)
   // data.item.label.forEach((item: any) => {
   //   // width += item.item.span?item.item.span:120;
   // });
diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue
index b18778f..a65e286 100644
--- a/src/components/DesignForm/public/form/formGroup.vue
+++ b/src/components/DesignForm/public/form/formGroup.vue
@@ -764,8 +764,8 @@ const currentNodePowerKey = inject('currentNodeKey') as any
 
 //获取当前节点授权
 const curNodePowerAry = () => {
-  console.log("获取当前节点授权",currentNodePowerKey)
-  console.log("获取当前节点授权",allNodePwoer)
+  // console.log("获取当前节点授权",currentNodePowerKey)
+  // console.log("获取当前节点授权",allNodePwoer)
   if(currentNodePowerKey && currentNodePowerKey.value && currentNodePowerKey.value != ""){
     if(allNodePwoer.value && Array.isArray(allNodePwoer.value) && allNodePwoer.value.length > 0){
       let powerAry: any[] = []
@@ -789,7 +789,7 @@ const curNodePowerAry = () => {
 */
 const judgeIsShow = (key: string) => {
   let myPower = curNodePowerAry()     //获取权限数组
-  console.log("判断此组件是否可见",myPower)
+  // console.log("判断此组件是否可见",myPower)
   if(Array.isArray(myPower) && myPower.length > 0){
     let isOk = true
     myPower.forEach((item:powerAryInfo) => {
diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue
index aaa7ec3..ae50705 100644
--- a/src/components/DesignForm/public/form/formItem.vue
+++ b/src/components/DesignForm/public/form/formItem.vue
@@ -739,7 +739,7 @@ const judgeIsShow = (key: string) => {
 @ 功能: 判断是否禁用
 */
 const judgeIsDisabled = (key: string) => {
-  console.log("判断是否禁用", key);
+  // console.log("判断是否禁用", key);
 // console.log("测试是否获取授权-1-->",allNodePwoer)
 //     console.log("测试是否获取授权-2-->",currentNodePowerKey)
   if (type.value === 3) {
@@ -755,7 +755,7 @@ const judgeIsDisabled = (key: string) => {
 
 
   let myPower = curNodePowerAry()
- console.log("测试是否获取授权-3-->",Array.isArray(myPower),myPower)
+//  console.log("测试是否获取授权-3-->",Array.isArray(myPower),myPower)
   if(Array.isArray(myPower) && myPower.length > 0){
     let isOk = false
     myPower.forEach((item:powerAryInfo) => {
@@ -764,8 +764,8 @@ const judgeIsDisabled = (key: string) => {
       }
     })
 
-    console.log("判断是否禁用------key------->", key);
-    console.log("判断是否禁用------isOk------->", isOk);
+    // console.log("判断是否禁用------key------->", key);
+    // console.log("判断是否禁用------isOk------->", isOk);
 
     return isOk
   }else{
diff --git a/src/components/DesignForm/public/headToolsApp.vue b/src/components/DesignForm/public/headToolsApp.vue
index 0ac2b18..b000c49 100644
--- a/src/components/DesignForm/public/headToolsApp.vue
+++ b/src/components/DesignForm/public/headToolsApp.vue
@@ -23,7 +23,7 @@ const props = withDefaults(
     }
 )
 const emits = defineEmits<{(e: 'click', value: string): void}>(); 
-const btnList = computed(() => {
+const btnList = computed(() => { 
 	const list = [
 		{ icon: 'monitor',iconFont:"fa-desktop", label: 'PC端', key: 101 },
 		{ icon: 'iphone',iconFont:"fa-mobile", label: '手机端', key: 102 },
diff --git a/src/components/DesignForm/validateText.ts b/src/components/DesignForm/validateText.ts
index 07e7ce4..3aae31b 100644
--- a/src/components/DesignForm/validateText.ts
+++ b/src/components/DesignForm/validateText.ts
@@ -57,4 +57,55 @@ const validateTextConfig: ValidateTextTypes[] = [
 	}
 ]
 
-export default validateTextConfig
+const transferDataSourceOptions = [
+  {
+    value: "数据源",
+    label: "数据源",
+  },
+  {
+    value: "固定选项",
+    label: "固定选项",
+  },
+];
+
+const locationLevelOptions = [
+  {
+    value: "省级",
+    label: "省级",
+  },
+  {
+    value: "市级",
+    label: "市级",
+  },
+  {
+    value: "区县级",
+    label: "区县级",
+  },
+  {
+    value: "详细地址",
+    label: "详细地址",
+  },
+]
+const scanTypes = [
+  {
+    value: "QrCode",
+    label: "二维码",
+  },
+  {
+    value: "OCR",
+    label: "光学字符识别",
+  },
+];
+const optionsCss = [
+  { label: "无样式", value: "" },
+  { label: "每行两列", value: "form-row-2" },
+  { label: "每行三列", value: "form-row-3" },
+  { label: "每行四列", value: "form-row-4" },
+];
+export  {
+	transferDataSourceOptions,
+	locationLevelOptions,
+	validateTextConfig,
+	scanTypes,
+	optionsCss
+}
diff --git a/src/utils/DesignForm/index.ts b/src/utils/DesignForm/index.ts
index 5b5eb41..63b8381 100644
--- a/src/utils/DesignForm/index.ts
+++ b/src/utils/DesignForm/index.ts
@@ -72,7 +72,7 @@ export const randomString = (len: number) => {
 }
 
 export const jsonParseStringify = (val: any) => {
-  if (typeof val === 'object') {
+  if (typeof val === 'object') { 
     return JSON.parse(JSON.stringify(val))
   } else {
     return val
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 485f690..c903afa 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -60,8 +60,8 @@ service.interceptors.request.use(
             }
             // console.error('请求拦截---------->', randomString)
             // console.error('请求拦截----headers------>', headers)
-            console.log('请求拦截----config---url--->', config.url)
-            console.log('请求拦截----data------>', data)
+            // console.log('请求拦截----config---url--->', config.url)
+            // console.log('请求拦截----data------>', data)
             // console.error('请求拦截----config------>', config)
             
         // console.log('请求拦截----content-type------>', config.headers['Content-Type'])
@@ -88,7 +88,7 @@ service.interceptors.response.use(
             let jsonData = sm4DecryptMethod(data.data, authKey)
             response.data.data = JSON.parse(jsonData)
         }
-        console.log('行营结果----解密结构------>', response.data)
+        // console.log('行营结果----解密结构------>', response.data)
         const { code, msg } = response.data;
         if (code === 0 || code === 200 || code === 10001) {
             return response.data;
diff --git a/src/utils/workflow/const.ts b/src/utils/workflow/const.ts
index 1fff71b..90275ff 100644
--- a/src/utils/workflow/const.ts
+++ b/src/utils/workflow/const.ts
@@ -57,7 +57,6 @@ export let notAsA_BasisForJudgment = [
 	"textarea",
 	"timePicker",
 	"colorPicker",
-	"switch",
 	"inputNumber",
 	"cascader",
 	"rate",
diff --git a/src/views/dashboard/components/allorgyear.vue b/src/views/dashboard/components/allorgyear.vue
index b2053f6..e643e14 100644
--- a/src/views/dashboard/components/allorgyear.vue
+++ b/src/views/dashboard/components/allorgyear.vue
@@ -38,7 +38,7 @@ const orgChartDrowData = () => {
     yearsInfo.value = timeYears;
     let sendInfo = {
         orgid: curreorgId.value.toString(),
-        years: timeYears
+        years: timeYears.toString()
     };
     orgTargetAnnualStatistics(sendInfo).then((data: any) => {
         // console.log(" props.dlyear.data", data)
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 1b42e18..144c25e 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -38,6 +38,7 @@
                 :type="passwordVisible === false ? 'password' : 'input'"
                 size="large"
                 name="password"
+                show-password
                 @keyup="checkCapslock"
                 @keyup.enter="handleLogin"
               />
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
index 4e0dd84..cf48b7f 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
@@ -29,6 +29,7 @@ import {
   previewAppFormVersion,
 } from "@/api/DesignForm/requestapi";
 import { treeStruct } from "@/api/DesignForm/type";
+import { afterResponse, beforeRequest, onChange } from '@/api/DesignForm/utils'
 
 //引入页面
 import DragControlApp from "@/components/DesignForm/dragControlApp.vue";
@@ -97,7 +98,7 @@ const state = computed({
   },
 });
 
-const formControlAttrEl = ref(null);
+const formControlAttrEl = ref();
 
 provide("formDesignType", state.value.designType);
 const appFormKeyVal = computed({
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFormNew.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFormNew.vue
index 92b8dab..3e792fc 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFormNew.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFormNew.vue
@@ -4,7 +4,31 @@
 @ 备注: 表单编辑页面
 -->
 <script lang='ts' setup>
-import { FormData, formStruct, DrawerStruct, VideoMsg } from "@/api/DesignForm/types";
+import { formStruct, DrawerStruct } from "@/api/DesignForm/types";
+import {
+  json2string,
+  objToStringify,
+  string2json,
+  stringToObj,
+} from "@/utils/DesignForm/form";
+import {
+  createAppForm,
+  editAppPageInfo,
+  getOneProductionForm,
+  haveCustomerFormVersion,
+  previewAppFormVersion,
+  saveOtherVersion,
+} from "@/api/DesignForm/requestapi";
+import { afterResponse, beforeRequest, onChange } from '@/api/DesignForm/utils'
+
+import Control from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/unitsPageFrom/control.vue";
+import Design from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/unitsPageFrom/design.vue";
+import Attribute from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/unitsPageFrom/attribute.vue";
+import { customerFormVersionCont, treeStruct } from "@/api/DesignForm/type";
+import { useRoute } from "vue-router";
+import { useDesignFormStore } from "@/store/DesignForm/designForm";
+
+import PreviewPage from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/previewPage.vue";
 
 const props = defineProps({
     appCont: {
@@ -40,9 +64,28 @@ const props = defineProps({
         },
     },
     state: {
-        type: Object,
+        type: Object as () => formStruct,
         default() {
-        return {};
+        return {
+            tooltip: {},
+            isSearch: false,
+            formData: {
+                list: [],
+                form: {},
+                config: {},
+                styles: {},
+                purview: [],
+                aiConfig: [],
+            },
+            editor: {},
+            loading: false,
+            formDataPreview: {},
+            previewVisible: false,
+            designType: '',
+            formDict: {},
+            formOtherData: {},
+            echatsViews: [],
+        };
         },
     },
 });
@@ -56,34 +99,711 @@ const emits = defineEmits<{
     (e: "runNextWindows", val: number): void;
     (e: "closeFormPage"): void;
 }>();
+const isWeb = ref(false);
+const route: any = useRoute().query || {};
+const versionCont = ref<customerFormVersionCont[]>([]); //版本内容列表
+const formControlAttrEl = ref();
+const isEdit = ref(false);
+const versionId = ref<string>(""); //版本号
+const state = computed({
+  get() {
+    return props.state;
+  },
+  set(val: formStruct) {
+    emits("update:state", val);
+  },
+});
+const appFormKeyVal = computed({
+  get() {
+    return props.formKey;
+  },
+  set(val: string) {
+    emits("update:formKey", val);
+  },
+});
+const controlData = computed(() => {
+  // console.log("注册自定义事件----------------->",props.formInfo)
+  // console.log("注册自定义事件--------1--------->",store.controlAttr)
+  // console.log("注册自定义事件---------3-------->",controlData.value.customRules)
+  return store.controlAttr;
+});
+const formFieldAry = ref<string[]>([]);
+const sunFormFieldAry = ref<string[]>([]);
+
+const drawer = reactive<DrawerStruct>({
+  visible: false,
+  type: "",
+  title: "",
+  codeType: "",
+  direction: undefined, //弹出方向rtl / ltr
+  callback: "",
+});
+const store = useDesignFormStore() as any;
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-24 13:39:25
+@ 功能: 获取表单内容
+*/
+const gainTableForm = () => {
+  if (props.appPageKey) {
+    isEdit.value = true;
+    state.value.loading = true;
+    getOneProductionForm({ id: props.appPageKey.toString() })
+      .then((res: any) => {
+        if (res.code == 0) {
+          const result = res.data;
+          // console.log("初始设计搜索时--1--->", result);
+          formFieldAry.value = result.formField;
+          sunFormFieldAry.value = result.tableStructureMap;
+          // 初始设计搜索时res.data=''
+          if (result.mastesform) {
+            state.value.formData = stringToObj(result.mastesform);
+          }
+          // console.log("初始设计搜索时",state.value.formData)
+          if (result.mastesformjson) {
+            let kjdkjksd = string2json(result.mastesformjson);
+            // console.log("初始设计搜索时-begin-->",state.value.formData.purview)
+            state.value.formData.purview = kjdkjksd.purview;
+            if (kjdkjksd.aiConfig) {
+              state.value.formData.aiConfig = kjdkjksd.aiConfig;
+            } else {
+              state.value.formData.aiConfig = [];
+            }
+
+            // console.log("初始设计搜索时--->",kjdkjksd)
+          }
+          state.value.formData.config.groupKey = result.groupKey;
+          state.value.formData.config.classify = result.classify;
+          // console.log("初始设计搜索时--end->",state.value.formData)
+          state.value.formDict = string2json(result.dict);
+          // 恢复表单名称
+          state.value.formOtherData.source = result.source;
+          state.value.formOtherData.formName = result.name;
+
+          state.value.formOtherData.formName = result.name;
+          state.value.formData.form.name = result.tablekey;
+          state.value.formData.form.formName = result.name;
+          if (result.source && state.value.designType !== "search") {
+            // 加载属性侧边栏的字段标识，搜索时不需要请求
+            formControlAttrEl.value.getFormFieldBySource(result.source);
+          }
+          if (result.flowIsOpen != 1) {
+            emits("judgeFormIsEdit", false);
+          } else {
+            emits("judgeFormIsEdit",  true);
+          }
+          emits("update:formVersion", result.id.toString());
+        } else {
+          ElMessage.error(res.msg || "加载异常");
+        }
+        state.value.loading = false;
+      })
+      .finally(() => {
+        haveCustomerFormVersion({ id: state.value.formData.form.name }).then(
+          ({ data }) => {
+            versionCont.value = data;
+            if (data.length > 0) {
+              data.forEach((item: any) => {
+                if (item.status == 1) {
+                  versionId.value = item.id.toString();
+                  emits("update:formVersion", item.id.toString());
+                }
+              });
+            }
+          }
+        );
+      })
+      .catch((res: any) => {
+        // console.log(res)
+        ElMessage.error(res.msg || "加载异常");
+        state.value.loading = false;
+      });
+  }
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-05-09 14:29:06
+@ 功能: 根据启用版本进行加载页面
+*/
+const versionUpdateForm = (val: string) => {
+  // console.log("加载异常-------111------->",val)
+  versionId.value = val;
+  gainTableForm();
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-24 13:42:25
+@ 功能: 预览版本
+*/
+const versionPreviewPage = (val: string) => {
+  if (val) {
+    versionId.value = val;
+    previewAppFormVersion({ id: val }).then((res: any) => {
+      if (res.code == 0) {
+        const result = res.data;
+        // console.log("初始设计搜索时--1--->",result)
+        formFieldAry.value = result.formField;
+        sunFormFieldAry.value = result.tableStructureMap;
+        // 初始设计搜索时res.data=''
+        if (result.mastesform) {
+          state.value.formData = stringToObj(result.mastesform);
+        }
+        // console.log("初始设计搜索时",state.value.formData)
+        if (result.mastesformjson) {
+          let kjdkjksd = string2json(result.mastesformjson);
+          // console.log("初始设计搜索时-begin-->",state.value.formData.purview)
+          state.value.formData.purview = kjdkjksd.purview;
+          // console.log("初始设计搜索时--->",kjdkjksd)
+        }
+        state.value.formData.config.groupKey = result.groupKey;
+        // console.log("初始设计搜索时--end->",state.value.formData)
+        state.value.formDict = string2json(result.dict);
+        // 恢复表单名称
+        state.value.formOtherData.source = result.source;
+        state.value.formOtherData.formName = result.name;
+
+        state.value.formOtherData.formName = result.name;
+        state.value.formData.form.name = result.tablekey;
+        state.value.formData.form.formName = result.name;
+        if (result.source && state.value.designType !== "search") {
+          // 加载属性侧边栏的字段标识，搜索时不需要请求
+          formControlAttrEl.value.getFormFieldBySource(result.source);
+        }
+        if (result.flowIsOpen != 1) {
+          emits("judgeFormIsEdit", false);
+        } else {
+          emits("judgeFormIsEdit",  true);
+        }
+      } else {
+        ElMessage.error(res.msg || "加载异常");
+      }
+      state.value.loading = false;
+    });
+  }
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-24 15:41:53
+@ 功能: 关联选项设置
+*/
+function optionsValue3Get3(data: any, fieldName: string) {
+  /* console.log("pageForm", "optionsValue3Get3");
+  console.log(state.value.formData.list);
+  console.log(data);
+  console.log(fieldName); */
+  for (let i = 0; i < state.value.formData.list.length; i++) {
+    if (state.value.formData.list[i].name == fieldName) {
+      state.value.formData.list[i].options = [];
+      for (let j = 0; j < data.length; j++) {
+        state.value.formData.list[i].options.push(data[j]);
+      }
+    }
+  }
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-05-15 14:07:39
+@ 功能: 编辑App自定义表单
+*/
+interface AsfRelation {
+    bgldbdId: string;
+    asfByTablekey: string;
+    glbdzjm: string;
+}
+function saveRefreshFormControlAttr1() {
+  formControlAttrEl.value.saveRefreshFormControlAttr();//
+}
+const asfHandler = () => {
+
+  /* 
+  relationArr
+    当relationArr不为空时,说明本表单关联了其他表单,可以获取到所有被关联的表单id
+    1.按照被关联的表单id更新asf_relation表,用glbdzjm和asf_by_tablekey可以唯一确定一个关联关系,如果没有该关联关系,则新增,如果有,则update
+    2.按照被关联的表单id更新asf_config表,若无该id对应记录,则新增
+  
+  */
+
+  /*
+    asf_config.datatitle  ####################
+      因为当前保存的表单并不是以被关联表单身份提供的datatitle,而数据库表中的datatitle是被关联表单身份的
+      所以把这个datatitle传到后端,并查询asf_config表中是否已存在本表,若已存在,则更新相应的数据标题记录
+
+      asf_config.all_fields  ####################
+      表单的所有字段标识数组,以["a","b","c"]的形式存储 
+
+    注意:即使保存的表单没有关联其他表单,也应执行上述操作  
+  */
+
+  let configDataTitle_arr = state.value.formData.form.dataTitle
+  let configDataTitle = configDataTitle_arr.join(','); 
+  // console.log("config数据标题----->"+configDataTitle_arr)
+
+  let relationArr: AsfRelation[] = []
+
+  let configAllFields_arr:String[] = []
+  state.value.formData.list.forEach((element:any) => {
+    if(element.type=="associatedForms"){
+      let obj:AsfRelation = {
+        bgldbdId: element.control.formid,
+        asfByTablekey: element.control.glbbddbd,
+        glbdzjm: element.name,
+      } 
+      relationArr.push(obj)
+    }
+    configAllFields_arr.push(element.name)
+  });
+  let configAllFields = configAllFields_arr.join(','); 
+  // console.log("config所有控件名----->"+configAllFields_arr)
+  let configBgldbdtableKey = state.value.formData.form.name
+  // console.log("config被关联的表单tablekey----->"+configBgldbdtableKey)
+  
+
+  // console.log(relationArr)
+
 
-const attrActiveTab = ref("first");
+
+
+
+  /* 
+    当state.value.formData.list中存在state.value.formData.list[i].type=="associatedForms"时
+    对每个符合条件的元素进行条件拼装,成为一个对象数组
+
+  */
+  
+  // console.log(state.value.formData)
+
+}
+const editAppFormTable = () => {
+  
+  asfHandler()
+  let sendData: any = {
+    jsondata: JSON.stringify(state.value.formData),
+    data: objToStringify(state.value.formData),
+    source: state.value.formOtherData.source, // 数据源允许在表单属性设置里修改的
+    name: state.value.formOtherData.formName, // 表单名称，用于在显示所有已创建的表单列表里显示
+    type: 4, // 1表单 2列表
+    dict: json2string(state.value.formDict),
+    appKey: appFormKeyVal.value,
+    groupKey: props.groupKey,
+    id: props.appPageKey.toString(),
+    version: versionId.value.toString(),
+    menuId: props.menuId,
+  };
+  state.value.loading = true;
+  // console.log("编辑App自定义表单",sendData)
+  editAppPageInfo(sendData)
+    .then((data: any) => {
+      state.value.loading = false;
+      // console.log("编辑App自定义表单--->",data)
+      emits("update:formVersion", versionId.value.toString());
+      gainTableForm();
+    })
+    .finally(() => {
+      state.value.loading = false;
+      saveRefreshFormControlAttr1();
+    });
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-05-15 13:58:21
+@ 功能: 写入自建应用App表单
+*/
+const saveAppFormData = () => {
+  let sendData: any = {
+    jsondata: JSON.stringify(state.value.formData),
+    data: objToStringify(state.value.formData),
+    source: state.value.formOtherData.source, // 数据源允许在表单属性设置里修改的
+    name: state.value.formOtherData.formName, // 表单名称，用于在显示所有已创建的表单列表里显示
+    type: 4, // 1表单 2列表 3:app 4：app表单
+    dict: json2string(state.value.formDict),
+    appKey: appFormKeyVal.value,
+    groupKey: props.groupKey,
+    menuId: props.menuId,
+    appSignCode: props.formconfigcont.signCode,
+  };
+  state.value.loading = true;
+  // console.log("写入自建应用App表单",sendData)
+  createAppForm(sendData)
+    .then((data: any) => {
+      state.value.loading = false;
+      // console.log("写入自建应用App表单--->",data)
+      // appPageKey.value = data.data.customerFormCont.id
+      // appPageKey.set(data.data.customerFormCont.id.toString())
+      versionId.value = data.data.formVersion.id.toString();
+      emits("update:formVersion", data.data.formVersion.id.toString());
+      emits("update:appPageKey", data.data.customerFormCont.id.toString());
+      // emits('update:formVersion', data.data.version.toString())
+      // console.log("写入自建应用App表单-11111-->",data.data.customerFormCont.id)
+      // console.log("写入自建应用App表单-2222-->",props.appPageKey)
+      // emits('update:appPageKey', data.data.customerFormCont.id.toString())
+      gainTableForm();
+    })
+    .finally(() => {
+      state.value.loading = false;
+    });
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-05-20 16:24:23
+@ 功能: 保存为其他版本
+*/
+const saveOtherVersionIng = () => {
+  let sendData: any = {
+    jsondata: JSON.stringify(state.value.formData),
+    data: objToStringify(state.value.formData),
+    source: state.value.formOtherData.source, // 数据源允许在表单属性设置里修改的
+    name: state.value.formOtherData.formName, // 表单名称，用于在显示所有已创建的表单列表里显示
+    type: 4, // 1表单 2列表 3:app 4：app表单
+    dict: json2string(state.value.formDict),
+    appKey: appFormKeyVal.value,
+    groupKey: props.groupKey,
+    menuId: props.menuId,
+    appSignCode: props.formconfigcont.signCode,
+  };
+  state.value.loading = true;
+  saveOtherVersion(sendData)
+    .then((data: any) => {
+      state.value.loading = false;
+      // console.log("保存为其他版本--->",data)
+      emits("update:formVersion", data.data.version.toString());
+      gainTableForm();
+    })
+    .finally(() => {
+      state.value.loading = false;
+    });
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-25 10:51:57
+@ 功能: 执行哪个按钮的操作
+*/
+const buttonCallbackEvent = (type: string) => {
+  console.log("执行哪个按钮的操作",type);
+  switch (type) {
+    case "del": //清空
+      state.value.formData.list = [];
+      store.setActiveKey("");
+      store.setControlAttr({});
+      break;
+    case "eye": //预览
+      store.setActiveKey("");
+      store.setControlAttr({});
+      let stringPreview = objToStringify(state.value.formData); // 防止预览窗口数据修改影响
+      const formName = state.value.formData.form.name;
+      const reg = new RegExp(`get${formName}ControlByName`, "g");
+      stringPreview = stringPreview.replace(reg, `getPreview${formName}ControlByName`);
+      state.value.formDataPreview = stringToObj(stringPreview);
+      state.value.formDataPreview.form.name = `Preview${formName}`; // 修改下表单名
+      // console.log("预览数据",state.value.formDataPreview);
+      state.value.previewVisible = true;
+      break;
+    case "json": //生成脚本预览
+      openAceEditDrawer({
+        direction: "rtl",
+        content: state.value.formData,
+        title: "可编辑修改或将已生成的脚本粘贴进来",
+      });
+      break;
+    case "save": //保存
+      if (props.appPageKey && props.appPageKey != "") {
+        //存在，进行编辑操作
+        editAppFormTable();
+      } else {
+        //不存在，进行新增操作
+        saveAppFormData();
+      }
+      break;
+    case "branch": //另存为新版
+      saveOtherVersionIng();
+    case "monitor":
+      isWeb.value = false;
+      // console.log("monitor",isWeb); //
+      break;
+    case "iphone":
+      isWeb.value = true;
+      // console.log("iphone",isWeb); //
+      break;
+  }
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-25 11:22:02
+@ 功能: 打开脚本预览
+*/
+const openAceEditDrawer = (params: any) => {
+  // console.log("打开脚本预览====:", params);
+  const { type, direction, codeType, title, callback, content } = params;
+  drawer.direction = direction; // 窗口位置ltr/rtl
+  drawer.type = type; // 作为窗口唯一标识，在窗口关闭时可根据type作不同处理
+  drawer.codeType = codeType || ""; // 显示代码类型
+  drawer.title = title ? `提示：${title}` : "";
+  drawer.visible = true;
+  drawer.callback = callback;
+  let editData =
+    codeType === "json" ? json2string(content, true) : objToStringify(content, true);
+
+  // console.log("打开脚本预览===1=:", type, editData);
+  switch (type) {
+    case "css":
+      editData = state.value.formData.config?.style || "";
+      break;
+    case "dict":
+      // 格式化一下
+      editData = json2string(state.value.formDict, true);
+      break;
+    case "cascader":
+      //   console.log("打开脚本预览==2=2=:", stringToObj(editData));
+      editData = stringToObj(editData);
+      break;
+    case "treeSelect":
+      let kvjData = stringToObj(editData);
+      //   console.log("打开脚本预览==2=2=:", editData, kvjData);
+      //   editData = stringToObj(editData);
+      if (kvjData == "" || kvjData == null || kvjData == undefined) {
+        editData = [];
+        // console.log("打开脚本预览==2=4=:", kvjData);
+      } else {
+        editData = stringToObj(editData);
+        // console.log("打开脚本预览==2=5=:", editData);
+      }
+      //   console.log("打开脚本预览==2=3=:", editData);
+      break;
+    case "beforeRequest":
+    case "beforeSubmit":
+    case "afterResponse":
+    case "afterSubmit":
+    case "change":
+      // eslint-disable-next-line no-case-declarations
+      const beforeData = state.value.formData.events || {};
+      if (beforeData[type]) {
+        editData = objToStringify(beforeData[type], true);
+      } else {
+        if (["afterResponse", "afterSubmit"].includes(type)) {
+          editData = afterResponse;
+        } else if (type === "change") {
+          editData = onChange;
+        } else {
+          editData = beforeRequest;
+        }
+      }
+      break;
+    // case 'afterResponse':
+    // case 'afterSubmit':
+    //   const newData = state.formData.events || {}
+    //   if (newData[type]) {
+    //     editData = objToStringify(newData[type], true)
+    //   } else {
+    //     editData = afterResponse
+    //   }
+    //   break
+
+    case "optionsParams":
+      if (!content) {
+        editData = beforeRequest;
+      }
+      break;
+    case "optionsResult":
+      if (!content) {
+        editData = afterResponse;
+      }
+      break;
+  }
+  drawer.content = editData;
+  // console.log("打开脚本预览==2=222=:", drawer.content);
+};
+/**
+@ 作者: 李文轩
+@ 时间: 2026-02-25 11:26:46
+@ 功能: 关联选项设置	修复bug:当字段标识改变时，关联选项设置的字段标识未同步更改
+*/
+const formNameChanged = (param1: any) => {
+  for (let i = 0; i < state.value.formData.list.length; i++) {
+    if (
+      state.value.formData.list[i].type == "radio" ||
+      state.value.formData.list[i].type == "select" ||
+      state.value.formData.list[i].type == "checkbox"
+    ) {
+      if (
+        state.value.formData.list[i].control.glxxsz != undefined &&
+        state.value.formData.list[i].control.glxxsz.length > 0
+      ) {
+        state.value.formData.list[i].control.glxxsz = [];
+        state.value.formData.list[i].options.push({
+          label: "",
+          value: "",
+        });
+        state.value.formData.list[i].options.pop();
+      }
+      if (
+        state.value.formData.list[i].control.glxxszForCheckBox != undefined &&
+        state.value.formData.list[i].control.glxxszForCheckBox.length > 0
+      ) {
+        state.value.formData.list[i].control.glxxszForCheckBox = [];
+      }
+    }
+  }
+  // ElMessage({
+  // 	message: '因字段标识改变，本表单的所有单选、多选、下拉的关联选项设置已重置，请重新设置。',
+  // 	type: 'warning',
+  // })
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-05-15 13:14:40
+@ 功能: 关闭预览
+*/
+const closePreviewPage = () => {
+  // console.log("关闭预览")
+  state.value.previewVisible = false;
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-05-15 13:28:57
+@ 功能: 关闭脚本预览窗，并初始化脚本预览参数
+*/
+const dialogCancel = () => {
+  drawer.visible = false;
+  drawer.type = "";
+  drawer.title = "";
+  drawer.codeType = "";
+  drawer.callback = "";
+  drawer.content = "";
+}; 
+// 弹窗确认3174.15    2924.57     3326.15   3119.33
+const dialogConfirm = (editVal: string) => {
+  // 生成脚本预览和导入json，都是将编辑器内容更新至state.formData
+  // console.log("生成脚本预览和导入", editVal);
+  // console.log(
+  //   "生成脚本预览和导入----->",
+  //   drawer.type,
+  //   "==========",
+  //   drawer.callback,
+  //   "==========",
+  //   drawer
+  // );
+  // console.log("生成脚本预览和导入===========>", state.value.formData);
+
+  try {
+    if (typeof drawer.callback === "function") {
+      // console.log("1======2========>", drawer.codeType, stringToObj(editVal));
+      // callback
+      const newObj =
+        drawer.codeType === "json" ? string2json(editVal) : stringToObj(editVal);
+      drawer.callback(newObj);
+      // console.log("1==============>");
+    } else {
+      switch (drawer.type) {
+        case "css":
+          // 表单属性－编辑表单样式
+          if (!state.value.formData.config) {
+            state.value.formData.config = {};
+          }
+          state.value.formData.config.style = editVal;
+          // console.log("2==============>");
+          break;
+        case "dict":
+          state.value.formDict = string2json(editVal);
+          break;
+        case "beforeRequest":
+        case "beforeSubmit":
+        case "afterResponse":
+        case "afterSubmit":
+        case "closeSubmit":
+        case "change":
+          if (!state.value.formData.events) {
+            state.value.formData.events = {};
+          }
+          state.value.formData.events[drawer.type] = stringToObj(editVal);
+          // console.log("3==============>");
+          break;
+        default:
+          state.value.formData = stringToObj(editVal);
+          // console.log("4==============>");
+      }
+    }
+    dialogCancel();
+  } catch (res:any) {
+    // console.log(res.message)
+    ElMessage.error(res.message);
+  }
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-27 16:53:30
+@ 功能: 级联选择与树
+*/
+const dialogConfirmTree = (content: string) => {
+  // console.log("级联选择与树", content);
+  try {
+    const newObj = drawer.codeType === 'json' ? string2json(content) : stringToObj(content);
+    // console.log("级联选择与树--->", controlData);
+    
+    if (typeof drawer.callback === "function") {
+      drawer.callback(newObj);
+    } else {
+      // 暂时保留原逻辑结构
+      // 根据实际情况处理newObj
+      controlData.value.control = {};
+      Object.assign(controlData.value.control, newObj);
+    }
+  } catch (error) {
+    console.error("处理树选择数据失败:", error);
+  }
+  drawer.visible = false;
+};
+defineExpose({
+  gainTableForm,
+});
+onMounted(() => {
+    if (route.source) {
+      formControlAttrEl.value.getFormFieldBySource(route.source);
+    }
+    gainTableForm();
+});
 </script>
 <template>
+  <ace-drawer
+    v-model="drawer.visible"
+    :title="drawer.title"
+    :direction="drawer.direction"
+    :content="drawer.content"
+    :code-type="drawer.codeType"
+    :data="drawer"
+    @before-close="dialogCancel"
+    @confirm="dialogConfirm"
+    @confirm-tree="dialogConfirmTree"
+  />
+  <PreviewPage v-model:state="state" :is-web="isWeb" @click-close="closePreviewPage" />
   <div class="form-content">
-    <el-card  shadow="always">
-        <template #header>
-            <div class="card-header">控件库</div>
-        </template>
-        <el-scrollbar ref="scrollbarRef" class="scroBox ">
-
-        </el-scrollbar>
-    </el-card>
-    <el-card  shadow="always">
-         <template #header>
-            <div class="card-header">控件库</div>
-        </template>
-    </el-card>
-    <el-card  shadow="always">
-         <template #header>
-            <div class="card-header">控件库</div>
-        </template>
-        <el-tabs v-model="attrActiveTab">
-            <el-tab-pane label="字段设置" name="first">字段设置</el-tab-pane>
-            <el-tab-pane label="表单设置" name="second">表单设置</el-tab-pane>
-            <el-tab-pane label="AI设置" name="third">AI设置</el-tab-pane>
-        </el-tabs>
-    </el-card>
+    <Control 
+      :table-key="state.formData.form.name" 
+      @version-update-form="versionUpdateForm"
+      @version-preview-page="versionPreviewPage" 
+    />
+    <Design 
+      v-model:is-web="isWeb"
+      :type="5"
+      :form-data="state.formData"
+      :dict="state.formDict"
+      @options-value3-get3="optionsValue3Get3"
+      @click="buttonCallbackEvent"
+    />
+    <Attribute 
+      ref="formControlAttrEl"
+      v-model:formOtherData="state.formOtherData"
+      :form-data="state.formData.form"
+      :form-config="state.formData.config"
+      :customerformid="props.appPageKey"
+      :form-list="state.formData.list"
+      :form-info="state.formData"
+      :is-edit="isEdit"
+      :form-field="formFieldAry"
+      :sun-form-field="sunFormFieldAry"
+      :state="state"
+      @open-dialog="openAceEditDrawer"
+      @form-name-change="formNameChanged"
+    />
+    
   </div>
 </template>
 <style  lang='scss' scoped>
@@ -94,7 +814,30 @@ const attrActiveTab = ref("first");
     grid-template-rows: auto;
     gap: 10px;
     padding: 10px 10px 0 10px;
-
+    height: calc(100vh - 50px);
+    :deep .el-tabs--border-card{
+        border: 0;
+    }
+    :deep .el-card__header{
+        padding: 10px 15px;
+        background-color: #f5f7fa;
+    }
+    :deep .el-card__body{
+        padding: 0;
+        
+    }
+    :deep .el-tabs__header{
+        justify-content: space-between;
+        // width: 100%;
+    }
+    :deep .is-active{
+        border-bottom: 1px solid var(--el-color-primary);
+    }
+}
+.cardHeader{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
 }
 .card-header{
     font-size: 1.4rem;
@@ -104,20 +847,63 @@ const attrActiveTab = ref("first");
     align-items: center;
     gap: 10px;
 }
-:deep .el-card__header{
-    padding: 10px 15px;
-}
-:deep .el-card__body{
-    padding: 0;
-    
-}
-:deep .el-tabs__header{
-    justify-content: space-between;
-    width: 100%;
+.category-title {
+    font-size: 14px;
+    font-weight: 600;
+    color: #165DFF;
+    margin-bottom: 10px;
+    padding-bottom: 8px;
+    border-bottom: 1px solid #ebeef5;
 }
 
 .scroBox{
     height: calc(100vh - 110px);
     overflow: auto;
 }
+
+// 布局区域
+
+.unitBox{
+    padding: 10px 15px;
+}
+.unitBody{
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    grid-gap: 10px;
+}
+.unitItem{
+    background: #f5f7fa;
+    border: 1px solid #dcdfe6;
+    border-radius: 4px;
+    padding: 10px 5px; /* 减小内边距以适应3列布局 */
+    text-align: center;
+    cursor: grab;
+    transition: all 0.2s;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    &:hover{
+        background: #ecf5ff;
+        transform: translateY(-2px);
+        box-shadow: 0 2px 12px 0 rgba(22, 93, 255, 0.1);
+        border-color: #b3d8ff;
+        color: #165DFF;
+    }
+}
+.control-icon {
+    font-size: 25px; /* 减小图标大小以适应3列布局 */
+    color: #165DFF;
+    margin-bottom: 3px; /* 减小间距以适应3列布局 */
+}
+        
+.control-name {
+    font-size: 12px; /* 减小字体大小以适应3列布局 */
+    color: #606266;
+    line-height: 1.2;
+}
+
+// 设计区域工具栏
+
+// 属性设置
+
 </style>
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/unitsPageFrom/attribute.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/unitsPageFrom/attribute.vue
new file mode 100644
index 0000000..392768d
--- /dev/null
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/unitsPageFrom/attribute.vue
@@ -0,0 +1,8527 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2026-02-24 13:23:51
+@ 备注: 属性
+-->
+<script lang='ts' setup>
+import validateConfig  from "@/components/DesignForm/validate";
+import { useDesignFormStore } from "@/store/DesignForm/designForm";
+import { getRequest, uploadUrl } from "@/api/DesignForm";
+import { validateTextConfig, type ValidateTextTypes }  from "@/components/DesignForm/validateText";
+import validateInt from "@/components/DesignForm/validateInt";
+import { CarsuselConfig, formStruct, PublicAtrr, VideoMsg } from "@/api/DesignForm/types";
+import { formatNumber } from "@/api/DesignForm/utils";
+import type { UploadInstance, UploadProps, UploadRawFile,ElTree } from "element-plus";
+import { ElMessage, genFileId } from "element-plus";
+import { getAssociatedFormsCurrentFieldTree, getAssociatedFormsOrgAndManTree, getCustomerFormList, getAsfasfFieldTree, getAsfasfFieldTreeOptionsValue3, getPersonByRoleId, getAllRole,getQrCodeImgInside, getAssociatedFormsRoleTree } from "@/api/javaRequest";
+import Draggable from "vuedraggable-es";
+
+//数学计算公式编辑器
+import MathFormula from "@/components/DesignForm/math/mathFormula.vue";
+import { orgInfo } from "@/api/hr/org/type";
+import { getOrgTreeList } from "@/api/hr/org/index";
+//样式布局
+import LayoutPage from "@/components/DesignForm/layoutPage/index.vue";
+import { customerFormGroupList, gainDataStorceAllField,chineseToPinyin } from "@/api/DesignForm/requestapi";
+import { analysisFromUnit } from "@/api/DesignForm/filterUnit";
+import { getAiagentList } from "@/api/doc/space";
+import { optionsInfo } from "@/api/DesignForm/type";
+const imgUploadApiUrl = import.meta.env.VITE_APP_BASE_API + "/api/upordown"; //上传地址
+import { v4 as uuidv4 } from "uuid";
+
+import { Delete,Plus } from "@element-plus/icons-vue";
+
+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";
+import TransferSelectUserRange from "@/widget/lowcodetransfer/lowcodeTransfer1.vue";
+
+import errimg from "@/assets/404_images/untilUploadImg.png";
+
+const transferSelectUserRangeData = ref({"type":"lowcodeTransfer","unitName":"请选择","iconFont":"fa-arrows-h","control":{"modelValue":[],"fixedOptions":[{"id":"thefirstrootnode","label":"根节点1","unitName":"","disabled":false,"children":[]},{"id":"thesecondrootnode","label":"根节点2","unitName":"","disabled":false,"children":[]}]},"config":{"transferName":"请选择","transferDataSource":"数据源","apiUrl":"/javasys/lowCode/transfer/getOrgAndManTree","method":"post"},"name":"lowcodeTransfer1758525493710","item":{"label":"穿梭框"},"styles":{"divStyle":{"divbox":"all","transparency":100},"labelStyle":{"divbox":"all","transparency":100},"inputStyle":{"transparency":100}}})
+
+
+
+
+const props = withDefaults(
+  //接收父级参数
+  defineProps<{
+    formData: any;
+    formList: any;
+    formConfig: any;
+    formOtherData: any;
+    customerformid: number | string;
+    formInfo: any;
+    isEdit: boolean;
+    formField: any[];
+    sunFormField: any[];
+    state: formStruct;
+  }>(),
+  {
+    formConfig: () => {
+      return {};
+    },
+    isEdit: () => {
+      return false;
+    },
+    formField: () => {
+      return [];
+    },
+    sunFormField: () => {
+      return [];
+    },
+    formOtherData: () => {
+      // 其他不需要保存在formData里的数据
+      return {};
+    },
+    formInfo: () => {
+      return {};
+    }
+  }
+);
+//注册自定义事件
+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:formInfo", data: any): void;
+  //(e: 'update:formData', data: any): void
+  //(e: 'update:formConfig', data: any): void
+}>();
+const { formConfig, formData, formInfo } = toRefs(props);
+const dataSourceOption = ref([]);
+const designType = inject("formDesignType");
+////////////////////////////////////////////////
+// Local ref for AI config to avoid direct prop modification
+const localAiConfig = ref(props.formInfo.aiConfig || []);
+
+// Watch for changes in formInfo.aiConfig and update local ref
+watch(() => formInfo.value?.aiConfig, (newVal) => {
+  localAiConfig.value = newVal || [];
+}, { deep: true });
+
+// Watch for changes in localAiConfig and emit back to parent
+watch(() => localAiConfig.value, (newVal) => {
+    console.log("localAiConfig.value",newVal)
+  if (formInfo.value) {
+    const updatedFormInfo = { ...formInfo.value };
+    updatedFormInfo.aiConfig = newVal;
+    // eslint-disable-next-line vue/no-mutating-props
+    props.formInfo.aiConfig = newVal;
+    emits('update:formInfo', updatedFormInfo);
+  }
+}, { deep: true });
+const formListmap = ref<any>();
+const subUnit = ref<any>();
+const unitInfo = ref<any>();
+const mathBoxShow = ref(false);
+//轮播图设置弹窗显示控制
+const dialogTableVisible = ref(false);
+//穿梭框设置弹窗显示控制
+const transferDialogTableVisible = ref(false);
+const tabsData = ref<any>([])
+const activeTab = ref('')
+const expandPageNum = ref(1)
+const expandPageSize = ref(10)
+const expandQueryParamNumber = ref('')
+const expandQueryParamName = ref('')
+const expandTableData = ref()
+const total = ref(10)
+const aft = ref();
+const aftRange = ref();
+const roleTree = ref<Tree[]>([]);
+//表单基础设置
+const page = ref<number>(1);
+const pageSize = ref<number>(200000);
+const loadingmore = ref(false);
+const loadingnomore = ref(false);
+const formGroup = ref<any>([]);
+const getAssociatedFormsCurrentFieldTreeData = ref<any>();
+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);
+});
+watch(orgTreeFilterText, (val) => {
+    orgTreeRef.value!.filter(val);
+});
+watch(roleTreeFilterText, (val) => {
+    roleTreeRef.value!.filter(val);
+});
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-25 11:36:09
+@ 功能: 从设计表单store中获取当前选中元素的属性
+*/
+const store = useDesignFormStore() as any;
+const controlData = computed(() => {
+    return store.controlAttr;
+});
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 13:13:13
+@ 功能: 行政组织树对照值
+*/
+const orgTreeProps = {
+  children: "child",
+  label: "name",
+};
+const orgCententRange = ref<orgInfo[]>();
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 13:14:20
+@ 功能: 获取行政组织树
+*/
+const haveOrgTreeInfo = () => {
+    getOrgTreeList({ orgid: 309 })
+    .then(({ data }) => {
+      orgCententRange.value = data;
+    //   console.log(orgCententRange.value)
+    })
+    .finally(() => {
+      //orgTreeLoading.value = false;
+    });
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-25 11:39:45
+@ 功能: 必填选择
+*/
+const ValidateText = reactive<ValidateTextTypes>({
+    type: "required",
+    label: "必填",
+    regExp: /^\s*$/,
+    message: "必填项",
+    checkbox: false,
+});
+
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-25 15:04:26
+@ 功能: 表单
+*/
+const stateForm = reactive({
+    dataSourceList: [],
+    customRulesList: [
+        ...validateConfig,
+        {
+        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: "请输入随机数位数",
+        },
+    ],
+});
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-14 08:41:02
+@ 功能: 单选校验
+*/
+const radioVerify = reactive<ValidateTextTypes>({});
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-25 11:30:36
+@ 功能: 字段属性设置
+*/
+const attrList = computed(() => {
+    if (Object.keys(controlData.value).length) {
+        const {
+            control = {},
+            type,
+            name,
+            config = {},
+            item = {},
+            attr = {},
+            selectvalue = "default",
+            unitName,
+        }: {
+            control: any;
+            type: any;
+            name: any;
+            item: any;
+            attr: any;
+            config: any;
+            selectvalue: any;
+            mathFormula: any;
+            unitName: any;
+        } = controlData.value;
+
+            let columnIndex = false; // 是否显示序号列
+            if (type === "table") {
+                // 表格时处理
+                const list = controlData.value && controlData.value.list;
+                if (list && list.length > 0) {
+                    columnIndex = list[0].type === "index";
+                }
+            }
+            //判断校验规则
+            if (typeof controlData.value.customRules == "object") {
+                if (Array.isArray(controlData.value.customRules)) {
+                    let otherPick: any[] = [];
+                    controlData.value.customRules.forEach((itemInfo: any) => {
+                        if (itemInfo.type == ValidateText.type) {
+                            ValidateText.checkbox = itemInfo.checkbox;
+                        }else{
+                            otherPick.push(itemInfo);
+                        }
+                    })
+                    if (otherPick.length > 0) {
+                        otherPick.forEach((itemInfo: any) => {
+                            radioVerify.type = itemInfo.type;
+                            radioVerify.label = itemInfo.label;
+                            radioVerify.regExp = itemInfo.regExp;
+                            radioVerify.message = itemInfo.message;
+                            radioVerify.checkbox = true;
+                        });
+                    }
+                }
+            } 
+            //组件属性
+            const temp = reactive<PublicAtrr[]>([
+                {
+                    label: "标签名称",
+                    value: item.label,
+                    path: "item.label",
+                    vHide: [
+                    "grid",
+                    "tabs",
+                    "title",
+                    "gridChild",
+                    "div",
+                    "inputSlot",
+                    "flex",
+                    "button",
+                    "txt",
+                    ],
+                    eventName: "labelNameVal",
+                },
+                {
+                    label: "标题",
+                    value: control.modelValue,
+                    path: "control.modelValue",
+                    vShow: ["title"],
+                },
+                {
+                    label: "组件类型",
+                    value: unitName,
+                    placeholder: "组件类型",
+                    path: "unitName",
+                },
+                // {
+                //     label: '自定义Class',
+                //     value: config.className,
+                //     placeholder: '样式类名',
+                //     path: 'config.className'
+                // },
+                {
+                    label: "字段标识",
+                    value: name,
+                    type: Object.keys(stateForm.dataSourceList).length > 0 ? "selectDataSoure" : "text",
+                    placeholder: "字段唯一标识，对应数据库",
+                    dict: stateForm.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.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: stateForm.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", "digitpage"],
+                },
+
+                // {
+                //     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: stateForm.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: stateForm.isSearch
+                // },
+                // {
+                //     label: '添加页隐藏',
+                //     value: config.disabledAdd,
+                //     path: 'config.disabledAdd',
+                //     type: 'switch',
+                //     vIf: stateForm.isSearch,
+                //     vHide: ['inputSlot']
+                // },
+                // {
+                //     label: '编辑页隐藏',
+                //     value: config.disabledEdit,
+                //     path: 'config.disabledEdit',
+                //     type: 'switch',
+                //     vIf: stateForm.isSearch,
+                //     vHide: ['inputSlot']
+                // },
+                // {
+                //     label: '详情页隐藏',
+                //     value: config.disabledDetail,
+                //     path: 'config.disabledDetail',
+                //     type: 'switch',
+                //     vIf: stateForm.isSearch,
+                //     vHide: ['inputSlot']
+                // },
+                {
+                    label: "设为Input输入框的前/后缀",
+                    value: type === "inputSlot",
+                    path: "",
+                    type: "switch",
+                    vShow: ["select", "inputSlot"],
+                    eventName: "setInputSlot",
+                },
+
+                
+                {
+                    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: stateForm.isSearch,
+                    vShow: ["associatedForms"],
+                },
+                {
+                    label: "移动端扫描输入",
+                    value: config.scanInput,
+                    path: "config.scanInput",
+                    type: "input",
+                    vIf: stateForm.isSearch,
+                    vShow: ["input"],
+                },
+                {
+                    label: "隐藏条件",
+                    value: config.associatedForms,
+                    path: "config.associatedForms",
+                    type: "associatedForms_hide",
+                    vIf: stateForm.isSearch,
+                    vShow: ["associatedForms"],
+                },
+                {
+                    label: "数据范围",
+                    value: config.associatedForms,
+                    path: "config.associatedForms",
+                    type: "associatedForms_dataRange",
+                    vIf: stateForm.isSearch,
+                    vShow: ["associatedForms"],
+                },
+                {
+                    label: "数据填充规则",
+                    value: config.associatedForms,
+                    path: "config.associatedForms",
+                    type: "associatedForms_FillRoles",
+                    vIf: stateForm.isSearch,
+                    vShow: ["associatedForms"],
+                },
+                {
+                    label: "轮播图设置",
+                    value: config.carousel,
+                    path: "config.carousel",
+                    type: "carousel",
+                    vIf: stateForm.isSearch,
+                    vShow: ["lowcodeCarsusel"],
+                },
+
+                {
+                    label: "穿梭框名",
+                    value: config.transfer,
+                    path: "config.transfer",
+                    type: "transfer_name",
+                    vIf: stateForm.isSearch,
+                    vShow: ["lowcodeTransfer"],
+                },
+                {
+                    label: "选项数据源",
+                    value: config.transfer,
+                    path: "config.transfer",
+                    type: "transfer_options_datasource",
+                    vIf: stateForm.isSearch,
+                    vShow: ["lowcodeTransfer"],
+                },
+                {
+                    label: "上传视频",
+                    value: config.uploadvideo,
+                    path: "config.uploadvideo",
+                    type: "uploadvideo_url",
+                    vIf: stateForm.isSearch,
+                    vShow: ["videoUpAndPlay"],
+                },
+                {
+                    label: "默认图片",
+                    value: config.lowcodeImage,
+                    path: "config.lowcodeImage",
+                    type: "lowcodeImage_url",
+                    vIf: stateForm.isSearch,
+                    vShow: ["lowcodeImage"],
+                },
+                {
+                    label: "必须现场拍照",
+                    value: config.lowcodeImage,
+                    path: "config.lowcodeImage",
+                    type: "lowcodeImage_currentShot",
+                    vIf: stateForm.isSearch,
+                    vShow: ["lowcodeImage"],
+                },
+                {
+                    label: "详情页展示全部选项",
+                    value: config.checkbox,
+                    path: "config.checkbox",
+                    type: "checkbox_showAll",
+                    vIf: stateForm.isSearch,
+                    vShow: ["checkbox"],
+                },
+                {
+                    label: "数据范围",
+                    value: config.orgCentent,
+                    path: "config.orgCentent",
+                    type: "orgCentent_range",
+                    vIf: stateForm.isSearch,
+                    vShow: ["orgCentent"],
+                },
+                {
+                    label: "是否多选",
+                    value: config.orgCentent,
+                    path: "config.orgCentent",
+                    type: "orgCentent_Multiple",
+                    vIf: stateForm.isSearch,
+                    vShow: ["orgCentent"],
+                },
+                {
+                    label: "默认一行",
+                    value: config.table,
+                    path: "config.table",
+                    type: "table_defaultOne",
+                    vIf: stateForm.isSearch,
+                    vShow: ["table"],
+                },
+                {
+                    label: "预填充设置",
+                    value: config.table,
+                    path: "config.table",
+                    type: "table_preFill",
+                    vIf: stateForm.isSearch,
+                    vShow: ["table"],
+                },
+                {
+                    label: "关联填充",
+                    value: config.orgCentent,
+                    path: "config.orgCentent",
+                    type: "orgCentent_ConnectUser",
+                    vIf: stateForm.isSearch,
+                    vShow: ["orgCentent"],
+                },
+                {
+                    label: "数据范围",
+                    value: config.expandUser,
+                    path: "config.expand-user",
+                    type: "expand-user",
+                    vIf: stateForm.isSearch,
+                    vShow: ["expand-user"],
+                },
+                {
+                    label: "是否多选",
+                    value: config.expandUser,
+                    path: "config.expand-user",
+                    type: "expand-user_MultiSelect",
+                    vIf: stateForm.isSearch,
+                    vShow: ["expand-user"],
+                },
+                /* {
+                    label: "表单栅格",
+                    value: config.span,
+                    placeholder: "表单区域栅格宽，0为自动宽",
+                    path: "config.span",
+                    vHide: ["gridChild"],
+                    isNum: true,
+                }, */
+                {
+                    label: "表单栅格",
+                    value: config.span,
+                    path: "config.span",
+                    type: "span",
+                    vHide: ["gridChild"],
+                    isNum: true,
+                },
+                {
+                    label: "占据的列数span",
+                    value: attr.span,
+                    type: "attrSpan",
+                    path: "attr.span",
+                    vShow: ["gridChild"],
+                    eventName: "formatNumber",
+                    isNum: true,
+                },
+                {
+                    label: "左侧的间隔格数offset",
+                    value: attr.offset,
+                    type: "attrOffset",
+                    path: "attr.offset",
+                    vShow: ["gridChild"],
+                    eventName: "formatNumber",
+                    isNum: true,
+                },
+                {
+                    label: "向右移动格数push",
+                    value: attr.push,
+                    type: "attrPush",
+                    path: "attr.push",
+                    vShow: ["gridChild"],
+                    eventName: "formatNumber",
+                    isNum: true,
+                },
+                {
+                    label: "向左移动格数pull",
+                    value: attr.pull,
+                    type: "attrPull",
+                    path: "attr.pull",
+                    vShow: ["gridChild"],
+                    eventName: "formatNumber",
+                    isNum: true,
+                },
+                /* {
+                    label: "添加时间水印",
+                    value: config.lowcodeImage,
+                    path: "config.lowcodeImage",
+                    type: "lowcodeImage_watermark",
+                    vIf: stateForm.isSearch,
+                    vShow: ["lowcodeImage"],
+                }, */
+                {
+                    label: "显示级别",
+                    value: config.organization,
+                    path: "config.organization",
+                    type: "organization_location_level",
+                    vIf: stateForm.isSearch,
+                    vShow: ["organization"],
+                },
+                /*{
+                                label: '尺寸',
+                                value: config.lowcodeImage,
+                                path: 'config.lowcodeImage',
+                                type: 'lowcodeImage_showMode',
+                                vIf: stateForm.isSearch,
+                                vShow: ['lowcodeImage']
+                            },
+                            {
+                                label: '契合度',
+                                value: config.lowcodeImage,
+                                path: 'config.lowcodeImage',
+                                type: 'lowcodeImage_fit',
+                                vIf: stateForm.isSearch,
+                                vShow: ['lowcodeImage']
+                            },
+                            {
+                                label: '圆角',
+                                value: config.lowcodeImage,
+                                path: 'config.lowcodeImage',
+                                type: 'lowcodeImage_radius',
+                                vIf: stateForm.isSearch,
+                                vShow: ['lowcodeImage']
+                            },
+                            {
+                                label: '边框和阴影',
+                                value: config.lowcodeImage,
+                                path: 'config.lowcodeImage',
+                                type: 'lowcodeImage_boderAndShadow',
+                                vIf: stateForm.isSearch,
+                                vShow: ['lowcodeImage']
+                            },
+                            {
+                                label: '图片链接',
+                                value: config.lowcodeImage,
+                                path: 'config.lowcodeImage',
+                                type: 'lowcodeImage_link',
+                                vIf: stateForm.isSearch,
+                                vShow: ['lowcodeImage']
+                            },
+                            {
+                                label: '浮动',
+                                value: config.lowcodeImage,
+                                path: 'config.lowcodeImage',
+                                type: 'lowcodeImage_float',
+                                vIf: stateForm.isSearch,
+                                vShow: ['lowcodeImage']
+                            }, */
+                // {
+                // 	label: '内外四边距',
+                // 	value: config.lowcodeImage,
+                // 	path: 'config.lowcodeImage',
+                // 	type: 'lowcodeImage_marginAndPadding',
+                // 	vIf: stateForm.isSearch,
+                // 	vShow: ['lowcodeImage']
+                // },
+                /* {
+                                label: '上传视频封面',
+                                value: config.uploadvideo,
+                                path: 'config.uploadvideo',
+                                type: 'uploadvideo_poster',
+                                vIf: stateForm.isSearch,
+                                vShow: ['videoUpAndPlay']
+                            }, */
+                {
+                    label: "视频宽度(像素)",
+                    value: config.uploadvideo,
+                    path: "config.uploadvideo",
+                    type: "uploadvideo_width",
+                    vIf: stateForm.isSearch,
+                    vShow: ["videoUpAndPlay"],
+                },
+                {
+                    label: "视频高度(像素)",
+                    value: config.uploadvideo,
+                    path: "config.uploadvideo",
+                    type: "uploadvideo_height",
+                    vIf: stateForm.isSearch,
+                    vShow: ["videoUpAndPlay"],
+                },
+                {
+                    label: "视频自动播放",
+                    value: config.uploadvideo,
+                    path: "config.uploadvideo",
+                    type: "uploadvideo_autoPlay",
+                    vIf: stateForm.isSearch,
+                    vShow: ["videoUpAndPlay"],
+                },
+                {
+                    label: "视频循环播放",
+                    value: config.uploadvideo,
+                    path: "config.uploadvideo",
+                    type: "uploadvideo_loopPlay",
+                    vIf: stateForm.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: 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 [];
+    }
+});
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-25 16:00:09
+@ 功能: 判断是否是组件
+*/
+const cssIsShouw = (val: any) => {
+  if (val.length && val.length > 0) {
+    return true;
+  }
+  return false;
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-25 16:16:47
+@ 功能: 获取组件样式Demo
+*/
+const controlDataStyls = computed(() => {
+  return store.controlAttr.styles;
+});
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-28 09:27:02
+@ 功能: 选择关联表单
+*/
+const formidChanged = () => {
+    //需设置关联关联表单的表单
+    controlData.value.control.glbbddbd = formData.value.name;
+    if (controlData.value.control.formid === "") {
+  } else {
+    getAsfasfFieldTree(controlData.value.control.formid).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);
+
+        dataExceptChild.splice(0, 2);
+
+        dataExceptChild.splice(2, 4);
+
+        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;
+    });
+  }
+}
+
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-28 09:59:30
+@ 功能: 表单ID改变
+*/
+const formidChangedOptionsValue3 = () => {
+    if (controlData.value.control.optionsValue3Formid === "") {
+    } else {
+        getAsfasfFieldTreeOptionsValue3(controlData.value.control.optionsValue3Formid).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 resDataForGlxxszExceptself1: any[] = [];
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-25 15:57:30
+@ 功能: 字段设置
+*/
+watch(() => store.activeKey, (val: string) => {
+    if(val){
+        stateForm.tabsName = "first";
+        cssIsShouw(attrList);
+    }
+
+    // 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);
+    }
+
+    //刚拖拽视频组件时,初始化imgid监听designForm.activeKey,变化时,如果controlData.value.type=='lowcodeCarsusel',就遍历轮播图数组把imgid=''的都生成uuid
+    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();
+    }else if(controlData.value.type === "orgCentent"){
+        haveOrgTreeInfo()
+    }else if(controlData.value.type === "expand-user"){
+        
+    }
+    //实现关联表单设置可选字段中没有当前字段效果    start
+    // console.log(controlData.value.name)
+    // if(typeof resDataForGlxxszExceptself.value !== 'undefined' && resDataForGlxxszExceptself.value){
+    // // resDataForGlxxszExceptself1 = JSON.parse(JSON.stringify(resDataForGlxxszExceptself.value));
+    // }
+    // 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)
+        console.log(newVal) */
+        if (str == val) {
+            resDataForGlxxszExceptself1.splice(i, 1); // 将使后面的元素依次前移，数组长度减1
+            i--; // 如果不减，将漏掉一个元素
+        }
+    }
+    //console.log(resDataForGlxxszExceptself1);
+    if (
+        getAssociatedFormsCurrentFieldTreeData.value &&
+        getAssociatedFormsCurrentFieldTreeData.value.treeAttrs &&
+        getAssociatedFormsCurrentFieldTreeData.value.treeAttrs != undefined
+    ) {
+        associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value = [
+            {
+                id: "rootid_" + getAssociatedFormsCurrentFieldTreeData.value.label,
+                //label: '当前表单',
+                label: "当前表单-" + getAssociatedFormsCurrentFieldTreeData.value.treeAttrs.show,
+                children: resDataForGlxxszExceptself1,
+                treeAttrs: getAssociatedFormsCurrentFieldTreeData.value.treeAttrs, //
+            },
+        ];
+    }
+
+
+
+
+
+}, {
+    immediate: true,
+})
+
+const fileSignAry = reactive<any>([]);
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-25 16:28:28
+@ 功能: 表单属性
+*/
+const formAttr = computed(() => {
+    const isSearch = stateForm.isSearch;
+    return [
+    {
+      label: "数据源",
+      placeholder: "请选择引用的数据源",
+      value: 1,
+      key: "dataSourceSetup",
+      type: "dataSourceSetup",
+      hide: isSearch,
+      options: [
+        {
+          label: "无",
+          value: "no",
+          name: "",
+          id: "",
+        },
+        {
+          label: "引用数据源",
+          value: "yes",
+          name: "",
+          id: "",
+        },
+      ],
+    },
+    {
+      label: "表单名称",
+      placeholder: "用于保存的表单名称",
+      value: formData.value.formName,
+      key: "formName",
+      hide: isSearch,
+      disabled: false,
+    },
+    {
+      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,
+      disabled: false,
+    },
+    // {
+    // 	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',
+                path: 'config',
+                key: 'expand',
+                hide: !isSearch
+            }*/
+  ];
+})
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-25 16:59:42
+@ 功能: 关联选项设置会在标签名称改变时清空
+*/
+const formNameChange = () => {
+  emits("formNameChange", 1);
+}
+/**
+ * 获取非负整数随机数
+ * @param Min 最小整数
+ * @param Max 最大整数
+ * @returns 随机数
+ */
+const Rand = (Min: number, Max: number) => {
+    switch (Min) {
+        case 0:
+            return Math.round(Math.random() * Max);
+            break;
+        case 1:
+            return Math.ceil(Math.random() * Max);
+            break;    
+        default:
+            return Math.round(Math.random() * (Max - Min) + Min);
+            break;    
+    }               
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-03 08:39:42
+@ 功能: 获取当前正在设置自动填充的组件（"结果"组件）的选项
+*/
+const currentComponentOptions = computed(() => {
+    return controlData.value.options
+})
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-25 16:59:18
+@ 功能: 修改指定路径下的值
+*/
+const getPropByPath = (obj: any, path: string, val: any) => {
+  let tempObj = obj;
+  const keyArr = path.split(".");
+  //liwenxuan 关联选项设置会在标签名称改变时清空 start 250410
+  if (keyArr && keyArr[0] && keyArr[0] == "name") {
+    if (
+      tempObj.type == "select" ||
+      tempObj.type == "radio" ||
+      tempObj.type == "checkbox" ||
+      tempObj.type == "switch"
+    ) {
+      formNameChange();
+    }
+  }
+  // liwenxuan 关联选项设置会在标签名称改变时清空 end 250410
+  // console.log("修改指定路径下的值", keyArr, tempObj);
+  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,
+  };
+};
+// 子表时添加序号和操作列
+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);
+  }
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-25 16:40:18
+@ 功能: 捕获字段变动
+*/
+const controlChange = (obj: any, val: any) => {
+    // select多选属性，
+    switch (obj.eventName) {
+        case 'selectMultiple':
+            if (val) {
+                // 多选，将值改为数组
+                controlData.value.control.modelValue = [];
+                controlData.value.control.glxxsz = [];
+            } else {
+                // 单选
+                controlData.value.control.modelValue = "";
+                for (var i = 0; i < controlData.value.options.length; i++) {
+                if (controlData.value.control.glxxsz[i] === undefined) {
+                    //新增了某个option
+                    controlData.value.control.glxxsz.push({
+                    conditionField: controlData.value.name,
+                    optionLabel: controlData.value.options[i].label,
+                    optionValue: controlData.value.options[i].value,
+                    tableIndex: i,
+                    id: uuidv4().replaceAll("-", "").toString(),
+                    });
+                } else {
+                    //修改了某个option
+                    controlData.value.control.glxxsz[i].optionLabel =
+                    controlData.value.options[i].label;
+                    controlData.value.control.glxxsz[i].optionValue =
+                    controlData.value.options[i].value;
+                }
+                }
+            }
+            break;
+        case 'tableColumn1':
+            tableColumnAdd(val);
+            break;
+        case 'formatNumber':
+            val = parseInt(val); // 将值转数值
+            break;
+        case 'filedNameKey':
+            // 选择字段标识时，同时修改显示标题
+            // 根据value找key
+            if (obj.type === "select") {
+                stateForm.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";
+            }
+            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)
+                    ) {
+                        if (
+                        Array.isArray(props.sunFormField) &&
+                        !props.sunFormField.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)) {
+                                            if (controlData.value.type == "table") {
+                                                controlData.value.name = "table_" + data.data;
+                                            } else {
+                                                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;
+                                                    if (controlData.value.type == "table") {
+                                                        controlData.value.name = "table_" + titleVal;
+                                                    } else {
+                                                        controlData.value.name = titleVal;
+                                                    }
+
+                                                    fileSignAry.push(titleVal);
+                                                    isEnd = false;
+                                                }
+                                            } while (isEnd);
+                                        }
+                                    } else {
+                                        if (!fileSignAry.includes(val)) {
+                                            if (controlData.value.type == "table") {
+                                                controlData.value.name = "table_" + val;
+                                            } else {
+                                                controlData.value.name = val;
+                                            }
+                                            // controlData.value.name = val;
+                                            fileSignAry.push(val);
+                                        } else {
+                                            let titleVal = val + Rand(10000000, 99999999);
+                                            if (!fileSignAry.includes(titleVal)) {
+                                                // controlData.value.name = titleVal;
+                                                if (controlData.value.type == "table") {
+                                                    controlData.value.name = "table_" + titleVal;
+                                                } else {
+                                                    controlData.value.name = titleVal;
+                                                }
+                                                fileSignAry.push(titleVal);
+                                            }
+                                        }
+                                    }
+                                }
+                            });
+                        }
+                    }
+                }
+            }
+            break;
+    }
+    if (obj.path) {
+        const newVal = obj.isNum ? formatNumber(val) : val; // 类型为数字时转整数
+        obj.path && getPropByPath(controlData.value, obj.path, newVal);
+    }
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 10:46:09
+@ 功能: 返回值处理
+*/
+const updataDigit = (key: string, val: any) => {
+    formConfig.value[key] = {
+        mathsFormula: val.mathsFormula,
+        takingMethod: val.takingMethod,
+        digit: val.digit,
+    };
+    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,
+            };
+        }
+    });
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 10:48:48
+@ 功能: 默认值处理
+*/
+const digitPageSub = (val: any, envt: any) => {
+    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;
+    }
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 10:55:36
+@ 功能: 
+*/
+const openMathDialog = (val: any) => {
+    subUnit.value = val;
+    formListmap.value = props.formList;
+    unitInfo.value = attrList.value;
+    mathBoxShow.value = true;
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 11:01:09
+@ 功能: 删除钩子 禁止删除
+*/
+const beforeRemove = ():boolean => {
+    return false;
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 11:02:37
+@ 功能: 上传成功钩子
+*/
+//每个视频上传控件对应一个videoMsg[videoIndex]
+const videoIndex = ref(0);
+const videoUploadOk = (response: any) => {
+    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;
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 11:06:13
+@ 功能: 上传失败钩子
+*/
+const videoUploadErr = (error: Error) => {
+    ElMessage.error(error.message);
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 11:08:47
+@ 功能: 检查文件类型
+更改已上传的视频: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);
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 11:45:10
+@ 功能: 删除默认图片
+*/
+const delDefaultImg = () => {
+    const element = controlData.value.control;
+    element.imgUrl = "";
+    element.uploadFlag = false;
+    element.useDefaultImg = false;
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 11:46:27
+@ 功能: 图片上传成功钩子
+*/
+const lowcodeImageUploadSuccess = (
+  response: any) => {
+  const element = controlData.value.control;
+  element.imgUrl = response.data.url;
+  element.uploadFlag = true;
+  element.useDefaultImg = true;
+  element.onSiteShot = '';
+  element.watermark = '';
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 13:24:24
+@ 功能: 子表预填充设置
+*/
+const preFillDialogFlag = ref(false)
+const preFillDialogShow = () => {
+  preFillDialogFlag.value = true
+}
+
+const preFillDialogDetermine = () => {
+  preFillDialogFlag.value = false
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 13:27:17
+@ 功能: 用户组织联动选择 showSelectOrgConnectUser  
+*/
+const selectOrgConnectUserDialogFlag = ref(false)
+const showSelectOrgConnectUser = () => {
+  selectOrgConnectUserDialogFlag.value = true
+}
+
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 13:56:17
+@ 功能: 获取所有角色
+*/
+
+
+const handleLeftTabChange = (tab: any) => {
+    getPersonByRoleId(tab,expandPageNum.value,expandPageSize.value+"",expandQueryParamNumber.value,expandQueryParamName.value).then(({ data }) => {
+        //console.log(data)
+        expandTableData.value = data.list
+        total.value = data.total
+        //activeName.value = tab
+        
+    });
+}
+
+const queryAllRole = () => {
+    getAllRole().then(({ data }) => {
+        //console.log(data)
+        tabsData.value = data
+        
+        
+    }).finally(()=>{
+        //activeName.value = tabsData.value[2]?.name
+        setTimeout(()=>{
+            activeTab.value = tabsData.value[0]?.id
+            //alert(tabsData.value[0]?.id)
+            //activeName.value = tabsData.value[0]?.id
+            handleLeftTabChange(activeTab.value)
+        },100)
+        
+    })
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 13:34:01
+@ 功能: 选择用户数据范围
+*/
+const userRangeDialogFlag = ref(false)
+const handleUserRangeDialogFlag = () => {
+    userRangeDialogFlag.value = true
+    if(controlData.value.control.queryBy=='role'){
+        queryAllRole()
+    }
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 14:14:24
+@ 功能: 选择用户数据范围确定
+*/
+const formatTooltip = (val: number) => {
+  //console.log("zhidhfasidhais----->",val)
+  /* const result = ((val / 24) * 100).toFixed(2);
+  return `${result}%`; */
+  return val+"/24"
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 14:46:36
+@ 功能: 点击开启隐藏设置
+*/
+//关联表单隐藏条件弹窗flag
+const associatedFormsHideDialogFlag = ref(false);
+const associatedFormsHideDialoghandle = () => {
+    associatedFormsHideDialogFlag.value = true
+    controlData.value.control.hideConditionHtmlCopy = controlData.value.control.hideConditionHtml;
+    nextTick(() => {
+        aft.value.focusEditor
+    });
+}
+watch(()=>associatedFormsHideDialogFlag.value, (val) => {
+  if (val === true && determine.value === false) {
+    setTimeout(() => {
+      //alert(1)
+      aft.value.tinymceReInit();
+    }, 200);
+  }
+});
+//
+const associatedFormsChooseDialogFlag = ref(false);
+const  chooseAssociatedForm = () => {
+    getCustomerFormTree();
+    associatedFormsChooseDialogFlag.value = true;
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 15:29:28
+@ 功能: 移除前N个元素 
+*/
+const removeFirstNumElements = (arr: string | any[], num: number) => {
+    if (arr.length < num) {
+        return [];
+    }
+    return arr.slice(num);
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 15:10:20
+@ 功能: 关联表单数据范围处理
+*/
+interface Tree {
+  id?: string;
+  label: string;
+  disabled?: boolean;
+  children?: Tree[];
+  parentId?: string;
+  [key: string]: any;
+}
+
+interface TreeNode {
+  data: Tree;
+  parent: TreeNode;
+  [key: string]: any;
+}
+const dataSource = ref<Tree[]>([]);
+const asfasfFieldTree = ref<Tree[]>();
+const asfasfMasterFieldTree = ref<Tree[]>();
+const asfasfChildTableList = ref<Tree[]>();
+const asfasfChildTableFields = ref<Tree[]>();
+const asfasfFieldTreeOptionsValue3 = ref<Tree[]>();
+const associatedFormsFillRolesDialogFlag = ref(false);
+const associatedFormsDataRangeDialogFlag = ref(false);
+const associatedFormsCurrentFormFieldTreeNoTable = ref<Tree[]>();
+const associatedFormsCurrentFormFieldTree = ref<Tree[]>();
+const associatedFormsCurrentFormFieldTree1 = ref<Tree[]>();
+const currentFormChildTableFieldsForFillRole = ref<Tree[]>();
+const associatedFormsCurrentFormFieldTreeNoTable1 = ref<any>([]);
+const resDataForGlxxszExceptself= ref<any>([]);
+const associatedFormsCurrentFormFieldTreeForGlxxsz = ref<Tree[]>();
+const associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf = ref<Tree[]>();
+let currentChildTableCount = 0
+const associatedFormsDataRangeDialoghandle = () => {
+    getAsfasfFieldTree(controlData.value.control.formid).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"
+            );
+            dataExceptChild = removeFirstNumElements(dataExceptChild, 8);
+            dataOnlyChild = dataOnlyChild.filter(
+                (obj: { type: string }) => obj.type == "table"
+            );
+            dataOnlyChild1 = dataOnlyChild1.filter(
+                (obj: { type: string }) => obj.type == "table"
+            );
+            dataOnlyChild1.forEach((element: any) => {
+                element.children = removeFirstNumElements(element.children, 6);
+            });
+            for (let m = 0; m < dataOnlyChild.length; m++) {
+                dataOnlyChild[m].children = [];
+            }
+            let resDataExceptChild = ref(dataExceptChild);
+            let resDataOnlyChild = ref(dataOnlyChild);
+            let resDataOnlyChild1 = ref(dataOnlyChild1);
+            let childTableCount = 0;
+            for (let n = 0; n < resDataOnlyChild.value.length; n++) {
+                //console.log(resDataOnlyChild.value[n])
+                resDataOnlyChild.value[n].disabled = false;
+                childTableCount = n;
+            }
+            currentChildTableCount = childTableCount;
+            asfasfFieldTree.value = [
+                {
+                id: "rootid_" + data.label,
+                label: "关联的表单-" + data.label,
+                children: [...resData.value],
+                treeAttrs: data.treeAttrs,
+                disabled: true,
+                },
+            ];
+            asfasfMasterFieldTree.value = [
+                {
+                id: "rootid_" + data.label,
+                label: "关联的表单-" + data.label,
+                children: [...resDataExceptChild.value],
+                treeAttrs: data.treeAttrs,
+                disabled: true,
+                },
+            ];
+            asfasfChildTableList.value = [
+                {
+                id: "rootid_" + data.label,
+                label: "关联的表单-" + data.label,
+                children: [...resDataOnlyChild.value],
+                treeAttrs: data.treeAttrs,
+                disabled: true,
+                },
+            ];
+            asfasfChildTableFields.value = [
+                {
+                id: "rootid_" + data.label,
+                label: "关联的表单-" + data.label,
+                children: [...resDataOnlyChild1.value],
+                treeAttrs: data.treeAttrs,
+                disabled: true,
+                },
+            ];
+        }
+        
+    }); 
+    associatedFormsDataRangeDialogFlag.value = true;
+    controlData.value.control.dataRangeConditionHtmlCopy =
+    controlData.value.control.dataRangeConditionHtml;
+
+    nextTick(() => {
+        aftRange.value.focusEditor();
+    });
+}
+
+const orgAndManTree = ref<Tree[]>();
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 15:41:20
+@ 功能: 数据填充规则设置按钮
+*/
+
+const associatedFormsDataFillRolesDialoghandle = () => {
+    if (controlData.value.control.formid === "") {
+    alert("请先选择要关联的表单");
+  } else {
+    associatedFormsFillRolesDialogFlag.value = true;
+  }
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 15:46:10
+@ 功能: 判断是否可编辑
+*/
+const isNotWriteWord = (val: any) => {
+    if (
+        val.eventName === "filedNameKey" &&
+        props.customerformid != "" &&
+        props.formField &&
+        Array.isArray(props.formField) &&
+        props.formField.includes(val.value)
+    ) {
+        if (
+            props.sunFormField &&
+            Array.isArray(props.sunFormField) &&
+            props.sunFormField.includes(val.value)
+        ) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+    return false;
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 15:52:02
+@ 功能: 根据不同类型判断是否显示当前属性
+*/
+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;
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 15:58:52
+@ 功能: 多选固定选项删除
+*/
+const delSelectOption = (index: number, type?: string) => {
+  //liwenxuan 20240508 checkbox 删除选项时提醒  start
+  let delflag = true;
+  let breakFlag = 0;
+  if (
+    (controlData.value.type === "checkbox" ||
+      controlData.value.type === "radio" ||
+      controlData.value.type === "select") &&
+    controlData.value.config.optionsType == 0
+  ) {
+    //多选删除时,当前index并不是索引而是value,需找出选择的多选框实际的索引作为index    liwenxuan     多选选择框选项拖动功能 20240815 start
+    for (let i = 0; i < controlData.value.options.length; i++) {
+      if (controlData.value.options[i].value == index) {
+        index = i;
+        break;
+      }
+    }
+    //多选删除时,当前index并不是索引而是value,需找出选择的多选框实际的索引作为index     liwenxuan    多选选择框选项拖动功能 20240815 end
+    if (controlData.value.type === "checkbox") {
+      for (var i = 0; i < controlData.value.control.glxxszForCheckBox.length; i++) {
+        if (breakFlag > 0) {
+          break;
+        }
+        for (
+          var j = 0;
+          j < controlData.value.control.glxxszForCheckBox[i].selectedOptions.length;
+          j++
+        ) {
+          if (
+            controlData.value.control.glxxszForCheckBox[i].selectedOptions[j] ===
+            controlData.value.options[index].value
+          ) {
+            let del = confirm(
+              "您本次删除的选项已在关联选项设置中有所配置，相关关联选项设置将被删除，是否确定删除？"
+            );
+            if (del == true) {
+              breakFlag++;
+              break;
+            } else {
+              delflag = false;
+              breakFlag++;
+              break;
+            }
+          }
+        }
+      }
+    }
+  }
+  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 = controlData.value.columns.filter((item: { label: number; }) => {
+        //console.log(item.label);
+        return item.label !== index; // 保留不等于index的项w
+      });
+    } else {
+      controlData.value.options.splice(index, 1);
+    }
+  }
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 16:03:24
+@ 功能: 更多属性弹窗
+*/
+const openAttrDialog = (type?: string, tooltip?: string) => {
+  let editData = controlData.value.control;
+  if (controlData.value.type === "button") {
+    // 按钮组件编辑属性
+    editData = controlData.value.config;
+    type = "button";
+  }
+  console.log("更多属性弹窗", controlData.value);
+  switch (type) {
+    case "treeSelect":
+      // console.log("更多属性弹窗", controlData.value.control.data);
+      editData = controlData.value.control.data;
+
+      break;
+    case "cascader":
+      // console.log("更多属性级联", controlData.value.options);
+      editData = controlData.value.options;
+      break;
+    case "optionsParams": // 选项请求附加参数
+      editData = controlData.value.config.beforeRequest;
+      // params.codeType = 'json'
+      break;
+    case "optionsResult":
+      editData = controlData.value.config.afterResponse;
+      break;
+  }
+  const emitsParams = {
+    content: editData,
+    title: tooltip,
+    type: type,
+    direction: "ltr",
+    callback: (result: any) => {
+      switch (type) {
+        case "treeSelect":
+          // console.log("更多属性弹窗会写数据：", result);
+          controlData.value.control.data = result;
+          // console.log(
+          //   "更多属性弹窗会写数据-----1------>：",
+          //   controlData.value.control.data
+          // );
+          break;
+        case "cascader":
+          controlData.value.options = result;
+          break;
+        case "optionsParams":
+          controlData.value.config.beforeRequest = result;
+          break;
+        case "optionsResult":
+          controlData.value.config.afterResponse = result;
+          break;
+        case "button":
+          controlData.value.config = result;
+          break;
+        default:
+          controlData.value.control = {};
+          Object.assign(controlData.value.control, result);
+      }
+    },
+  };
+  emits("openDialog", emitsParams);
+};
+// 必填校验
+const requiredChange = (val: any) => {
+  if (!controlData.value.item?.rules) {
+    controlData.value.item.rules = [];
+  }
+  if (val) {
+    controlData.value.item.rules.push({
+      required: true,
+      message: "必填项",
+      trigger: "change",
+    });
+  } else {
+    controlData.value.item.rules.splice(0, 1);
+  }
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 16:01:41
+@ 功能: 多选固定选项增加
+*/
+const addSelectOption = (type: any) => {
+  // console.log("多选固定选项增加", controlData.value.type);
+  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;
+
+      // console.log("多选固定选项增加-------1---->", maxVal, controlData.value.options);
+
+      if (controlData.value.options && controlData.value.options.length > 0) {
+        let optMax = 1;
+        controlData.value.options.forEach((item: any) => {
+          if (item.value * 1 >= optMax) {
+            optMax = item.value;
+          }
+        });
+
+        // console.log("多选固定选项增加-------4---->", maxVal, optMax);
+
+        if (maxVal < optMax) {
+          maxVal = optMax * 1 + 1;
+        } else {
+          maxVal = maxVal * 1 + 1;
+        }
+
+        // let isTrue = true;
+        // controlData.value.options.forEach((item: any) => {
+        //   console.log("多选固定选项增加-------4---->", maxVal, item.value);
+        //   if (item.value == maxVal) {
+        //     maxVal = item.value;
+        //     isTrue = false;
+        //   }
+        // });
+
+        // if (isTrue) {
+        //   maxVal = maxVal * 1 + 1;
+        // }
+      }
+      // console.log(
+      //   "多选固定选项增加-------3---->",
+      //   maxVal,
+      //   controlData.value.options.length
+      // );
+      controlData.value.options.push({
+        label: "",
+        value: maxVal.toString(),
+      });
+    }
+  }
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 16:07:25
+@ 功能: 变更规则
+*/
+const rulesSelectNumChange = (item: any, val: string) => {
+    // console.log("快速添加校验规则改变时",item,val)
+    const filter = stateForm.numberRulesList.filter((item) => item.type === val);
+    if (filter && filter.length) {
+        item.message = filter[0].msg;
+        if (val == "time") {
+        item.rule = "YYYYMMDD";
+        } else {
+        item.rule = "";
+        }
+    }
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 16:11:09
+@ 功能: 删除一条编码规则
+*/
+const delNumRules = (index: number) => {
+    controlData.value.config.customRules && controlData.value.config.customRules.splice(index, 1);
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 16:12:16
+@ 功能: 添加一条编码规则
+*/
+const addNumRules = () => {
+    if (!controlData.value.config.customRules) {
+        controlData.value.config.customRules = [];
+    }
+    controlData.value.config.customRules.push({
+        type: "time",
+        rule: "YYYYMMDD",
+    });
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 16:15:16
+@ 功能: 
+*/
+const optionsTypeChanged = () => {
+    controlData.value.config.optionsFun = "";
+    controlData.value.options = [];
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 16:25:08
+@ 功能: 打开弹窗
+*/
+// 初始选项数据
+const options = ref<any[]>([])
+// 编辑时的文本内容（每行一个选项）
+const editText = ref('')
+// 弹窗显示状态
+const dialogVisible = ref(false)
+const openDialog = () => {
+    // 将选项数组转换为文本，每行一个
+    editText.value = options.value.map((option: { label: any; }) => option.label).join('\n')
+    dialogVisible.value = true
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 16:27:44
+@ 功能: 关联选项设置
+*/
+const ZdtcszDialogFlag = ref(false);
+const glxxszDialogFlag = ref(false);
+const glxxszDialogFlagCheckBox = ref(false);
+const glxxszDialogFlagSwitch = ref(false);
+
+const handelGlxxszDialogSwitch = () => {
+     if (
+        controlData.value.control.activeValue == undefined ||
+        controlData.value.control.inactiveValue == undefined
+    ) {
+        alert("请先设置开关状态打开/关闭时的值");
+    } else {
+        glxxszDialogFlagSwitch.value = true;
+    }
+}
+const handelGlxxszDialog = () => {
+  if (controlData.value.options.length === 0) {
+    alert("无可配置选项，请先添加。");
+  } else {
+    glxxszDialogFlag.value = true;
+  }
+}
+const handelGlxxszDialogCheckbox = () => {
+    glxxszDialogFlagCheckBox.value = true;
+}
+const handelZdtcszDialog = () => {
+  if (controlData.value.options.length === 0) {
+    // alert("无可配置选项，请先添加。");
+    ElMessage({
+      message: '无可配置选项，请先添加。',
+      type: 'warning'
+    })
+  } else {
+
+    if(controlData.value.control.zdtcsz){
+
+    }else{
+      controlData.value.control.zdtcsz = {
+						tbx: '',
+						tby: ''
+					}
+    }
+    ZdtcszDialogFlag.value = true;
+    
+  }
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 16:50:06
+@ 功能: 选择系统表单字段
+*/
+const optionsValue3SettingDialogOpenFlag = ref(false);
+const optionsValue3Setting = () => {
+    optionsValue3SettingDialogOpenFlag.value = true;
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 16:53:27
+@ 功能: 返回选项配置提示
+*/
+const getOptionPlaceholder = (type: number) => {
+    switch (type) {
+        case 1:
+            return "数据源接口URL,可带参数";
+        break;
+        case 2:
+            return "字典key，默认为字段标识";
+        break;
+    }
+    return "";
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 16:54:25
+@ 功能: options动态选项数据源请求时
+*/
+const optionsEvent = (type: string, tooltip?: string) => {
+  openAttrDialog(type, tooltip);
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 16:57:40
+@ 功能: 必填文本框改变
+*/
+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;
+          }
+        });
+      }
+    }
+  }
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 16:58:26
+@ 功能: 是否选中必填
+*/
+const requiredChangeSet = (val: any) => {
+  const isChecked = !!val;
+  if (!controlData.value?.customRules) {
+    controlData.value.customRules = [];
+  }
+  if (isChecked) {
+    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
+    ) {
+      for (let i = controlData.value.customRules.length - 1; i >= 0; i--) {
+        if (controlData.value.customRules[i].type == ValidateText.type) {
+          controlData.value.customRules.splice(i, 1);
+        }
+      }
+    }
+  }
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-26 17:02:16
+@ 功能: 校验规则必填勾选设置，存在校验规则时勾选
+*/
+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
+});
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-14 14:14:42
+@ 功能: 单选改变事件
+*/
+const textUinrVerfy = reactive([...validateTextConfig]);
+const numberUinrVerfy = reactive([...validateInt]);
+const radioChangeSet = (val: any) => {
+  // console.log("单选改变事件-222-->", val);
+  let pickRadio:any = {};
+  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 = [];
+  }
+  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",
+    });
+  }
+};
+
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-27 10:01:41
+@ 功能: 获取表单分组
+*/
+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;
+
+      // console.log("组件加载完毕--------1----------->", formData.value);
+      // console.log("组件加载完毕--------2----------->", props.formList);
+      // console.log("组件加载完毕--------3----------->", stateForm.dataSourceList);
+      if (formData.value.dataSource == "yes" && stateForm.dataSourceList.length < 1) {
+        // console.log("组件加载完毕--------4----------->", stateForm.dataSourceList);
+        tableFileList();
+      }
+    });
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-27 10:03:28
+@ 功能: 获取有源数据库表单
+*/
+const tableFileList = () => {
+  let sendData = {
+    id: formData.value.dataSourceConfig.id,
+    sqlType: formData.value.dataSourceConfig.dsn.sqlType,
+    name: formData.value.dataSourceConfig.dsn.dataBaseName,
+    tableName: formData.value.dataSourceConfig.tableKey,
+    host: formData.value.dataSourceConfig.dsn.ip,
+    prot: formData.value.dataSourceConfig.dsn.port,
+    user: formData.value.dataSourceConfig.dsn.userName,
+    pwd: formData.value.dataSourceConfig.dsn.password,
+  };
+  gainDataStorceAllField(sendData)
+    .then((data) => {
+      console.log("获取有源数据库表单", data);
+      // formGroup.value = data.data;
+      stateForm.dataSourceList = data.data;
+    })
+    .finally(() => {});
+};
+
+
+
+
+onBeforeMount(() => {
+  getAssociatedFormsOrgAndManTree().then(({ data }) => {
+    let resData = ref(data.children);
+    orgAndManTree.value = [
+      {
+        id: data.id,
+        //label: data.label,
+        label: "组织机构",
+        children: [...resData.value],
+      },
+    ];
+  });
+});
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-27 10:08:57
+@ 功能: 知识库
+*/
+interface AiAgentItem {
+  uuid: string;
+  name: string;
+}
+const aiAgentList = ref<AiAgentItem[]>([
+  // {
+  //   label: "法律法规",
+  //   value: 1,
+  // },
+  // {
+  //   label: "安全环保",
+  //   value: 2,
+  // },
+  // {
+  //   label: "员工守则",
+  //   value: 3,
+  // },
+]);
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-27 10:18:23
+@ 功能: 根据选定数据源获取表单字段
+*/
+const getFormFieldBySource = (id?: string) => {
+  if (stateForm.isSearch) {
+    // 搜索设计这里不需要数据源
+    return;
+  }
+  const source = id;
+  if (source) {
+    getRequest("sourceById", { id: source })
+      .then((res:any) => {
+        // console.log(res)
+        const tableData = res.data.result?.tableData;
+        if (tableData && tableData.length) {
+          stateForm.dataSourceList = tableData.filter((item: any) => item.enterable);
+        }
+      })
+      .catch(() => {
+        // console.log(res)
+      });
+  }
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-27 10:16:00
+@ 功能: 表单属性修改
+*/
+const formAttrChange = (obj: any, val?: any) => {
+    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;
+    }
+}
+
+
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-27 10:22:42
+@ 功能: 打开数据源设定
+*/
+const openDataSourceBox = ref(false);
+const openSetDataSource = () => {
+  openDataSourceBox.value = true;
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-12-23 16:36:16
+@ 功能: 关闭数据源
+*/
+const closeDataSource = () => {
+  openDataSourceBox.value = false;
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-27 10:47:24
+@ 功能: 上传成功
+*/
+const handleAvatarSuccess: UploadProps["onSuccess"] = (response) => {
+    formConfig.value.imageUrl = response.data.url;
+}
+
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-27 10:49:19
+@ 功能: 上传之前检查
+*/
+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;
+    }
+    return true;
+};
+
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-27 10:57:54
+@ 功能: 获取关联表单字段
+*/
+
+const getAssociatedFormsCurrentFieldTree1 = () => {
+    getAssociatedFormsCurrentFieldTree(props.customerformid).then(({ data }) => {
+    // console.log(data)
+    getAssociatedFormsCurrentFieldTreeData.value = 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));
+      let resDataNoTableNoAsf = 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,
+        },
+      ];
+
+      //liwenxuan 关联选项设置对子表不生效的bug修复 start 250409
+      let resDataHasTableButNoTableChild = JSON.parse(JSON.stringify(data.children));
+      resDataHasTableButNoTableChild.splice(0, 2);
+      resDataHasTableButNoTableChild.splice(2, 4);
+      resDataHasTableButNoTableChild.forEach((element: any) => {
+        if (element.type && element.type == "table") {
+          element.children = [];
+          element.disabled = false;
+        }
+        let currentIdArr = element.id.split(":");
+        //console.log(currentIdArr)
+        let currentId = currentIdArr[currentIdArr.length - 1];
+        //console.log(currentId)
+
+        if (currentId == controlData.value.name) {
+          /* alert(currentId)
+          console.log(currentId) */
+          element.disabled = true;
+        }
+      });
+
+      //liwenxuan 关联选项设置对子表不生效的bug修复 end 250409
+
+      resDataNoTable = resDataNoTable.filter(
+        (item: { type: string | null }) => item.type != "table"
+      );
+      resDataNoTableNoAsf = resDataNoTable.filter(
+        (item: { type: string | null }) =>
+          item.type != "associatedForms" &&
+          item.type != "table" &&
+          item.type != "checkbox"
+      );
+
+      associatedFormsCurrentFormFieldTreeNoTable.value = [
+        {
+          id: "rootid_" + data.label,
+          label: "当前表单-" + data.treeAttrs.show,
+          children: [...resDataNoTableNoAsf],
+          treeAttrs: data.treeAttrs,
+        },
+      ];
+      //console.log(resDataNoTable)
+      associatedFormsCurrentFormFieldTreeNoTable1.value = [...resDataNoTable];
+      //liwenxuan 关联选项设置无法识别创建人,创建时间控件bug修复 start 250409
+      /* let r1 = JSON.parse(JSON.stringify(data.children));
+      
+      r1.splice(0,2);
+      r1.splice(2,4); */
+      //let resDataForGlxxsz = ref(data.children.slice(8));
+      let resDataForGlxxsz = ref(resDataHasTableButNoTableChild);
+      //liwenxuan 关联选项设置无法识别创建人,创建时间控件bug修复 end 250409
+      if(resDataForGlxxsz.value){
+        resDataForGlxxszExceptself.value = 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
+        },
+      ];
+    }
+  });
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-27 11:14:29
+@ 功能: 查看内部二维码图片
+*/
+const qrCodeInsideDialogFlag = ref(false);
+const qrCodeImgInside = ref('')
+const showQrCodeInside = () =>{
+    //查看二维码展示弹窗图片,图片带有分组,app,表单名称,和二维码图片
+    //在此获取必要的参数并请求后台,获取二维码图片,当图片返回成功时,显示弹窗
+    //必要的参数为cfid
+    getQrCodeImgInside(props.customerformid).then(({ data }) => {
+        qrCodeImgInside.value = data;
+        if (qrCodeInsideDialogFlag.value == false) {
+        //console.log(qrCodeImgInside)
+        qrCodeInsideDialogFlag.value = true;
+        }
+    });
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-27 11:17:55
+@ 功能: 信息提示
+*/
+const showQrCodeOutside = () => {
+  ElMessage({
+    message: "暂不支持外部填单",
+    type: "warning",
+  });
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-27 11:29:33
+@ 功能: 显示多少个字
+*/
+const handleMaxSelect = () => {
+    if (formData.value.qrCodeShowFields.length > 5) {
+        // alert("最多可选择5个字段");
+        ElMessage({
+            message: "最多可选择5个字段",
+            type: "warning",
+        });
+    }
+    while (formData.value.qrCodeShowFields.length > 5) {
+        //
+        formData.value.qrCodeShowFields.pop();
+    }
+};
+
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-27 11:43:47
+@ 功能: 编辑表单样式
+*/
+const editFormStyle = (tooltip: string) => {
+    emits("openDialog", {
+        codeType: "css",
+        direction: "ltr",
+        type: "css",
+        title: tooltip,
+    });
+};
+
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-27 11:45:05
+@ 功能: 设置数据字典
+*/
+const editFormDict = (tooltip: string) => {
+    emits("openDialog", {
+        type: "dict",
+        direction: "ltr",
+        codeType: "json",
+        title: tooltip,
+    });
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-27 10:07:47
+@ 功能: 
+*/
+const gainAiagentList = () => {
+    getAiagentList().then(resp=>{
+        aiAgentList.value=resp.data
+    })
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-27 11:48:48
+@ 功能: 点击了哪个按钮
+*/
+const eventClick = (type: string, tooltip?: string) => {
+  emits("openDialog", { type: type, title: tooltip, direction: "ltr" });
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-27 13:11:50
+@ 功能: 获取数据源，表单设计才加载，搜索设置不需要
+*/
+const getDataSource = () => {
+  // 获取数据源，表单设计才加载，搜索设置不需要
+  if (!stateForm.isSearch) {
+    // getRequest('sourceList').then((res: any) => {
+    // 	dataSourceOption.value = res.data.list
+    // 	//dataSourceOption.value.unshift({ name: '无', id: '' })
+    // })
+  }
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-27 13:13:46
+@ 功能: 
+//关联表单数据填充时无法获取当前表单新增且保存的字段，只有关闭重启后方能获取----bug修改
+//穿梭框编辑固定选项时，修改的节点无法立即预览到，需保存后退出重进才能预览到修改后的----bug修改
+*/
+const showAssociatedFormsFillRole = ref(true);
+const saveRefreshFormControlAttr = () => {
+    getAssociatedFormsCurrentFieldTree1();
+    showAssociatedFormsFillRole.value = false;
+    // 等待一个短时间的延迟，确保组件卸载完成
+    setTimeout(() => {
+        showAssociatedFormsFillRole.value = true;
+    }, 200);
+};
+
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-27 13:28:39
+@ 功能: 删除AI设置
+*/
+const delList = (index: string | number) => {
+    if(localAiConfig.value){
+        localAiConfig.value = [...localAiConfig.value];
+        localAiConfig.value.splice(Number(index), 1);
+    }
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-27 13:31:07
+@ 功能: 添加条件AI条件
+*/
+const addPickTracn = () => {
+    console.log("添加条件AI条件",localAiConfig.value)
+    if (localAiConfig.value&&localAiConfig.value.length>0) {
+        // localAiConfig.value = [...localAiConfig.value];
+        localAiConfig.value.push({
+            title: [],
+            trigger: 1,
+            openShowType: 1,
+        });
+    } else {
+        localAiConfig.value = [
+            {
+                title: [],
+                trigger: 1,
+                openShowType: 1,
+            },
+        ];
+    }
+};
+
+
+
+const unitFormList = ref<optionsInfo[]>([]);
+const currentAsfChangeCount = ref(0);
+const asfsExpectCurrent = ref<any>([]);
+const asfs = ref<any>([]);
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-27 13:58:13
+@ 功能: 监听表单变化
+*/
+watch(() => props.formList, (dataList: any) => {
+    unitFormList.value = analysisFromUnit(props.state);
+    if (
+      dataList &&
+      Array.isArray(dataList) &&
+      dataList.length > 0 &&
+      controlData.value.type == "associatedForms" &&
+      currentAsfChangeCount.value == 0
+    ) {
+        asfsExpectCurrent.value = [];
+        asfs.value = [];
+        currentAsfChangeCount.value = 1;
+        for (let i = 0; i < dataList.length; i++) {
+            if (dataList[i].type == "associatedForms") {
+                asfs.value.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.value.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.value.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.value.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.value.push(q);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        if (asfs.value.length > 0) {
+            asfsExpectCurrent.value = asfs.value.filter((item: any) => {
+                return item.name != controlData.value.name;
+            });
+            /* if(asfsExpectCurrent.value.length>0){
+                    console.log(asfsExpectCurrent.value)
+                } */
+        }
+    }
+},
+{
+    deep: true,
+}
+)
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-28 09:22:58
+@ 功能: 监听属性设置标签页切换
+*/
+watch(()=>stateForm.tabsName, (val:string) => {
+    if (val == "first") {
+        if (formData.value.dataSource == "yes" && stateForm.dataSourceList.length < 1) {
+            // console.log("组件加载完毕--------4----------->", formData.value);
+            tableFileList();
+        }
+    }
+},{
+    immediate: true,
+})
+
+watch(
+  () => formData.value.dataSource,
+  (val: string) => {
+    if (val == "yes") {
+      formAttr.value.forEach((item) => {
+        console.log(item.label, "====", "item.", item.type);
+        if (!item.hide) {
+          if (!item.type) {
+            // console.log(item.label, "item.", item.type);
+            item.disabled = true;
+          }
+        }
+        // if (item.key == "formName" || item.key == "name") {
+        //   item.disabled = true;
+        // }
+      });
+    } else {
+      // console.log("formData.value---------------", formData.value);
+      if (formData.value.dataSourceConfi) {
+        formData.value.dataSourceConfig.id = "";
+        formData.value.dataSourceConfig.dataBaseName = "";
+        formData.value.dataSourceConfig.tableName = "";
+        formData.value.dataSourceConfig.tableKey = "";
+        formData.value.dataSourceConfig.dsn = {
+          dataBaseName: "",
+          ip: "",
+          port: 0,
+          userName: "",
+          password: "",
+        };
+      }
+
+      formAttr.value.forEach((item) => {
+        // console.log(item.label, "item.", item.type);
+        if (!item.hide) {
+          if (!item.type) {
+            // console.log(item.label, "item.", item.type);
+            item.disabled = false;
+          }
+        }
+        // if (item.key == "formName" || item.key == "name") {
+        //   item.disabled = false;
+        // }
+      });
+    }
+  },
+  {
+    deep: true,
+  }
+);
+
+defineExpose({ getFormFieldBySource, saveRefreshFormControlAttr });
+
+onMounted(() => {
+  gainFormGroupList();
+  analysisFromUnit(props.state);
+  gainAiagentList()
+  nextTick(()=>{
+    getAssociatedFormsCurrentFieldTree1()
+    getDataSource();
+    getRoleTree()
+  })
+});
+//判断输入框是否可写
+const isNotWrite = (val: any) => {
+  // console.log("判断输入框是否可写--->",val,props.customerformid)
+  if (val.disabled) {
+    return true;
+  } else {
+    if (val.key === "name" && props.customerformid != "") {
+      return true;
+    }
+  }
+  return false;
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-28 11:38:24
+@ 功能: 关闭选择用户
+*/
+const handleExpandTabChange = () => {
+    if(controlData.value.control.queryBy=='role'){
+        queryAllRole()
+    }
+}
+
+const multipleSelection = ref<User[]>([])
+
+interface User {
+  id: number
+  name: string
+  number: string
+  key: string
+  
+}
+const componentKey = ref(0);
+
+const reRenderComponent = () => {
+	componentKey.value++;
+}
+const checkedIdListChangedIndex = (val:any) => {
+	//console.log(val)
+	controlData.value.control.orgRange = val
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-28 13:28:35
+@ 功能: 条件的右边
+*/
+const gotoRight = () => {
+    // 遍历multipleSelection中的每个用户
+    multipleSelection.value.forEach(user => {
+        // 检查checkDataList中是否已存在具有相同key的用户
+        const exists = controlData.value.control.roleCheckDataList.some((item: { key: string; }) => item.key === user.key);
+        
+        // 如果不存在，则添加到checkDataList中
+        if (!exists) {
+        controlData.value.control.roleCheckDataList.push(user);
+        }
+    });
+    let arr: any[] = []
+    controlData.value.control.roleCheckDataList.forEach((element: { key: string; }) => {
+        let str = element.key+""
+        arr.push(str)
+    });
+    //console.log(arr)
+    controlData.value.control.roleRange = arr
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-28 13:42:18
+@ 功能: 动态选在i
+*/
+const handleCurrentChange = () => {
+    handleLeftTabChange(activeTab.value)
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-28 14:04:07
+@ 功能: 指标换
+*/
+const handleSizeChange  = () => {
+    handleLeftTabChange(activeTab.value)
+}
+
+const expandQueryParam = ref('')
+
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-28 14:10:21
+@ 功能: 字符串验证
+*/
+const isAllDigits = (str:any) => {
+    // 首先检查输入是否为字符串类型
+    if (typeof str !== 'string') {
+        return false;
+    }
+    
+    // 检查字符串是否为空
+    if (str.length === 0) {
+        return false;
+    }
+    
+    // 使用正则表达式检查是否全为数字
+    // ^ 表示字符串开始，$ 表示字符串结束
+    // \d+ 表示一个或多个数字
+    const regex = /^\d+$/;
+    return regex.test(str);
+}
+
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-28 14:09:13
+@ 功能: 搜索
+*/
+const searchClick = () => {
+    expandQueryParamNumber.value = ''
+    expandQueryParamName.value = ''
+    if(isAllDigits(expandQueryParam.value)){
+        expandQueryParamNumber.value = expandQueryParam.value
+    }else{
+        expandQueryParamName.value = expandQueryParam.value
+    }
+    handleLeftTabChange(activeTab.value)
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-28 14:11:23
+@ 功能: 重新查询
+*/
+const resetClick = () => {
+    expandQueryParamNumber.value = ''
+    expandQueryParamName.value = ''
+    expandQueryParam.value = ''
+    handleLeftTabChange(activeTab.value)
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-28 14:12:35
+@ 功能: 选项卡变动值
+*/
+const handleSelectionChange = (val: User[]) => {
+    multipleSelection.value = val
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-28 14:25:25
+@ 功能: 全部删除
+*/
+const delAllClick = () => {
+    controlData.value.control.roleCheckDataList = []
+    controlData.value.control.roleRange = []
+}
+const delRowClick = (param: any) => {
+    let key = param.key
+    // console.log(key)
+    controlData.value.control.roleCheckDataList = controlData.value.control.roleCheckDataList.filter((item: { key: any; }) => item.key !== key);
+    let arr: any[] = []
+    controlData.value.control.roleCheckDataList.forEach((element: { key: string; }) => {
+        let str = element.key+""
+        arr.push(str)
+    });
+    //console.log(arr)
+    controlData.value.control.roleRange = arr
+}
+
+//最近点击的上传按钮对应的imgId
+const currentUploadImgid = ref("");
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-28 15:24:45
+@ 功能: 轮播图图片上传成功钩子
+*/
+const carouselImgUploadSuccess = (
+    response: any) => {
+    const carsuselConfigData: CarsuselConfig[] = controlData.value.control.carsuselConfigArr;
+    carsuselConfigData.forEach((element) => {
+        if (element.imgId == currentUploadImgid.value) {
+        element.imgUrl = response.data.url;
+        element.uploadFlag = true;
+        }
+    });
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-28 15:36:14
+@ 功能: 
+*/
+const changeCurrentUploadImgid = (clickedRow: any) => {
+  currentUploadImgid.value = clickedRow.imgId;
+};
+
+//图片展示显示控制
+const showImagePreview = ref(false);
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-28 15:37:09
+@ 功能: 开启大图展示
+*/
+const handlePreview = (index: number, row: any) => {
+    showImagePreview.value = true;
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-28 15:37:29
+@ 功能: 关闭大图展示
+*/
+const closePreview = () => {
+    showImagePreview.value = false;
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-28 15:39:18
+@ 功能: 轮播图所有已上传的图片的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;
+});
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-28 15:40:45
+@ 功能: 删除一行图片
+*/
+const deleteRow = (clickedRow: any) => {
+    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--; // 如果不减，将漏掉一个元素
+        }
+    }
+}
+
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-28 15:42:18
+@ 功能: 轮播图设置table
+*/
+const 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);
+}
+
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-28 15:43:08
+@ 功能: 添加窜梭框节点
+*/
+const addRootNode = () => {
+    let onlyNumber = uuidv4().replaceAll("-", "").toString();
+    controlData.value.control.fixedOptions.push({
+        id: onlyNumber,
+        label: "新根节点",
+        disabled: false,
+        children: [],
+    });
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-28 16:00:56
+@ 功能: 新增子节点
+*/
+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];
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-28 16:02:16
+@ 功能: 编辑节点名
+*/
+const changeLabel = (node: TreeNode, 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];
+    }
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-28 16:02:57
+@ 功能:  设为可选/不可选
+*/
+const setNodeEnable = (node: TreeNode, 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];
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-28 16:08:04
+@ 功能: 删除节点
+*/
+const remove = (node: TreeNode, 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 customerFormTree = ref<Tree[]>([]);
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-28 16:47:42
+@ 功能: 关联选项设置优化为树
+*/
+const removeTreeNode = (tree: any, targetId: any) => {
+    // 深拷贝原始树结构避免污染原数据
+    const clonedTree = JSON.parse(JSON.stringify(tree));
+    // 递归处理节点
+    function processNode(node: { id: any; children: any[]; }) {
+        // 命中目标节点时返回null进行过滤
+        if (node.id === targetId) return null;
+
+        // 递归处理子节点并过滤空值
+        if (node.children?.length) {
+            node.children = node.children.map((child: any) => processNode(child)).filter(Boolean);
+        }
+
+        return node;
+    }
+
+    // 处理单根或多根树结构
+    const result = Array.isArray(clonedTree)
+        ? clonedTree.map((node) => processNode(node)).filter(Boolean)
+        : processNode(clonedTree);
+
+    return result || null;
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-28 16:44:48
+@ 功能: 获取表单
+*/
+const getCustomerFormTree = async () => {
+    getCustomerFormList().then(({ data }) => {
+            /* console.log(data.children)
+            console.log(props.customerformid) */
+            let datachildrenWithoutSelf = removeTreeNode(data.children, props.customerformid);
+            let resData = ref<any>(datachildrenWithoutSelf);
+            customerFormTree.value = [
+                {
+                    id: data.id,
+                    //value: data.value,
+                    //label: data.label,
+                    label: "请选择表单",
+                    children: [...resData.value],
+                },
+            ];
+        });
+}
+const handleDetermineAssociatedFormsChooseDialog = () => {
+    associatedFormsChooseDialogFlag.value = false;
+}
+const treeDefaultProps = {
+    //
+    children: "children",
+    label: "label",
+};
+const fieldTreeSearchFlag = ref(false);
+const filterNode = (value: string, data: any) => {
+    if (!value) return true;
+    return data.label ? data.label.includes(value) : false;
+};
+const handleFieldTreeExpand = () => {
+    fieldTreeSearchFlag.value = true;
+}
+const handleFieldTreeCollapse = () => {
+  fieldTreeSearchFlag.value = false;
+}
+
+const handleFieldTreeContextmenu = (
+  MouseEvent: any,
+  object: any) => {
+  aft.value.addIcon_field(object);
+}
+const orgTreeSearchFlag = ref(false);
+const handleOrgTreeExpand = () => {
+  orgTreeSearchFlag.value = true;
+}
+
+const handleOrgTreeCollapse = () => {
+  orgTreeSearchFlag.value = false;
+}
+const handleOrgTreeContextmenu = (MouseEvent: any, object: any) => {
+    aft.value.addIcon_org(object);
+}
+
+
+
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-03 11:05:16
+@ 功能: 角色树
+*/
+const getRoleTree = async () => {
+    getAssociatedFormsRoleTree().then(({ data }) => {
+        roleTree.value = [
+            {
+                id: data.id,
+                //label: data.label,
+                label: "角色",
+                children: data.children,
+            },
+        ];
+    });
+};
+
+const roleTreeSearchFlag = ref(false);
+const handleRoleTreeExpand = () => {
+  roleTreeSearchFlag.value = true;
+}
+
+const handleRoleTreeCollapse = () => {
+    handleRoleTreeCollapse
+}
+
+const handleRoleTreeContextmenu = (MouseEvent: any,object: any) => {
+  aft.value.addIcon(object);
+}
+
+const aftTextChanged = (str: string) => {
+  controlData.value.control.hideConditionHtml =  str
+}
+
+const aftGongshiChanged  =    (gongshi: any)  =>                                                                                                                                                                                             {
+  controlData.value.control.hideGongShi.formulaHtml = gongshi.formulaHtml;
+  controlData.value.control.hideGongShi.mathsFormula = gongshi.mathsFormula;
+  controlData.value.control.hideGongShi.mathsString = gongshi.mathsString;
+}
+//上次点击了确定为true
+let determine = ref(true);
+let determineRange = ref(true);
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-02 10:00:16
+@ 功能: asf隐藏条件取消编辑
+*/
+const asfhTextCancel = () => {
+    determine.value = false;
+    associatedFormsHideDialogFlag.value = false;
+    controlData.value.control.hideConditionHtml =
+        controlData.value.control.hideConditionHtmlCopy;
+    //父组件取消将copy同步至子组件
+    aft.value.handelCancel(controlData.value.control.hideConditionHtmlCopy);
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-02 10:03:52
+@ 功能: 确定回调
+*/
+const handleDetermine = () => {
+    associatedFormsHideDialogFlag.value = false;
+    determine.value = true;
+    controlData.value.control.hideConditionHtmlCopy =
+    controlData.value.control.hideConditionHtml;
+}
+
+//数据范围弹窗确定回调
+watch(associatedFormsDataRangeDialogFlag, (val) => {
+    if (val === true && determineRange.value === false) {
+        setTimeout(() => {
+            //alert(2)
+            aftRange.value.tinymceReInit();
+        }, 200);
+    }
+});
+
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-02 14:28:16
+@ 功能: 关闭数据范围弹窗
+*/
+const asfhTextCancelRange = () => {
+    determineRange.value = false;
+    associatedFormsDataRangeDialogFlag.value = false;
+    controlData.value.control.dataRangeConditionHtml = controlData.value.control.dataRangeConditionHtmlCopy;
+    //父组件取消将copy同步至子组件
+    aftRange.value.handelCancel(controlData.value.control.dataRangeConditionHtmlCopy);
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-02 14:29:45
+@ 功能: 数据范围弹窗确定回调
+*/
+const handleDetermineRange = () => {
+    associatedFormsDataRangeDialogFlag.value = false;
+    determineRange.value = true;
+    controlData.value.control.dataRangeConditionHtmlCopy = controlData.value.control.dataRangeConditionHtml;
+}
+const handleOrgTreeContextmenuRange = (
+  MouseEvent: any,
+  object: any) => {
+  aftRange.value.addIcon_field(object);
+}
+
+const handleFieldTreeContextmenuRange = (
+  MouseEvent: any,
+  object: any) =>  {
+  aftRange.value.addIcon_field(object);
+}
+const handleRoleTreeContextmenuRange = (
+  MouseEvent: any,
+  object: any) => {
+  aftRange.value.addIcon(object);
+}
+
+const aftTextChangedRange = (str: string) => {
+  controlData.value.control.dataRangeConditionHtml = str;
+}
+const aftGongshiChangedRange = (gongshi: any) => {
+  controlData.value.control.dataRangeGongShi.formulaHtml = gongshi.formulaHtml;
+  controlData.value.control.dataRangeGongShi.mathsFormula = gongshi.mathsFormula;
+  controlData.value.control.dataRangeGongShi.mathsString = gongshi.mathsString;
+}
+//数据填充规则确定按钮
+const handleDetermineFillRoles = () =>{
+  associatedFormsFillRolesDialogFlag.value = false;
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-02 15:03:11
+@ 功能: 添加角色
+*/
+const addFillRole = () => {
+  let onlyNumber = uuidv4().replaceAll("-", "").toString(); //获取唯一编码
+  controlData.value.control.fillRoles.master.push({
+    leftValue: "",
+    rightValue: "",
+    id: onlyNumber,
+  });
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-02 15:13:50
+@ 功能: 将已被选择的要填充的关联其他表单的表单的子表字段设为不可选择
+*/
+const childRoleRightChanged = () => {
+    let selectedArr: any[] = [];
+    let otherMasterSelectedArr: any[] = [];
+    let otherChildSelectedArr: any[] = [];
+    asfsExpectCurrent.value.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);
+                }
+            });
+        });
+    });
+    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
+        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;
+                    }
+                });
+            }
+        });
+    }
+    //主表控制 end
+
+    //子表控制start
+    if (currentFormChildTableFieldsForFillRole.value) {
+        currentFormChildTableFieldsForFillRole.value[0]?.children?.forEach((element: any) => {
+            element.children.forEach((item: any) => {
+                selectedArr.forEach(() => {
+                    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
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-02 15:16:28
+@ 功能: 删除角色
+*/
+const 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--; // 如果不减，将漏掉一个元素
+        }
+    }
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-02 15:33:23
+@ 功能: 关联表单数据填充规则根据已选择子表的数目和id将已选择的子表置为不可选择
+*/
+const 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;
+                }
+            });
+        });
+    }
+}
+
+
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-02 15:32:47
+@ 功能: 子表填充规则要受到子表数量的限制
+*/
+const  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 + " 张子表,不可再添加");
+    }
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-02 15:43:09
+@ 功能: 删除子级角色
+*/
+const delChildRole = (id: any) => {
+    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 handleDetermineGlxxszDialog = () => {
+  glxxszDialogFlag.value = false;
+}
+const createRowForGlxxsz1 = () => {
+    if (controlData.value.config.optionsType == 0) {
+        controlData.value.control.glxxsz.push(
+            {
+                conditionField: controlData.value.name,
+                selectedOptions: [],
+                showFields: [],
+                id: uuidv4().replaceAll("-", "").toString(),
+            }
+        );
+    }
+}
+
+const deleteRowForGlxxsz1 = (row: { id: any }) => {
+    if (controlData.value.config.optionsType == 0) {
+        controlData.value.control.glxxsz = controlData.value.control.glxxsz.filter(
+            (item: { id: any }) => item.id != row.id
+        );
+    }
+}
+
+
+const handleDetermineGlxxszDialogCheckBox = () => {
+  glxxszDialogFlagCheckBox.value = false;
+}
+
+const createRowForGlxxsz = () => {
+    if (controlData.value.config.optionsType == 0) {
+        controlData.value.control.glxxszForCheckBox.push(
+            {
+                conditionField: controlData.value.name,
+                selectedOptions: [],
+                showFields: [],
+                id: uuidv4().replaceAll("-", "").toString(),
+            }
+        );
+    }
+}
+
+const 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 handleDetermineGlxxszDialogSwitch = () => {
+  glxxszDialogFlagSwitch.value = false;
+}
+
+// 获取当前选择的标题行节点（用于获取label）
+const currentTitleColumnNode = computed(() => {
+  if (!controlData.value?.control?.zdtcsz?.tbx) return null
+  return findTreeNode(zdtcszTree.value, controlData.value.control.zdtcsz.tbx)
+})
+
+// 获取当前选择的索引列节点（用于获取label）
+const currentIndexColumnNode = computed(() => {
+  if (!controlData.value?.control?.zdtcsz?.tby) return null
+  return findTreeNode(zdtcszTree.value, controlData.value.control.zdtcsz.tby)
+})
+// 索引列的标签
+const indexColumnLabel = computed(() => {
+  if (!currentIndexColumnNode.value) return "默认行"
+  return currentIndexColumnNode.value.label
+})
+
+// 标题行的标签
+const titleColumnLabel = computed(() => {
+  if (!currentTitleColumnNode.value) return "标题行"
+  return currentTitleColumnNode.value.label
+})
+// 左上角标签：格式为"索引列\标题行"
+const leftTopLabel = computed(() => {
+  return `${indexColumnLabel.value}\\${titleColumnLabel.value}`
+})
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-02 16:53:00
+@ 功能: 确定按钮的处理函数
+*/
+const handleDetermineZdtcszDialogFlag = () => {
+    // 保存数据
+    handleTableDataChange()
+    
+    // 关闭弹窗
+    ZdtcszDialogFlag.value = false
+    
+    // 可以在这里添加其他处理逻辑
+    /* console.log('保存的数据:', controlData.value.control.zdtcsz.tableData)
+    console.log('当前组件选项:', currentComponentOptions.value)
+    console.log('左上角标签:', leftTopLabel.value) */
+}
+// 自动填充设置 liwenxuan 20251230 start
+
+let datapropsformList = JSON.parse(JSON.stringify(props.formList))
+
+const zdtcszTree = computed(()=>{
+  if(datapropsformList&&datapropsformList.length==0){
+    datapropsformList = JSON.parse(JSON.stringify(props.formList))
+  }
+  
+  if(associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value && associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value[0].children && associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value[0].children.length>0){
+    let datab = JSON.parse(JSON.stringify(associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value[0].children))
+    let currentCompId = controlData.value.name
+    const treeC = mergeAndFilterFormTrees(datapropsformList, datab,currentCompId);
+    return treeC
+  }else{
+    return []
+  }
+  
+})
+/**
+ * 合并两个组件树，仅保留type为radio和select的节点，并过滤掉指定compId的节点，同时保留options属性
+ * @param {Array} treeA - 组件树a，包含表单结构信息
+ * @param {Array} treeB - 组件树b，包含字段数据信息
+ * @param {String} compId - 需要过滤掉的组件id的后一部分
+ * @returns {Array} - 合并后仅包含radio和select节点的组件树c
+ */
+function mergeAndFilterFormTrees(treeA: any, treeB: any | any[], compId: any) {
+  // 构建b树的映射，key为name（从id中提取），value为b树节点
+  const bMap = new Map();
+  
+  // 从b树中提取通用的parentId（假设所有节点有相同的parentId）
+  let commonParentId: string | any = null;
+  
+  // 从id中提取name：formField:30540:upload1765154030446 -> upload1765154030446
+  treeB.forEach((node: { id: any; parentId: string | null; }) => {
+    const id = node.id;
+    if (id) {
+      const parts = id.split(':');
+      const name = parts[parts.length - 1]; // 取最后一部分作为name
+      bMap.set(name, node);
+      
+      // 设置通用的parentId
+      if (node.parentId && !commonParentId) {
+        commonParentId = node.parentId;
+      }
+    }
+  });
+  
+  // 如果没有找到parentId，使用默认值
+  if (!commonParentId) {
+    commonParentId = "formField:30540";
+  }
+  
+  // 计数器
+  let gridCount = 0;
+  let tabsCount = 0;
+  let divCount = 0;
+  let cardCount = 0;
+  
+  // 递归处理a树，仅保留radio和select节点，并过滤掉compId
+  const processANode = (node: any, parentId = commonParentId) =>   {
+    // 获取当前节点的name
+    const nodeName = node.name;
+    const nodeType = node.type;
+    
+    // 检查当前节点是否需要被过滤（如果compId与节点name相等，则过滤）
+    if (compId && nodeName === compId) {
+      // 从bMap中删除对应的节点（如果存在），避免后面被使用
+      if (nodeName && bMap.has(nodeName)) {
+        bMap.delete(nodeName);
+      }
+      return null;
+    }
+    
+    // 如果是radio或select类型，直接处理
+    if (nodeType === 'radio' || nodeType === 'select') {
+      // 检查是否需要过滤
+      if (compId && nodeName === compId) {
+        return null;
+      }
+      
+      // 查找b树中对应的节点
+      let bNode = null;
+      if (nodeName && bMap.has(nodeName)) {
+        bNode = bMap.get(nodeName);
+        bMap.delete(nodeName); // 从map中删除，标记为已使用
+      }
+      
+      // 如果b节点存在，检查是否需要过滤
+      if (bNode && compId) {
+        const bNodeId = bNode.id || '';
+        const parts = bNodeId.split(':');
+        const bNodeName = parts[parts.length - 1];
+        if (bNodeName === compId) {
+          return null;
+        }
+      }
+      
+      let cNode;
+      if (bNode) {
+        // 复制b节点的所有属性
+        cNode = { ...bNode };
+        // 确保children数组存在
+        if (!cNode.children) {
+          cNode.children = [];
+        }
+        // 使用b节点的parentId
+        cNode.parentId = bNode.parentId || parentId;
+        
+        // 保留a节点中的options属性到c节点中
+        if (node.options && Array.isArray(node.options)) {
+          // 如果c节点中已经有options，可以合并，这里我们直接用a节点的options
+          // 因为a节点中的options通常是最新的配置
+          cNode.options = node.options;
+          
+          // 如果a节点有control.glxxsz（关联选项设置），也保留
+          if (node.control && node.control.glxxsz && Array.isArray(node.control.glxxsz)) {
+            if (!cNode.control) {
+              cNode.control = {};
+            }
+            cNode.control.glxxsz = node.control.glxxsz;
+          }
+        }
+      } else {
+        // 如果b中不存在，则创建新节点
+        const label = node.item?.label || nodeName || nodeType;
+        const id = nodeName ? `${commonParentId}:${nodeName}` : null;
+        cNode = {
+          id: id,
+          label: label,
+          parentId: parentId,
+          children: [],
+          value: id,
+          treeAttrs: {
+            show: label
+          },
+          disabled: false, // radio和select类型，叶子节点disabled为false
+          type: nodeType,
+          options: [],
+          control: {},
+          config: {}
+        };
+        
+        // 保留a节点中的options属性
+        if (node.options && Array.isArray(node.options)) {
+          cNode.options = node.options;
+        }
+        
+        // 保留control.glxxsz（关联选项设置）
+        if (node.control && node.control.glxxsz && Array.isArray(node.control.glxxsz)) {
+          if (!cNode.control) {
+            cNode.control = {};
+          }
+          (cNode.control as any).glxxsz = node.control.glxxsz;
+        }
+        
+        // 保留config属性
+        if (node.config) {
+          cNode.config = node.config;
+        }
+      }
+      
+      return cNode;
+    }
+    
+    // 如果不是radio或select，但可能是容器类型，需要处理其子节点
+    // 检查是否是容器类型
+    const containerTypes = ['table', 'card', 'flex', 'div', 'grid', 'tabs'];
+    if (containerTypes.includes(nodeType)) {
+      // 检查容器节点本身是否需要过滤
+      if (compId && nodeName === compId) {
+        // 如果容器节点需要过滤，其所有子节点都不处理
+        // 从bMap中删除对应的节点（如果存在）
+        if (nodeName && bMap.has(nodeName)) {
+          bMap.delete(nodeName);
+        }
+        return null;
+      }
+      
+      // 创建一个容器节点占位符
+      let containerId;
+      let containerLabel;
+      let originalName = nodeName; // 保存原始name用于检查过滤
+      
+      // 根据容器类型设置不同的id和label
+      switch(nodeType) {
+        case 'grid':
+          gridCount++;
+          containerId = `格栅布局${gridCount}`;
+          containerLabel = containerId;
+          break;
+        case 'tabs':
+          tabsCount++;
+          containerId = `标签页${tabsCount}`;
+          containerLabel = containerId;
+          break;
+        case 'div':
+          divCount++;
+          containerId = `容器${divCount}`;
+          containerLabel = containerId;
+          break;
+        case 'card':
+          cardCount++;
+          containerId = `卡片${cardCount}`;
+          containerLabel = containerId;
+          break;
+        case 'table':
+        case 'flex':
+          // 对于table和flex，查找b树中对应的节点
+          let bNode = null;
+          if (nodeName && bMap.has(nodeName)) {
+            bNode = bMap.get(nodeName);
+            bMap.delete(nodeName);
+          }
+          
+          // 检查b节点是否需要过滤
+          if (bNode && compId) {
+            const bNodeId = bNode.id || '';
+            const parts = bNodeId.split(':');
+            const bNodeName = parts[parts.length - 1];
+            if (bNodeName === compId) {
+              return null;
+            }
+          }
+          
+          if (bNode) {
+            containerId = bNode.id || `${commonParentId}:${nodeName}`;
+            containerLabel = nodeType === 'table' ? `子表${bNode.label || nodeName}` : 
+                                            `弹性布局${bNode.label || nodeName}`;
+          } else {
+            containerId = `${commonParentId}:${nodeName}`;
+            containerLabel = nodeType === 'table' ? `子表${node.item?.label || nodeName}` : 
+                                            `弹性布局${node.item?.label || nodeName}`;
+          }
+          break;
+        default:
+          containerId = `${commonParentId}:${nodeName}`;
+          containerLabel = node.item?.label || nodeName || nodeType;
+      }
+      
+      // 创建容器节点
+      const containerNode = {
+        id: containerId,
+        label: containerLabel,
+        parentId: parentId,
+        children: [] as any[],
+        value: containerId,
+        treeAttrs: {
+          show: containerLabel
+        },
+        disabled: null as null | boolean, // 容器节点，非叶子节点
+        type: nodeType
+      };
+      
+      // 处理子组件
+      let hasValidChildren = false;
+      
+      if (nodeType === 'table' || nodeType === 'card' || nodeType === 'flex' || nodeType === 'div') {
+        // 这些类型的子组件在list中
+        if (node.list && Array.isArray(node.list)) {
+          node.list.forEach((child: any) => {
+            const processedChild = processANode(child, containerId);
+            if (processedChild) {
+              containerNode.children.push(processedChild);
+              hasValidChildren = true;
+            }
+          });
+        }
+      } else if (nodeType === 'grid' || nodeType === 'tabs') {
+        // 这些类型的子组件在columns.list中
+        if (node.columns && Array.isArray(node.columns)) {
+          // 对于tabs，需要为每个column创建子节点
+          if (nodeType === 'tabs') {
+            const tabNodes: {
+                id: string; label: any; parentId: any; children: any[]; value: string; treeAttrs: { show: any; }; disabled: null; // 非叶子节点
+                type: string;
+            }[] = [];
+            node.columns.forEach((column: { label: any; list: any[]; }, index: number) => {
+              // 为每个column创建一个节点
+              const columnId = `${containerId}:${column.label}`;
+              const columnNode = {
+                id: columnId,
+                label: column.label || `Tab${index + 1}`,
+                parentId: containerId,
+                children: [] as any[],
+                value: columnId,
+                treeAttrs: {
+                  show: column.label || `Tab${index + 1}`
+                },
+                disabled: null, // 非叶子节点
+                type: 'tab'
+              };
+              
+              // 处理column中的子组件
+              let columnHasValidChildren = false;
+              if (column.list && Array.isArray(column.list)) {
+                const childNodes: any[] = [];
+                column.list.forEach((child: any) => {
+                  const processedChild = processANode(child, columnId);
+                  if (processedChild) {
+                    childNodes.push(processedChild);
+                    columnHasValidChildren = true;
+                    hasValidChildren = true;
+                  }
+                });
+                columnNode.children = childNodes;
+              }
+              
+              // 如果column有子节点，添加到tabs节点下
+              if (columnHasValidChildren) {
+                tabNodes.push(columnNode);
+              }
+            });
+            containerNode.children = tabNodes;
+          } else {
+            // 对于grid，直接处理所有columns中的子组件
+            const childNodes: any[] = [];
+            node.columns.forEach((column: { list: any[]; }) => {
+              if (column.list && Array.isArray(column.list)) {
+                column.list.forEach((child: any) => {
+                  const processedChild = processANode(child, containerId);
+                  if (processedChild) {
+                    childNodes.push(processedChild);
+                    hasValidChildren = true;
+                  }
+                });
+              }
+            });
+            containerNode.children = childNodes;
+          }
+        }
+      }
+      
+      // 如果容器没有有效的子节点（radio或select），则返回null
+      if (!hasValidChildren) {
+        // 对于table和flex，即使没有子节点也要保留（因为可以选择）
+        if (nodeType === 'table' || nodeType === 'flex') {
+          containerNode.disabled = false;
+          return containerNode;
+        }
+        return null;
+      }
+      
+      // 设置容器节点的disabled属性
+      // 对于table和flex，即使有子节点也可以选择，disabled为false
+      if (nodeType === 'table' || nodeType === 'flex') {
+        containerNode.disabled = false;
+      } else {
+        // 其他容器类型，有子节点为null，没有子节点为true
+        containerNode.disabled = null;
+      }
+      
+      return containerNode;
+    }
+    
+    // 其他非radio/select类型，直接返回null
+    return null;
+  }
+  
+  // 处理a树的所有根节点
+  const cTree: any[] = [];
+  treeA.forEach((rootNode: { name: any; type: any; options: any; control: { glxxsz: any; }; item: { label: any; }; config: any; list: any[]; columns: any[]; }) => {
+    const processedNode = processANode(rootNode);
+    if (processedNode) {
+      cTree.push(processedNode);
+    }
+  });
+  
+  // 将b树中剩余的radio和select元素（在a中不存在的）添加到c树中
+  bMap.forEach((bNode, nodeName) => {
+    // 检查是否需要过滤
+    if (compId) {
+      const bNodeId = bNode.id || '';
+      const parts = bNodeId.split(':');
+      const bNodeName = parts[parts.length - 1];
+      if (bNodeName === compId) {
+        // 过滤掉这个节点
+        return;
+      }
+    }
+    
+    // 只保留radio和select类型
+    if (bNode.type === 'radio' || bNode.type === 'select') {
+      // 保留b节点的原始结构
+      const newNode = { ...bNode };
+      
+      // 确保children数组存在
+      if (!newNode.children) {
+        newNode.children = [];
+      }
+      
+      // 设置disabled属性为false（叶子节点）
+      newNode.disabled = false;
+      
+      cTree.push(newNode);
+    }
+  });
+  
+  return cTree;
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-03 08:42:52
+@ 功能: 递归查找树节点
+*/
+const findTreeNode = (tree: any[], id: any) => {
+    if (!tree || !Array.isArray(tree)) return null
+    
+    for (let node of tree) {
+        if (node.id === id) {
+            return node
+        }
+        
+        // 如果有子节点，递归查找
+        if (node.children && node.children.length > 0) {
+            const found = findTreeNode(node.children, id)
+            if (found) return found
+        }
+    }
+    
+    return null
+}
+const asfPropsData = computed(()=>{
+  let result = {}
+  asfsCurrentTable.value.forEach((element:any) => {
+    if(element.id==controlData.value.control.preFill.asf){
+      result = element
+    }else{
+      result = {}
+    }
+  });
+  return result
+})
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-03 08:41:39
+@ 功能: 原始选项数组（标题行=列，索引列=行），将空值选项放在末尾，键改为'未选择'
+*/
+const titleOptions = computed(() => {
+  const options = currentTitleColumnNode.value?.options || []
+  // 将空值选项放在正常选项后面，键改为'未选择'
+  return [...options, { label: '未选择', value: 'notChosen' }]
+})
+// 使用 ref 替代 computed，使其可写
+const zdtcszTableData = ref([])
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-02 16:53:31
+@ 功能:  监听表格数据变化，保存到临时存储
+*/
+const handleTableDataChange = () => {
+    // 将表格数据转换为更容易存储的格式
+    const tableData = {}
+    
+    zdtcszTableData.value.forEach((row) => {
+        const rowKey = row.rowKey
+        tableData[rowKey] = {}
+        
+        // 获取当前有效的列
+        let currentColumns = []
+        if (titleOptions.value.length > 0) {
+            // 有标题行，使用标题行的选项
+            currentColumns = titleOptions.value
+        } else if (zdtcszTableData.value[0]) {
+            // 没有标题行，从第一行数据中提取所有col_开头的字段
+            const firstRow = zdtcszTableData.value[0]
+            Object.keys(firstRow).forEach(key => {
+                if (key.startsWith('col_')) {
+                    const colKey = key.replace('col_', '')
+                    currentColumns.push({ value: colKey })
+                }
+            })
+        }
+        
+        // 保存每一列的值
+        currentColumns.forEach(col => {
+            const colKey = col.value
+            tableData[rowKey][colKey] = row[`col_${colKey}`] || ''
+        })
+    })
+    
+    // 保存到 controlData 中
+    if (!controlData.value.control.zdtcsz) {
+        controlData.value.control.zdtcsz = {}
+    }
+    controlData.value.control.zdtcsz.tableData = tableData
+}
+
+const filterTreeByExpandUsers = (a: any, b: any[]) => {                                                                                                                   
+    //console.log(a)
+    //console.log(b)
+    // 从参数b中提取所有expand-user字段名（处理%^%格式）
+    const expandUserFields = new Set();
+    const pathMap = new Map(); // 用于存储字段名到完整路径的映射
+    const labelMap = new Map(); // 用于存储字段名到自定义label的映射
+    
+    b.forEach((path: string | any[]) => {
+        if (path.length > 0) {
+            // 获取最后一个元素，并提取%^%前面的字段名和后面的自定义label
+            const lastElement = path[path.length - 1];
+            if (lastElement.includes('%^%')) {
+                const [fieldName, customLabel] = lastElement.split('%^%');
+                expandUserFields.add(fieldName);
+                pathMap.set(fieldName, path);
+                labelMap.set(fieldName, customLabel);
+            } else {
+                // 如果没有%^%，直接使用
+                expandUserFields.add(lastElement);
+                pathMap.set(lastElement, path);
+                // 如果没有自定义label，使用默认的"选择用户"
+                labelMap.set(lastElement, "选择用户");
+            }
+        }
+    });
+    
+    // 如果没有任何expand-user字段，返回空数组
+    if (expandUserFields.size === 0) {
+        return [];
+    }
+    
+    // 递归过滤树，只保留需要的节点，并添加label前缀
+    const filterNodes = (nodes: any) => {
+        const result = [];
+        
+        for (const node of nodes) {
+            // 检查当前节点是否是expand-user节点
+            const isTargetNode = node.treeAttrs && 
+                                node.treeAttrs.field && 
+                                expandUserFields.has(node.treeAttrs.field);
+            
+            // 检查子节点中是否有需要保留的节点
+            let hasTargetChildren = false;
+            if (node.children && node.children.length > 0) {
+                const filteredChildren = filterNodes(node.children);
+                if (filteredChildren.length > 0) {
+                    hasTargetChildren = true;
+                    node.children = filteredChildren;
+                } else {
+                    node.children = null;
+                }
+            }
+            
+            // 如果当前节点是目标节点，或者有目标子节点，则保留
+            if (isTargetNode || hasTargetChildren) {
+                // 如果是expand-user节点，检查是否需要添加前缀
+                if (isTargetNode) {
+                    const fieldName = node.treeAttrs.field;
+                    const customLabel = labelMap.get(fieldName) || "选择用户";
+                    
+                    // 查找该节点在b中的路径
+                    const path = pathMap.get(fieldName);
+                    if (path && path.length > 1) {
+                        // 检查路径中是否包含布局组件
+                        const layoutTypes = ['tabs', 'grid', 'card', 'div'];
+                        for (let i = 0; i < path.length - 1; i++) {
+                            if (layoutTypes.includes(path[i])) {
+                                let str = ""
+                                // 添加前缀到label
+                                if(path[i]=="tabs"){
+                                  str = "标签页"
+                                }else if(path[i]=="grid"){
+                                  str = "格栅布局"
+                                }else if(path[i]=="card"){
+                                  str = "卡片布局"
+                                }else if(path[i]=="div"){
+                                  str = "容器"
+                                }
+                                // 使用自定义label而不是节点的原始label
+                                node.label = `${str}-${customLabel}(${fieldName})`;
+                                break; // 只添加第一个遇到的布局组件前缀
+                            }
+                        }
+                    }
+                    
+                    // 如果没有布局组件前缀，直接使用自定义label和字段名
+                    if (!node.label.includes('(')) {
+                        node.label = `${customLabel}(${fieldName})`;
+                    }
+                }
+                
+                result.push(node);
+            }
+        }
+        
+        return result;
+    }
+    
+    return filterNodes(a);
+}
+
+const expandUserNames = computed(()=>{
+  let data = JSON.parse(JSON.stringify(props.formList))
+  return findExpandUserNames(data)
+})
+                                                                                                                                                                                                  
+
+function findExpandUserNames(data:any) {
+    //console.log(data)
+    const result: never[][] = [];
+    
+    // 定义需要特殊处理的布局组件类型
+    const layoutTypes = ['tabs', 'grid', 'card', 'div']; // 注意：flex不在这里面
+    
+    function traverse(node:any, ancestors:any[]) {
+        // 处理_custom包装的数据结构
+        if (node && node._custom && node._custom.value) {
+            node = node._custom.value;
+        }
+        
+        // 检查当前节点是否有type属性
+        if (node && node.type) {
+            // 如果当前节点是expand-user类型
+            if (node.type === 'expand-user') {
+                // 检查multiSelect属性，如果为"1"则跳过该节点
+                if (node.control && node.control.multiSelect && node.control.multiSelect === "1") {
+                    return; // 不符合条件，跳过该节点
+                }
+                
+                // 创建当前元素的路径数组（祖先在前，自己在后）
+                const path:any = [...ancestors];
+                
+                // 获取expand-user的label，如果没有则使用默认值
+                const label = (node.item && node.item.label) || '选择用户';
+                
+                // 在最后一个元素（expand-user的name）后面拼接%^%和label
+                const lastElement = node.name + '%^%' + label;
+                path.push(lastElement);
+                
+                result.push(path);
+                return; // 找到expand-user后不需要继续遍历其子节点
+            }
+            
+            // 处理不同类型的组件
+            if (layoutTypes.includes(node.type)) {
+                // 对于特殊布局组件，使用类型标志
+                const newAncestors = [...ancestors, node.type];
+                
+                switch (node.type) {
+                    case 'tabs':
+                        if (node.columns && Array.isArray(node.columns)) {
+                            node.columns.forEach((tab:any) => {
+                                if (tab.list && Array.isArray(tab.list)) {
+                                    tab.list.forEach((item:any) => {
+                                        traverse(item, newAncestors);
+                                    });
+                                }
+                            });
+                        }
+                        break;
+                        
+                    case 'grid':
+                        if (node.columns && Array.isArray(node.columns)) {
+                            node.columns.forEach((column: { list: any[]; }) => {
+                                if (column.list && Array.isArray(column.list)) {
+                                    column.list.forEach((item: any) => {
+                                        traverse(item, newAncestors);
+                                    });
+                                }
+                            });
+                        }
+                        break;
+                        
+                    case 'card':
+                    case 'div':
+                        if (node.list && Array.isArray(node.list)) {
+                            node.list.forEach((item: any) => {
+                                traverse(item, newAncestors);
+                            });
+                        }
+                        break;
+                }
+            } else if (node.type === 'flex') {
+                // 对于flex组件，使用name而不是类型标志
+                const newAncestors = node.name ? [...ancestors, node.name] : ancestors;
+                
+                if (node.list && Array.isArray(node.list)) {
+                    node.list.forEach((item: any) => {
+                        traverse(item, newAncestors);
+                    });
+                }
+                
+                // 对于flex类型，还需要检查tableData
+                if (node.tableData && Array.isArray(node.tableData)) {
+                    node.tableData.forEach((item: any) => {
+                        traverse(item, newAncestors);
+                    });
+                }
+            } else {
+                // 对于其他组件，使用name
+                const newAncestors = node.name ? [...ancestors, node.name] : ancestors;
+                
+                // 检查是否有list属性并遍历
+                if (node.list && Array.isArray(node.list)) {
+                    node.list.forEach((item: any) => {
+                        traverse(item, newAncestors);
+                    });
+                }
+                
+                // 对于table类型，还需要检查tableData
+                if (node.type === 'table' && node.tableData && Array.isArray(node.tableData)) {
+                    node.tableData.forEach((item: any) => {
+                        traverse(item, newAncestors);
+                    });
+                }
+            }
+        }
+    }
+    
+    // 遍历输入数据
+    if (Array.isArray(data)) {
+        data.forEach(item => traverse(item));
+    } else {
+        traverse(data);
+    }
+    //console.log(result)
+    return result;
+}
+
+const expandUserComponentsTree = computed(()=>{
+    let data = JSON.parse(JSON.stringify(associatedFormsCurrentFormFieldTree1.value))
+    let result = filterTreeByExpandUsers(data,expandUserNames.value)
+    result = result[0].children
+    return result
+}) 
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-03 08:56:33
+@ 功能: 
+*/
+const glxxszTree = computed(()=>{
+    if(datapropsformList.length==0){
+        datapropsformList = JSON.parse(JSON.stringify(props.formList))
+    }
+    
+    console.log(datapropsformList)
+    if(associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value && associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value[0].children && associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value[0].children.length>0){
+
+        
+        let datab = JSON.parse(JSON.stringify(associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value[0].children))
+        
+        const treeC = mergeFormTrees(datapropsformList, datab);
+        console.log(treeC)
+        return treeC
+    }else{
+        return null
+    }
+  
+})
+
+
+
+
+/**
+ * 合并两个组件树，以组件树a的结构为准，填充组件树b的数据
+ * @param {Array} treeA - 组件树a，包含表单结构信息
+ * @param {Array} treeB - 组件树b，包含字段数据信息
+ * @returns {Array} - 合并后的组件树c
+ */
+function mergeFormTrees(treeA: any[], treeB: any[]) {
+  // 构建b树的映射，key为name（从id中提取），value为b树节点
+  const bMap = new Map();
+  
+  // 从b树中提取通用的parentId（假设所有节点有相同的parentId）
+  let commonParentId: string | null = null;
+  
+  // 从id中提取name：formField:30540:upload1765154030446 -> upload1765154030446
+  treeB.forEach((node: { id: any; parentId: any; }) => {
+    const id = node.id;
+    if (id) {
+      const parts = id.split(':');
+      const name = parts[parts.length - 1]; // 取最后一部分作为name
+      bMap.set(name, node);
+      
+      // 设置通用的parentId
+      if (node.parentId && !commonParentId) {
+        commonParentId = node.parentId;
+      }
+    }
+  });
+  
+  // 如果没有找到parentId，使用默认值
+  if (!commonParentId) {
+    commonParentId = "formField:30540"; // 默认值，但最好从b树中获取
+  }
+  
+  // 计数器
+  let gridCount = 0;
+  let tabsCount = 0;
+  let divCount = 0;
+  let cardCount = 0;
+  
+  // 递归处理a树
+  function processANode(node: { name: any; type: string; item: { label: any; }; list: any[]; columns: any[]; }, parentId = commonParentId) {
+    // 获取当前节点的name
+    const nodeName = node.name;
+    
+    // 处理flex类型
+    if (node.type === 'flex') {
+      // 查找b树中对应的节点
+      let bNode = null;
+      if (nodeName && bMap.has(nodeName)) {
+        bNode = bMap.get(nodeName);
+        bMap.delete(nodeName); // 从map中删除，标记为已使用
+      }
+      
+      let cNode;
+      let flexLabel = node.item?.label || nodeName || 'flex';
+      
+      if (bNode) {
+        // 复制b节点的所有属性
+        cNode = { ...bNode };
+        // 确保children数组存在
+        if (!cNode.children) {
+          cNode.children = [];
+        }
+        // 获取原来的label，如果没有则用name
+        const originalLabel = cNode.label || flexLabel;
+        // 在label左边拼接"弹性布局"
+        cNode.label = `弹性布局${originalLabel}`;
+        
+        // 如果treeAttrs.show存在，也更新
+        if (cNode.treeAttrs && cNode.treeAttrs.show) {
+          cNode.treeAttrs.show = `弹性布局${cNode.treeAttrs.show}`;
+        } else if (cNode.treeAttrs) {
+          cNode.treeAttrs.show = `弹性布局${originalLabel}`;
+        }
+        
+        // 使用b节点的parentId
+        cNode.parentId = bNode.parentId || parentId;
+      } else {
+        // 如果b中不存在，则创建新节点
+        cNode = {
+          id: nodeName ? `${commonParentId}:${nodeName}` : null,
+          label: `弹性布局${flexLabel}`,
+          parentId: parentId,
+          children: [],
+          value: nodeName ? `${commonParentId}:${nodeName}` : null,
+          treeAttrs: {
+            show: `弹性布局${flexLabel}`
+          },
+          disabled: false, // flex类型即使叶子节点也可以选择，设为false
+          type: 'flex'
+        };
+      }
+      
+      // 处理子组件
+      let hasChildren = false;
+      if (node.list && Array.isArray(node.list)) {
+        const childNodes: any[] = [];
+        node.list.forEach((child: any) => {
+          const processedChild = processANode(child, cNode.id);
+          if (processedChild) {
+            childNodes.push(processedChild);
+            hasChildren = true;
+          }
+        });
+        cNode.children = childNodes;
+      }
+      
+      return cNode;
+    }
+    
+    // 处理table类型
+    if (node.type === 'table') {
+      // 查找b树中对应的节点
+      let bNode = null;
+      if (nodeName && bMap.has(nodeName)) {
+        bNode = bMap.get(nodeName);
+        bMap.delete(nodeName); // 从map中删除，标记为已使用
+      }
+      
+      let cNode;
+      let tableLabel = node.item?.label || nodeName || 'table';
+      
+      if (bNode) {
+        // 复制b节点的所有属性
+        cNode = { ...bNode };
+        // 确保children数组存在
+        if (!cNode.children) {
+          cNode.children = [];
+        }
+        // 获取原来的label，如果没有则用name
+        const originalLabel = cNode.label || tableLabel;
+        // 在label左边拼接"子表"
+        cNode.label = `子表${originalLabel}`;
+        
+        // 如果treeAttrs.show存在，也更新
+        if (cNode.treeAttrs && cNode.treeAttrs.show) {
+          cNode.treeAttrs.show = `子表${cNode.treeAttrs.show}`;
+        } else if (cNode.treeAttrs) {
+          cNode.treeAttrs.show = `子表${originalLabel}`;
+        }
+        
+        // 使用b节点的parentId
+        cNode.parentId = bNode.parentId || parentId;
+      } else {
+        // 如果b中不存在，则创建新节点
+        cNode = {
+          id: nodeName ? `${commonParentId}:${nodeName}` : null,
+          label: `子表${tableLabel}`,
+          parentId: parentId,
+          children: [],
+          value: nodeName ? `${commonParentId}:${nodeName}` : null,
+          treeAttrs: {
+            show: `子表${tableLabel}`
+          },
+          disabled: false, // table类型即使叶子节点也可以选择，设为false
+          type: 'table'
+        };
+      }
+      
+      // 处理子组件
+      let hasChildren = false;
+      if (node.list && Array.isArray(node.list)) {
+        const childNodes: any[] = [];
+        node.list.forEach((child: any) => {
+          const processedChild = processANode(child, cNode.id);
+          if (processedChild) {
+            childNodes.push(processedChild);
+            hasChildren = true;
+          }
+        });
+        cNode.children = childNodes;
+      }
+      
+      return cNode;
+    }
+    
+    // 处理grid类型
+    if (node.type === 'grid') {
+      gridCount++;
+      const gridId = `格栅布局${gridCount}`;
+      const gridFullId = `${commonParentId}:${gridId}`;
+      
+      // 创建grid节点
+      const cNode = {
+        id: gridFullId,
+        label: gridId,
+        parentId: parentId,
+        children: [],
+        value: gridFullId,
+        treeAttrs: {
+          show: gridId
+        },
+        disabled: null, // 非叶子节点，设置为null
+        type: 'grid'
+      };
+      
+      // 处理子组件（在columns.list中）
+      let hasChildren = false;
+      if (node.columns && Array.isArray(node.columns)) {
+        const childNodes: any[] = [];
+        node.columns.forEach((column: { list: any[]; }) => {
+          if (column.list && Array.isArray(column.list)) {
+            column.list.forEach((child: any) => {
+              const processedChild = processANode(child, gridFullId);
+              if (processedChild) {
+                childNodes.push(processedChild);
+                hasChildren = true;
+              }
+            });
+          }
+        });
+        cNode.children = childNodes;
+      }
+      
+      // 如果没有子节点，设置disabled为true（容器类型叶子节点）
+      if (!hasChildren) {
+        cNode.disabled = true;
+      }
+      
+      return cNode;
+    }
+    
+    // 处理tabs类型
+    if (node.type === 'tabs') {
+      tabsCount++;
+      const tabsId = `标签页${tabsCount}`;
+      const tabsFullId = `${commonParentId}:${tabsId}`;
+      
+      // 创建tabs节点
+      const cNode = {
+        id: tabsFullId,
+        label: tabsId,
+        parentId: parentId,
+        children: [],
+        value: tabsFullId,
+        treeAttrs: {
+          show: tabsId
+        },
+        disabled: null, // 非叶子节点，设置为null
+        type: 'tabs'
+      };
+      
+      // 处理子组件（每个column作为一级）
+      let hasChildren = false;
+      if (node.columns && Array.isArray(node.columns)) {
+        const columnNodes: {
+            id: string; label: any; parentId: string; children: never[]; value: string; treeAttrs: { show: any; }; disabled: null; // 非叶子节点，设置为null
+            type: string;
+        }[] = [];
+        node.columns.forEach((column: { label: any; list: any[]; }, index: number) => {
+          // 为每个column创建一个节点
+          const columnId = `${tabsFullId}:${column.label}`;
+          const columnNode = {
+            id: columnId,
+            label: column.label || `Tab${index + 1}`,
+            parentId: tabsFullId,
+            children: [],
+            value: columnId,
+            treeAttrs: {
+              show: column.label || `Tab${index + 1}`
+            },
+            disabled: null, // 非叶子节点，设置为null
+            type: 'tab'
+          };
+          
+          // 处理column中的子组件
+          let columnHasChildren = false;
+          if (column.list && Array.isArray(column.list)) {
+            const childNodes: any[] = [];
+            column.list.forEach((child: any) => {
+              const processedChild = processANode(child, columnId);
+              if (processedChild) {
+                childNodes.push(processedChild);
+                columnHasChildren = true;
+                hasChildren = true;
+              }
+            });
+            columnNode.children = childNodes;
+          }
+          
+          // 如果column没有子节点，设置disabled为true（容器类型叶子节点）
+          if (!columnHasChildren) {
+            columnNode.disabled = true;
+          }
+          
+          columnNodes.push(columnNode);
+        });
+        cNode.children = columnNodes;
+      }
+      
+      // 如果tabs没有子节点，设置disabled为true（容器类型叶子节点）
+      if (!hasChildren) {
+        cNode.disabled = true;
+      }
+      
+      return cNode;
+    }
+    
+    // 处理div类型
+    if (node.type === 'div') {
+      divCount++;
+      const divId = `容器${divCount}`;
+      const divFullId = `${commonParentId}:${divId}`;
+      
+      // 创建div节点
+      const cNode = {
+        id: divFullId,
+        label: divId,
+        parentId: parentId,
+        children: [],
+        value: divFullId,
+        treeAttrs: {
+          show: divId
+        },
+        disabled: null, // 非叶子节点，设置为null
+        type: 'div'
+      };
+      
+      // 处理子组件
+      let hasChildren = false;
+      if (node.list && Array.isArray(node.list)) {
+        const childNodes: any[] = [];
+        node.list.forEach((child: any) => {
+          const processedChild = processANode(child, divFullId);
+          if (processedChild) {
+            childNodes.push(processedChild);
+            hasChildren = true;
+          }
+        });
+        cNode.children = childNodes;
+      }
+      
+      // 如果没有子节点，设置disabled为true（容器类型叶子节点）
+      if (!hasChildren) {
+        cNode.disabled = true;
+      }
+      
+      return cNode;
+    }
+    
+    // 处理card类型
+    if (node.type === 'card') {
+      cardCount++;
+      const cardId = `卡片${cardCount}`;
+      const cardFullId = `${commonParentId}:${cardId}`;
+      
+      // 创建card节点
+      const cNode = {
+        id: cardFullId,
+        label: cardId,
+        parentId: parentId,
+        children: [],
+        value: cardFullId,
+        treeAttrs: {
+          show: cardId
+        },
+        disabled: null, // 非叶子节点，设置为null
+        type: 'card'
+      };
+      
+      // 处理子组件
+      let hasChildren = false;
+      if (node.list && Array.isArray(node.list)) {
+        const childNodes: any[] = [];
+        node.list.forEach((child: any) => {
+          const processedChild = processANode(child, cardFullId);
+          if (processedChild) {
+            childNodes.push(processedChild);
+            hasChildren = true;
+          }
+        });
+        cNode.children = childNodes;
+      }
+      
+      // 如果没有子节点，设置disabled为true（容器类型叶子节点）
+      if (!hasChildren) {
+        cNode.disabled = true;
+      }
+      
+      return cNode;
+    }
+    
+    // 处理其他类型
+    // 查找b树中对应的节点
+    let bNode = null;
+    if (nodeName && bMap.has(nodeName)) {
+      bNode = bMap.get(nodeName);
+      bMap.delete(nodeName); // 从map中删除，标记为已使用
+    }
+    
+    // 创建c树节点
+    let cNode;
+    if (bNode) {
+      // 复制b节点的所有属性
+      cNode = { ...bNode };
+      // 确保children数组存在
+      if (!cNode.children) {
+        cNode.children = [];
+      }
+      // 使用b节点的parentId
+      cNode.parentId = bNode.parentId || parentId;
+    } else {
+      return null; // b中不存在且不是上述容器类型，则忽略
+    }
+    
+    // 判断是否为叶子节点
+    let hasChildren = false;
+    
+    // 对于非容器节点，判断是否有子节点
+    // 从b节点中获取children信息
+    hasChildren = cNode.children && cNode.children.length > 0;
+    
+    // 设置disabled属性
+    // 容器类型列表
+    const containerTypes = ['card', 'div', 'grid', 'tabs'];
+    
+    // 如果是容器类型
+    if (containerTypes.includes(node.type)) {
+      // 如果有子节点，设置为null，否则设置为true
+      cNode.disabled = hasChildren ? null : true;
+    } else {
+      // 如果是非容器类型，叶子节点disabled为false
+      cNode.disabled = false;
+    }
+    
+    return cNode;
+  }
+  
+  // 处理a树的所有根节点
+  const cTree: any[] = []
+  treeA.forEach((rootNode: any) => {
+    const processedNode = processANode(rootNode);
+    if (processedNode) {
+      cTree.push(processedNode);
+    }
+  });
+  
+  // 将b树中剩余的元素（在a中不存在的）添加到c树中
+  bMap.forEach(bNode => {
+    // 保留b节点的原始结构
+    const newNode = { ...bNode };
+    
+    // 确保children数组存在
+    if (!newNode.children) {
+      newNode.children = [];
+    }
+    
+    // 判断是否为叶子节点
+    const hasChildren = newNode.children && newNode.children.length > 0;
+    
+    // 容器类型列表（包括flex和table）
+    const containerTypes = ['card', 'div', 'grid', 'tabs', 'flex', 'table'];
+    // 判断节点是否是容器类型
+    const isContainer = containerTypes.includes(newNode.type);
+    
+    // 设置disabled属性
+    if (isContainer) {
+      // 对于flex和table，即使叶子节点也可以选择，设为false
+      if (newNode.type === 'flex' || newNode.type === 'table') {
+        newNode.disabled = false;
+      } else {
+        // 其他容器类型：有子节点为null，否则为true
+        newNode.disabled = hasChildren ? null : true;
+      }
+    } else {
+      // 非容器类型：叶子节点为false
+      newNode.disabled = false;
+    }
+    
+    cTree.push(newNode);
+  });
+  
+  return cTree;
+}  
+const multipleTableRef = ref<TableInstance>() 
+/**
+ * 提取字符串中最后一个英文冒号后的内容，无冒号则返回原字符串
+ * @param {string} str - 输入的字符串
+ * @returns {string} 最后一个冒号后的内容或原字符串
+ */
+function getAfterLastColon(str:string) {
+    //console.log(str)
+    // 首先验证入参类型，确保是字符串（避免非字符串类型导致方法出错）
+    if (typeof str !== 'string') {
+        //console.warn('入参必须是字符串类型，当前已自动转为字符串');
+        str = String(str); // 非字符串类型自动转为字符串
+    }
+
+    // 查找最后一个英文冒号的索引位置
+    const lastColonIndex = str.lastIndexOf(':');
+
+    // 若未找到冒号（索引为 -1），或冒号在字符串最后一位（后面无内容），返回原字符串
+    if (lastColonIndex === -1 || lastColonIndex === str.length - 1) {
+        return str;
+    }
+
+    // 截取最后一个冒号后面的字符（索引+1 开始到字符串结尾）
+    return str.slice(lastColonIndex + 1);
+} 
+const asfsCurrentTable = computed(()=>{
+    let currentTable: any[] = []
+    let count = 0
+    let result = []
+    xTree.value.forEach((element:any) => {
+
+        if(getAfterLastColon(element.value) == controlData.value.name){
+            currentTable.push(element)
+            count++
+        }
+    });
+    if(count>0){
+        result =  currentTable[0].children
+    }else{
+        result = []
+    }
+
+    return result
+})
+// 定义treeSelectRef
+const treeSelectRef = ref();
+
+const handleTreeSelectChange = (value: any) => {
+    console.log(value)
+
+    if(undefined == value){
+        controlData.value.control.connectUserComponent = ""
+        controlData.value.control.showConnectUserComponent = ""
+    }else{
+        // value 是选中的值，根据props配置，默认是节点的id
+        //console.log('选中的值:', value);
+
+        // 通过TreeSelect实例的getNode方法获取节点
+        if (treeSelectRef.value) {
+            const node = treeSelectRef.value.getNode(value);
+            // 注意：node是TreeSelect内部节点，节点数据在node.data中
+            if (node) {
+                //console.log('节点数据:', node.data);
+                controlData.value.control.showConnectUserComponent = node.data.label
+                // 你可以在这里做你想要的操作
+            }
+        }
+
+    }
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-03 08:15:43
+@ 功能: 取消编辑
+*/
+const cancelEditing = () => {
+    dialogVisible.value = false
+    editText.value = ''
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-03 08:25:11
+@ 功能: 保存更改
+*/
+const saveChanges = () => {
+    // 按行分割文本，过滤空行和空白字符
+    const lines = editText.value
+        .split('\n')
+        .map(line => line.trim())
+        .filter(line => line !== '')
+    
+    // 生成新的选项数组
+    const newOptions = lines.map((label, index) => ({
+        label,
+        value: (index + 1).toString() // 从1开始的正整数
+    }))
+    
+    // 更新选项列表
+    options.value = newOptions
+    
+    // 关闭弹窗
+    dialogVisible.value = false
+    
+    // 清空编辑文本
+    editText.value = ''
+    
+    
+    controlData.value.options = mergeArrays(controlData.value.options,options.value);
+    options.value = [];
+};
+
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-03 08:28:29
+@ 功能: 合并数组排序
+*/
+const mergeArrays = (a:any[], b:any[]) => {
+    // 1. 找出a中的最大value（转为数字比较）
+    let maxValue = 0;
+    a.forEach(item => {
+        const numValue = parseInt(item.value, 10);
+        if (numValue > maxValue) {
+            maxValue = numValue;
+        }
+    });
+    
+    // 2. 创建b的副本并重新赋值value，从maxValue+1开始递增
+    const newB = b.map((item, index) => ({
+        ...item,
+        value: String(maxValue + 1 + index)
+    }));
+    
+    // 3. 合并数组，a在前，新的b在后
+    return [...a, ...newB];
+}
+const tablePreFillValueChanged = (val: any) => {
+	console.log("关联表单选择--->", val)
+	controlData.value.control.preFill.ids = val.currentVal
+}
+const handleDetermineoptionsValue3 = () => {
+  optionsValue3SettingDialogOpenFlag.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;
+        }
+      }
+    }
+    // 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" && !controlData.value.multiple)
+    ) {
+      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 {
+            // console.log(changedOptions);
+            // console.log(controlData.value.control.glxxsz);
+            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 }
+);
+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 tabsRef = ref(null); 
+/**
+@ 作者: 秦东
+@ 时间: 2024-12-26 16:26:06
+@ 功能: 设定关联数据
+*/
+// const dataList = ref<dataBaseStruct[]>([]);
+const updataBase = (val: any) => {
+  // console.log("设定关联数据", val);
+  formData.value.dataSourceConfig.id = val.id;
+  formData.value.dataSourceConfig.dataBaseName = val.dataBaseName;
+  formData.value.dataSourceConfig.tableName = val.tableName;
+  formData.value.dataSourceConfig.tableKey = val.tableKey;
+  formData.value.dataSourceConfig.dsn = val.dsn;
+  // dataList.value = val.fields;
+  stateForm.dataSourceList = val.fields;
+
+  formData.value.name = val.tableKey;
+  formData.value.formName = val.tableName;
+
+  // formAttr.value.forEach((item) => {
+  //   if (item.key == "formName" || item.key == "name") {
+  //     item.disabled = true;
+  //   }
+  // });
+
+  // console.log("设定关联数据------1-------》", stateForm.dataSourceList);
+  // console.log("设定关联数据------2-------》", val.fields);
+  // console.log("设定关联数据------3-------》", stateForm.dataSourceList);
+};
+</script>
+<template>
+     <DataSourcePage
+        v-model:isShow="openDataSourceBox"
+        @close-data-source="closeDataSource"
+        @updata-base="updataBase"
+    />
+    <el-card class="setAttrCardBox" shadow="always">
+         <template #header>
+            <div class="card-header">属性设置</div>
+        </template>
+        <el-tabs v-model="stateForm.tabsName" type="border-card">
+            <el-tab-pane label="字段设置" name="first">
+                <div v-if="attrList.length <= 0" id="emptyProperties" class="empty-state">
+                    <i class="fa fa-cog"></i>
+                    <p>请选择设计区域中的元素进行属性设置</p>
+                </div>
+                <div v-else>
+                    <el-form size="small" class="form">
+                        <el-divider content-position="left">
+                            <el-text class="category-title">通用属性</el-text>
+                        </el-divider>
+                        <template v-for="(item, index) in attrList" :key="index">
+                            <template v-if="item.label == '必须现场拍照'">
+                                <el-form-item v-if="controlData.control.useDefaultImg==false" :label="item.label" class="form_cont">
+                                    <el-radio-group v-model="controlData.control.onSiteShot">
+                                        <el-radio value="1">是</el-radio>
+                                        <el-radio value="">否</el-radio>
+                                    </el-radio-group>
+                                    <div v-if="controlData.control.onSiteShot=='1'" style="width: 100%;border: 0px solid black; margin-top: 10px">
+                                        <div style="position: relative; left: -84px">
+                                        添加时间水印
+                                            <el-radio-group v-model="controlData.control.watermark" style="position: relative; left: 8px">
+                                                <el-radio value="1">是</el-radio>
+                                                <el-radio value="">否</el-radio>
+                                            </el-radio-group>
+                                        </div>
+                                    </div>
+                                </el-form-item>
+                            </template>
+                            <el-form-item v-else :label="item.label" class="form_cont">
+                                <el-select
+                                    v-if="item.type === 'select'"
+                                    v-model="item.value"
+                                    :placeholder="item.placeholder"
+                                    :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-select
+                                    v-if="item.type === 'selectDataSoure'"
+                                    v-model="item.value"
+                                    :placeholder="item.placeholder"
+                                    :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.fieldes : key"
+                                        :label="item.path === 'name' ? `${opt.comment}(${opt.fieldes})` : 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_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 === 'organization_location_level'">
+                                    <el-select v-model="controlData.control.locationLevel" placeholder="请选择地址精确到" style="width: 200px">
+                                        <el-option
+                                            v-for="i in locationLevelOptions"
+                                            :key="i.value"
+                                            :label="i.label"
+                                            :value="i.value"
+                                        />
+                                    </el-select>
+                                </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_url'"><!--  -->
+                                    <el-button v-if="controlData.control.uploadFlag" type="danger" style="margin-right: 8px;" @click="delDefaultImg">
+                                        删除默认图片
+                                    </el-button>
+                                    <el-upload
+                                        :action="uploadUrl"
+                                        :before-remove="beforeRemove"
+                                        :on-success="lowcodeImageUploadSuccess"
+                                        :on-error="videoUploadErr"
+                                        :limit="1"
+                                        accept=".jpg,.jpeg,.png,.tif,.tga,.bmp,.dds,.svg,.eps,.pdf,.hdr,.raw,.exr,.psd,.afphoto,.afdesign"
+                                        :show-file-list = "false"
+                                    >
+                                        <el-button v-if="!controlData.control.uploadFlag" type="primary">上传默认图片</el-button>
+                                        <el-button v-if="controlData.control.uploadFlag" type="primary">更改默认图片</el-button>
+                                    
+                                    </el-upload>
+                                    <div v-if="controlData.control.uploadFlag">
+                                        <div style="position: relative; left: -60px;top:8px">
+                                            默认图片可更改
+                                            <el-radio-group v-model="controlData.control.defaultAllowsChange" style="position: relative; left: 8px">
+                                                <el-radio value="">是</el-radio>
+                                                <el-radio value="0">否</el-radio>
+                                            </el-radio-group>
+                                        </div>
+                                    </div>
+                                </el-row>
+                                <el-row v-else-if="item.type === 'lowcodeImage_currentShot'">
+                                    <el-radio-group v-model="controlData.control.onSiteShot">
+                                        <el-radio value="1">是</el-radio>
+                                        <el-radio value="">否</el-radio>
+                                    </el-radio-group>
+                                </el-row>
+                                <el-row v-else-if="item.type === 'checkbox_showAll'">
+                                    <el-radio-group v-model="controlData.control.showAll">
+                                        <el-radio value="1">是</el-radio>
+                                        <el-radio value="">否</el-radio>
+                                    </el-radio-group>
+                                </el-row>
+                                <el-row v-else-if="item.type === 'orgCentent_range'">
+                                    <!-- {{ controlData.control.range }} -->
+                                    <el-tree-select
+                                        v-model="controlData.control.range"
+                                        node-key="id"
+                                        :props="orgTreeProps"
+                                        :data="orgCententRange"
+                                        :render-after-expand="false"
+                                        show-checkbox
+                                        multiple
+                                        style="width: 200px"
+                                        collapse-tags
+                                        collapse-tags-tooltip
+                                        :max-collapse-tags="2"
+                                    />
+                                </el-row>
+                                <el-row v-else-if="item.type === 'orgCentent_Multiple'">
+
+                                    <el-radio-group v-model="controlData.control.multiple">
+                                        <el-radio value="1">是</el-radio>
+                                        <el-radio value="">否</el-radio>
+                                    </el-radio-group>
+
+                                </el-row>
+                                <el-row v-else-if="item.type === 'table_defaultOne'">
+
+                                    <el-radio-group v-model="controlData.control.defaultOne">
+                                        <el-radio value="">是</el-radio>
+                                        <el-radio value="2">否</el-radio>
+                                    </el-radio-group>
+
+                                </el-row>
+                                <el-row v-else-if="item.type === 'table_preFill'">
+
+                                    <el-link
+                                        :underline="false" 
+                                        
+                                        type="primary"
+                                        
+                                        @click="preFillDialogShow"
+                                    >
+                                        预填充设置
+                                    </el-link>
+                                    <!-- {{controlData.control.preFill.ids}} -->
+                                </el-row>
+                                <el-row v-else-if="item.type === 'orgCentent_ConnectUser'">
+                                    <!-- <div v-if="controlData.control.connectUserComponent && controlData.control.connectUserComponent.length>0"> -->
+                                    
+                                    <div v-if="controlData.control.showConnectUserComponent!=''">
+                                    <el-link
+                                        :underline="false" 
+                                        
+                                        type="primary"
+                                        
+                                        @click="showSelectOrgConnectUser"
+                                    >
+                                        {{ controlData.control.showConnectUserComponent }}
+                                    </el-link>
+                                    </div>
+
+                                    
+                                    <el-button v-if="!controlData.control.connectUserComponent||!controlData.control.showConnectUserComponent"    @click="showSelectOrgConnectUser">选择关联的用户组件</el-button>
+                                </el-row>
+                                <el-row v-else-if="item.type === 'expand-user'">
+                                    <el-button @click="handleUserRangeDialogFlag">可选用户设置</el-button>
+                                </el-row>
+
+                                <el-row v-else-if="item.type === 'expand-user_MultiSelect'">
+                                    <el-radio-group v-model="controlData.control.multiSelect">
+                                        <el-radio value="1">是</el-radio>
+                                        <el-radio value="">否</el-radio>
+                                    </el-radio-group>
+                                </el-row>
+
+                                <el-row v-else-if="item.type === 'span'" >
+                                    <div style="width:190px;margin-left: 10px;">
+                                        <el-slider v-model="controlData.config.span" :format-tooltip="formatTooltip"   :max="24" />
+                                    </div>
+                                </el-row>
+                                <el-row v-else-if="item.type === 'attrSpan'" >
+                                    <div style="width:150px;margin-left: 10px;">
+                                        <el-slider v-model="controlData.attr.span" :format-tooltip="formatTooltip"   :max="24" />
+                                    </div>
+                                </el-row>
+                                <el-row v-else-if="item.type === 'attrOffset'" >
+                                    <div style="width:131px">
+                                        <!-- <el-slider v-model="controlData.attr.offset" :format-tooltip="formatTooltip"   :max="24" /> -->
+                                        <el-input-number v-model="controlData.attr.offset" :min="0" :max="23" />
+                                    </div>
+                                </el-row>
+                                <el-row v-else-if="item.type === 'attrPush'" >
+                                    <div style="width:131px">
+                                        <!-- <el-slider v-model="controlData.attr.offset" :format-tooltip="formatTooltip"   :max="24" /> -->
+                                        <el-input-number v-model="controlData.attr.push" :min="0" :max="23" />
+                                    </div>
+                                </el-row>
+                                <el-row v-else-if="item.type === 'attrPull'" >
+                                    <div style="width:131px">
+                                        <!-- <el-slider v-model="controlData.attr.offset" :format-tooltip="formatTooltip"   :max="24" /> -->
+                                        <el-input-number v-model="controlData.attr.pull" :min="0" :max="23" />
+                                    </div>
+                                </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 === 'input'"><!-- 移动端扫描输入 -->
+                                    <el-switch v-model="controlData.control.scanInputFlag" />
+                                    <div
+                                        v-if="controlData.control.scanInputFlag"
+                                        style="
+                                            display: flex;
+                                            width: auto;
+                                            margin-top: 33px;
+                                            margin-left: -125px;
+                                            padding-bottom: 6px;
+                                        "
+                                    >
+                                    <div style="margin-right: 12px">扫描方式</div>
+                                    <el-select
+                                        v-model="controlData.control.scanType"
+                                        style="width: 150px; height: 20px"
+                                    >
+                                        <el-option
+                                        v-for="scanType in scanTypes"
+                                        :key="scanType.value"
+                                        :label="scanType.label"
+                                        :value="scanType.value"
+                                        />
+                                    </el-select>
+                                    </div>
+                                </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
+                                    v-model="item.value"
+                                    :type="item.inputStyle"
+                                    :placeholder="item.placeholder"
+                                    disabled
+                                    />
+                                </el-row>
+                                <el-input
+                                    v-else
+                                    v-model="item.value"
+                                    :type="item.inputStyle"
+                                    :placeholder="item.placeholder"
+                                    :disabled="isNotWriteWord(item)"
+                                    @input="controlChange(item, $event)"
+                                />
+                            </el-form-item>
+                        </template>
+                        <template v-if="controlData.config">
+                            <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
+                                    v-if="
+                                    showHide(
+                                        [
+                                        'input',
+                                        'textarea',
+                                        'radio',
+                                        'checkbox',
+                                        'select',
+                                        'date',
+                                        'switch',
+                                        'number',
+                                        'cascader',
+                                        'slider',
+                                        'datePicker',
+                                        'timePicker',
+                                        'colorPicker',
+                                        'inputNumber',
+                                        'rate',
+                                        'treeSelect',
+                                        ],
+                                        true
+                                    )
+                                    "
+                                    class="form_cont"
+                                    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)">
+                            <el-divider content-position="left">标签配置项</el-divider>
+                            <div
+                                v-if="controlData.type == 'tabs'"
+                            >
+                                <draggable
+                                    :list="controlData.columns"
+                                    :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.label as number, 'tabs')"
+                                                    ></i>
+                                                </el-col>
+                                            </el-form-item>
+                                        </div>
+                                    </template>
+                                </draggable>
+                            </div>
+                            <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 stateForm.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>
+                        <div
+                            v-if="
+                            showHide(
+                                ['radio', 'select', 'checkbox', 'cascader', 'inputSlot', 'treeSelect'],
+                                true
+                            )
+                            "
+                        >
+                            <el-divider content-position="left">选项配置</el-divider>
+                            <el-form-item label="选项数据源" class="form_cont">
+                                <el-select
+                                    v-model="controlData.config.optionsType"
+                                    @change="optionsTypeChanged"
+                                >
+                                    <el-option :value="0" label="固定选项" />
+                                    <el-option :value="3" label="系统表单字段" />
+                                    <el-option :value="1" label="数据源" />
+                                    <el-option :value="2" label="接口字典" />
+                                </el-select>
+                            </el-form-item>
+                            <template v-if="controlData.config.optionsType === 0">
+                                <div
+                                    v-if="
+                                    controlData.type !== 'cascader' &&
+                                    controlData.type !== 'checkbox' &&
+                                    controlData.type !== 'radio' &&
+                                    controlData.type !== 'select'
+                                    "
+                                >
+                                    <el-form-item
+                                        v-for="(item, index) in controlData.options"
+                                        :key="index"
+                                        class="form_cont"
+                                        label="选项标签"
+                                    >
+                                        <el-col :span="10">
+                                            <el-input v-model="item.label" placeholder="选项标签" />
+                                        </el-col>
+                                        <el-col :span="2" :offset="1">
+                                            <i class="icon-del" @click="delSelectOption(index as number)"></i>
+                                        </el-col>
+                                    </el-form-item>
+                                </div>
+                                <!-- 多选选择框选项拖动功能 liwenxuan 20240815 start -->
+                                <div
+                                    v-if="
+                                    controlData.type !== 'cascader' &&
+                                    (controlData.type == 'checkbox' ||
+                                        controlData.type == 'radio' ||
+                                        controlData.type == 'select')
+                                    "
+                                >
+                                    <draggable
+                                        :list="controlData.options"
+                                        :force-fallback="true"
+                                        chosen-class="chosenClass"
+                                        animation="300"
+                                    >
+                                        <template #item="{ element }">
+                                            <div class="item form_cont">
+                                                <el-form-item>
+                                                    <el-col
+                                                        :span="2"
+                                                        style="padding-top: 4px; cursor: move; color: #66b1ff"
+                                                    >
+                                                        <i class="icon-move"></i>
+                                                    </el-col>
+                                                    <el-col :span="6" style="cursor: move"> 选项标签 </el-col>
+                                                    <el-col :span="10">
+                                                        <el-input v-model="element.label" placeholder="选项标签" />
+                                                    </el-col>
+                                                    <el-col :span="2" :offset="1">
+                                                        <i
+                                                            class="icon-del"
+                                                            @click="delSelectOption(element.value as number)"
+                                                        ></i>
+                                                    </el-col>
+                                                </el-form-item>
+                                            </div>
+                                        </template>
+                                    </draggable>
+                                </div>
+                                <!-- 多选选择框选项拖动功能 liwenxuan 20240815 end -->
+                                <el-form-item class="form_cont">
+                                    <el-button @click="addSelectOption">
+                                        {{ controlData.type === "cascader" ? "编辑" : "新增" }}
+                                    </el-button>
+                                    <el-button  size="small" style="margin-right: 12px;" @click="openDialog">
+                                        批量导入
+                                    </el-button>
+                                    <!-- <div style="width:100%; position: relative;  top: 6px; display: flex;">
+                                        <div v-if="showHide(['switch'], true)">
+                                            <el-button style="position: relative; top: -1px" @click="handelGlxxszDialogSwitch" >关联选项设置</el-button>
+                                        </div>
+                                        <div
+                                            v-if="
+                                            showHide(['radio', 'select'], true) && controlData.config.optionsType == 0
+                                            "
+                                        >
+                                            <el-button  style="position: relative; top: -1px" @click="handelGlxxszDialog">关联选项设置</el-button>
+                                        </div>
+                                        <div v-if="showHide(['checkbox'], true) && controlData.config.optionsType == 0">
+                                            <el-button  style="position: relative; top: -1px" @click="handelGlxxszDialogCheckbox">关联选项设置</el-button>
+                                        </div>
+                                        <div
+                                            v-if="
+                                            showHide(['radio', 'select'], true) && controlData.config.optionsType == 0
+                                            "
+                                        >
+                                            <el-button  style="position: relative; top: -1px;right:-12px" @click="handelZdtcszDialog">矩阵填充设置</el-button>
+                                        </div>
+                                    </div> -->
+                                </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>
+                            </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="
+                            !stateForm.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"
+                                    :placeholder="ValidateText.message"
+                                    @input="requiredText"
+                                    >
+                                    <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, index) in textUinrVerfy"
+                                        :key="item.type || index"
+                                        v-model="item.message"
+                                        :placeholder="item.message"
+                                        class="radioInput"
+                                        @input="requiredTextRadio(item)"
+                                    >
+                                        <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, index) in numberUinrVerfy"
+                                        :key="item.type || index"
+                                        v-model="item.message"
+                                        :placeholder="item.message"
+                                        class="radioInput"
+                                        @input="requiredTextRadio(item)"
+                                    >
+                                        <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"
+                                                >
+                                                
+                                                    <el-input v-model="item.message" placeholder="校验提示信息">
+                                                        <template #prepend>
+                                                            <el-select
+                                                            v-model="item.type"
+                                                            style="width: 80px"
+                                                            @change="rulesSelectChange(item, $event)"
+                                                            >
+                                                            <el-option
+                                                                v-for="list in stateForm.customRulesList"
+                                                                :key="list.type"
+                                                                :label="list.label"
+                                                                :value="list.type"
+                                                            />
+                                                            </el-select>
+                                                        </template>
+                                                        <template #append>
+                                                            <i
+                                                            class="icon-del"
+                                                            @click="delAddRules(index as number)"
+                                                            ></i>
+                                                        </template>
+                                                    </el-input>
+                                                    <el-input
+                                                        v-if="item.type === 'rules'"
+                                                        v-model="item.rules"
+                                                        placeholder="正则表达式"
+                                                    />
+                                                    <el-input
+                                                        v-if="item.type === 'methods'"
+                                                        v-model="item.methods"
+                                                        placeholder="方法名称，此方法仅适用于导出vue文件"
+                                                    />
+                                                </el-form-item>
+                                                <el-form-item class="form_cont">
+                                                    <el-button @click="addRulesFast">快速添加</el-button>
+                                                    <el-button @click="addRules(stateForm.tooltip.rules)"
+                                                    >编写校验规则
+                                                        <el-tooltip
+                                                            :content="stateForm.tooltip.rules"
+                                                            placement="top"
+                                                            raw-content
+                                                        >
+                                                            <el-icon>
+                                                                <QuestionFilled />
+                                                            </el-icon>
+                                                        </el-tooltip>
+                                                    </el-button>
+                                                </el-form-item> -->
+                            </div>
+                            <el-form-item v-else class="form_cont">
+                                <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>
+                        <el-divider content-position="left"><el-text class="category-title">高级属性</el-text></el-divider>
+                        <LayoutPage
+                            v-if="cssIsShouw(attrList)"
+                            v-model:styles-val="controlDataStyls"
+                            :place="controlData.type"
+                        />
+                    </el-form>
+                </div>
+            </el-tab-pane>
+            <el-tab-pane label="表单设置" name="second">
+                <el-form size="small" class="form">
+                    <el-divider content-position="left"><el-text class="category-title">基础配置</el-text></el-divider>
+                    <el-form-item v-if="formConfig.classify != 4" class="form_cont">
+                        <template #label> 归属分组 </template>
+                        <el-select
+                        id="groupForm"
+                        ref="groupForm"
+                        v-model="formConfig.groupKey"
+                        placeholder="Select"
+                        >
+                            <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)"
+                        :key="index"
+                        :label="item.label"
+                        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>
+
+                        <div v-else-if="item.type === 'dataSourceSetup'">
+                        <el-radio-group v-model="formData.dataSource" size="small">
+                            <el-radio-button
+                                v-for="(optVal, index) in item.options"
+                                :key="optVal.value || index"
+                                :label="optVal.label"
+                                :value="optVal.value"
+                            />
+                            <!-- <el-radio-button label="Washington" value="Washington" />
+                                            <el-radio-button label="Los Angeles" value="Los Angeles" />
+                                            <el-radio-button label="Chicago" value="Chicago" /> -->
+                        </el-radio-group>
+                        <div v-if="formData.dataSource == 'yes'" @click="openSetDataSource">
+                            <el-text v-if="formData.dataSourceConfig.tableName != ''">
+                                {{ formData.dataSourceConfig.dataBaseName }} /  {{ formData.dataSourceConfig.tableName }}
+                            </el-text>
+                            <el-text v-else>请选择数据源</el-text>
+                        </div>
+                        </div>
+                        <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-form-item class="form_cont" label="二维码">
+                        <el-switch v-model="formData.qrCodeFlag" />
+                    </el-form-item>
+                    <el-form-item v-if="formData.qrCodeFlag" class="form_cont" label="内部二维码">
+                        <el-switch v-model="formData.qrCodeInside" />
+                        <el-button
+                            v-if="formData.qrCodeInside"
+                            type="primary"
+                            text
+                            @click="showQrCodeInside"
+                        >
+                            查看内部二维码图片
+                        </el-button>
+                    </el-form-item>
+                    <el-form-item v-if="formData.qrCodeFlag" class="form_cont" label="外部二维码">
+                        <el-switch v-model="formData.qrCodeOutside" />
+                        <el-button
+                            v-if="formData.qrCodeOutside"
+                            type="primary"
+                            text
+                            @click="showQrCodeOutside"
+                        >
+                        查看外部二维码图片
+                        </el-button>
+                    </el-form-item>
+                    <el-form-item
+                        v-if="formData.qrCodeFlag"
+                        class="form_cont"
+                        label="二维码打印样式"
+                    >
+                        <el-radio-group v-model="formData.qrCodePrintStyle">
+                            <el-radio value="1">图片</el-radio>
+                            <el-radio value="2">表格卡片</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                    <el-form-item
+                        v-if="formData.qrCodeFlag && formData.qrCodePrintStyle == 2"
+                        class="form_cont"
+                        label="表格卡片显示字段"
+                    >
+                        <el-select
+                            v-model="formData.qrCodeShowFields"
+                            multiple
+                            placeholder="请选择"
+                            style="width: 240px"
+                            @change="handleMaxSelect"
+                        >
+                        <el-option
+                            v-for="item in associatedFormsCurrentFormFieldTreeNoTable1"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        />
+                        </el-select>
+                    </el-form-item>
+                    <el-divider content-position="left"><el-text class="category-title">表单整体布局</el-text></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="隐藏"
+                            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.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-text class="category-title">表单功能补充</el-text></el-divider>
+                    <el-form-item class="form_cont">
+                        <el-button @click="editFormStyle(stateForm.tooltip.css)">
+                            编辑表单样式
+                            <el-tooltip :content="stateForm.tooltip.css" placement="top">
+                                <el-icon><QuestionFilled /></el-icon>
+                            </el-tooltip>
+                        </el-button>
+                        <el-button @click="editFormDict(stateForm.tooltip.dict)">
+                            设置数据字典
+                            <el-tooltip :content="stateForm.tooltip.dict" placement="top">
+                                <el-icon><QuestionFilled /></el-icon>
+                            </el-tooltip>
+                        </el-button>
+                    </el-form-item>
+                    <template v-if="!stateForm.isSearch">
+                        <el-divider content-position="left"><el-text class="category-title">接口数据事件</el-text></el-divider>
+
+                        <el-form-item v-if="!stateForm.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-tab-pane label="AI设置" name="third">
+                <el-divider content-position="left"><el-text class="category-title">AI触发条件设置</el-text></el-divider>
+                 <div class="common-layout">
+                    <el-scrollbar class="aiBox">
+                        <el-card v-for="(item, index) in props.formInfo.aiConfig" :key="index" class="aiCardBox">
+                            <template #header>
+                                <div class="card-header">
+                                <i class="fa fa-close" @click="delList(index)"></i>
+                                </div>
+                            </template>
+                            <el-form :model="item" label-width="auto">
+                                <el-form-item label="触发字段">
+                                <el-select
+                                    v-model="item.title"
+                                    multiple
+                                    collapse-tags
+                                    placeholder="请选择触发字段"
+                                >
+                                    <el-option
+                                    v-for="oItem in unitFormList"
+                                    :key="oItem.value"
+                                    :label="oItem.label"
+                                    :value="oItem.value"
+                                    />
+                                </el-select>
+                                </el-form-item>
+                                <el-form-item label="触发方式">
+                                <el-radio-group v-model="item.trigger">
+                                    <el-radio :value="1">任一有值</el-radio>
+                                    <el-radio :value="2">半数以上有值</el-radio>
+                                    <el-radio :value="3">全部有值</el-radio>
+                                </el-radio-group>
+                                </el-form-item>
+                                <el-form-item label="采用的知识库">
+                                <el-select
+                                    v-model="item.library"
+                                    multiple
+                                    collapse-tags
+                                    placeholder="请选择采用的知识库"
+                                >
+                                    <el-option
+                                    v-for="lItem in aiAgentList"
+                                    :key="lItem.uuid"
+                                    :label="lItem.name"
+                                    :value="lItem.uuid"
+                                    />
+                                </el-select>
+                                </el-form-item>
+                                <!-- <el-form-item label="结果呈现方式">
+                                <el-radio-group v-model="item.openShowType">
+                                    <el-radio :value="1">底部展示</el-radio>
+                                    <el-radio :value="2">消息弹出框</el-radio>
+                                    <el-radio :value="3">抽屉</el-radio>
+                                    <el-radio :value="4">消息提示</el-radio>
+                                    <el-radio :value="5">通知框</el-radio>
+                                </el-radio-group>
+                                </el-form-item> -->
+                            </el-form>
+                        </el-card>
+
+                        <el-button type="primary" class="aiBut" @click="addPickTracn">添加条件</el-button>
+                    </el-scrollbar>
+                 </div>
+
+            </el-tab-pane>
+        </el-tabs>
+    </el-card>
+    <!--选择用户-->
+    <el-dialog
+        v-model="userRangeDialogFlag"
+        title="可选用户设置"
+        width="840"
+    >
+        <el-tabs v-if="controlData.type === 'expand-user'" v-model="controlData.control.queryBy" style="width:100%;" @tab-change="handleExpandTabChange" >
+            <el-tab-pane label="根据角色筛选"  name="role">
+                <div class="tabslayout">
+                    <el-row>
+                        <el-col :span="16" style="padding: 0;border-right: 0px solid black;">
+                            <el-tabs ref="tabsRef" v-model="activeTab" style="height:483px;" tab-position="left" @tab-change="handleLeftTabChange" >
+                                <el-tab-pane 
+                                    v-for="tab in tabsData"
+                                    :key="tab.id" 
+                                    :label="tab.name" 
+                                    :name="tab.id"
+                                >
+                                    <div>
+                                        <el-input v-model="expandQueryParam" placeholder="请输入用户名" clearable  style="width: 50%; margin-bottom: 10px;margin-left: 3px;"/>
+                                        <el-button type="primary" style="margin-left: 10px; margin-bottom: 10px;" @click="searchClick">查询</el-button>
+                                        <el-button style="margin-bottom: 10px;" @click="resetClick">重置</el-button>
+                                    </div>
+                                    <div class="expandTable">
+                                        <el-table ref="multipleTableRef" :data="expandTableData" style="width: 100%; height: 440px" :row-style="{ height: '39.8px' }" :cell-style="{ padding: '1.5px 0' }" @selection-change="handleSelectionChange">
+                                           
+                                            <el-table-column prop="name" label="姓名" width="160px" align="left">
+                                                <template #default="scope">
+                                                    {{ scope.row.name }}({{ scope.row.number }})
+                                                </template>
+                                            </el-table-column>
+                                            <!-- <el-table-column prop="tel" label="联系方式" width="120px" align="left" /> -->
+                                            <el-table-column prop="nickName" label="部门" width="140px" align="left">
+                                                <template #default="{ row }">
+                                                    {{row.deparment}}
+                                                </template>
+                                            </el-table-column>
+                                            <el-table-column type="selection" width="45" />
+                                            
+                                        </el-table>
+                                    </div>
+                                    <div class="expandPage">
+
+                                    </div>
+                                </el-tab-pane>    
+                            </el-tabs>
+                        </el-col>
+                        <el-col :span="1" style="display: flex; align-items: center;justify-content: center;" >
+                            <el-icon style="font-size: large;cursor: pointer;" @click="gotoRight">
+                                <ArrowRightBold />
+                            </el-icon>
+                        </el-col>
+                        <el-col :span="6" style="padding: 0">
+                             <div >
+                                <div  style="display: flex; align-items: center; padding-bottom: 18px;">
+                                    <div>已选择：{{ controlData.control.roleCheckDataList.length }}</div>
+                                    <el-button type="danger" size="small" style="margin-left: auto" @click="delAllClick">全部移除</el-button >
+                                </div>
+                                <el-table :data="controlData.control.roleCheckDataList" style="height: 440px;padding-top: 2px;" :row-style="{ height: '39.8px' }" :cell-style="{ padding: '1.5px 0' }">
+                                    <el-table-column prop="name" label="姓名" align="left">
+                                        <template #default="scope">
+                                            {{ scope.row.name }}({{ scope.row.number }})
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column label="" width="60px" >
+                                        <template #default="{ row }">
+                                            <el-button size="small" type="danger" @click="delRowClick(row)" 
+                                                >移除</el-button
+                                            >
+                                        </template>
+                                    </el-table-column>
+                                </el-table>
+                            </div>
+                        </el-col>
+                        <div style="width:100%;display: flex;margin-top: 18px;justify-content: center;">
+                            <el-pagination v-model:current-page="expandPageNum" v-model:page-size="expandPageSize" background layout="prev, pager, next, jumper,sizes"  :pager-count="3" :page-sizes="[10, 20, 100, 500, 1000]" :total = "total" @current-change="handleCurrentChange" @size-change="handleSizeChange"/>
+                        </div>
+                    </el-row>
+                </div>
+            </el-tab-pane>
+             <el-tab-pane label="根据组织筛选" name="org">
+                <div style="width:100%;display: flex;margin-top: 1px;justify-content: center;">
+                    <TransferSelectUserRange v-if="userRangeDialogFlag"  :key="componentKey" :data="transferSelectUserRangeData"  :selected-value="controlData.control.orgRange" @checked-id-list-changed="checkedIdListChangedIndex"   @re-render-component="reRenderComponent" />
+                </div>
+             </el-tab-pane>
+        </el-tabs>
+        <template #footer>
+            <div class="dialog-footer">
+                <el-button type="primary" @click="userRangeDialogFlag = false">
+                    确定
+                </el-button>
+            </div>
+        </template>
+    </el-dialog>  
+    <!--轮播图设置-->
+    <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>
+
+    <!--内部二维码-->
+    <el-dialog
+        v-model="qrCodeInsideDialogFlag"
+        class="glxxsztc"
+        top="150px"
+        :close-on-click-modal="false"
+        title="内部二维码"
+        :show-close="false"
+        style="margin-top: 70px"
+        width="50%"
+    >
+        <img :src="qrCodeImgInside" style="width: 50%; height: 50%" />
+        <template #footer>
+            <div class="dialog-footer">
+                <el-button type="primary" @click="qrCodeInsideDialogFlag = false">确定</el-button>
+            </div>
+        </template>
+    </el-dialog>  
+    <!--选择关联表单-->
+    <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"
+                    node-key="id"
+                    @change="formidChanged"
+                />
+            </div>
+        </template>
+        <template #footer>
+            <div class="dialog-footer">
+                <el-button type="primary" @click="handleDetermineAssociatedFormsChooseDialog">确定</el-button>
+            </div>
+        </template>
+    </el-dialog>  
+    <!--隐藏条件-->
+    <el-dialog
+        v-model="associatedFormsHideDialogFlag"
+        title="隐藏条件"
+        top="150px"
+        :close-on-click-modal="false"
+        :show-close="false"
+        style="margin-top: 70px; min-height: 500px"
+        width="50%"
+    >
+        <template v-if="controlData.type == 'associatedForms'">
+            <div class="common-layout">
+                <el-container>
+                    <el-aside
+                        width="300px"
+                        style="height: 420px; border: 1px solid gainsboro; margin-right: 5px"
+                    >
+                        <el-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="treeDefaultProps"
+                            @node-collapse="handleFieldTreeCollapse"
+                            @node-contextmenu="handleFieldTreeContextmenu"
+                        />
+                        <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-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>
+                        <div style="border: 1px solid gainsboro; height: 55%; padding-top: 20px">
+                            <ul>
+                                <li>请从左侧面板<span style="color: red">右击</span>选择字段或选项</li>
+                                <li>
+                                    支持的符号：<span style="color: red">'==', '&gt;=', '&gt;', '&lt;=', '&lt;', '!='</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-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-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-tree
+                            ref="roleTreeRef"
+                            style="max-width: 600px; border: 1px solid gainsboro; margin: 3px"
+                            :data="roleTree"
+                            :props="treeDefaultProps"
+                            :filter-node-method="filterNode"
+                            @node-expand="handleRoleTreeExpand"
+                            @node-collapse="handleRoleTreeCollapse"
+                            @node-contextmenu="handleRoleTreeContextmenuRange"
+                        />
+                    </el-aside> 
+                    <el-main
+                        style="border: 1px solid gainsboro; padding: 3px"
+                        class="associatedFormsHideDialogMain"
+                    >
+                        <div
+                            style="
+                                border: 1px solid gainsboro;
+                                height: 7%;
+                                border-bottom: 0px;
+                                padding-top: 3px;
+                                padding-left: 5px;
+                                background-color: #e6f3fe;
+                            "
+                        >
+                            仅可选择符合以下条件的数据
+                        </div>
+                        <div
+                            id="associatedFormsHideEditArea"
+                            style="border: 1px solid gainsboro; height: 38%; border-bottom: 0px"
+                        >
+                            <AssociatedFormsTinyaceRange
+                                ref="aftRange"
+                                :aft-text="controlData.control.dataRangeConditionHtml"
+                                :aft-text-copy="controlData.control.dataRangeConditionHtmlCopy"
+                                :current-form="String(props.customerformid)"
+                                @text-change="aftTextChangedRange"
+                                @gongshi-change="aftGongshiChangedRange"
+                            ></AssociatedFormsTinyaceRange>
+                        </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"
+                                    >'==', '>=', '>', '&gt;=', '&gt;', '&lt;=', '!='</span
+                                >
+                                </li>
+                                <li>
+                                支持<span style="color: red">"包含,不包含,数据拥有者,数据所属部门"</span
+                                >关键字,用于组织机构条件,角色条件,==运算符和!=运算符
+                                </li>
+                                <li>参考举例：</li>
+                                <span style="margin-left: 14px">年龄>10</span
+                                ><br />
+                                <span style="margin-left: 14px">企管部==数据所属部门</span
+                                ><br />
+                                <span style="margin-left: 14px">绩效考核执行人包含数据拥有者</span
+                                ><br />
+                                <span style="margin-left: 14px">生产部包含数据所属部门</span>
+                            </ul>
+                        </div>
+                    </el-main>    
+                </el-container>
+            </div>
+        </template>
+        <template #footer>
+            <div class="dialog-footer">
+                <el-button @click="asfhTextCancelRange">取消</el-button>
+                <el-button type="primary" @click="handleDetermineRange"> 确定 </el-button>
+            </div>
+        </template>
+    </el-dialog>  
+    <!-- 数据填充规则弹窗 -->
+    <el-dialog
+        v-model="associatedFormsFillRolesDialogFlag"
+        title="数据填充规则"
+        top="150px"
+        :close-on-click-modal="false"
+        :show-close="false"
+        style="margin-top: 70px; min-height: 300px; max-height: 900px"
+        width="60%"
+    >
+        <template v-if="controlData.type == 'associatedForms'">
+            <el-button
+                style="font-size: large; margin-top: 10px; margin-bottom: 15px"
+                type="primary"
+                link
+                append-to-body="true"
+                modal="true"
+                @click="addFillRole"
+            >十 主表填充规则</el-button>
+            <div style="max-height: 230px; border: 1px solid white; overflow-y: auto">
+                <div
+                    style="
+                        background-color: #f0f0f0;
+                        padding: 12px;
+                        border-radius: 5px;
+                        padding-left: 45px;
+                        padding-bottom: 10px;
+                        margin-right: 10px;
+                    "
+                >
+                    <!-- #F5F7FA     #E6F3FE  #F0F0F0  #F5F7FA-->
+                    <template
+                        v-for="(, index) in controlData.control.fillRoles.master"
+                        :key="controlData.control.fillRoles.master[index].id"
+                    >
+                        <AssociatedFormsFillRole
+                            v-if="showAssociatedFormsFillRole"
+                            v-model:left-value="controlData.control.fillRoles.master[index].leftValue"
+                            v-model:right-value="controlData.control.fillRoles.master[index].rightValue"
+                            :left-tree-source="asfasfMasterFieldTree"
+                            :right-tree-source="associatedFormsCurrentFormFieldTree1"
+                            :current-key="controlData.control.fillRoles.master[index].id"
+                            @del-role="delRole"
+                            @child-role-right-changed="childRoleRightChanged"
+                        >
+                        </AssociatedFormsFillRole
+                        ><!--  -->
+                    </template>
+                </div>
+            </div>
+            <el-popover
+                v-if="currentChildTableCount > 0"
+                placement="right-start"
+                title=""
+                :width="200"
+                trigger="hover"
+                content="【关联表单子表字段】暂不支持填充至【当前表单主表字段】"
+            >
+                <template #reference>
+                    <el-button
+                        style="font-size: large; margin-top: 23px; margin-bottom: 15px"
+                        type="primary"
+                        link
+                        append-to-body="true"
+                        modal="true"
+                        @click="addChildFillRole"
+                        >十 子表填充规则</el-button>
+                </template>
+            </el-popover>
+            <div
+                v-if="currentChildTableCount > 0"
+                style="max-height: 330px; overflow-y: auto; padding-top: 7px"
+            >
+                <template
+                v-for="(itemsss, 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"
+                        @delRole="delChildRole(controlData.control.fillRoles.child[index].id)"
+                    >
+                    </AssociatedFormsChildFillRole>
+                </template>
+            </div>
+
+        </template>
+        <template #footer>
+            <div class="dialog-footer">
+                <!-- <el-button @click="asfhTextCancelFillRoles">取消</el-button> -->
+                <el-button type="primary" @click="handleDetermineFillRoles"> 确定 </el-button>
+            </div>
+        </template>
+    </el-dialog>
+    <!-- :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 &&
+                !controlData.control.multiple
+            " 
+        >
+            <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="glxxszTree"
+                            multiple
+                            show-checkbox
+                            collapse-tags 
+                            collapse-tags-tooltip 
+                            :max-collapse-tags="2" 
+                            clearable
+                            filterable
+                        />
+                    </template>
+                </el-table-column>
+            </el-table>
+        </template>
+        <template
+            v-if="
+                controlData.type == 'select' &&
+                controlData.config.optionsType == 0 &&
+                controlData.control.multiple
+            "
+        >
+            <el-table
+                :data="controlData.control.glxxsz"
+                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.glxxsz[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.glxxsz[fieldScope.$index].showFields"
+                            style="width: 100%"
+                            :data="glxxszTree"
+                            multiple
+                            show-checkbox
+                            collapse-tags 
+                            collapse-tags-tooltip 
+                            :max-collapse-tags="2" 
+                            clearable
+                            filterable
+                        />
+                    </template>
+                </el-table-column>
+
+                <el-table-column fixed="right" label="操作" width="130">
+                    <template #default="operateScope">
+                        <el-button
+                            type="danger"
+                            :icon="Delete"
+                            circle
+                            @click="deleteRowForGlxxsz1(operateScope.row)"
+                        />
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-button
+                plain
+                type="success"
+                style="margin-top: 10px"
+                @click="createRowForGlxxsz1"
+            >新增</el-button>
+        </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="glxxszTree"
+                            multiple
+                            show-checkbox
+                            collapse-tags 
+                            collapse-tags-tooltip 
+                            :max-collapse-tags="2" 
+                            clearable
+                            filterable
+                        />
+                    </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;width: 100%;">
+                <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="glxxszTree"
+                    multiple
+                    show-checkbox
+                    collapse-tags 
+                    collapse-tags-tooltip 
+                    :max-collapse-tags="2" 
+                    clearable
+                    filterable
+                />
+            </div>
+            <div style="display: flex;width: 100%;">
+                <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="glxxszTree"
+                    multiple
+                    show-checkbox
+                    collapse-tags 
+                    collapse-tags-tooltip 
+                    :max-collapse-tags="2" 
+                    clearable
+                    filterable
+                />
+            </div>
+        </template>
+        <template #footer>
+            <div class="dialog-footer">
+                <el-button type="primary" @click="handleDetermineGlxxszDialogSwitch">
+                确定
+                </el-button>
+            </div>
+        </template>
+    </el-dialog>    
+    <!-- 自动填充设置弹窗 start -->
+     <el-dialog
+        v-model="ZdtcszDialogFlag"
+        class="glxxsztc"
+        top="150px"
+        :close-on-click-modal="false"
+        :title="`矩阵填充设置--` + controlData.name"
+        :show-close="false"
+        style="margin-top: 70px"
+        width="50%"
+    >
+        <div v-if="ZdtcszDialogFlag" style="width: 100%; display: flex; align-items: center; flex-wrap: nowrap; gap: 10px; padding: 8px 0;">
+            <!-- 标题行文本 -->
+            <span style="font-size: larger; margin-left: 35px; min-width: 60px; white-space: nowrap;">标题行</span>
+            <!-- 第一个树形选择器 -->
+            <el-tree-select
+                v-model="controlData.control.zdtcsz.tbx"
+                :data="zdtcszTree"
+                collapse-tags 
+                collapse-tags-tooltip 
+                :max-collapse-tags="2" 
+                clearable
+                filterable
+                style="flex: 1; min-width: 200px; max-width: 400px;"
+            />
+            <!-- 索引列文本 -->
+            <span style="font-size: larger; min-width: 60px; white-space: nowrap;">索引列</span>
+            <!-- 第二个树形选择器 -->
+            <el-tree-select
+                v-model="controlData.control.zdtcsz.tby"
+                :data="zdtcszTree"
+                collapse-tags 
+                collapse-tags-tooltip 
+                :max-collapse-tags="2" 
+                clearable
+                filterable
+                style="flex: 1; min-width: 200px; max-width: 400px; margin-right: 35px;"
+            />
+        </div>
+        <div style="width: 100%; padding: 20px; overflow-x: auto;">
+            <el-table
+                :data="zdtcszTableData"
+                border
+                style="width: 100%;"
+                :header-cell-style="{ textAlign: 'center' }"
+                :cell-style="{ textAlign: 'center' }"
+            >
+            <!-- 第一列：动态列标题，显示"索引列\标题行"的格式 -->
+                <el-table-column
+                    :label="leftTopLabel"
+                    prop="rowLabel"
+                    width="200"
+                    align="center"
+                />
+                <!-- 动态生成标题行对应的表格列 -->
+                <template v-if="titleOptions.length > 0">
+                    <el-table-column
+                        v-for="col in zdtcszTableColumns"
+                        :key="col.value"
+                        :label="col.label"
+                        :prop="`col_${col.value}`"
+                        min-width="200"
+                        align="center"
+                    >
+                        <template #default="scope">
+                            <!-- 改为下拉选择器 -->
+                            <el-select
+                                v-model="scope.row[`col_${col.value}`]"
+                                size="small"
+                                placeholder="请选择"
+                                style="width: 100%;"
+                                clearable
+                                @change="handleTableDataChange"
+                            >
+                                <el-option
+                                    v-for="option in currentComponentOptions"
+                                    :key="option.value"
+                                    :label="option.label"
+                                    :value="option.value"
+                                />
+                            </el-select>
+                        </template>
+                    </el-table-column>
+                </template>
+                <!-- 当没有标题行时，显示一个默认列 -->
+                <template v-else-if="zdtcszTableData.length > 0">
+                    <el-table-column
+                        key="default"
+                        label="默认列"
+                        prop="col_default"
+                        min-width="200"
+                        align="center"
+                    >
+                        <template #default="scope">
+                            <el-select
+                                v-model="scope.row.col_default"
+                                size="small"
+                                placeholder="请选择"
+                                style="width: 100%;"
+                                @change="handleTableDataChange"
+                            >
+                                <el-option
+                                    v-for="option in currentComponentOptions"
+                                    :key="option.value"
+                                    :label="option.label"
+                                    :value="option.value"
+                                />
+                            </el-select>
+                        </template>
+                    </el-table-column>
+                </template>
+            </el-table>
+        </div>
+        <template #footer>
+            <div class="dialog-footer">
+                <el-button type="primary" @click="handleDetermineZdtcszDialogFlag">
+                    确定
+                </el-button>
+            </div>
+        </template>
+    </el-dialog>    
+    <!-- 用户组织联动选择  start-->
+    <el-dialog
+        v-model="selectOrgConnectUserDialogFlag"
+        title="选择关联的用户组件"
+        top="150px"
+        style="margin-top: 70px"
+    >
+        <!-- {{ expandUserComponentsTree }} -->
+        <el-tree-select
+            v-if="controlData.type == 'orgCentent'"
+            ref="treeSelectRef"
+            v-model="controlData.control.connectUserComponent"
+            style="width: 100%;"
+            :data="expandUserComponentsTree"
+            clearable
+            placeholder="请选择"
+            @change="handleTreeSelectChange"
+        />
+    </el-dialog>
+    <!-- 选项批量编辑  liwenxuan 20251212 start -->
+    <el-dialog
+        v-model="dialogVisible"
+        title="批量导入"
+        width="700px"
+        
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        style="--el-dialog-padding-primary: 20px; border-radius: 8px; box-shadow: 0 2px 16px rgba(0,0,0,0.08); border: none; "
+    >
+        <div class="dialog-content" style="width: 100%; padding-left: 15px;padding-right: 12px;height: 310px;">
+            <!-- 标题+提示区域：靠左排列，提示在标题下方 -->
+            <div class="edit-header" style="margin-bottom: 10px;">
+            
+            <span class="edit-hint" style="font-size: 15px; display: block; margin-top: 2px; margin-left: 2px;">每行对应一个选项</span>
+            </div>
+            
+            <!-- 文本域：100%宽度，靠左，无多余边框 -->
+            <div class="textarea-container" style="width: 100%;height: 260px;">
+            <el-input
+                v-model="editText"
+                type="textarea"
+                
+                :rows="12"
+                placeholder="请输入选项"
+                resize="none"
+                style="width: 100%; border-radius: 6px; border: 0.5px solid #e5e7eb; padding: 0px; font-size: 14px; color: #666; text-align: left;margin-bottom: 10px;"
+            />
+            </div>
+        </div>
+        
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="cancelEditing">取消</el-button>
+                <el-button  style="margin-right: 12px;" type="primary" @click="saveChanges">确定</el-button>
+            </span>
+        </template>
+    </el-dialog>
+    <!-- 子表预填充设置  liwenxuan 20260204  start -->
+    <el-dialog
+      v-model="preFillDialogFlag"
+      title="子表预填充设置"
+      width="700px"
+      
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      style="--el-dialog-padding-primary: 20px; border-radius: 8px; box-shadow: 0 2px 16px rgba(0,0,0,0.08); border: none; "
+    >
+        <div style="display: flex; margin-bottom: 20px; margin-top: 20px;width: 100%;">
+            <span style="font-size: larger; margin-left: 35px; margin-right: 15px">选择关联表单</span>
+            <el-tree-select
+                v-model="controlData.control.preFill.asf"
+                style="width: 60%"
+                :data="asfsCurrentTable"
+                clearable
+            />
+        </div>
+        <div v-if="preFillDialogFlag" style="display: flex; margin-bottom: 20px; margin-top: 20px;width: 100%;">
+          <span style="font-size: larger; margin-left: 35px; margin-right: 15px"
+            >选择填充记录</span><!-- controlData.control.preFill.ids -->
+          <AssociatedformsForCreate
+            style="width: 60%"
+            @value-changed="tablePreFillValueChanged"
+            :data="asfPropsData"
+            :ids = controlData.control.preFill.ids
+          />
+        </div>
+        <template #footer>
+            <div class="dialog-footer">
+                <el-button type="primary" @click="preFillDialogDetermine"> 确定 </el-button>
+            </div>
+        </template>
+    </el-dialog>
+    <!-- 单选下拉多选选项来源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?customerFormTree[0].children:[]"
+                    check-strictly
+                    :render-after-expand="false"
+                    filterable
+                    node-key="id"
+                    @change="formidChangedOptionsValue3"
+                />
+            </div>
+            <div
+                v-if="
+                typeof controlData.control.optionsValue3Formid != 'undefined' &&
+                typeof asfasfFieldTreeOptionsValue3 != 'undefined' &&
+                controlData.control.optionsValue3Formid != ''
+                "
+                style="display: flex"
+            >
+                <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> 
+
+
+
+    
+</template>
+<style  lang='scss' scoped>
+.empty-state {
+    text-align: center;
+    color: #909399;
+    padding: 30px 20px;
+}
+        
+.empty-state i {
+    font-size: 40px;
+    margin-bottom: 10px;
+    opacity: 0.5;
+}
+.category-title {
+    font-size: 14px;
+    font-weight: 600;
+    color: #165DFF;
+    margin-bottom: 10px;
+    padding-bottom: 8px;
+
+}
+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;
+}
+
+.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;
+  }
+}
+.custom-tree-node {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 14px;
+  padding-right: 8px;
+}
+.custom-tree-node:hover {
+  background-color: antiquewhite;
+}
+
+.associatedFormsHideDialogMain7 {
+  display: flex;
+}
+.el-main {
+  --el-main-padding: 5px;
+}
+.jiaoYan {
+  .el-input-group__append,
+  .el-input-group__prepend {
+    padding: 0 5px;
+  }
+}
+.contentBetween {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.common-layout {
+  width: 100%;
+  height: calc(100vh - 230px);
+  :deep .el-header {
+    padding: 0px;
+  }
+  :deep .el-main {
+    padding: 10px;
+  }
+
+  .asideBox {
+    height: calc(100vh - 230px);
+  }
+  .aiButs {
+    width: 94%;
+    margin-left: 3%;
+  }
+  .contBox {
+    border-right: 1px solid #ccc;
+  }
+  .titleBox {
+    width: 100%;
+    height: 40px;
+    border-bottom: 1px solid #ccc;
+    display: flex;
+    align-items: center;
+  }
+  .rowBox {
+    width: 100%;
+    text-align: center;
+  }
+}
+.form-content{
+    .aiBox {
+    width: 100%;
+
+    height: calc(100vh - 170px);
+    .aiBut {
+        width: 94%;
+        margin-bottom: 15px;
+        margin-left: 3%;
+    }
+    :deep .el-card__header {
+        padding: 5px 10px;
+        border: 0;
+        background-color: #FFFFFF;
+        i {
+        color: #ff0000;
+        }
+    }
+    :deep .el-card__body {
+        padding: 0px 10px 10px 10px;
+    }
+    }
+
+    .is-active{
+        border-bottom: 0;
+    }
+    .tabslayout{
+        .is-active{
+            border-bottom: 0px;
+        }
+    }
+    
+}
+.setAttrCardBox{
+    :deep .el-tabs__content {
+        height: calc(100vh - 145px);
+        overflow: auto;
+    }
+}
+
+.aiCardBox {
+  width: 94%;
+  margin-top: 15px;
+  margin-bottom: 15px;
+  margin-left: 3%;
+}
+// .card-header {
+//   text-align: right;
+// }
+.card-header{
+    font-size: 1.4rem;
+    font-weight: 700;
+    color: #0020C2;
+    display: flex;
+    align-items: center;
+    gap: 10px;
+}
+</style>
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/unitsPageFrom/control.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/unitsPageFrom/control.vue
new file mode 100644
index 0000000..26e084c
--- /dev/null
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/unitsPageFrom/control.vue
@@ -0,0 +1,257 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2026-02-24 13:22:18
+@ 备注: 控件库
+-->
+<script lang='ts' setup>
+import controlListData from "@/components/DesignForm/assembly";
+import { jsonParseStringify } from "@/utils/DesignForm";
+import Draggable from "vuedraggable-es";
+import "@/assets/iconfont/iconfont.css";
+
+import SvgIcon from "@/components/SvgIcon/index.vue";
+import FormVersion from "@/components/DesignForm/formVersion.vue";
+const props = defineProps({
+    tableKey: {
+        type: String,
+        default: ""
+    },
+    signCode: {
+        type: String,
+        default: ""
+    }
+})
+// const props = withDefaults(
+//   defineProps<{
+//     tableKey?: number | string;
+//     signCode?: number | string;
+//   }>(),
+//   {}
+// );
+const emits = defineEmits<{
+  (e: "versionUpdateForm", value: string): void;
+  (e: "versionPreviewPage", value: string): void;
+}>();
+
+const designType = inject("formDesignType") as string; //注入一个由祖先组件或整个应用 (通过 app.provide()) 提供的值。
+const versionActiveTab = ref(false);
+const tableVersion = ref(); //版本显示器
+const isSearch = computed(() => {
+  return designType === "search";
+});
+// 默认搜索允许显示的字段
+const searchField = [
+    "input",
+    "radio",
+    "checkbox",
+    "select",
+    "datePicker",
+    "timePicker",
+    "inputNumber",
+    "cascader",
+    "component",
+    "button",
+];
+/**
+@ 作者: 秦东
+@ 时间: 2024-05-09 11:36:59
+@ 功能: 启用和禁用版本
+*/
+const enableOrDisable = (val?: any) => {
+  // console.log("启用和禁用版本",val)
+  emits("versionUpdateForm", val);
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-05-21 09:05:20
+@ 功能: 预览版本
+*/
+const previewPage = (val?: any) => {
+  emits("versionPreviewPage", val);
+};
+
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-24 13:45:38
+@ 功能: 表单组件数据
+*/
+const controlList = computed(() => {
+    if (designType === "search") {
+        // 只返回基础字段
+        const temp: any = [];
+        controlListData.forEach((item: any) => {
+        if (item.children) {
+            const filter = item.children.filter((ch: any) => {
+            return searchField.includes(ch.type);
+            });
+            if (filter && filter.length) {
+            temp.push({ title: item.title, children: filter });
+            }
+        }
+        });
+        return temp;
+    } else {
+        return controlListData;
+    }
+});
+/**
+@ 作者: 秦东
+@ 时间: 2024-05-09 11:40:15
+@ 功能: 打开版本选择页面
+*/
+const useVersionClick = () => {
+    tableVersion.value.open();
+};
+/**
+@ 作者: 秦东
+@ 时间: 2024-05-15 10:15:14
+@ 功能: 克隆选中的组件数据结构
+*/
+const clone = (origin: any) => {
+  // console.log("克隆选中的组件数据结构",origin)
+  return jsonParseStringify(origin);
+};
+</script>
+<template>
+  <el-card  shadow="always">
+        <template #header>
+            <div class="cardHeader">
+                <div class="card-header">控件库</div>
+                <div v-if="!isSearch"  class="card-headerRight" @click="useVersionClick">版本管理</div>
+            </div>
+        </template>
+        <el-scrollbar ref="scrollbarRef" class="scroBox ">
+            <div v-for="(list, index) in controlList" :key="index" v-memo="[index]" class="unitBox">
+                <el-text class="category-title">{{ list.title }}</el-text>
+                <el-divider style="margin: 5px 0 10px 0;" />
+                <div class="unitBody">
+                    <Draggable
+                        v-model="list.children"
+                        tag="ul"
+                        :group="{ name: 'form', pull: 'clone', put: false }"
+                        ghost-class="ghost"
+                        :sort="false"
+                        :clone="clone"
+                        itemKey="unitListKey"
+                    >
+                        <template #item="{ element }">
+                            <div class="unitItem">
+                                <SvgIcon v-if="element.iconFont == ''" icon-class="caogaoxiang" class="control-icon" />
+                                <i v-if="element.iconFont != ''" :class="`fa ${element.iconFont} `"></i>
+                                <el-text class="control-name">{{element.label}}</el-text>
+                            </div>
+                        </template>
+                    </Draggable>
+                </div>
+            </div>
+
+        </el-scrollbar>
+        <FormVersion
+            ref="tableVersion"
+            :table-key="props.tableKey"
+            :sign-code="props.signCode"
+            @enable-or-disable="enableOrDisable"
+            @preview-page="previewPage"
+        />
+    </el-card>
+</template>
+<style  lang='scss' scoped>
+.form-content {
+    width: 100%;
+    display: grid;
+    grid-template-columns: 300px 1fr 300px;
+    grid-template-rows: auto;
+    gap: 10px;
+    padding: 10px 10px 0 10px;
+    :deep .el-tabs--border-card{
+        border: 0;
+    }
+    :deep .el-card__header{
+        padding: 10px 15px;
+        background-color: #f5f7fa;
+    }
+    :deep .el-card__body{
+        padding: 0;
+        
+    }
+    :deep .el-tabs__header{
+        justify-content: space-between;
+        width: 100%;
+    }
+    :deep .is-active{
+        border-bottom: 1px solid var(--el-color-primary);
+    }
+}
+.cardHeader{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+.card-header{
+    font-size: 1.4rem;
+    font-weight: 700;
+    color: #0020C2;
+    display: flex;
+    align-items: center;
+    gap: 10px;
+}
+.category-title {
+    font-size: 14px;
+    font-weight: 600;
+    color: #165DFF;
+    margin-bottom: 10px;
+    padding-bottom: 8px;
+    border-bottom: 1px solid #ebeef5;
+}
+
+.scroBox{
+    height: calc(100vh - 110px);
+    overflow: auto;
+}
+
+// 布局区域
+
+.unitBox{
+    padding: 10px 15px;
+}
+.unitBody ul{
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    grid-gap: 10px;
+}
+.unitItem{
+    background: #f5f7fa;
+    border: 1px solid #dcdfe6;
+    border-radius: 4px;
+    padding: 10px 5px; /* 减小内边距以适应3列布局 */
+    text-align: center;
+    cursor: grab;
+    transition: all 0.2s;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    &:hover{
+        background: #ecf5ff;
+        transform: translateY(-2px);
+        box-shadow: 0 2px 12px 0 rgba(22, 93, 255, 0.1);
+        border-color: #b3d8ff;
+        color: #165DFF;
+    }
+    i{
+        font-size: 20px; /* 减小图标大小以适应3列布局 */
+        color: #165DFF;
+        margin: 5px 0; /* 减小间距以适应3列布局 */
+    }
+}
+.control-icon {
+    font-size: 25px; /* 减小图标大小以适应3列布局 */
+    color: #165DFF;
+    margin-bottom: 3px; /* 减小间距以适应3列布局 */
+}
+        
+.control-name {
+    font-size: 12px; /* 减小字体大小以适应3列布局 */
+    color: #606266;
+    line-height: 1.2;
+}
+</style>
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/unitsPageFrom/design.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/unitsPageFrom/design.vue
new file mode 100644
index 0000000..f6d62cd
--- /dev/null
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/unitsPageFrom/design.vue
@@ -0,0 +1,3520 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2026-02-24 13:23:08
+@ 备注: 设计区域
+-->
+<script lang='ts' setup>
+import "@/assets/scss/element-var.scss";
+import "@/assets/scss/index.scss";
+import { FormData, FormList, FormDataStyle } from "@/api/DesignForm/types";
+import {
+  constGetControlByName,
+  constSetFormOptions,
+  constFormBtnEvent,
+  constControlChange,
+  constFormProps,
+  appendOrRemoveStyle,
+  constAiEffect,
+} from "@/api/DesignForm/utils";
+
+import SvgIcon from "@/components/SvgIcon/index.vue";
+import { useRoute } from "vue-router";
+
+import WebFormGroup from "@/components/DesignForm/public/form/webformGroup.vue";
+import FormGroup from "@/components/DesignForm/public/form/formGroup.vue";
+import { jsonParseStringify } from "@/utils/DesignForm";
+import { getMainOrgByWorkNumber, getOrgAndManTree, queryHideRoleCondition, queryIfOrgOrPerson } from "@/api/javaRequest";
+import { currencyFormApiSubmit } from "@/api/taskapi/management";
+import formatResult from "@/utils/DesignForm/formatResult";
+import formChangeValue from "@/utils/DesignForm/formChangeValue";
+
+
+const props = withDefaults(
+  defineProps<{
+    formData: FormData;
+    type?: number; // 1新增；2修改；3查看（表单模式） ；4查看； 5设计
+    numrun?: number; //1：获取；非1：不变
+    disabled?: boolean; // 禁用表单提交
+    requestUrl?: string; // 编辑数据请求url
+    beforeRequest?: Function; // 请求编辑数据前参数处理方法，可对请求参数处理
+    afterResponse?: Function | string; // 请求数据加载完成后数据处理方法，可对返回数据处理
+    addUrl?: string; // 表单数据新增提交保存url
+    editUrl?: string; // 表单数据修改保存提交url
+    beforeSubmit?: Function | string; // 表单提交前数据处理，可对提交数据处理，新增和保存都会触发
+    afterSubmit?: Function; // 表单提交后，默认提示提交结果，可return false阻止提示
+    closeAppSubmit?: Function; //关闭拉窗
+    changeKeyVal?: Function; //监听表单值该表
+    anewSubmit?: Function; //重新提交表单
+    saveDraftPage?: Function; //保存草稿
+    saveEditFormInfo?: Function; //保存草稿  只改表单不操作流程
+    sendDraftSubmit?: Function; //草稿提交审批
+    submitEdit?: Function; //提交修改数据申请
+    value?: { [key: string]: any }; // 表单初始值，同setValue
+    options?: { [key: string]: any }; // 表单组件选项，同setOptions
+    dict?: object; // 固定匹配的字典
+    isSearch?: boolean; // 列表里作为筛选使用
+    isWorkFlow?: number; //
+    flowkey?: string; //
+    groupid?: string; //
+    signCode?: string; //
+    versionId?: string; //
+    mastesformjson?: string; //
+    isWeb: boolean; //
+    nodeKey?: string;
+    purview?: any[];
+  }>(),
+  {
+    type: 1, // 1新增；2修改；3查看（表单模式） ；4查看； 5设计
+    numrun: 2,
+    formData: () => {
+      return {
+        list: [],
+        form: {},
+        config: {
+          groupKey: '',
+          style: "",
+        },
+        styles: {
+          divStyle: {},
+          labelStyle: {},
+          inputStyle: {},
+        },
+        aiConfig: [],
+      };
+    },
+    dict: () => {
+      return {};
+    },
+    isSearch: false,
+    issave: {
+      type: Boolean,
+      default: true,
+    },
+    key: 1,
+    isWorkFlow: 2,
+    flowkey: "",
+    groupid: "",
+    signCode: "",
+    mastesformjson: "",
+    requestUrl: "",
+    beforeRequest: () => {},
+    afterResponse: () => {},
+    addUrl: "",
+    editUrl: "",
+    beforeSubmit: () => {},
+    afterSubmit: () => {},
+    closeAppSubmit: () => {},
+    changeKeyVal: () => {},
+    anewSubmit: () => {},
+    saveDraftPage: () => {},
+    saveEditFormInfo: () => {},
+    sendDraftSubmit: () => {},
+    submitEdit: () => {},
+    versionId: "",
+    nodeKey: "",
+    purview: Array,
+  }
+);
+const emits = defineEmits<{
+  (e: "btnClick", type: string): void;
+  (e: "change", val: any): void; // 表单组件值发生变化时
+  (e: "update:issave", type: boolean): void;
+  (e: "refresh"): void;
+  (e: "optionsValue3Get3", val: any, fieldName: string): void;
+  (e: 'click', value: string): void;
+  (e: 'update:formData', formData: FormData): void;
+}>();
+const route = useRoute();
+const rangedUserTrees1= ref([]);
+// 处理表单值开始
+const model = ref<any>({});
+// 设置全局事件结束
+const resultDict = ref({});
+let mustBeHidden: any = [];
+let newModelKeyArr: string[] = [];
+const orgAndManTree = ref()
+const asfs: any[] = [];
+const rangedUsers :any= [];
+const selectOrgs :any = [];
+const rangedUsersPath :any= [];
+const selectOrgsPath :any = [];
+const setFormOptions = ref({});
+const tables: any[] = [];
+const loading = ref(false);
+const getAsfsRunedFlag = ref(false)
+// 表单检验方法
+const ruleForm = ref();
+const validate = (callback: any) => {
+  ruleForm.value.validate((valid: boolean, fields: any) => {
+    // console.log("ruleForm.value--->filter-->",ruleForm.value)
+    // console.log("getValue--->fields-->",fields)
+    // console.log("getValue--->valid-->",valid)
+
+    let fieldValue = fields;
+    if (valid) {
+      // 校验通过，返回当前表单的值
+      fieldValue = getValue();
+    }
+    callback(valid, fieldValue);
+  });
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-04 09:58:56
+@ 功能: 注册window事件
+*/
+let timer = 0;
+let eventName = "";
+let getValueEvent = "";
+const setWindowEvent = (bool?: boolean) => {
+  // console.log("注册window事件",props,props.formData)
+  if (props.formData.list.length > 0) {
+    const formName = props.formData.form?.name;
+    if (!formName) {
+      // 导出.vue时，name可以没有
+      return;
+    }
+    eventName = `get${formName}ControlByName`;
+    getValueEvent = `get${formName}ValueByName`;
+    if (formName && (!window[eventName as any] || !bool)) {
+      // 根据name获取当前数据项
+      // @ts-ignore
+      window[eventName] = (name: string) => {
+        return getNameForEach(props.formData.list, name);
+      };
+      // 根据name获取当前项的值
+      // @ts-ignore
+      window[getValueEvent] = (name: string) => {
+        return model.value[name];
+      };
+    }
+  }
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-04 10:15:59
+@ 功能: 追加移除style样式
+*/
+const appendRemoveStyle = (type?: boolean) => {
+  try {
+    const {
+      config: { style },
+    } = props.formData;
+    appendOrRemoveStyle("formStyle", style || "", type);
+  } catch (e) {
+    /* empty */
+  }
+};
+//表单变动监听             
+watch(
+  () => props.formData,
+  () => {
+    emits("update:issave", false);
+  },
+  { deep: true }
+);
+watch(
+  () => props.formData.config,
+  () => {
+    if (timer < 2) {
+      setWindowEvent(); // 简单判断下，这里不是每次都更新
+    }
+    timer++;
+    appendRemoveStyle(true); // 更新样式
+  },
+  { deep: true }
+);
+
+setWindowEvent();
+watch(
+  () => props.formData.list,
+  () => {
+    // formData从接口获取时
+    getInitModel();
+  }
+);
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-04 10:04:43
+@ 功能: 表单参数
+*/
+const formProps = computed(() => {
+  return {
+    model: model.value,
+    type: props.type,
+    hideField: props.formData.config?.hideField as [],
+    showColon: props.formData.form.showColon,
+    dict: dictForm.value,
+  };
+});
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-04 10:11:57
+@ 功能: 监听表单配置参数
+*/
+
+
+
+provide(constFormProps, formProps);
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-04 10:02:45
+@ 功能: 提供一个方法，用于根据name从formData.list里查找数据
+*/
+const getNameForEach = (data: any, name: string) => {
+  let temp = {};
+  for (const key in data) {
+    const dataKey = data[key];
+    if (dataKey.name === name) {
+      return dataKey;
+    }
+    if (["grid", "tabs"].includes(dataKey.type)) {
+      dataKey.columns.forEach((co: any) => {
+        temp = getNameForEach(co.list, name);
+      });
+    }
+    if (["card", "div"].includes(dataKey.type)) {
+      temp = getNameForEach(dataKey.list, name);
+    }
+  }
+  return temp;
+};
+const getControlByName = (name: string) => {
+  return getNameForEach(props.formData.list, name);
+};
+provide(constGetControlByName, getControlByName);
+
+
+
+const dictForm = computed(() => {
+  const storage = window.localStorage.getItem("akFormDict");
+  let storageDict = {};
+  if (storage) {
+    storageDict = JSON.parse(storage);
+  }
+  // 全局的、当前表单配置的以及接口返回的
+  return Object.assign({}, storageDict, props.dict, resultDict.value);
+});
+
+
+const pickPageType = ref("PC");
+const webIsTrue = computed(() => props.isWeb)
+
+function optionsValue3Get2(data: any, fieldName: string) {
+  //console.log("form.vue","optionsValue3Get2")
+  emits("optionsValue3Get3", data, fieldName);
+}
+
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-25 10:51:00
+@ 功能: 执行哪个按钮的操作3579.76   2509.81
+2162.87   2783.09     
+*/
+const btnClick = (type: string) => {
+    if(type === 'monitor'){
+        pickPageType.value = 'PC'
+    }else if(type === 'iphone'){
+        pickPageType.value = 'WEB'
+    }
+	emits('click', type)
+}
+
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-04 10:29:34
+@ 功能: 智能体
+*/
+const currentAgent = ref<
+  {
+    model: boolean;
+    name: string;
+    rowdex:number,
+    uuid: string[];
+    fields: string[];
+    trigger: number;
+    params: { [key: string]: any };
+    subparams:{[key: string]: any}[];
+  }[]
+>([]);
+
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-04 10:28:14
+@ 功能: 获取表单初始model值
+*/
+const getInitModel = () => {
+  if (props.formData.aiConfig && props.formData.aiConfig.length > 0) {
+    props.formData.aiConfig.forEach((item) => {
+      currentAgent.value.push({
+        name: "test",
+        model: false,
+        rowdex:0,
+        uuid: item.library,
+        fields: item.title,
+        trigger: item.trigger,
+        params: {},
+        subparams:[]
+      });
+    });
+  }
+  
+  const obj = {};
+  forEachGetFormModel(props.formData.list, obj);
+  // console.log("obj===>",obj)
+  // console.log("obj===>",props.formData.list)
+  model.value = obj;
+};
+
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-04 10:35:03
+@ 功能: 从表单数据里提取表单所需的model
+*/
+const forEachGetFormModel = (list: FormList[], obj: any) => {
+  list.forEach((item: any) => {
+    if (["table", "flex"].includes(item.type)) {
+      obj[item.name] = jsonParseStringify(item.tableData);
+    } else if (["grid", "tabs"].includes(item.type)) {
+      item.columns.forEach((col: any) => {
+        forEachGetFormModel(col.list, obj);
+      });
+    } else if (["card", "div"].includes(item.type)) {
+      forEachGetFormModel(item.list, obj);
+    } else {
+      const excludeType = ["title", "divider", "txt", "button"];
+      if (excludeType.indexOf(item.type) === -1) {
+        obj[item.name] = jsonParseStringify(item.control.modelValue);
+        if (["switch"].includes(item.type)) {
+          model.value[item.name] = jsonParseStringify(item.control.inactiveValue);
+          // console.log(model.value)
+        }
+      }
+    }
+  });
+  showOrHide("onMounted");
+};
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-04 10:47:43
+@ 功能: 处理字符串
+*/
+const splitString = (str: string) => {
+  const operators = ["==", ">", ">=", "<", "<=", "!=", "不包含", "包含"];
+  for (let operator of operators) {
+    if (str.includes(operator)) {
+      let index = str.indexOf(operator);
+      let left = str.slice(0, index).trim();
+      let right = str.slice(index + operator.length).trim();
+      return { left, operator, right };
+    }
+  }
+}
+const addStringIfNotExists = (arr: string[], str: string) => {
+  if (!arr.includes(str)) {
+    arr.push(str);
+  }
+  return arr;
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-04 10:39:37
+@ 功能: 现实或者隐藏设计区域
+*/
+const showOrHide = (data: any,currentDataNameValue?:any) => {
+  
+  let dataObjFlag = false//data是否是对象
+  if(data=="onMounted"||data=="kong"){
+    
+  }else{
+    //console.log(data)
+    dataObjFlag = true
+    //console.log(data.name)
+  }
+  if(dataObjFlag){
+    if(data.type=="select"||data.type=="radio"||data.type=="checkbox"||data.type=="switch"){
+
+    }else{
+      return
+    }
+    
+  }
+  
+
+  /* 
+		企管部有当前用户,
+		当前用户是什么权限角色.
+		某表单某字段值大于等于小于不等于某个值
+
+		所需接口
+		接口1:当前用户是不是指定的权限角色
+		接口2:当前用户是否在指定的机构下或机构的祖先机构下
+		接口3:本表单(关联关联表单的表单)的某字段的当前值大于等于小于不等于指定的值???也许不需要接口呢?
+
+	*/
+
+  //关联表单隐藏条件判定 start
+  for (let i = 0; i < props.formData.list.length; i++) {
+    if (props.formData.list[i].type == "associatedForms" && formProps.value.type != 5) {
+      //console.log(props.formData.list[i].name)
+      let asfHideCondition = props.formData.list[i].control.hideGongShi.mathsFormula;
+      const leftOperatorsAndRight = splitString(asfHideCondition);
+
+      if (leftOperatorsAndRight) {
+        let leftArr = leftOperatorsAndRight.left.split(":");
+        //console.log(leftArr)
+        if (data == "onMounted" || (leftArr[0] == "formField" && leftArr.length == 3)) {
+          if (data == "onMounted" || (data != "kong" && data.name == leftArr[2])) {
+            //关联表单隐藏相关的值发生了变化
+
+            if (leftOperatorsAndRight.operator == "包含") {
+              if (leftOperatorsAndRight.right == "当前用户") {
+                if (leftOperatorsAndRight.left.startsWith("orgOrPerson")) {
+                  //接口2
+
+                  queryIfOrgOrPerson(leftOperatorsAndRight).then(({ data }) => {
+                    if (data == true) {
+                      // Create a copy of formData to avoid direct mutation
+                      const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+                      // Update the copy
+                      updatedFormData.config.hideField = addStringIfNotExists(
+                        updatedFormData.config.hideField,
+                        updatedFormData.list[i].name
+                      );
+                      // Emit event to update parent
+                      emits('update:formData', updatedFormData);
+                      mustBeHidden.push(props.formData.list[i].name);
+                    }
+                  });
+                } else if (leftOperatorsAndRight.left.startsWith("roleid")) {
+                  //接口1
+                  queryHideRoleCondition(leftOperatorsAndRight).then(({ data }) => {
+                    if (data == true) {
+                      //alert(data)
+                      // Create a copy of formData to avoid direct mutation
+                      const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+                      // Update the copy
+                      updatedFormData.config.hideField = addStringIfNotExists(
+                        updatedFormData.config.hideField,
+                        updatedFormData.list[i].name
+                      );
+                      // Emit event to update parent
+                      emits('update:formData', updatedFormData);
+                      mustBeHidden.push(props.formData.list[i].name);
+                    }
+                  });
+                }
+              }
+            } else if (leftOperatorsAndRight.operator == "不包含") {
+              if (leftOperatorsAndRight.right == "当前用户") {
+                if (leftOperatorsAndRight.left.startsWith("orgOrPerson")) {
+                  //接口2
+                  queryIfOrgOrPerson(leftOperatorsAndRight).then(({ data }) => {
+                    if (data == false) {
+                      // Create a copy of formData to avoid direct mutation
+                      const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+                      // Update the copy
+                      updatedFormData.config.hideField = addStringIfNotExists(
+                        updatedFormData.config.hideField,
+                        updatedFormData.list[i].name
+                      );
+                      // Emit event to update parent
+                      emits('update:formData', updatedFormData);
+                      mustBeHidden.push(props.formData.list[i].name);
+                    }
+                  });
+                } else if (leftOperatorsAndRight.left.startsWith("roleid")) {
+                  //接口1
+                  queryHideRoleCondition(leftOperatorsAndRight).then(({ data }) => {
+                    if (data == false) {
+                      //alert(data)
+                      // Create a copy of formData to avoid direct mutation
+                      const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+                      // Update the copy
+                      updatedFormData.config.hideField = addStringIfNotExists(
+                        updatedFormData.config.hideField,
+                        updatedFormData.list[i].name
+                      );
+                      // Emit event to update parent
+                      emits('update:formData', updatedFormData);
+                      mustBeHidden.push(props.formData.list[i].name);
+                    }
+                  });
+                }
+              }
+            } else {
+              //console.log(leftOperatorsAndRight)
+              if (leftOperatorsAndRight.right == "当前用户") {
+                if (leftOperatorsAndRight.operator == "==") {
+                  //接口2
+                  queryIfOrgOrPerson(leftOperatorsAndRight).then(({ data }) => {
+                    if (data == true) {
+                      // Create a copy of formData to avoid direct mutation
+                      const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+                      // Update the copy
+                      updatedFormData.config.hideField = addStringIfNotExists(
+                        updatedFormData.config.hideField,
+                        updatedFormData.list[i].name
+                      );
+                      // Emit event to update parent
+                      emits('update:formData', updatedFormData);
+                      mustBeHidden.push(props.formData.list[i].name);
+                    }
+                  });
+                } else if (leftOperatorsAndRight.operator == "!=") {
+                  //接口2
+                  queryIfOrgOrPerson(leftOperatorsAndRight).then(({ data }) => {
+                    if (data == true) {
+                      // Create a copy of formData to avoid direct mutation
+                      const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+                      // Update the copy
+                      updatedFormData.config.hideField = addStringIfNotExists(
+                        updatedFormData.config.hideField,
+                        updatedFormData.list[i].name
+                      );
+                      // Emit event to update parent
+                      emits('update:formData', updatedFormData);
+                      mustBeHidden.push(props.formData.list[i].name);
+                    }
+                  });
+                }
+              } else {
+                //接口3
+                //console.log(leftOperatorsAndRight)
+                //console.log(data)
+                if (data.name == leftArr[2]) {
+                  nextTick(() => {
+                    console.log(model.value[leftArr[2]]);
+                    if (leftOperatorsAndRight.operator == "==") {
+                      if (model.value[leftArr[2]] == leftOperatorsAndRight.right) {
+                        // Create a copy of formData to avoid direct mutation
+                        const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+                        // Update the copy
+                        updatedFormData.config.hideField = addStringIfNotExists(
+                          updatedFormData.config.hideField,
+                          updatedFormData.list[i].name
+                        );
+                        // Emit event to update parent
+                        emits('update:formData', updatedFormData);
+                      } else {
+                        // Create a copy of formData to avoid direct mutation
+                        const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+                        // Update the copy
+                        updatedFormData.config.hideField = removeStringIfExists(
+                          updatedFormData.config.hideField,
+                          updatedFormData.list[i].name
+                        );
+                        // Emit event to update parent
+                        emits('update:formData', updatedFormData);
+                      }
+                    } else if (leftOperatorsAndRight.operator == "!=") {
+                      if (model.value[leftArr[2]] != leftOperatorsAndRight.right) {
+                        // Create a copy of formData to avoid direct mutation
+                        const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+                        // Update the copy
+                        updatedFormData.config.hideField = addStringIfNotExists(
+                          updatedFormData.config.hideField,
+                          updatedFormData.list[i].name
+                        );
+                        // Emit event to update parent
+                        emits('update:formData', updatedFormData);
+                      } else {
+                        // Create a copy of formData to avoid direct mutation
+                        const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+                        // Update the copy
+                        updatedFormData.config.hideField = removeStringIfExists(
+                          updatedFormData.config.hideField,
+                          updatedFormData.list[i].name
+                        );
+                        // Emit event to update parent
+                        emits('update:formData', updatedFormData);
+                      }
+                    } else if (leftOperatorsAndRight.operator == ">=") {
+                      if (model.value[leftArr[2]] >= leftOperatorsAndRight.right) {
+                        // Create a copy of formData to avoid direct mutation
+                        const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+                        // Update the copy
+                        updatedFormData.config.hideField = addStringIfNotExists(
+                          updatedFormData.config.hideField,
+                          updatedFormData.list[i].name
+                        );
+                        // Emit event to update parent
+                        emits('update:formData', updatedFormData);
+                      } else {
+                        // Create a copy of formData to avoid direct mutation
+                        const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+                        // Update the copy
+                        updatedFormData.config.hideField = removeStringIfExists(
+                          updatedFormData.config.hideField,
+                          updatedFormData.list[i].name
+                        );
+                        // Emit event to update parent
+                        emits('update:formData', updatedFormData);
+                      }
+                    } else if (leftOperatorsAndRight.operator == ">") {
+                      if (model.value[leftArr[2]] > leftOperatorsAndRight.right) {
+                        // Create a copy of formData to avoid direct mutation
+                        const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+                        // Update the copy
+                        updatedFormData.config.hideField = addStringIfNotExists(
+                          updatedFormData.config.hideField,
+                          updatedFormData.list[i].name
+                        );
+                        // Emit event to update parent
+                        emits('update:formData', updatedFormData);
+                      } else {
+                        // Create a copy of formData to avoid direct mutation
+                        const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+                        // Update the copy
+                        updatedFormData.config.hideField = removeStringIfExists(
+                          updatedFormData.config.hideField,
+                          updatedFormData.list[i].name
+                        );
+                        // Emit event to update parent
+                        emits('update:formData', updatedFormData);
+                      }
+                    } else if (leftOperatorsAndRight.operator == "<") {
+                      if (model.value[leftArr[2]] < leftOperatorsAndRight.right) {
+                        // Create a copy of formData to avoid direct mutation
+                        const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+                        // Update the copy
+                        updatedFormData.config.hideField = addStringIfNotExists(
+                          updatedFormData.config.hideField,
+                          updatedFormData.list[i].name
+                        );
+                        // Emit event to update parent
+                        emits('update:formData', updatedFormData);
+                      } else {
+                        // Create a copy of formData to avoid direct mutation
+                        const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+                        // Update the copy
+                        updatedFormData.config.hideField = removeStringIfExists(
+                          updatedFormData.config.hideField,
+                          updatedFormData.list[i].name
+                        );
+                        // Emit event to update parent
+                        emits('update:formData', updatedFormData);
+                      }
+                    } else if (leftOperatorsAndRight.operator == "<=") {
+                      if (model.value[leftArr[2]] <= leftOperatorsAndRight.right) {
+                        // Create a copy of formData to avoid direct mutation
+                        const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+                        // Update the copy
+                        updatedFormData.config.hideField = addStringIfNotExists(
+                          updatedFormData.config.hideField,
+                          updatedFormData.list[i].name
+                        );
+                        // Emit event to update parent
+                        emits('update:formData', updatedFormData);
+                      } else {
+                        // Create a copy of formData to avoid direct mutation
+                        const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+                        // Update the copy
+                        updatedFormData.config.hideField = removeStringIfExists(
+                          updatedFormData.config.hideField,
+                          updatedFormData.list[i].name
+                        );
+                        // Emit event to update parent
+                        emits('update:formData', updatedFormData);
+                      }
+                    }
+                  });
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  //关联表单隐藏条件判定 end
+
+  //liwenxuan 关联选项设置效果实现 start
+  /* console.log("监听表单-1-constControlChange-->",props.formData)
+	 console.log("监听表单-2-constControlChange-->",key)
+	 console.log("监听表单-3-constControlChange-->", value)
+	 console.log("监听表单-4-constControlChange-->",data)
+	 console.log("监听表单-5-constControlChange-->",type)
+	 console.log("监听表单-6-constControlChange-->",attribute) */
+
+  //得到当前表单各选项的值
+  //props.formData.config.hideField.push("nin2yuan4yi4wei4wo3menda3fen1ma101939")
+
+  //得到所有配置对象，包括radio,checkbox,select,switch
+  const radioSelectShowConfigArr = [];
+  const checkboxShowConfigArr = [];
+  const switchShowConfigArr = [];
+  //以showFields的处理过冒号的每个元素为key,其对应的optionValue为value,新建一个数组radioselectArr2。----用于获取所有出现在配置中的字段。
+  const radioSelectArr2: any[] = [];
+
+
+  const radioSelectZdtcszConfigArr: any[] = [];
+
+  //20240815 关联选项设置的隐藏效果嵌套在内时不生效的问题修复 liwenxuan start
+  //console.log(props.formData.list)			newModelKeyArr
+  for (let i = 0; i < props.formData.list.length; i++) {
+    if (
+      props.formData.list[i].type == "radio" ||
+      props.formData.list[i].type == "select" ||
+      props.formData.list[i].type == "checkbox" ||
+      props.formData.list[i].type == "switch"
+    ) {
+      // Create a copy of formData to avoid direct mutation
+      const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+      // Update the copy
+      updatedFormData.config.hideField = [];
+      // Emit event to update parent
+      emits('update:formData', updatedFormData);
+      if (
+        props.formData.list[i].type == "radio" ||
+        props.formData.list[i].type == "select"
+      ) {
+        if (!props.formData.list[i].control.multiple) {
+          radioSelectShowConfigArr.push(props.formData.list[i].control.glxxsz);
+          if(props.formData.list[i].control.zdtcsz&&!isEmptyPlainObject(props.formData.list[i].control.zdtcsz.tableData)){
+            // Create a copy of formData to avoid direct mutation
+            const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+            // Update the copy
+            updatedFormData.list[i].control.zdtcsz.name = updatedFormData.list[i].name;
+            // Emit event to update parent
+            emits('update:formData', updatedFormData);
+            radioSelectZdtcszConfigArr.push(props.formData.list[i].control.zdtcsz)
+          }
+        } else {
+          checkboxShowConfigArr.push(props.formData.list[i].control.glxxsz);
+          if(props.formData.list[i].control.zdtcsz&&!isEmptyPlainObject(props.formData.list[i].control.zdtcsz.tableData)){
+            // Create a copy of formData to avoid direct mutation
+            const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+            // Update the copy
+            updatedFormData.list[i].control.zdtcsz.name = updatedFormData.list[i].name;
+            // Emit event to update parent
+            emits('update:formData', updatedFormData);
+            radioSelectZdtcszConfigArr.push(props.formData.list[i].control.zdtcsz)
+          }
+        }
+      } else if (props.formData.list[i].type == "checkbox") {
+        checkboxShowConfigArr.push(props.formData.list[i].control.glxxszForCheckBox);
+      } else if (props.formData.list[i].type == "switch") {
+        switchShowConfigArr.push(props.formData.list[i].control.glxxszSwitch);
+      }
+    } else if (
+      props.formData.list[i].type == "card" ||
+      props.formData.list[i].type == "flex" ||
+      props.formData.list[i].type == "div" ||
+      props.formData.list[i].type == "table"
+    ) {
+      // Create a copy of formData to avoid direct mutation
+      const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+      // Update the copy
+      updatedFormData.config.hideField = [];
+      // Emit event to update parent
+      emits('update:formData', updatedFormData);
+      let a = JSON.parse(JSON.stringify(props.formData.list[i].list));
+      for (let w = 0; w < a.length; w++) {
+        if (a[w].type == "radio" || a[w].type == "select") {
+          //console.log(a[w])
+          if (!a[w].control.multiple) {
+            radioSelectShowConfigArr.push(a[w].control.glxxsz);
+          } else {
+            checkboxShowConfigArr.push(a[w].control.glxxsz);
+          }
+          if(a[w].control.zdtcsz&&!isEmptyPlainObject(a[w].control.zdtcsz.tableData)){
+            a[w].control.zdtcsz.name = a[w].name
+            radioSelectZdtcszConfigArr.push(a[w].control.zdtcsz)
+          }
+          //radioSelectShowConfigArr.push(a[w].control.glxxsz);
+        } else if (a[w].type == "checkbox") {
+          checkboxShowConfigArr.push(a[w].control.glxxszForCheckBox);
+        } else if (a[w].type == "switch") {
+          switchShowConfigArr.push(a[w].control.glxxszSwitch);
+        }
+        newModelKeyArr.push(a[w].name);
+      }
+    } else if (props.formData.list[i].type == "grid") {
+      // Create a copy of formData to avoid direct mutation
+      const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+      // Update the copy
+      updatedFormData.config.hideField = [];
+      // Emit event to update parent
+      emits('update:formData', updatedFormData);
+      let columns = JSON.parse(JSON.stringify(props.formData.list[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]));
+            if (a.type == "radio" || a.type == "select") {
+              if (!a.control.multiple) {
+                radioSelectShowConfigArr.push(a.control.glxxsz);
+              } else {
+                checkboxShowConfigArr.push(a.control.glxxsz);
+              }
+              if(a.control.zdtcsz&&!isEmptyPlainObject(a.control.zdtcsz.tableData)){
+                a.control.zdtcsz.name = a.name
+                radioSelectZdtcszConfigArr.push(a.control.zdtcsz)
+              }
+
+              //radioSelectShowConfigArr.push(a.control.glxxsz);
+            } else if (a.type == "checkbox") {
+              checkboxShowConfigArr.push(a.control.glxxszForCheckBox);
+            } else if (a.type == "switch") {
+              switchShowConfigArr.push(a.control.glxxszSwitch);
+            }
+            newModelKeyArr.push(a.name);
+          }
+        }
+      }
+    } else if (props.formData.list[i].type == "tabs") {
+      //tabs标签页有可能再嵌套一层flex或者table
+      // Create a copy of formData to avoid direct mutation
+      const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+      // Update the copy
+      updatedFormData.config.hideField = [];
+      // Emit event to update parent
+      emits('update:formData', updatedFormData);
+      let columns = JSON.parse(JSON.stringify(props.formData.list[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]));
+            if (a.type == "radio" || a.type == "select") {
+              if (!a.control.multiple) {
+                radioSelectShowConfigArr.push(a.control.glxxsz);
+              } else {
+                checkboxShowConfigArr.push(a.control.glxxsz);
+              }
+              if(a.control.zdtcsz&&!isEmptyPlainObject(a.control.zdtcsz.tableData)){
+                a.control.zdtcsz.name = a.name
+                radioSelectZdtcszConfigArr.push(a.control.zdtcsz)
+              }
+              //radioSelectShowConfigArr.push(a.control.glxxsz);
+            } else if (a.type == "checkbox") {
+              checkboxShowConfigArr.push(a.control.glxxszForCheckBox);
+            } else if (a.type == "switch") {
+              switchShowConfigArr.push(a.control.glxxszSwitch);
+            } 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]));
+                  if (q.type == "radio" || q.type == "select") {
+                    if (!q.control.multiple) {
+                      radioSelectShowConfigArr.push(q.control.glxxsz);
+                    } else {
+                      checkboxShowConfigArr.push(q.control.glxxsz);
+                    }
+                    if(q.control.zdtcsz&&!isEmptyPlainObject(q.control.zdtcsz.tableData)){
+                      q.control.zdtcsz.name = q.name
+                      radioSelectZdtcszConfigArr.push(q.control.zdtcsz)
+                    }
+                    //radioSelectShowConfigArr.push(q.control.glxxsz);
+                  } else if (q.type == "checkbox") {
+                    checkboxShowConfigArr.push(q.control.glxxszForCheckBox);
+                  } else if (q.type == "switch") {
+                    switchShowConfigArr.push(q.control.glxxszSwitch);
+                  }
+                  newModelKeyArr.push(q.name);
+                }
+              }
+            }
+            newModelKeyArr.push(a.name);
+          }
+        }
+      }
+    }
+    newModelKeyArr.push(props.formData.list[i].name);
+  }
+  newModelKeyArr = Array.from(new Set(newModelKeyArr));
+  //20240815 关联选项设置的隐藏效果嵌套在内时不生效的问题修复 liwenxuan end
+  //console.log(radioSelectShowConfigArr)
+  //console.log(radioSelectZdtcszConfigArr)
+  //数组深拷贝
+  const radioSelectShowConfigArr2 = JSON.parse(JSON.stringify(radioSelectShowConfigArr));
+  const checkboxShowConfigArr2 = JSON.parse(JSON.stringify(checkboxShowConfigArr));
+  const switchShowConfigArr2 = JSON.parse(JSON.stringify(switchShowConfigArr));
+  /* console.log(radioSelectShowConfigArr2)
+	console.log(checkboxShowConfigArr2) */
+  //console.log("fodijafkjlsdhoidnfoidshojhfeknsidjfoiewhofnosdifhjeonoidufeinkdsaofhe")
+  //console.log(switchShowConfigArr2)
+
+  if (radioSelectShowConfigArr2.length > 0) {
+    for (let i = 0; i < radioSelectShowConfigArr2.length; i++) {
+      if (radioSelectShowConfigArr2[i].length > 0) {
+        for (let j = 0; j < radioSelectShowConfigArr2[i].length; j++) {
+          //数组深拷贝
+          const jArr = JSON.parse(JSON.stringify(radioSelectShowConfigArr2[i][j]));
+          const optionValueJArr = jArr.optionValue;
+          if (jArr.showFields != undefined && jArr.showFields.length > 0) {
+            for (let n = 0; n < jArr.showFields.length; n++) {
+              let fieldKeyArr = jArr.showFields[n].split(":");
+              let fieldKeyStr = fieldKeyArr[fieldKeyArr.length - 1];
+              radioSelectArr2.push({
+                //conditionFieldKey:jArr.conditionField,
+                //conditionFieldValue:optionValueJArr,
+                toShowFieldKey: fieldKeyStr,
+              });
+            }
+          }
+        }
+      }
+    }
+  }
+
+  //将出现在多选配置中的字段放入radioSelectArr2,radioSelectArr2是未去重的所有可能被隐藏的字段
+  if (checkboxShowConfigArr2.length > 0) {
+    for (let i = 0; i < checkboxShowConfigArr2.length; i++) {
+      //console.log(i)
+      if (checkboxShowConfigArr2[i].length > 0) {
+        for (let j = 0; j < checkboxShowConfigArr2[i].length; j++) {
+          //console.log(j)
+          //console.log(checkboxShowConfigArr2[i][j].showFields)
+          if (
+            checkboxShowConfigArr2[i][j].showFields &&
+            checkboxShowConfigArr2[i][j].showFields.length > 0
+          ) {
+            for (let n = 0; n < checkboxShowConfigArr2[i][j].showFields.length; n++) {
+              let fieldKeyArr = checkboxShowConfigArr2[i][j].showFields[n].split(":");
+              let fieldKeyStr = fieldKeyArr[fieldKeyArr.length - 1];
+              //console.log(fieldKeyStr)
+              radioSelectArr2.push({
+                toShowFieldKey: fieldKeyStr,
+              });
+            }
+          }
+        }
+      }
+    }
+  }
+
+  //将出现在开关配置中的字段放入radioSelectArr2,radioSelectArr2是未去重的所有可能被隐藏的字段
+  if (switchShowConfigArr2.length > 0) {
+    for (let i = 0; i < switchShowConfigArr2.length; i++) {
+      if (switchShowConfigArr2[i].length > 0) {
+        for (let j = 0; j < switchShowConfigArr2[i].length; j++) {
+          if (switchShowConfigArr2[i][j].showFields.length > 0) {
+            for (let n = 0; n < switchShowConfigArr2[i][j].showFields.length; n++) {
+              //console.log("99999999999999999999------"+switchShowConfigArr2[i][j].showFields[n])
+              let fieldKeyArr = switchShowConfigArr2[i][j].showFields[n].split(":");
+              let fieldKeyStr = fieldKeyArr[fieldKeyArr.length - 1];
+              //console.log(fieldKeyStr)
+              radioSelectArr2.push({
+                toShowFieldKey: fieldKeyStr,
+              });
+            }
+          }
+        }
+      }
+    }
+  }
+  //console.log("radioSelectArr2radioSelectArr2radioSelectArr2radioSelectArr2radioSelectArr2=======")
+  //console.log(radioSelectArr2)
+  //以showFields的处理过冒号的每个元素为key,其对应的optionValue为value,新建一个数组radioselectArr3  ---用于组装完整显示隐藏条件、
+  const radioSelectArr3: any[] = [];
+
+  if (radioSelectShowConfigArr2.length > 0) {
+    for (let i = 0; i < radioSelectShowConfigArr2.length; i++) {
+      if (radioSelectShowConfigArr2[i].length > 0) {
+        for (let j = 0; j < radioSelectShowConfigArr2[i].length; j++) {
+          //数组深拷贝
+          const jArr = JSON.parse(JSON.stringify(radioSelectShowConfigArr2[i][j]));
+          const optionValueJArr = jArr.optionValue;
+          if (jArr.showFields != undefined && jArr.showFields.length > 0) {
+            if (jArr.showFields.length > 1) {
+              let arr1 = [];
+              for (let n = 0; n < jArr.showFields.length; n++) {
+                let fieldKeyArr = jArr.showFields[n].split(":");
+                let fieldKeyStr = fieldKeyArr[fieldKeyArr.length - 1];
+                arr1.push(fieldKeyStr);
+              }
+              radioSelectArr3.push({
+                conditionFieldKey: jArr.conditionField,
+                conditionFieldValue: optionValueJArr,
+                toShowFieldKey: arr1,
+              });
+            } else {
+              //等于1
+              for (let n = 0; n < jArr.showFields.length; n++) {
+                let fieldKeyArr = jArr.showFields[n].split(":");
+                let fieldKeyStr = fieldKeyArr[fieldKeyArr.length - 1];
+                radioSelectArr3.push({
+                  conditionFieldKey: jArr.conditionField,
+                  conditionFieldValue: optionValueJArr,
+                  toShowFieldKey: [fieldKeyStr],
+                });
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  //console.log(radioSelectArr3)
+  //将多选配置也放入radioSelectArr3
+  if (checkboxShowConfigArr2.length > 0) {
+    for (let i = 0; i < checkboxShowConfigArr2.length; i++) {
+      if (checkboxShowConfigArr2[i].length > 0) {
+        for (let j = 0; j < checkboxShowConfigArr2[i].length; j++) {
+          //数组深拷贝
+          const jArr = JSON.parse(JSON.stringify(checkboxShowConfigArr2[i][j]));
+          const optionValueJArr = jArr.selectedOptions;
+          if (jArr.showFields != undefined && jArr.showFields.length > 0) {
+            if (jArr.showFields.length > 1) {
+              let arr1 = [];
+              for (let n = 0; n < jArr.showFields.length; n++) {
+                let fieldKeyArr = jArr.showFields[n].split(":");
+                let fieldKeyStr = fieldKeyArr[fieldKeyArr.length - 1];
+                arr1.push(fieldKeyStr);
+              }
+              radioSelectArr3.push({
+                conditionFieldKey: jArr.conditionField,
+                conditionFieldValue: optionValueJArr,
+                toShowFieldKey: arr1,
+              });
+            } else {
+              //等于1
+              for (let n = 0; n < jArr.showFields.length; n++) {
+                let fieldKeyArr = jArr.showFields[n].split(":");
+                let fieldKeyStr = fieldKeyArr[fieldKeyArr.length - 1];
+                radioSelectArr3.push({
+                  conditionFieldKey: jArr.conditionField,
+                  conditionFieldValue: optionValueJArr,
+                  toShowFieldKey: [fieldKeyStr],
+                });
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  //将开关配置也放入radioSelectArr3
+  if (switchShowConfigArr2.length > 0) {
+    for (let i = 0; i < switchShowConfigArr2.length; i++) {
+      if (switchShowConfigArr2[i].length > 0) {
+        for (let j = 0; j < switchShowConfigArr2[i].length; j++) {
+          //数组深拷贝
+          const jArr = JSON.parse(JSON.stringify(switchShowConfigArr2[i][j]));
+          //console.log("111111111111111111111-----------"+JSON.stringify(switchShowConfigArr2[i][j]))
+          if (jArr.showFields != undefined && jArr.showFields.length > 0) {
+            const optionValueJArr =
+              typeof jArr.openValue == "undefined" ? jArr.offValue : jArr.openValue;
+            let arr1 = [];
+            for (let n = 0; n < jArr.showFields.length; n++) {
+              let fieldKeyArr = jArr.showFields[n].split(":");
+              let fieldKeyStr = fieldKeyArr[fieldKeyArr.length - 1];
+              //console.log(fieldKeyStr)
+              arr1.push(fieldKeyStr);
+            }
+            radioSelectArr3.push({
+              conditionFieldKey: jArr.conditionField,
+              conditionFieldValue: optionValueJArr,
+              toShowFieldKey: arr1,
+            });
+          }
+        }
+      }
+    }
+  }
+  //console.log(radioSelectArr3)
+  //暂时使用的隐藏数组，数据敲定后赋给props.formData.config.hideField
+  let hideFieldArr: any[] = [];
+
+  //但凡配置条件的字段先放入隐藏数组中
+  for (let i = 0; i < radioSelectArr2.length; i++) {
+    hideFieldArr.push(radioSelectArr2[i].toShowFieldKey);
+  }
+  hideFieldArr = Array.from(new Set(hideFieldArr));
+  const defaultHideFields: any[] = JSON.parse(JSON.stringify(hideFieldArr));
+
+  for (let i = 0; i < defaultHideFields.length; i++) {
+    hideFieldArr = recursionToGetFinallyHideFields(
+      hideFieldArr,
+      radioSelectArr3,
+      defaultHideFields
+    );
+  }
+  hideFieldArr = recursionToGetFinallyHideFields(
+    hideFieldArr,
+    radioSelectArr3,
+    defaultHideFields
+  );
+
+  // Create a copy of formData to avoid direct mutation
+  const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+  // Update the copy
+  if (updatedFormData.config.hideField) {
+    updatedFormData.config.hideField.push(...mustBeHidden);
+  } else {
+    updatedFormData.config.hideField = mustBeHidden;
+  }
+  // Emit event to update parent
+  emits('update:formData', updatedFormData);
+
+  //console.log(props.formData.config.hideField)
+
+  //props.formData.config?.hideField?.push("nin2yuan4yi4wei4wo3menda3fen1ma101939")
+  //console.log("监听表单--constControlChange-->",key, value, data, tProp,type,attribute)//liwenxuan
+
+
+
+//console.log(radioSelectZdtcszConfigArr)
+nextTick(()=>{
+  //console.log(model.value)//
+  radioSelectZdtcszConfigArr.forEach(element => {
+    let tbx=getLastColonAfterString(element.tbx)
+    let tby=getLastColonAfterString(element.tby)
+    /* console.log(tbx)
+    console.log(tby) */
+
+    //console.log(element.name)
+    let rowValue = model.value[tbx]
+    
+    let columnValue = model.value[tby]
+    
+
+    
+    if(rowValue==""){
+      rowValue="notChosen"
+    }
+
+    if(columnValue==""){
+      columnValue="notChosen"
+    }
+    /* console.log(rowValue)
+    console.log(columnValue) */
+    /* if(dataObjFlag && element.name==data.name && currentDataNameValue!=""){//允许直接选择被矩阵填充的字段
+      console.log(data.name)
+      console.log("直接选择被矩阵填充的字段,允许")
+      model.value[element.name] = currentDataNameValue
+      return
+    }else{ */
+      if(tbx!=""&&tby!=""){
+      
+        let cellValue = getTableCellValue(element.tableData, rowValue, columnValue)
+        model.value[element.name] = cellValue*1
+      }else if(tbx!=""&&tby==""){
+        //console.log("仅设置了标题行")
+        let cellValue = getTableCellValue(element.tableData, rowValue, 'default')
+        //console.log(cellValue)
+        model.value[element.name] = cellValue*1
+      }else if(tbx==""&&tby!=""){
+        //console.log("仅设置了索引列")
+        let cellValue = getTableCellValue(element.tableData, 'any', columnValue)
+        //console.log(cellValue)
+        model.value[element.name] = cellValue*1
+      }
+
+    //}
+
+    
+    
+    
+
+    //console.log(getTableCellValueV2(element.tableData, 3, 2));
+  });
+
+
+})
+
+}
+
+
+
+
+
+const removeStringIfExists = (arr: string[], str: string) => {
+  let newArr = [];
+  for (let item of arr) {
+    if (item !== str) {
+      newArr.push(item);
+    }
+  }
+  return newArr;
+}
+// 判断对象是否是“内容为空的纯对象”
+const isEmptyPlainObject = (obj: any) => {
+  // 先确认是对象类型，再检查属性数量为0
+  return Object.prototype.toString.call(obj) === '[object Object]' && Object.keys(obj).length === 0;
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-04 11:21:03
+@ 功能: 比较两个数组是否一致
+*/
+const arrayEqual = (a: string[], b: any[]) => {
+  //alert("开始比较")
+  //先将数组排序
+  let a_ = JSON.parse(JSON.stringify(a));
+  for (let i = 0; i < a_.length; i++) {
+    a_[i] = a_[i] + "";
+  }
+  //console.log(a_)
+  //console.log(b)
+  a_ = a_.sort();
+  b = b.sort();
+  //判断数组长度是否相等，若不相等返回false
+  if (a_.length != b.length) return false;
+  //逐个比较数组元素
+  for (var i = 0; i < a_.length; ++i) {
+    if (a_[i] !== b[i]) return false;
+  }
+  return true;
+}
+const getLastColonAfterString = (str: string) => {
+  // 1. 输入校验：确保输入是字符串类型（处理非字符串入参）
+  if (typeof str !== 'string') {
+    //console.warn('输入必须为字符串类型');
+    return '';
+  }
+
+  // 2. 找到最后一个英文冒号的索引位置
+  const lastColonIndex = str.lastIndexOf(':');
+
+  // 3. 边界判断：无冒号 或 冒号在最后一位 → 返回空字符串
+  if (lastColonIndex === -1 || lastColonIndex === str.length - 1) {
+    return '';
+  }
+
+  // 4. 截取最后一个冒号后的所有字符并返回
+  return str.slice(lastColonIndex + 1);
+}
+
+/**
+ * 获取表格单元格值，兼容多种tableData结构
+ * 支持三种结构：
+ * 1. 标准行列结构：{列号: {行号: 值, ...}, ...}
+ * 2. 仅一行结构：{default: {列号: 值, ...}}
+ * 3. 仅一列结构：{列号: {default: 值}, ...}
+ * 
+ * @param {Object} tableData - 表格数据
+ * @param {String|Number} rowValue - 行标识
+ * @param {String|Number} columnValue - 列标识
+ * @returns {String|undefined} - 返回对应的单元格值，如果未找到则返回undefined
+ */
+const getTableCellValueV3 = (tableData: any, rowValue: any, columnValue: any) => {
+  try {
+    // 检查输入参数
+    if (!tableData || typeof tableData !== 'object' || Array.isArray(tableData)) {
+      return undefined;
+    }
+    
+    // 处理null或undefined值
+    if (rowValue == null || columnValue == null) {
+      return undefined;
+    }
+    
+    // 转换为字符串
+    const rowStr = String(rowValue);
+    const columnStr = String(columnValue);
+    
+    // 1. 首先尝试检测是否为仅一行结构（有default行）
+    if (tableData.default && typeof tableData.default === 'object') {
+      // 这是仅一行结构：{default: {列号: 值, ...}}
+      // 忽略行值，直接使用列值
+      return tableData.default?.[columnStr];
+    }
+    
+    // 2. 尝试标准结构或仅一列结构
+    const columnObj = tableData[columnStr];
+    if (columnObj && typeof columnObj === 'object') {
+      // 2.1 尝试从列对象中获取行值
+      const cellValue = columnObj[rowStr];
+      if (cellValue !== undefined) {
+        return cellValue; // 找到标准结构的值
+      }
+      
+      // 2.2 如果没找到标准结构的行值，检查是否是仅一列结构（有default值）
+      if (columnObj.default !== undefined) {
+        // 这是仅一列结构：{列号: {default: 值}, ...}
+        // 忽略行值，返回该列的default值
+        return columnObj.default;
+      }
+    }
+    
+    // 3. 如果没有匹配任何结构，尝试其他可能的查找方式
+    
+    // 3.1 如果列不存在，检查所有列是否有default值（用于仅一列结构）
+    if (!columnObj) {
+      // 遍历所有列，看是否有匹配的列号
+      for (const colKey in tableData) {
+        if (String(colKey) === columnStr) {
+          const colData = tableData[colKey];
+          if (colData && typeof colData === 'object' && colData.default !== undefined) {
+            return colData.default;
+          }
+        }
+      }
+    }
+    
+    // 3.2 检查是否有default行（可能列名不是字符串"default"）
+    for (const key in tableData) {
+      const data = tableData[key];
+      if (data && typeof data === 'object') {
+        // 检查这个对象是否是一个行数据（包含列号作为键）
+        if (data[columnStr] !== undefined) {
+          // 这可能是行数据，返回对应的列值
+          return data[columnStr];
+        }
+      }
+    }
+    
+    // 4. 所有尝试都失败，返回undefined
+    return undefined;
+  } catch (error) {
+    // 如果发生任何错误，返回undefined
+    console.error('获取表格单元格值时发生错误:', error);
+    return undefined;
+  }
+}
+/**
+ * 统一方法，推荐使用这个
+ */
+const getTableCellValue = (tableData: any, rowValue: string, columnValue: string) => {
+  return getTableCellValueEnhanced(tableData, rowValue, columnValue);
+}
+/**
+ * 检测tableData的结构
+ * @returns {string} - 结构类型：'standard', 'singleRow', 'singleColumn', 'mixed', 'unknown'
+ */
+const  detectTableStructure = (tableData: any) => {
+  if (!tableData || typeof tableData !== 'object') {
+    return 'unknown';
+  }
+  
+  const keys = Object.keys(tableData);
+  if (keys.length === 0) {
+    return 'empty';
+  }
+  
+  // 检查是否为仅一行结构（有default键）
+  if (keys.length === 1 && keys[0] === 'default') {
+    const defaultData = tableData.default;
+    if (defaultData && typeof defaultData === 'object') {
+      // 检查default对象的值是否都是简单值（不是对象）
+      const hasNestedObjects = Object.values(defaultData).some(
+        value => value && typeof value === 'object'
+      );
+      if (!hasNestedObjects) {
+        return 'singleRow';
+      }
+    }
+  }
+  
+  // 检查是否为仅一列结构
+  let isSingleColumn = true;
+  for (const key of keys) {
+    const colData = tableData[key];
+    if (!colData || typeof colData !== 'object') {
+      isSingleColumn = false;
+      break;
+    }
+    
+    // 检查是否只有default键或只有一个键
+    const colKeys = Object.keys(colData);
+    if (colKeys.length !== 1 || (colKeys.length === 1 && colKeys[0] !== 'default')) {
+      // 如果有多个键，或者唯一的键不是default，则不是仅一列结构
+      if (colKeys.length > 1 || (colKeys.length === 1 && !colKeys[0].match(/^\d+$/))) {
+        isSingleColumn = false;
+        break;
+      }
+    }
+  }
+  
+  if (isSingleColumn) {
+    return 'singleColumn';
+  }
+  
+  // 检查是否为标准结构（所有值都是对象，且对象键是行号）
+  let isStandard = true;
+  for (const key of keys) {
+    const colData = tableData[key];
+    if (!colData || typeof colData !== 'object') {
+      isStandard = false;
+      break;
+    }
+    
+    // 检查对象键是否都是数字字符串（表示行号）
+    const colKeys = Object.keys(colData);
+    if (colKeys.length === 0) {
+      isStandard = false;
+      break;
+    }
+    
+    // 允许有default键和其他键混合
+    const hasNonNumericKeys = colKeys.some(k => k !== 'default' && !k.match(/^\d+$/));
+    if (hasNonNumericKeys) {
+      isStandard = false;
+      break;
+    }
+  }
+  
+  if (isStandard) {
+    return 'standard';
+  }
+  
+  // 混合结构
+  return 'mixed';
+}
+/**
+ * 从仅一行结构中获取值
+ */
+const getFromSingleRowStructure = (tableData: any, columnStr: string) => {
+  return tableData.default?.[columnStr];
+}
+/**
+ * 从仅一列结构中获取值
+ */
+const getFromSingleColumnStructure = (tableData: any, columnStr: string) => {
+  const colData = tableData[columnStr];
+  if (colData && typeof colData === 'object') {
+    // 优先返回default值，如果没有则返回第一个值
+    return colData.default !== undefined ? colData.default : Object.values(colData)[0];
+  }
+  return undefined;
+}
+/**
+ * 从混合结构中获取值
+ */
+const getFromMixedStructure = (tableData: any, rowStr: string, columnStr: string) => {
+  // 尝试多种方式
+  
+  // 1. 尝试标准方式
+  const standardValue = tableData?.[columnStr]?.[rowStr];
+  if (standardValue !== undefined) {
+    return standardValue;
+  }
+  
+  // 2. 检查该列是否有default值
+  const columnData = tableData[columnStr];
+  if (columnData && typeof columnData === 'object') {
+    if (columnData.default !== undefined) {
+      return columnData.default;
+    }
+  }
+  
+  // 3. 检查是否有default行
+  if (tableData.default && typeof tableData.default === 'object') {
+    return tableData.default[columnStr];
+  }
+  
+  // 4. 遍历查找
+  for (const key in tableData) {
+    const data = tableData[key];
+    if (data && typeof data === 'object') {
+      // 如果这个对象有我们要找的列键
+      if (data[columnStr] !== undefined) {
+        return data[columnStr];
+      }
+      // 如果键名匹配列，并且有我们要找的行键
+      if (key === columnStr && data[rowStr] !== undefined) {
+        return data[rowStr];
+      }
+    }
+  }
+  
+  return undefined;
+}
+/**
+ * 增强版：自动检测tableData结构并获取值
+ * 支持动态结构检测
+ */
+const getTableCellValueEnhanced = (tableData: any, rowValue: string, columnValue: string) => {
+  try {
+    if (!tableData || typeof tableData !== 'object') {
+      return undefined;
+    }
+    
+    if (rowValue == null || columnValue == null) {
+      return undefined;
+    }
+    
+    const rowStr = String(rowValue);
+    const columnStr = String(columnValue);
+    
+    // 先尝试直接获取（标准结构）
+    const directValue = tableData?.[columnStr]?.[rowStr];
+    if (directValue !== undefined) {
+      return directValue;
+    }
+    
+    // 检测表格结构
+    const tableStructure = detectTableStructure(tableData);
+    
+    switch (tableStructure) {
+      case 'standard':
+        // 标准结构，已经尝试过直接获取
+        break;
+        
+      case 'singleRow':
+        // 仅一行结构
+        return getFromSingleRowStructure(tableData, columnStr);
+        
+      case 'singleColumn':
+        // 仅一列结构
+        return getFromSingleColumnStructure(tableData, columnStr);
+        
+      case 'mixed':
+        // 混合结构，尝试多种方式
+        return getFromMixedStructure(tableData, rowStr, columnStr);
+        
+      default:
+        // 未知结构，返回undefined
+        return undefined;
+    }
+    
+    return undefined;
+  } catch (error) {
+    console.error('获取表格单元格值时发生错误:', error);
+    return undefined;
+  }
+}
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-04 11:19:18
+@ 功能: 递归获取最终隐藏字段
+*/
+interface hideFieldConditionArritem {
+  toShow: string;
+  conditions: any[];
+}
+
+const recursionToGetFinallyHideFields = (
+  hideFieldArr: any[],
+  radioSelectArr3: string | any[],
+  defaultHideFields: any[]
+) => {
+  nextTick(() => {
+    //console.log(model.value)
+    /* console.log("以showFields的处理过冒号的每个元素为key,其对应的optionValue为value,新建的数组radioselectArr3  --- 内容为完整显示隐藏条件")
+		console.log(radioSelectArr3)
+		console.log("当前表单的值-------------------")
+		console.log(model.value)
+		console.log("默认隐藏的字段-----------------")
+		console.log(defaultHideFields) */
+    let modelKeyArr = []; //所有字段
+    for (let i = 0; i < props.formData.list.length; i++) {
+      modelKeyArr.push(props.formData.list[i].name + "");
+    }
+    modelKeyArr = newModelKeyArr;
+
+    //console.log(modelKeyArr)
+    /* console.log("所有字段modelKeyArr^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^")
+		console.log(modelKeyArr) */
+
+    //console.log("当前表单的值-------------------")
+    //console.log(model.value)
+
+    //当前处于显示状态的默认隐藏的字段
+    let nowShowingDefaultHideFieldArr = defaultHideFields.filter(
+      (a) => !hideFieldArr.includes(a)
+    );
+    //当前所有处于显示状态的字段
+    let nowShowingFieldArr = modelKeyArr.filter((a) => !hideFieldArr.includes(a));
+
+    //以被默认隐藏的每个字段为key,显示该字段的所有条件的数组作为value,来作为该数组的每一项。
+    const hideFieldConditionArr: hideFieldConditionArritem[] = [];
+    //保存应多选条件造成的应隐藏的字段
+    let hideFieldsFromCheckbox: string[] = [];
+    for (let i = 0; i < hideFieldArr.length; i++) {
+      hideFieldConditionArr.push({
+        toShow: hideFieldArr[i],
+        conditions: [],
+      });
+    }
+    //console.log(hideFieldConditionArr)
+    //遍历所有配置条件数组radioSelectArr3，当radioSelectArr3 [ i ] . toshowFieldKey 【i】==hideFieldArr【i】时
+    for (let i = 0; i < radioSelectArr3.length; i++) {
+      for (let j = 0; j < radioSelectArr3[i].toShowFieldKey.length; j++) {
+        for (let n = 0; n < hideFieldConditionArr.length; n++) {
+          /* console.log(i)
+				console.log(j)
+				console.log(n) */
+          if (radioSelectArr3[i].toShowFieldKey[j] == hideFieldConditionArr[n].toShow) {
+            if (Array.isArray(radioSelectArr3[i].conditionFieldValue)) {
+              let valStr = "";
+              for (let x = 0; x < radioSelectArr3[i].conditionFieldValue.length; x++) {
+                valStr = valStr + radioSelectArr3[i].conditionFieldValue[x] + ",";
+              }
+              hideFieldConditionArr[n].conditions.push({
+                conditionFrom: "radioOrSelect", //本条件来自于单选或者下拉
+                condition: [
+                  {
+                    //条件详细信息//当表单字段conditionField的值为conditionFieldValue时,显示hideFieldConditionArr[n]
+                    conditionField: radioSelectArr3[i].conditionFieldKey,
+                    conditionFieldValue: valStr,
+                  },
+                ],
+              });
+            } else {
+              hideFieldConditionArr[n].conditions.push({
+                conditionFrom: "radioOrSelect", //本条件来自于单选或者下拉
+                condition: [
+                  {
+                    //条件详细信息//当表单字段conditionField的值为conditionFieldValue时,显示hideFieldConditionArr[n]
+                    conditionField: radioSelectArr3[i].conditionFieldKey,
+                    conditionFieldValue: radioSelectArr3[i].conditionFieldValue, //
+                  },
+                ],
+              });
+            }
+          }
+        }
+      }
+    }
+    //console.log(hideFieldConditionArr);
+    //要显示的和其满足显示条件的个数.
+    //let showfieldsCountX = [];
+    for (let i = 0; i < hideFieldConditionArr.length; i++) {
+      let x = 0; //满足显示条件的次数
+      let toshow = hideFieldConditionArr[i].toShow;
+      let conditions = hideFieldConditionArr[i].conditions;
+      //console.log(conditions)
+      for (let j = 0; j < conditions.length; j++) {
+        let conditionField = conditions[j].condition[0].conditionField;
+        let conditionFieldValue = conditions[j].condition[0].conditionFieldValue;
+        //console.log(conditionField)
+        if (conditionFieldValue.includes(",")) {
+          //来自多选
+          let conditionFieldValueArr = conditionFieldValue.split(",");
+          conditionFieldValueArr = conditionFieldValueArr.slice(0, -1);
+          /* console.log(conditionFieldValueArr)
+					console.log(conditionFieldValue) */
+          for (let n = 0; n < modelKeyArr.length; n++) {
+            if (modelKeyArr[n] == conditionField) {
+              //let count_1 = 0;
+              let trueValue = model.value[modelKeyArr[n]];
+              if (trueValue.length > 0 && arrayEqual(trueValue, conditionFieldValueArr)) {
+                //此时满足了条件,但是必须看一下conditionField有没有被隐藏.如果被隐藏了,则x不能增加.
+                //alert("多选条件成功触发")
+                /* console.log(conditionField)
+								console.log(toshow) */
+                let flag = false; //其依赖的选项的父字段是否被隐藏.默认没被隐藏,
+                //如果此时的conditionField有可能被隐藏且已被隐藏,x不能++
+                /* for(let a = 0;a<hideFieldConditionArr.length;a++){
+									if(hideFieldConditionArr[a].toShow==conditionField){//当conditions.length>1说明时多选,=1说明是单选.
+										for(let b = 0;b<hideFieldConditionArr[a].conditions.length;b++){
+											for(let c = 0;c<hideFieldConditionArr[a].conditions[b].condition.length;c++){
+												if(hideFieldConditionArr[a].conditions[b].condition[c]==conditionField){
+													//暂时写到这里,先去组装多选条件数组.
+													//console.log(1)
+												}
+											}
+										}
+									}
+								} */
+                if (flag == false) {
+                  x++;
+                  hideFieldsFromCheckbox.push(toshow);
+                  //console.log(hideFieldArr)
+                  /* for(let i = 0;i<hideFieldsFromCheckbox.length;i++){
+										hideFieldArr = hideFieldArr.filter((item: string) => item!=hideFieldsFromCheckbox[i])
+										//emits('refresh')
+									} */
+                }
+              }
+            }
+          }
+        } else {
+          //来自单选下拉
+          //console.log(modelKeyArr)
+          for (let n = 0; n < modelKeyArr.length; n++) {
+            if (modelKeyArr[n] == conditionField) {
+              //let count_1 = 0;
+              let trueValue = model.value[modelKeyArr[n]];
+              //console.log(modelKeyArr[n])
+              /* console.log("conditionField====="+conditionField)
+							console.log("trueValue====="+trueValue)
+							console.log("conditionFieldValue-----"+conditionFieldValue) */
+
+              if (trueValue == conditionFieldValue) {
+                //此时满足了条件,但是必须看一下conditionField有没有被隐藏.如果被隐藏了,则x不能增加.
+                let flag = false; //其依赖的选项的父字段是否被隐藏.默认没被隐藏,
+                //如果此时的conditionField有可能被隐藏且已被隐藏,x不能++
+                /* for(let a = 0;a<hideFieldConditionArr.length;a++){
+									if(hideFieldConditionArr[a].toShow==conditionField){//当conditions.length>1说明时多选,=1说明是单选.
+										for(let b = 0;b<hideFieldConditionArr[a].conditions.length;b++){
+											for(let c = 0;c<hideFieldConditionArr[a].conditions[b].condition.length;c++){
+												if(hideFieldConditionArr[a].conditions[b].condition[c]==conditionField){
+													//暂时写到这里,先去组装多选条件数组.
+													console.log(1)
+												}
+											}
+										}
+									}
+								} */
+                if (flag == false) {
+                  x++;
+                }
+              }
+            }
+          }
+        }
+      }
+      //console.log(x,hideFieldArr,toshow)
+      if (x > 0) {
+        hideFieldArr = hideFieldArr.filter((item: string) => item != toshow);
+      }
+      //console.log(x,hideFieldArr)
+    }
+    //将隐藏的字段值重置
+    for (let i = 0; i < hideFieldArr.length; i++) {
+      //console.log(i+"dsfafdasdfasfsda===="+hideFieldArr[i]+"=====jiuopfdsahokjuhuiofadshuiofadsjbknfdjisahuifhjken wij================"+model.value[hideFieldArr[i]])
+      if (
+        typeof model.value[hideFieldArr[i]] === "string" ||
+        typeof model.value[hideFieldArr[i]] === "number"
+      ) {
+        model.value[hideFieldArr[i]] = "";
+      } else if (model.value[hideFieldArr[i]] instanceof Array) {
+        model.value[hideFieldArr[i]] = [];
+      } else if (typeof model.value[hideFieldArr[i]] == "boolean") {
+        model.value[hideFieldArr[i]] = false;
+      }
+    }
+    //默认隐藏的字段中目前被显示出来的
+    nowShowingDefaultHideFieldArr = defaultHideFields.filter(
+      (a) => !hideFieldArr.includes(a)
+    );
+    /* console.log("(((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((())))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))")
+	console.log(nowShowingDefaultHideFieldArr) */
+    /* for(let i = 0;i< nowShowingDefaultHideFieldArr.length; i++){
+		//当被显示出来的字段涉及到的conditionfield已经被隐藏了时,其x应-1,如果x-1后造成该field被隐藏,应递归重新敲定hideFieldArr
+		if()
+	} */
+
+    //console.log("条件筛选过后最终要隐藏的字段-----"+hideFieldArr)
+
+    //编辑表单页不隐藏任何字段。
+    if (formProps.value.type != 5) {
+      //console.log(hideFieldArr)
+      // Create a copy of formData to avoid direct mutation
+      const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+      // Update the copy
+      if (updatedFormData.config.hideField) {
+        updatedFormData.config.hideField.push(...hideFieldArr); //实际造成隐藏效果
+      } else {
+        updatedFormData.config.hideField = hideFieldArr;
+      }
+      // Emit event to update parent
+      emits('update:formData', updatedFormData);
+    }
+  });
+
+  return hideFieldArr;
+};
+let asfRangeDoubleCondiChangeObj = ref();
+provide("asfRangeDoubleCondiChangeObj", asfRangeDoubleCondiChangeObj);
+
+let oldModelStr = "";
+
+watch(() => model.value, (newVal) => {
+  let currentChangeKey = "";
+  const newModelStr = JSON.stringify(newVal);
+  let oldModelStr1 = oldModelStr;
+    if (newModelStr !== oldModelStr1 && oldModelStr1 != "") {
+      let oldVal = JSON.parse(oldModelStr1);
+      for (const key in newVal) {
+        if (JSON.stringify(newVal[key]) !== JSON.stringify(oldVal[key])) {
+          currentChangeKey = key;
+        }
+      }
+    }
+    let rangeFormulaArr = [];
+    if (asfs.length > 0) {
+      asfs.forEach((element: any) => {
+        let asfName = element.name;
+
+        if (
+          element.control.dataRangeGongShi &&
+          element.control.dataRangeGongShi.mathsFormula &&
+          element.control.dataRangeGongShi.mathsFormula.length > 0
+        ) {
+          let asfRangeDoubleCondi = element.control.dataRangeGongShi.mathsFormula;
+
+          if (currentChangeKey != "") {
+            let a = asfRangeDoubleCondi.split(":");
+            let field = a[a.length - 1];
+            if (currentChangeKey == field) {
+              let toShowDoubleCondiValVal = model.value[currentChangeKey];
+              //console.log("关联表单"+asfName+"应该更新其选项,只显示doubleCondiVal为"+toShowDoubleCondiValVal+"的选项")
+              let obj = {
+                asfName: asfName,
+                toShowDoubleCondiValVal: toShowDoubleCondiValVal,
+              };
+              asfRangeDoubleCondiChangeObj.value = obj;
+            }
+          }
+        }
+      });
+    }
+    oldModelStr = newModelStr;
+},
+{ deep: true });
+//-----------------------AI setting--------------------------
+//当前AI智能体，根据form表单的配置来初始化
+//params 主表字段参数   subparams子表字段参数，子表触发时需要清空  ; rowdex:表示子表的第几条数据，没有的话说明不是子表数据
+const aiassistRef = ref();
+//触发AI查询事件
+provide(constAiEffect, ({ key, value, field,rowdex}: any) => {
+  //新建ai_envents 是为了解决前端并发问题
+  const ai_events: Array<{ uuids: string[]; params: { [key: string]: any } }> = [];
+  currentAgent.value.forEach(ag=>{
+    if(ag.fields.includes(key)){ //trigger: 1:任一  2：半数 3：全部
+      if (rowdex!=null){//子表操作
+        ag.rowdex=rowdex //更新智能体的rowdex
+        if(rowdex>=ag.subparams.length){
+          ag.subparams.push({[field]:value})
+        }else{
+          ag.subparams[rowdex][field]=value
+        }
+      }else{ //主表操作, 直接加入params种
+        ag.params[field]=value;  //这个地方把key换成fieldName
+      }
+      let mergedObj;
+      if(ag.subparams.length>0){        
+         mergedObj = Object.assign({}, ag.params, ag.subparams[ag.rowdex]); //合并子表和主表
+      }else{
+        mergedObj = ag.params
+      }
+      switch(ag.trigger){
+        case 2:
+          if(Object.keys(mergedObj).length>=ag.fields.length/2){
+            ai_events.push({uuids:ag.uuid,params:mergedObj })
+          }
+          break;
+        case 3:
+          if(Object.keys(mergedObj).length==ag.fields.length){
+            ai_events.push({uuids:ag.uuid,params:mergedObj})
+          }
+          break;
+        default:
+          ai_events.push({uuids:ag.uuid,params:mergedObj})
+      }
+    }
+  }) 
+  if(ai_events.length>0){
+    aiassistRef.value.onSendParamToAI(ai_events)
+  }  
+});                                                                                                                
+
+provide(constAiEffect, ({ key, value, field,rowdex}: any) => {
+  //新建ai_envents 是为了解决前端并发问题
+  const ai_events: Array<{ uuids: string[]; params: { [key: string]: any } }> = [];
+  currentAgent.value.forEach(ag=>{
+    if(ag.fields.includes(key)){ //trigger: 1:任一  2：半数 3：全部
+      if (rowdex!=null){//子表操作
+        ag.rowdex=rowdex //更新智能体的rowdex
+        if(rowdex>=ag.subparams.length){
+          ag.subparams.push({[field]:value})
+        }else{
+          ag.subparams[rowdex][field]=value
+        }
+      }else{ //主表操作, 直接加入params种
+        ag.params[field]=value;  //这个地方把key换成fieldName
+      }
+      let mergedObj;
+      if(ag.subparams.length>0){        
+         mergedObj = Object.assign({}, ag.params, ag.subparams[ag.rowdex]); //合并子表和主表
+      }else{
+        mergedObj = ag.params
+      }
+      switch(ag.trigger){
+        case 2:
+          if(Object.keys(mergedObj).length>=ag.fields.length/2){
+            ai_events.push({uuids:ag.uuid,params:mergedObj })
+          }
+          break;
+        case 3:
+          if(Object.keys(mergedObj).length==ag.fields.length){
+            ai_events.push({uuids:ag.uuid,params:mergedObj})
+          }
+          break;
+        default:
+          ai_events.push({uuids:ag.uuid,params:mergedObj})
+      }
+    }
+  }) 
+  if(ai_events.length>0){
+    aiassistRef.value.onSendParamToAI(ai_events)
+  }  
+})
+
+// 对表单设置初始值
+const setValue = (obj: { [key: string]: any }, filter?: boolean) => {
+  // 分两种，false时将obj所有值合并到model，当obj有某些值不存于表单中，也会合并到model，当提交表单也会提交此值
+  // true则过滤没用的值，即存在当前表单的才合并
+  if (filter) {
+    for (const key in obj) {
+      if (model.value[key] !== undefined) {
+        model.value[key] = obj[key];
+      }
+    }
+  } else {
+    model.value = Object.assign({}, model.value, jsonParseStringify(obj)); // 防止列表直接使用set方法对弹窗表单编辑，当重置表单时当前行数据被清空
+  }
+};
+
+// 表单组件值改变事件 tProp为子表格相关
+provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any) => {
+  console.log("表单组件值改变事件----------1--------->", key);
+  console.log("表单组件值改变事件----------2--------->", value);
+  console.log("表单组件值改变事件----------3--------->", data);
+  console.log("表单组件值改变事件----------4--------->", tProp);
+  console.log("表单组件值改变事件----------5--------->", type);
+  console.log("表单组件值改变事件----------6--------->", attribute);
+  console.log("表单组件值改变事件----------11--------->", model.value);
+
+  let fieldVal: Record<string, string> = {};
+  for (let i in model.value) {
+    if (i == key) {
+      fieldVal[i] = typeof value == "number" ? value.toString() : value;
+    } else {
+      fieldVal[i] =
+        typeof model.value[i] == "number" ? model.value[i].toString() : model.value[i];
+    }
+    // console.log("监听表单--constControlChange----------1--------->",i,model.value[i])
+  }
+  // console.log("监听表单--fieldVal----------2--------->",fieldVal)
+  // let fieldVal =  {}
+  // validate((valid: boolean, fields: any) => {
+  // 	console.log("监听表单--constControlChange----------1--------->",fields)
+  // 	for(let i in fields){
+  // 		fieldVal[i]=fields[i].toString()
+
+  // 		console.log("监听表单--constControlChange----------2--------->",fields)
+  // 	}
+  // 	//判断是否进行计算
+  if (type == "digitpage") {
+    let oldFormConfig = props.formData.config;
+    let newFormConfig = props.formData.config.groupKey;
+    let odlHideField = props.formData.config.hideField;
+    // Create a copy of formData to avoid direct mutation
+    const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+    // Update the copy
+    delete updatedFormData.config.groupKey;
+    delete updatedFormData.config.hideField;
+    // Emit event to update parent
+    emits('update:formData', updatedFormData);
+    let sendInfo = {
+      fieldKey: key,
+      mathsFornula: props.formData.config,
+      keyVal: fieldVal,
+    };
+    // console.log("sendInfoe-2->",props.formData,props.formData)
+    currencyFormApiSubmit("/systemapi/maths/mathematicalCalculations", sendInfo)
+      .then((data: any) => {
+        // console.log("结果-->",data)
+        let formatRes: any = data.data;
+        // 比较适用通用表单，保存在服务端
+        const afterResponse = props.formData.events?.afterResponse;
+        // 构建结果树 - 修复重复问题
+        let result = {};
+        if (typeof afterResponse === "string" && afterResponse) {
+          formatRes = formatResult(result, afterResponse);
+        } else if (typeof afterResponse === "function") {
+          formatRes = afterResponse(result) ?? result;
+        }
+        // 比较适用于导出vue文件
+        if (typeof props.afterResponse === "string" && props.afterResponse) {
+          formatRes = formatResult(result, props.afterResponse);
+        } else if (typeof props.afterResponse === "function") {
+          formatRes = props.afterResponse(result) ?? result;
+        }
+        if (formatRes === false) {
+          return;
+        }
+        // console.log("停止数据请求--->",formatRes)
+        setValue(formatRes.result || formatRes);
+        nextTick(() => {
+          // 将dict保存，可用于从接口中设置表单组件options。
+          if (formatRes.dict && Object.keys(formatRes.dict).length) {
+            resultDict.value = formatRes.dict;
+          }
+          // Create a copy of formData to avoid direct mutation
+          const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+          // Update the copy
+          updatedFormData.config.groupKey = newFormConfig;
+          updatedFormData.config.hideField = odlHideField;
+          // Emit event to update parent
+          emits('update:formData', updatedFormData);
+        });
+      })
+      .finally(() => {
+        // Create a copy of formData to avoid direct mutation
+        const updatedFormData = JSON.parse(JSON.stringify(props.formData));
+        // Update the copy
+        updatedFormData.config.groupKey = newFormConfig;
+        updatedFormData.config.hideField = odlHideField;
+        // Emit event to update parent
+        emits('update:formData', updatedFormData);
+      });
+  }
+  // })
+
+  showOrHide(data,value);
+
+  if (typeof props.changeKeyVal === "function") {
+    props.changeKeyVal(key, value, type, attribute);
+  }
+  if (key) {
+    if (!tProp) {
+      // 表格和弹性布局不是这里更新，只触change
+      model.value[key] = value;
+    }
+    // 支持在线方式数据处理，如A组件值改变时，可自动修改B组件的值，可参考请假流程自动时长计算
+    if (props.formData.events?.change) {
+      model.value = props.formData.events.change(key, model.value);
+    }
+    const onFormChange = props.formData.events?.change;
+    if (onFormChange) {
+      if (typeof onFormChange === "function") {
+        model.value = onFormChange(key, model.value);
+      } else {
+        model.value = formChangeValue(key, model.value, onFormChange);
+      }
+    }
+    // 当表格和弹性内的字段和外面字段冲突时，可通过tProps区分
+    emits("change", { key, value, model: model.value, data, tProp });
+  }
+
+  /* 
+		
+	*/
+});
+/**
+@ 作者: 秦东
+@ 时间: 2026-03-04 14:07:05
+@ 功能: 提供一个取值的方法
+*/
+const getValue = (filter?: boolean) => {
+  // console.log("getValue--->filter-->",filter)
+  // console.log("getValue--->model-->",model)
+  if (filter) {
+    const obj: any = {};
+    for (const key in model.value) {
+      // eslint-disable-next-line no-prototype-builtins
+      if (model.value.hasOwnProperty(key)) {
+        const val = (model.value as any)[key];
+        if (!/^\s*$/.test(val)) {
+          obj[key] = val;
+        }
+      }
+    }
+    return obj;
+  } else {
+    // console.log("getValue--->model-value->",model.value)
+    return model.value;
+  }
+};
+
+provide(constSetFormOptions, setFormOptions);
+const setOptions = (obj: { [key: string]: string[] }) => {
+  setFormOptions.value = obj;
+};
+// 不管成功失败，有事件时都需要执行回调
+const afterSubmit = (type: string, res: any) => {
+  const afterSubmit = props.formData.events?.afterSubmit;
+  let notReturn;
+  if (typeof afterSubmit === "function") {
+    notReturn = afterSubmit(type, res);
+  } else if (typeof props.afterSubmit === "function") {
+    notReturn = props.afterSubmit(type, res);
+    //   console.log("notReturn--123456->",props.afterSubmit)
+  }
+  // console.log("notReturn--->",notReturn)
+  // console.log("afterSubmit--->",afterSubmit)
+  // console.log("typeof afterSubmit--->",typeof afterSubmit)
+  // console.log("type--->",type)
+  // console.log("res--->",res)
+  // console.log("props.formData.events--->",props.formData.events)
+  // console.log("props.formData.events?.afterSubmit--->",props.formData.events?.afterSubmit)
+
+  loading.value = false;
+  // 不管结果，重置表单，防再次打开时保留上一次的值
+  // resetFields()
+  if (notReturn === false) {
+    // 有返回false时则不提示
+    return;
+  }
+  if (type === "success") {
+    ElMessage.success(res.msg || "保存成功！");
+  } else if (type === "fail") {
+    ElMessage.error(res.message || "保存失败！");
+  }
+};
+
+
+//新增、查看、保存数据
+const submit = (params = {}) => {
+  let addUrl = props.formData.config?.addUrl || props.addUrl;
+  let editUrl = props.formData.config?.editUrl || props.editUrl;
+  let apiUrl = props.type === 1 ? addUrl : editUrl;
+
+  console.log("新增、查看、保存数据", apiUrl, props.type, props.addUrl, props.editUrl);
+  if (props.isSearch || !apiUrl || loading.value) {
+    if (!props.isSearch && !apiUrl) {
+      console.error(new Error("请在表单设计处配置接口事件url或选择数据源或设置props"));
+    }
+    // 列表里作为筛选时，不提交表单
+    return;
+  }
+  switch (apiUrl) {
+    case "getFormContent":
+      apiUrl = "/systemapi/task_management/look_customer_formdata";
+      break;
+    case "saveFormContent":
+      //  apiUrl ="/systemapi/task_management/customer_form_adddata"
+      // apiUrl ="/systemapi/task_management/add_form_data"
+      // apiUrl ="/systemapi/task_management/add_form_newdata"
+      apiUrl = "/systemapi/task_management/add_customer_form";
+      break;
+    case "editFormContent":
+      apiUrl = "/systemapi/task_management/editCustomerTable";
+      break;
+    case "addData":
+      apiUrl = "/systemapi/task_management/createAppTask";
+      break;
+    default:
+  }
+  validate((valid: boolean, fields: any) => {
+    if (valid) {
+      const formatParams = Object.assign({}, fields, params);
+      // console.log("params--->",params)
+      // console.log("fields--->",fields)
+      // console.log("formatParams-Object-->",formatParams)
+
+      let submitParams;
+      const beforeSubmit = props.formData.events?.beforeSubmit;
+      if (beforeSubmit) {
+        if (typeof beforeSubmit === "function") {
+          submitParams = beforeSubmit(formatParams, route);
+        } else {
+          submitParams = formatResult(formatParams, beforeSubmit);
+        }
+      }
+      if (props.beforeSubmit && typeof props.beforeSubmit === "string") {
+        submitParams = formatResult(formatParams, props.beforeSubmit);
+      } else if (typeof props.beforeSubmit === "function") {
+        submitParams = props.beforeSubmit(formatParams, route);
+      }
+      if (submitParams === false) {
+        return;
+      }
+      // console.log("beforeSubmit--->",beforeSubmit)
+      // console.log("props.beforeSubmit--->",props.beforeSubmit)
+      // console.log("props.beforeSubmit--->",props.beforeSubmit)
+      formatParams.versionId = props.versionId;
+      formatParams.appKey = props.groupid;
+      formatParams.status = 2;
+      // loading.value = true
+      console.log("apiUrl--->", apiUrl);
+      console.log("submitParams--->", submitParams);
+      console.log("formatParams--->", formatParams);
+
+      // debugger
+      // 提交保存表单
+      currencyFormApiSubmit(apiUrl, submitParams ?? formatParams)
+        .then((res: any) => {
+          // console.log("formatParams--111->",res)
+          afterSubmit("success", res);
+        })
+        .catch((res) => {
+          afterSubmit("fail", res);
+        });
+      // getRequest(apiUrl, submitParams ?? formatParams)
+      // 	.then((res: any) => {
+      // 		afterSubmit('success', res)
+      // 	})
+      // 	.catch(res => {
+      // 		afterSubmit('fail', res)
+      // 	})
+    } else {
+      // 没通过校验
+      // afterSubmit("validate", fields);
+    }
+  });
+};
+// 重置表单方法
+const resetFields = () => {
+  ruleForm.value.resetFields();
+  // setValue(Object.assign(model.value, obj || {})) // 这才能清空组件显示的值
+};
+//保存草稿
+const saveDraftPage = (type: string, res: any) => {
+  const saveDraftPage = props.formData.events?.saveDraftPage;
+  let notReturn;
+  if (typeof saveDraftPage === "function") {
+    notReturn = saveDraftPage(type, res);
+    //   console.log("notReturn-1-123456->",props.anewSubmit)
+  } else if (typeof props.saveDraftPage === "function") {
+    notReturn = props.saveDraftPage(type, res);
+    //   console.log("notReturn--123456->",props.anewSubmit)
+  }
+  loading.value = false;
+  if (notReturn === false) {
+    // 有返回false时则不提示
+    return;
+  }
+  if (type === "success") {
+    ElMessage.success(res.msg || "保存成功！");
+  } else if (type === "fail") {
+    ElMessage.error(res.message || "保存失败！");
+  }
+};
+const saveDraft = (params = {}) => {
+  // let apiUrl ="/systemapi/task_management/add_form_newdata"
+  let apiUrl = "/systemapi/task_management/add_customer_form";
+  if (props.isSearch || !apiUrl || loading.value) {
+    if (!props.isSearch && !apiUrl) {
+      console.error(new Error("请在表单设计处配置接口事件url或选择数据源或设置props"));
+    }
+    // 列表里作为筛选时，不提交表单
+    return;
+  }
+  validate((valid: boolean, fields: any) => {
+    if (valid) {
+      const formatParams = Object.assign({}, fields, params);
+      let submitParams;
+      const beforeSubmit = props.formData.events?.beforeSubmit;
+      if (beforeSubmit) {
+        if (typeof beforeSubmit === "function") {
+          submitParams = beforeSubmit(formatParams, route);
+        } else {
+          submitParams = formatResult(formatParams, beforeSubmit);
+        }
+      }
+      if (props.beforeSubmit && typeof props.beforeSubmit === "string") {
+        submitParams = formatResult(formatParams, props.beforeSubmit);
+      } else if (typeof props.beforeSubmit === "function") {
+        submitParams = props.beforeSubmit(formatParams, route);
+      }
+      if (submitParams === false) {
+        return;
+      }
+      formatParams.versionId = props.versionId;
+      formatParams.appKey = props.groupid;
+      formatParams.status = 1;
+      if (formatParams.formId) {
+        if (formatParams.formId == "") {
+          formatParams.formId = props.versionId;
+        }
+      } else {
+        formatParams.formId = props.versionId;
+      }
+      console.log("提交保存草稿！", params);
+      // 提交保存表单
+      currencyFormApiSubmit(apiUrl, submitParams ?? formatParams)
+        .then((res: any) => {
+          saveDraftPage("success", res);
+        })
+        .catch((res) => {
+          saveDraftPage("fail", res);
+        });
+    } else {
+      // 没通过校验
+      saveDraftPage("validate", fields);
+    }
+  });
+};
+//保存草稿  只保存表单，不操作流程
+const saveEditDraft = (params = {}) => {
+  // let apiUrl = "/systemapi/task_management/newcust_form_editdata"
+  // let apiUrl ="/systemapi/task_management/add_customer_form"
+  let apiUrl = "/systemapi/task_management/editCustomerTable";
+  if (props.isSearch || !apiUrl || loading.value) {
+    if (!props.isSearch && !apiUrl) {
+      console.error(new Error("请在表单设计处配置接口事件url或选择数据源或设置props"));
+    }
+    // 列表里作为筛选时，不提交表单
+    return;
+  }
+  validate((valid: boolean, fields: any) => {
+    if (valid) {
+      const formatParams = Object.assign({}, fields, params);
+      let submitParams;
+      const beforeSubmit = props.formData.events?.beforeSubmit;
+      if (beforeSubmit) {
+        if (typeof beforeSubmit === "function") {
+          submitParams = beforeSubmit(formatParams, route);
+        } else {
+          submitParams = formatResult(formatParams, beforeSubmit);
+        }
+      }
+      if (props.beforeSubmit && typeof props.beforeSubmit === "string") {
+        submitParams = formatResult(formatParams, props.beforeSubmit);
+      } else if (typeof props.beforeSubmit === "function") {
+        submitParams = props.beforeSubmit(formatParams, route);
+      }
+      if (submitParams === false) {
+        return;
+      }
+      // 提交保存表单
+      currencyFormApiSubmit(apiUrl, submitParams ?? formatParams)
+        .then((res: any) => {
+          saveEditFormInfo("success", res);
+        })
+        .catch((res) => {
+          saveEditFormInfo("fail", res);
+        });
+    } else {
+      // 没通过校验
+      saveEditFormInfo("validate", fields);
+    }
+  });
+};
+const saveEditFormInfo = (type: string, res: any) => {
+  const saveEditFormInfo = props.formData.events?.saveEditFormInfo;
+  let notReturn;
+  if (typeof saveEditFormInfo === "function") {
+    notReturn = saveEditFormInfo(type, res);
+    //   console.log("notReturn-1-123456->",props.saveEditFormInfo)
+  } else if (typeof props.saveEditFormInfo === "function") {
+    notReturn = props.saveEditFormInfo(type, res);
+    //   console.log("notReturn--123456->",props.anewSubmit)
+  }
+  loading.value = false;
+  if (notReturn === false) {
+    // 有返回false时则不提示
+    return;
+  }
+  if (type === "success") {
+    ElMessage.success(res.msg || "保存成功！");
+  } else if (type === "fail") {
+    ElMessage.error(res.message || "保存失败！");
+  }
+};
+const anewSubmit = (type: string, res: any) => {
+  const anewSubmit = props.formData.events?.anewSubmit;
+  let notReturn;
+  if (typeof anewSubmit === "function") {
+    notReturn = anewSubmit(type, res);
+    //   console.log("notReturn-1-123456->",props.anewSubmit)
+  } else if (typeof props.anewSubmit === "function") {
+    notReturn = props.anewSubmit(type, res);
+    //   console.log("notReturn--123456->",props.anewSubmit)
+  }
+  loading.value = false;
+  if (notReturn === false) {
+    // 有返回false时则不提示
+    return;
+  }
+  if (type === "success") {
+    ElMessage.success(res.msg || "保存成功！");
+  } else if (type === "fail") {
+    ElMessage.error(res.message || "保存失败！");
+  }
+};
+//重洗提交表单流程
+const afreshSubmit = (params = {}) => {
+  // let apiUrl = "/systemapi/task_management/newcust_form_editdata"
+  let apiUrl = "/systemapi/task_management/editCustomerTable";
+  if (props.isSearch || !apiUrl || loading.value) {
+    if (!props.isSearch && !apiUrl) {
+      console.error(new Error("请在表单设计处配置接口事件url或选择数据源或设置props"));
+    }
+    // 列表里作为筛选时，不提交表单
+    return;
+  }
+  validate((valid: boolean, fields: any) => {
+    if (valid) {
+      const formatParams = Object.assign({}, fields, params);
+      let submitParams;
+      const beforeSubmit = props.formData.events?.beforeSubmit;
+      if (beforeSubmit) {
+        if (typeof beforeSubmit === "function") {
+          submitParams = beforeSubmit(formatParams, route);
+        } else {
+          submitParams = formatResult(formatParams, beforeSubmit);
+        }
+      }
+      if (props.beforeSubmit && typeof props.beforeSubmit === "string") {
+        submitParams = formatResult(formatParams, props.beforeSubmit);
+      } else if (typeof props.beforeSubmit === "function") {
+        submitParams = props.beforeSubmit(formatParams, route);
+      }
+      if (submitParams === false) {
+        return;
+      }
+      // 提交保存表单
+      currencyFormApiSubmit(apiUrl, submitParams ?? formatParams)
+        .then((res: any) => {
+          anewSubmit("success", res);
+        })
+        .catch((res) => {
+          anewSubmit("fail", res);
+        });
+    } else {
+      // 没通过校验
+      anewSubmit("validate", fields);
+    }
+  });
+};
+const sendDraftSubmit = (type: string, res: any) => {
+  const sendDraftSubmit = props.formData.events?.sendDraftSubmit;
+  let notReturn;
+  if (typeof sendDraftSubmit === "function") {
+    notReturn = sendDraftSubmit(type, res);
+    //   console.log("notReturn-1-123456->",props.sendDraftSubmit)
+  } else if (typeof props.sendDraftSubmit === "function") {
+    notReturn = props.sendDraftSubmit(type, res);
+    //   console.log("notReturn--123456->",props.anewSubmit)
+  }
+  loading.value = false;
+  if (notReturn === false) {
+    // 有返回false时则不提示
+    return;
+  }
+  if (type === "success") {
+    ElMessage.success(res.msg || "提交成功！");
+  } else if (type === "fail") {
+    ElMessage.error(res.message || "提交失败！");
+  }
+};
+/**
+ * 草稿提交审批
+ */
+const draftSubmit = (params = {}) => {
+  // let apiUrl = "/systemapi/task_management/newcust_form_editdata"
+  let apiUrl = "/systemapi/task_management/editCustomerTable";
+  if (props.isSearch || !apiUrl || loading.value) {
+    if (!props.isSearch && !apiUrl) {
+      console.error(new Error("请在表单设计处配置接口事件url或选择数据源或设置props"));
+    }
+    // 列表里作为筛选时，不提交表单
+    return;
+  }
+  validate((valid: boolean, fields: any) => {
+    if (valid) {
+      const formatParams = Object.assign({}, fields, params);
+      let submitParams;
+      const beforeSubmit = props.formData.events?.beforeSubmit;
+      if (beforeSubmit) {
+        if (typeof beforeSubmit === "function") {
+          submitParams = beforeSubmit(formatParams, route);
+        } else {
+          submitParams = formatResult(formatParams, beforeSubmit);
+        }
+      }
+      if (props.beforeSubmit && typeof props.beforeSubmit === "string") {
+        submitParams = formatResult(formatParams, props.beforeSubmit);
+      } else if (typeof props.beforeSubmit === "function") {
+        submitParams = props.beforeSubmit(formatParams, route);
+      }
+      if (submitParams === false) {
+        return;
+      }
+      // 提交保存表单
+      currencyFormApiSubmit(apiUrl, submitParams ?? formatParams)
+        .then((res: any) => {
+          sendDraftSubmit("success", res);
+        })
+        .catch((res) => {
+          sendDraftSubmit("fail", res);
+        });
+    } else {
+      // 没通过校验
+      sendDraftSubmit("validate", fields);
+    }
+  });
+};
+//提交修改数据
+const submitEdit = (type: string, res: any) => {
+  const submitEdit = props.formData.events?.submitEdit;
+  let notReturn;
+  if (typeof submitEdit === "function") {
+    notReturn = submitEdit(type, res);
+    //   console.log("notReturn-1-123456->",props.submitEdit)
+  } else if (typeof props.submitEdit === "function") {
+    notReturn = props.submitEdit(type, res);
+    //   console.log("notReturn--123456->",props.anewSubmit)
+  }
+  loading.value = false;
+  if (notReturn === false) {
+    // 有返回false时则不提示
+    return;
+  }
+  if (type === "success") {
+    ElMessage.success(res.msg || "提交成功！");
+  } else if (type === "fail") {
+    ElMessage.error(res.message || "提交失败！");
+  }
+};
+/**
+ * 申请修改
+ */
+const submitEditButton = (params = {}) => {
+  // let apiUrl = "/systemapi/task_flow/editFormLogData"
+  let apiUrl = "/systemapi/task_management/applyForTableFormData";
+  if (props.isSearch || !apiUrl || loading.value) {
+    if (!props.isSearch && !apiUrl) {
+      console.error(new Error("请在表单设计处配置接口事件url或选择数据源或设置props"));
+    }
+    // 列表里作为筛选时，不提交表单
+    return;
+  }
+  validate((valid: boolean, fields: any) => {
+    if (valid) {
+      const formatParams = Object.assign({}, fields, params);
+      let submitParams;
+      const beforeSubmit = props.formData.events?.beforeSubmit;
+      if (beforeSubmit) {
+        if (typeof beforeSubmit === "function") {
+          submitParams = beforeSubmit(formatParams, route);
+        } else {
+          submitParams = formatResult(formatParams, beforeSubmit);
+        }
+      }
+      if (props.beforeSubmit && typeof props.beforeSubmit === "string") {
+        submitParams = formatResult(formatParams, props.beforeSubmit);
+      } else if (typeof props.beforeSubmit === "function") {
+        submitParams = props.beforeSubmit(formatParams, route);
+      }
+      if (submitParams === false) {
+        return;
+      }
+      console.log("提交修改数据",apiUrl,submitParams,formatParams)
+      // 提交保存表单
+      currencyFormApiSubmit(apiUrl, submitParams ?? formatParams)
+        .then((res: any) => {
+          submitEdit("success", res);
+        })
+        .catch((res) => {
+          submitEdit("fail", res);
+        });
+    } else {
+      // 没通过校验
+      submitEdit("validate", fields);
+    }
+  });
+};
+// 按钮组件事件
+provide(constFormBtnEvent, (obj: any) => {
+  console.log("点击的哪个按钮----》", obj.key);
+  emits("btnClick", obj.key);
+  if ([3, 4, 5].includes(props.type)) {
+    return ElMessage.error("当前模式不能提交表单");
+  }
+  switch (obj.key) {
+    case "submit":
+      submit(); // 提交
+      break;
+    case "reset":
+      resetFields(); // 重置
+      break;
+    case "cancel": // 取消返回，
+      // router.go(-1) //这个刷新后可能会失败
+      let notReturn;
+      if (typeof props.closeAppSubmit === "function") {
+        notReturn = props.closeAppSubmit();
+      }
+      break;
+    case "saveDraft": //保存草稿
+      saveDraft(); // 保存草稿
+      // console.log("保存草稿--------->saveDraft")
+      break;
+    case "saveEditDraft": //保存草稿		只保存表单不操作流程
+      saveEditDraft();
+      // console.log("保存草稿--------->saveEditDraft")
+      break;
+    case "afreshSubmit": //重新提交流程
+      afreshSubmit(); // 提交
+      break;
+    case "draftSubmit": //草稿提交审批
+      draftSubmit();
+      break;
+    case "submitEdit": //申请修改
+      submitEditButton();
+      break;
+    default:
+      break;
+  }
+});
+// 获取表单数据，编辑时，外部调用
+const getData = (params = {}) => {
+  let requestUrl = props.formData.config?.requestUrl || props.requestUrl;
+  if (props.type === 5 || !requestUrl || props.isSearch) {
+    console.error("执行了获取数据方法，但配置有误！");
+    return;
+  }
+  switch (requestUrl) {
+    case "getFormContent":
+      requestUrl = "/systemapi/task_management/look_customer_formdata";
+      break;
+    case "saveFormContent":
+      // requestUrl ="/systemapi/task_management/customer_form_adddata"
+      requestUrl = "/systemapi/task_management/add_form_data";
+      break;
+    case "editFormContent":
+      // requestUrl ="/systemapi/task_management/newcust_form_editdata"
+      requestUrl = "/systemapi/task_management/add_customer_form";
+      break;
+    default:
+  }
+
+  loading.value = true;
+  const newParams: any = params;
+  // 同时可使用props或是events里的事件，根据使用使用其中一种即可
+  let newParams2;
+  const beforeRequest = props.formData.events?.beforeRequest;
+  if (typeof beforeRequest === "function") {
+    newParams2 = beforeRequest(newParams, route);
+  }
+  if (typeof props.beforeRequest === "function") {
+    newParams2 = props.beforeRequest(newParams, route);
+  }
+  if (newParams2 === false) {
+    // 停止数据请求
+    return;
+  }
+  currencyFormApiSubmit(requestUrl, newParams2 ?? newParams)
+    .then((res: any) => {
+      loading.value = false;
+      const result = res.data;
+      result.formKey = newParams.id;
+      result.formId = newParams.version;
+      // console.log("停止数据请求--->",newParams)
+      if (result) {
+        let formatRes: any = result;
+        // 比较适用通用表单，保存在服务端
+        const afterResponse = props.formData.events?.afterResponse;
+        if (typeof afterResponse === "string" && afterResponse) {
+          formatRes = formatResult(result, afterResponse);
+        } else if (typeof afterResponse === "function") {
+          formatRes = afterResponse(result) ?? result;
+        }
+        // 比较适用于导出vue文件
+        if (typeof props.afterResponse === "string" && props.afterResponse) {
+          formatRes = formatResult(result, props.afterResponse);
+        } else if (typeof props.afterResponse === "function") {
+          formatRes = props.afterResponse(result) ?? result;
+        }
+        if (formatRes === false) {
+          return;
+        }
+        setValue(formatRes.result || formatRes);
+        nextTick(() => {
+          // 将dict保存，可用于从接口中设置表单组件options。
+          if (formatRes.dict && Object.keys(formatRes.dict).length) {
+            resultDict.value = formatRes.dict;
+          }
+        });
+      }
+    })
+    .catch((res) => {
+      loading.value = false;
+      return ElMessage.error(res.message);
+    });
+  // console.log("res------执行了获取数据方法，但配置有误----->", requestUrl,newParams2,newParams)
+};
+//修改流程表单数据回显
+const getEditData = (params = {}) => {
+  let requestUrl = "/systemapi/task_flow/gainEditFormFlowInfo";
+  loading.value = true;
+  const newParams: any = params;
+  // 同时可使用props或是events里的事件，根据使用使用其中一种即可
+  let newParams2;
+  const beforeRequest = props.formData.events?.beforeRequest;
+  if (typeof beforeRequest === "function") {
+    newParams2 = beforeRequest(newParams, route);
+  }
+  if (typeof props.beforeRequest === "function") {
+    newParams2 = props.beforeRequest(newParams, route);
+  }
+  if (newParams2 === false) {
+    // 停止数据请求
+    return;
+  }
+  currencyFormApiSubmit(requestUrl, newParams2 ?? newParams)
+    .then((res: any) => {
+      loading.value = false;
+      const result = res.data.masterDataInfo;
+      result.formKey = newParams.id;
+      result.formId = newParams.version;
+
+      if (result) {
+        let formatRes: any = result;
+        // 比较适用通用表单，保存在服务端
+        const afterResponse = props.formData.events?.afterResponse;
+
+        if (typeof afterResponse === "string" && afterResponse) {
+          formatRes = formatResult(result, afterResponse);
+        } else if (typeof afterResponse === "function") {
+          formatRes = afterResponse(result) ?? result;
+        }
+        // 比较适用于导出vue文件
+        if (typeof props.afterResponse === "string" && props.afterResponse) {
+          formatRes = formatResult(result, props.afterResponse);
+        } else if (typeof props.afterResponse === "function") {
+          formatRes = props.afterResponse(result) ?? result;
+        }
+        if (formatRes === false) {
+          return;
+        }
+        // console.log("停止数据请求--->",formatRes)
+        setValue(formatRes.result || formatRes);
+        nextTick(() => {
+          // 将dict保存，可用于从接口中设置表单组件options。
+          if (formatRes.dict && Object.keys(formatRes.dict).length) {
+            resultDict.value = formatRes.dict;
+          }
+        });
+      }
+      return res.data;
+    })
+    .catch((res) => {
+      loading.value = false;
+      return ElMessage.error(res.message);
+    });
+};
+// 表单初始值
+watch(
+  () => props.value,
+  (v: any) => {
+    v && setValue(v);
+  },
+  {
+    immediate: true,
+  }
+);
+// 表单options
+watch(
+  () => props.options,
+  (v: any) => {
+    v && setOptions(v);
+  }
+);
+// ------------------------数据处理结束------------------------
+const groupExpandUserConfigs = (configs: any[]) => {
+    // 用于存储分组结果的Map
+    // key是排序后的范围数组字符串，value是包含names和原始keys的对象
+    const groupMap = new Map();
+    
+    configs.forEach(config => {
+        // 根据queryBy确定使用哪个范围数组
+        let range, rangeType;
+        if (config.control.queryBy === 'org') {
+            range = config.control.orgRange;
+            rangeType = 'orgRange';
+        } else {
+            range = config.control.roleRange;
+            rangeType = 'roleRange';
+        }
+        
+        // 对范围数组进行排序并转换为字符串作为分组key
+        const sortedRange = [...range].sort().join(',');
+        
+        // 如果该分组key不存在，创建新的分组
+        if (!groupMap.has(sortedRange)) {
+            groupMap.set(sortedRange, {
+                names: [],
+                keys: range, // 存储原始keys，不排序
+                rangeType: rangeType
+            });
+        }
+        
+        // 将当前配置的name添加到对应分组
+        groupMap.get(sortedRange).names.push(config.name);
+    });
+    
+    // 将Map转换为要求的输出格式
+    const result = [];
+    for (const groupInfo of groupMap.values()) {
+        result.push({
+            groupArray: groupInfo.names,
+            keys: groupInfo.keys,
+            rangeType: groupInfo.rangeType // 可选：添加范围类型信息
+        });
+    }
+    
+    return result;
+}
+// 辅助函数：递归构建节点树
+const buildNodeTree = (node: any, keepIds: any, idArray: any, processedIds: any) => {
+    const newNode:any = { 
+        id: node.id,
+        label: node.label,
+        value: node.value,
+        number: node.number,
+        children: []
+    };
+    
+    // 修改目标节点的标签
+    if (idArray.includes(node.id)) {
+        newNode.label = `${node.label}(${node.value || ''})`;
+        newNode.number = newNode.label;
+    }
+    
+    // 处理子节点
+    if (node.children && node.children.length > 0) {
+        const children = [];
+        const childProcessedIds = new Set(); // 用于子节点的去重
+        
+        for (const child of node.children) {
+            if (child?.id && keepIds.has(child.id) && !childProcessedIds.has(child.id)) {
+                childProcessedIds.add(child.id);
+                children.push(buildNodeTree(child, keepIds, idArray, processedIds));
+            }
+        }
+        if (children.length > 0) {
+            newNode.children = children;
+        }
+    }
+    
+    return newNode;
+}
+// 辅助函数：查找特定条件的节点
+const findTargetNode = (treeData: any) => {
+    if (!treeData) return null;
+    
+    const stack = Array.isArray(treeData) ? [...treeData] : [treeData];
+    
+    while (stack.length > 0) {
+        const node = stack.pop();
+        
+        // 检查节点是否符合条件
+        if (node.id === "309" && node.label === "山东恒信高科能源有限公司") {
+            return node;
+        }
+        
+        // 继续遍历子节点
+        if (node.children && node.children.length > 0) {
+            stack.push(...node.children);
+        }
+    }
+    
+    return null;
+}
+// 递归格式化所有节点，保持与非空时相同的格式，并过滤没有用户的组织节点
+const formatAllNodes = (node: any, processedIds: any) => {
+    // 判断是否为组织节点（ID长度小于5）
+    const isOrganization = node.id && node.id.length < 5;
+    
+    // 处理子节点
+    let children = [];
+    const childProcessedIds = new Set();
+    
+    if (node.children && node.children.length > 0) {
+        for (const child of node.children) {
+            if (child?.id && !childProcessedIds.has(child.id)) {
+                childProcessedIds.add(child.id);
+                let formattedChild = formatAllNodes(child, processedIds);
+                if (formattedChild) {
+                    children.push(formattedChild);
+                }
+            }
+        }
+    }
+    
+    // 如果是组织节点且没有用户子节点，则过滤掉
+    if (isOrganization && children.length === 0) {
+        return null;
+    }
+    
+    // 对所有节点应用相同的格式化逻辑
+    const newNode:any = { 
+        id: node.id,
+        label: node.label,
+        value: node.value,
+        number: node.number,
+        children: children
+    };
+    
+    // 对所有节点应用相同的标签格式化
+    if (node.value !== null && node.value !== undefined) {
+        newNode.label = `${node.label}(${node.value})`;
+        newNode.number = newNode.label;
+    }
+    
+    // 如果有子节点，添加子节点
+    if (children.length > 0) {
+        newNode.children = children;
+    }
+    
+    return newNode;
+}
+// 当 idList 为空时处理树数据，使用与不为空时相同的格式化逻辑
+const processTreeWithAllNodes = (treeData: any) => {
+    if (!treeData) {
+        return Array.isArray(treeData) ? [] : null;
+    }
+    
+    const roots = Array.isArray(treeData) ? treeData : [treeData];
+    
+    // 构建结果树 - 使用与不为空时相同的逻辑，但应用到所有节点
+    const result = [];
+    const processedIds = new Set();
+    
+    // 处理所有根节点
+    for (const root of roots) {
+        if (!root?.id || processedIds.has(root.id)) {
+            continue;
+        }
+        
+        processedIds.add(root.id);
+        // 使用相同的格式化逻辑，但应用到所有节点，并过滤没有用户的组织节点
+        const formattedNode = formatAllNodes(root, processedIds);
+        if (formattedNode) {
+            result.push(formattedNode);
+        }
+    }
+    
+    // 清理临时数据
+    processedIds.clear();
+    
+    return Array.isArray(treeData) ? result : result[0] || null;
+}
+
+//实现选择用户选择时,自动填充选择组织  liwenxuan 2025-11-11 end
+function modifyTreeData(treeData: any, idList: any) {
+    //console.log("modifyTreeDataMinimal 执行了");
+    let gkFlag = true
+    const idArray = Array.isArray(idList) ? idList : [idList];
+    
+    // 当 gkFlag 为 true 且 idList 为空时，查找特定节点作为新的 treeData
+    if (gkFlag && idArray.length === 0) {
+        const targetNode = findTargetNode(treeData);
+        if (targetNode) {
+            // 使用找到的节点作为新的 treeData
+            treeData = targetNode;
+        }
+    }
+    
+    // 当 idList 为空时，使用相同的处理逻辑，但保持所有节点
+    if (idArray.length === 0) {
+        return processTreeWithAllNodes(treeData);
+    }
+    
+    if (!treeData) {
+        return Array.isArray(treeData) ? [] : null;
+    }
+    
+    const roots = Array.isArray(treeData) ? treeData : [treeData];
+    
+    // 创建节点映射和父节点映射
+    const nodeMap = new Map();
+    const parentMap = new Map();
+    
+    // 使用迭代而非递归构建映射，避免栈溢出
+    const stack = [...roots];
+    
+    while (stack.length > 0) {
+        const node = stack.pop();
+        if (!node?.id) continue;
+        
+        // 如果节点ID已存在，跳过重复节点
+        if (!nodeMap.has(node.id)) {
+            nodeMap.set(node.id, node);
+            
+            if (node.children) {
+                for (const child of node.children) {
+                    if (child?.id) {
+                        parentMap.set(child.id, node.id);
+                        stack.push(child);
+                    }
+                }
+            }
+        }
+    }
+    
+    // 找到需要保留的节点（目标节点及其祖先）
+    const keepIds = new Set();
+    for (const id of idArray) {
+        let currentId = id;
+        while (currentId && nodeMap.has(currentId)) {
+            keepIds.add(currentId);
+            currentId = parentMap.get(currentId);
+        }
+    }
+    
+    // 构建结果树 - 修复重复问题
+    const result = [];
+    const processedIds = new Set(); // 跟踪已处理的节点ID，防止重复
+    
+    // 只处理根节点中需要保留的节点
+    for (const root of roots) {
+        if (!root?.id || !keepIds.has(root.id) || processedIds.has(root.id)) {
+            continue;
+        }
+        
+        processedIds.add(root.id);
+        result.push(buildNodeTree(root, keepIds, idArray, processedIds));
+    }
+    
+    // 清理临时数据
+    nodeMap.clear();
+    parentMap.clear();
+    keepIds.clear();
+    processedIds.clear();
+    
+    return Array.isArray(treeData) ? result : result[0] || null;
+}
+const getTree1 = () => {
+    getOrgAndManTree().then(({ data }) => {
+        orgAndManTree.value = data
+
+    }).finally(()=>{
+		//console.log(rangedUsers)
+
+		// 使用示例
+		const configArray = rangedUsers;
+		const groupedNames = groupExpandUserConfigs(configArray);
+		//console.log(groupedNames);
+		groupedNames.forEach((element:any) => {
+			let keys = element.keys
+			let arr = []
+			arr.push(modifyTreeData(orgAndManTree.value,keys))
+			element.tree = arr
+      //console.log(arr)
+
+			rangedUsers.forEach((item:any) => {
+				let i = 0
+				element.groupArray.forEach((el:any) => {
+					if(item.name==el){
+						i++
+					}
+				});
+				if(i>0){
+					item.tree = element.tree
+				}
+			});
+		});
+    rangedUserTrees1.value = JSON.parse(JSON.stringify(rangedUsers))
+    rangedUsers.forEach((item:any) => {
+      // 判断对象自身是否存在 tree 属性（不检查原型链）
+      if (item.hasOwnProperty('tree')) {
+        // 删除 tree 属性
+        delete item.tree;
+      }
+    })
+
+		
+	})
+}
+//实现选择用户选择时,自动填充选择组织  liwenxuan 2025-11-11 start 
+const location = ref('North Pole')
+const getParenthesesContent = (str:string) => {
+  //console.log(str)
+  const match = str.match(/\((.*?)\)/);
+  return match ? match[1] : '';
+}
+/**
+ * 提取字符串中最后一个英文冒号后的内容，无冒号则返回原字符串
+ * @param {string} str - 输入的字符串
+ * @returns {string} 最后一个冒号后的内容或原字符串
+ */
+function getAfterLastColon(str:string) {
+    // 首先验证入参类型，确保是字符串（避免非字符串类型导致方法出错）
+    if (typeof str !== 'string') {
+        //console.warn('入参必须是字符串类型，当前已自动转为字符串');
+        str = String(str); // 非字符串类型自动转为字符串
+    }
+
+    // 查找最后一个英文冒号的索引位置
+    const lastColonIndex = str.lastIndexOf(':');
+
+    // 若未找到冒号（索引为 -1），或冒号在字符串最后一位（后面无内容），返回原字符串
+    if (lastColonIndex === -1 || lastColonIndex === str.length - 1) {
+        return str;
+    }
+
+    // 截取最后一个冒号后面的字符（索引+1 开始到字符串结尾）
+    return str.slice(lastColonIndex + 1);
+}
+
+const  updateLocation = (currentValue: any,currentComp:any) => {
+  let userPath = ""
+  rangedUsersPath.forEach((element: any) => {
+    if(element.obj==currentComp){
+      userPath = element.path
+    }
+  });
+  location.value = currentValue+currentComp
+  let deepCopyedCurrentValue:string = JSON.stringify(toRaw(currentValue))
+  let workNumber = getParenthesesContent(deepCopyedCurrentValue)
+  //console.log(workNumber)
+  let mainOrg = 309
+  getMainOrgByWorkNumber({workNumber:workNumber}).then(({ data }) => {
+    //console.log(data)
+    mainOrg = data*1
+    
+  }).finally(()=>{
+    
+    //找到关联此 user 组件的所有 org 组件
+    let connectOrgs: any[] = []
+    selectOrgs.forEach((element:any) => {
+      if(element.control.connectUserComponent){
+        let realCurrentCompName = getAfterLastColon(element.control.connectUserComponent)
+        if(currentComp == realCurrentCompName){
+          connectOrgs.push(element)
+        }
+      }
+    });
+    let deepCopyedConnectOrgs = JSON.parse(JSON.stringify(connectOrgs))
+    //console.log(connectOrgs)
+    //console.log(selectOrgsPath)
+    
+    deepCopyedConnectOrgs.forEach((element:any) => {
+      selectOrgsPath.forEach((item: any) => {
+        if(item.obj==element.name){
+          if(item.path==undefined || item.path=="" || item.path=="undefined"){
+            element.path = ""
+          }else{
+            element.path = item.path
+          }
+          
+        }
+      });
+      //console.log(element)
+      if(element.path==""){
+        /* console.log(currentValue)
+        console.log(currentComp)
+        console.log(workNumber) */
+        if(workNumber==""){
+          model.value[element.name] = undefined
+        }else{
+          model.value[element.name] = mainOrg
+        }
+        
+      }else{
+        //console.log(model.value[element.path])
+
+        
+        model.value[element.path].forEach((x:any) => {
+          /* console.log(currentValue)
+          console.log(currentComp)
+          console.log(x) */
+
+
+          if(userPath!=""){
+            if(x[currentComp] == currentValue){
+              if(workNumber==""){
+                x[element.name] = undefined
+              }else{
+                x[element.name] = mainOrg
+              }
+            }
+
+          }else{
+            if(workNumber==""){
+              x[element.name] = undefined
+            }else{
+              x[element.name] = mainOrg
+            }
+          }          
+        });
+      }
+    });
+    //console.log(deepCopyedConnectOrgs)
+    //console.log(model.value)
+
+    });
+}
+
+provide('location', {
+  location,
+  updateLocation
+})
+const  checkAndGetTree = () => {
+  //console.log("checkAndGetTree")
+  if(rangedUsers.length>0){
+    getTree1();
+  }else{
+    if(getAsfsRunedFlag.value){
+
+    }else{
+      setTimeout(()=>{
+        checkAndGetTree()
+      },100)
+    }
+    
+  }
+
+
+}
+const getAsfs = () => {
+  /* setTimeout(() => { */
+  if(props.formData.list&&props.formData.list.length>0){
+    //alert(1)
+    let dataList = ref({});
+    dataList.value = props.formData.list;
+
+    if (dataList && Array.isArray(dataList.value) && dataList.value.length > 0) {
+      
+      for (let i = 0; i < dataList.value.length; i++) {
+        let for1Name = dataList.value[i].name
+        
+        if (dataList.value[i].type == "associatedForms") {
+          asfs.push(dataList.value[i]);
+        } else if(dataList.value[i].type == "expand-user"){
+          let pathObj = {path:"",obj: dataList.value[i].name}
+          rangedUsersPath.push(pathObj)
+          rangedUsers.push(dataList.value[i]);
+        } else if(dataList.value[i].type == "orgCentent"){
+          let pathObj = {path:"",obj: dataList.value[i].name}
+          selectOrgsPath.push(pathObj)
+          selectOrgs.push(dataList.value[i]);
+        }else if (
+          dataList.value[i].type == "card" ||
+          dataList.value[i].type == "flex" ||
+          dataList.value[i].type == "div" ||
+          dataList.value[i].type == "table"
+        ) {
+          
+          if (dataList.value[i].type == "table") {
+            tables.push(dataList.value[i]);
+          }
+
+          dataList.value[i].list.forEach((element: any) => {
+            
+            if (element.type == "associatedForms") {
+              asfs.push(element);
+            }else if(element.type  == "expand-user"){
+              let pathObj = {path:""+for1Name,obj:element.name}
+              rangedUsersPath.push(pathObj)
+              rangedUsers.push(element);
+            }else if(element.type  == "orgCentent"){
+              let pathObj = {path:""+for1Name,obj:element.name}
+              selectOrgsPath.push(pathObj)
+              selectOrgs.push(element);
+            }
+          });
+        } else if (dataList.value[i].type == "grid") {
+          let columns = JSON.parse(JSON.stringify(dataList.value[i].columns));
+
+          if (columns.length > 0) {
+            for (let z = 0; z < columns.length; z++) {
+              for (let x = 0; x < columns[z].list.length; x++) {
+                let a = JSON.parse(JSON.stringify(columns[z].list[x]));
+
+                if (a.type == "associatedForms") {
+                  asfs.push(a);
+                }else if(a.type == "expand-user"){
+                  let pathObj = {path:""+for1Name,obj:a.name}
+                  rangedUsersPath.push(pathObj)
+                  rangedUsers.push(a);
+                }else if(a.type == "orgCentent"){
+                  let pathObj = {path:""+for1Name,obj:a.name}
+                  selectOrgsPath.push(pathObj)
+                  selectOrgs.push(a);
+                }
+              }
+            }
+          }
+        } else if (dataList.value[i].type == "tabs") {
+          //tabs标签页有可能再嵌套一层flex或者table
+          let columns = JSON.parse(JSON.stringify(dataList.value[i].columns));
+          if (columns.length > 0) {
+            for (let z = 0; z < columns.length; z++) {
+              for (let x = 0; x < columns[z].list.length; x++) {
+                let a = JSON.parse(JSON.stringify(columns[z].list[x]));
+
+                if (a.type == "associatedForms") {
+                  asfs.push(a);
+                } else if(a.type == "expand-user"){
+                  let pathObj = {path:""+for1Name,obj:a.name}
+                  rangedUsersPath.push(pathObj)
+                  rangedUsers.push(a);
+                } else if(a.type == "orgCentent"){
+                  let pathObj = {path:""+for1Name,obj:a.name}
+                  selectOrgsPath.push(pathObj)
+                  selectOrgs.push(a);
+                }else if (a.type == "flex" || a.type == "table") {
+                  let for2Name = a.name
+                  if (a.type == "table") {
+                    tables.push(dataList.value[i]);
+                  }
+
+                  if (a.list.length > 0) {
+                    for (let m = 0; m < a.list.length; m++) {
+                      let q = JSON.parse(JSON.stringify(a.list[m]));
+
+                      if (q.type == "associatedForms") {
+                        asfs.push(q);
+                      }else if(q.type == "expand-user"){
+                        let pathObj = {path:""+for2Name,obj:q.name}
+                        rangedUsersPath.push(pathObj)
+                        rangedUsers.push(q);
+                      }else if(q.type == "orgCentent"){
+                        let pathObj = {path:""+for2Name,obj:q.name}
+                        selectOrgsPath.push(pathObj)
+                        selectOrgs.push(q);
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      checkAndGetTree()
+    }
+    getAsfsRunedFlag.value = true
+  }else{
+		setTimeout(()=>{
+			getAsfs()
+		},100)
+	}
+  /* }, 500); */
+}
+
+
+
+
+defineExpose({
+  setOptions,
+  setValue,
+  getValue,
+  validate,
+  resetFields,
+  getData,
+  submit,
+  anewSubmit,
+  saveDraftPage,
+  saveEditFormInfo,
+  getEditData,
+  submitEdit,
+});
+
+onMounted(() => {
+  //alert(1)
+  getAsfs();
+  // console.log("数据处理结束--->",props.formData)
+  getInitModel();
+  nextTick(() => {
+    appendRemoveStyle(true);
+  });
+  showOrHide("kong");
+  
+  
+});
+onUnmounted(() => {
+  if (eventName) {
+    // @ts-ignore
+    window[eventName] = "";
+  }
+  appendRemoveStyle();
+});
+
+
+
+</script>
+<template>
+  <el-card  shadow="always">
+         <template #header>
+            <div class="card-header">设计区域</div>
+        </template>
+        <div class="design-toolbar">
+            <el-button-group>
+                <el-button class="fa fa-television" :type="pickPageType === 'PC' ? 'primary' : ''"  size="small" @click="btnClick('monitor')">电脑端</el-button>
+                <el-button class="fa fa-mobile" :type="pickPageType === 'WEB' ? 'primary' : ''"  size="small" @click="btnClick('iphone')">移动端</el-button>
+            </el-button-group>
+            <el-button-group>
+                <el-button class="fa fa-trash-o"  size="small" @click="btnClick('del')">清空</el-button>
+                <el-button class="fa fa-eye"  size="small" @click="btnClick('eye')">预览</el-button>
+                <el-button class="fa fa-file-code-o"  size="small" @click="btnClick('json')">脚本预览</el-button>
+                <el-button class="fa fa-save" type="success" size="small" @click="btnClick('save')">保存</el-button>
+                <el-button class="fa fa-code-fork" type="warning" size="small" @click="btnClick('branch')">另存未新版本</el-button>
+            </el-button-group>
+        </div>
+        <div class="webPcBoday">
+          
+        
+          <el-scrollbar :class="webIsTrue?'webBox':'design-area'" id="designArea">
+              <div  v-if="formData.list.length === 0" class="placeholder" id="emptyPlaceholder">
+                  <i class="fa fa-magic"></i>
+                  <p>从左侧拖拽控件到此处开始设计表单</p>
+              </div>
+              <el-form
+                  v-bind="formData.form"
+                  ref="ruleForm"
+                  
+                  :disabled="disabled || type === 3"
+                  class="add-form"
+                  :class="{
+                      'design-form': type === 5,
+                      'detail-form': type === 3 || type === 4 || type === 1,
+                  }"
+              >
+                  <WebFormGroup
+                    v-if="webIsTrue"
+                    :tableinfo="formData.form"
+                    :is-web="webIsTrue"
+                    :numrun="numrun"
+                    :data="formData.list"
+                    :alldata="formData"
+                    @optionsValue3Get2="optionsValue3Get2"
+                  />
+                  <FormGroup
+                    v-else
+                      :tableinfo="formData.form"
+                      :numrun="numrun"
+                      :data="formData.list"
+                      :alldata="formData"
+                      :node-key="nodeKey"
+                      :purview="purview"
+                      :org-and-man-tree="rangedUserTrees1"
+                      @options-value3-get2="optionsValue3Get2" 
+                  />
+
+                  <slot></slot>
+              </el-form>
+          </el-scrollbar>
+        </div>
+    </el-card>
+</template>
+<style  lang='scss' scoped>
+.design-toolbar {
+    display: flex;
+    align-items: center;                                                                     
+    justify-content: space-between;
+    padding: 10px 10px;
+    border-bottom: 1px solid #ebeef5;
+    background: #f5f7fa;
+    :deep .el-button>span{
+        margin-left: 5px;
+    }
+}
+.toolbar-right {
+    display: flex;
+    gap: 0px;
+}
+.card-header{
+    font-size: 1.4rem;
+    font-weight: 700;
+    color: #0020C2;
+    display: flex;
+    align-items: center;
+    gap: 10px;
+}
+.webPcBoday{
+  flex: 1;
+   padding: 20px;
+}
+.design-area {
+    
+    background: #fafafa;
+    border: 2px dashed #c0c4cc;
+    border-radius: 4px;
+    height: calc(100vh - 190px);
+  
+}
+.placeholder {
+    text-align: center;
+    color: #909399;
+    padding: 40px 20px;
+}
+        
+.placeholder i {
+    font-size: 48px;
+    margin-bottom: 15px;
+    opacity: 0.7;
+}
+.webBox {
+  background: #fafafa;
+    border: 2px dashed #c0c4cc;
+    border-radius: 4px;
+    height: calc(100vh - 190px);
+    max-width: 380px;
+    margin: 0 auto;
+}
+</style>
diff --git a/src/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue b/src/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue
index 44c430c..e8ca933 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue
@@ -251,7 +251,7 @@ onBeforeMount(() => {
           </div>
         </el-header>
         <el-container>
-          <!-- <NewPageForm
+          <NewPageForm
             v-if="tabsActive == 1"
             ref="appPageInfo"
             v-model:state="state"
@@ -262,8 +262,8 @@ onBeforeMount(() => {
             :menu-id="menuId"
             :group-key="props.groupKey"
             :formconfigcont="formConfigCont"
-          /> -->
-          <PageForm
+          />
+          <!-- <PageForm
             v-if="tabsActive == 1"
             ref="appPageInfo"
             v-model:state="state"
@@ -274,7 +274,7 @@ onBeforeMount(() => {
             :menu-id="menuId"
             :group-key="props.groupKey"
             :formconfigcont="formConfigCont"
-          />
+          /> -->
           <PageFlow
             v-if="tabsActive == 2"
             v-model:state="state"
diff --git a/src/views/sysworkflow/lowcodepage/pageFlow/flowStep.vue b/src/views/sysworkflow/lowcodepage/pageFlow/flowStep.vue
index fdbd4da..7271b76 100644
--- a/src/views/sysworkflow/lowcodepage/pageFlow/flowStep.vue
+++ b/src/views/sysworkflow/lowcodepage/pageFlow/flowStep.vue
@@ -37,6 +37,10 @@ const props = defineProps({
 	nextStep:{
 		type:Number,
 		default:0
+	},
+    loading:{
+		type:Boolean,
+		default:false
 	}
 })
 const presetPersonnel = ref<any>([]);    //预设选择人
@@ -49,6 +53,7 @@ const flowList =   computed<any>({
 		emits("update:flowMap", val);
 	},
 });
+const flowLoading = computed(() => props.loading)
 watch(()=>props.flowMap,(val:any)=>{
 	
 	emits("update:flowMap", val);
@@ -58,11 +63,15 @@ onMounted(()=>{
 })
 //判断是否有增加人员按钮
 const judgeAddUser = (val:any):boolean =>{
-	console.log("val----->",val)
+	console.log("判断是否有增加人员按钮----->",val)
 	if(val.customNode == "beginnode"){
 		val.runscope = val.runscope!=0?val.runscope:1
 		return true
 	}
+    console.log("判断是否有增加人员按钮--isArray--->",Array.isArray(val.operator))
+    if(!Array.isArray(val.operator)){
+		return true
+	}
 	switch(val.runtype){
 		case 1:
 			val.runscope = val.runscope!=0?val.runscope:1
@@ -104,6 +113,8 @@ const addPeople = (val:any) =>{
 	selectedPeople.value = val.operator
 	if(val.runscope == 1){
 		openclosebox.value = true
+	}if(val.runscope == 0){
+		openclosebox.value = true
 	}else{
 		openOrClose.value = true
 	}
@@ -131,7 +142,7 @@ const updateNode = (val:any) =>{
 @ 功能: 判断审批节点样式
 */
 const judgeNodeClass = (val:number,stepVal:number):string => {
-    console.log("判断审批节点样式",val,stepVal)
+    // console.log("判断审批节点样式",val,stepVal)
     switch(val){
         case 1:
             if(props.currentProgress == stepVal){
@@ -160,7 +171,7 @@ const judgeNodeClass = (val:number,stepVal:number):string => {
 }
 
 
-</script>
+</script> 
 <template >
     <el-card  shadow="always">
         <template #header>
@@ -169,9 +180,9 @@ const judgeNodeClass = (val:number,stepVal:number):string => {
             审批流程
           </div>
         </template>
-        <el-scrollbar  :class="ifSendFlow?'flowBody':'flowBodyNofoot'">
+        <el-scrollbar v-loading="flowLoading" element-loading-text="Loading..." element-loading-background="rgba(122, 122, 122, 0.8)" :class="ifSendFlow?'flowBody':'flowBodyNofoot'">
 
-            <div class="approval-steps">
+            <div  class="approval-steps">
                 <div v-for="item in flowList" :key="item.step" :class="['step', judgeNodeClass(item.type,item.step)]">
                     <div class="step-icon">
                         <SvgIcon v-if="item.type==0" icon-class="faqiren" size="25" />
@@ -181,7 +192,7 @@ const judgeNodeClass = (val:number,stepVal:number):string => {
                         <!--SvgIcon v-else icon-class="shenpi" size="25" /-->
                     </div>
                     <div class="step-content">
-                        <h3 class="step-title">{{item.nodeName}}</h3>
+                        <h3 class="step-title">{{item.nodeName}}{{ props.currentProgress }}</h3>
                         <div v-for="items in item.operator" :key="items.id" class="flowLogBox">
 
                             <div >
diff --git a/src/views/sysworkflow/lowcodepage/pageFlow/newTableFlow.vue b/src/views/sysworkflow/lowcodepage/pageFlow/newTableFlow.vue
index 80f66b9..5283f47 100644
--- a/src/views/sysworkflow/lowcodepage/pageFlow/newTableFlow.vue
+++ b/src/views/sysworkflow/lowcodepage/pageFlow/newTableFlow.vue
@@ -142,16 +142,16 @@ const getTaskFormData = () => {
   drawLoading.value = true
   echoTableFormPage({ id: props.versionid.toString() })
   .then(({ data }) => {
-    console.log("表单数据",data)
+    // console.log("表单数据",data)
       let extraW=0; 
       if (data.tableFormPage.flowIsOpen == 1 && data.tableFormPage.flowkeystr != "0") {
         isFlowTable.value = true;
         // drawbox.value = 800 + 350;
-        console.error("存在流程----》",extraW)
+        // console.error("存在流程----》",extraW)
       } else {
         isFlowTable.value = false;
         // drawbox.value = 800;
-        console.error("不存在流程----》",extraW)
+        // console.error("不存在流程----》",extraW)
       }
 
       if(isFlowTable.value){
@@ -167,7 +167,7 @@ const getTaskFormData = () => {
       nodeKey.value = data.flowPage.nodeKey?data.flowPage.nodeKey:"";
       purviewAry.value = data.tableFormPage.powerAry;
       gainFlowChart.id = data.tableFormPage.flowkeystr;
-      console.log("表单数据--->1", data.flowPage.flowList);
+      // console.log("表单数据--->1", data.flowPage.flowList);
       flowMap.value = data.flowPage.flowList;
       state.id = props.versionid;
       state.formData = stringToObj(data.tableFormPage.mastesform);
@@ -176,7 +176,7 @@ const getTaskFormData = () => {
       state.formData.powerstr = string2json(data.tableFormPage.powerstr);
       judgeSubmitCancel({ name: data.tableFormPage.mastesformjson }).then(
         (datajud: any) => {
-          console.error("不存在流程--1-datajud-》",datajud)
+          // console.error("不存在流程--1-datajud-》",datajud)
           if (datajud.code == 0) {
             if (datajud.data.buttonIsTrue == 3 || datajud.data.buttonIsTrue == 4) {
               state.formData.list.push(submitButton);
@@ -184,8 +184,8 @@ const getTaskFormData = () => {
           }
         }
       );
-        console.log("表单数据--state.formData->1", state.formData);
-      console.error("不存在流程--1--》",state.formData.aiConfig)
+      //   console.log("表单数据--state.formData->1", state.formData);
+      // console.error("不存在流程--1--》",state.formData.aiConfig)
 
       if(state.formData&&state.formData.aiConfig&&state.formData.aiConfig.length>0){
         aiConfigArea.value=true
@@ -209,7 +209,7 @@ const getTaskFormData = () => {
         extraW = extraW + 300
       }
 
- console.error("不存在流程--extraW--》",extraW)
+//  console.error("不存在流程--extraW--》",extraW)
       if (aiConfigArea.value && isFlowTable.value){
         pageType.value  = 3
         pageBody.value = "treePage"
@@ -255,9 +255,9 @@ const initData = () => {
   state.id = 0;
   state.loading = true;
   let aryLen = flowFactor.length;
-  console.log("改变表单值--flowMap.value--1- >", flowMap.value);
+  // console.log("改变表单值--flowMap.value--1- >", flowMap.value);
   flowMap.value = [];
-  console.log("改变表单值--flowMap.value--->", flowMap.value);
+  // console.log("改变表单值--flowMap.value--->", flowMap.value);
   if (aryLen > 0) flowFactor.splice(0, aryLen);
 }
 /**
@@ -459,10 +459,10 @@ const closeAppSubmit = () => {
 };
 //组件解析
 const changeKeyVal = (key: any, val: any, type: any, attribute: any) => {
-  // console.log("改变表单值--key--->",key)
-  // console.log("改变表单值--val--->",val,Array.isArray(val))
-  // console.log("改变表单值--type--->",type)
-  // console.log("改变表单值--attribute--->",attribute)
+  console.log("改变表单值--key--->",key)
+  console.log("改变表单值--val--->",val,Array.isArray(val))
+  console.log("改变表单值--type--->",type)
+  console.log("改变表单值--attribute--->",attribute)
 
   let isUpdateFlowChart = false;
   console.log("改变表单值--notAsA_BasisForJudgment--->",notAsA_BasisForJudgment.indexOf(type))
@@ -627,17 +627,21 @@ const changeKeyVal = (key: any, val: any, type: any, attribute: any) => {
     }
   }
   let isTrue = false
+
+  console.log("changeFlowPick--->",changeFlowPick.value)
+
   if(changeFlowPick.value && Array.isArray(changeFlowPick.value) && changeFlowPick.value.includes(key)){
     isTrue = true
   }
+   console.log("更新工作流图--->",isUpdateFlowChart,isTrue)
   //更新工作流图
-  if (isUpdateFlowChart && isTrue) {
+  if (isUpdateFlowChart || isTrue) {
     flowLoading.value = true;
     //获取工作流不进图
     gainFlowChart.conditionList = flowFactor;
     gainFlowChart.nodelPeople = nodelUserList;
     gainFlowChart.oldFlow = flowMap;
-    // console.log("获取工作流不进图--gainFlowChart--->",gainFlowChart)
+    console.log("获取工作流不进图--gainFlowChart--->",gainFlowChart)
     realTimeUpdateFlow(gainFlowChart).then((data: any) => {
       // console.log("获取工作流不进图-new-->",data)
       flowMap.value = data.data.flowList;
@@ -764,6 +768,7 @@ provide('currentNodeKey', nodeKey)
           
           <FlowStep 
             v-if="isFlowTable" 
+            :loading="flowLoading" 
             v-model:flow-map="flowMap"
             :next-step="nextStep"
             :current-progress="currentProgress"
diff --git a/src/views/sysworkflow/lowcodepage/runApp/regularPage/myToDoPage.vue b/src/views/sysworkflow/lowcodepage/runApp/regularPage/myToDoPage.vue
index ffe20f2..6d661eb 100644
--- a/src/views/sysworkflow/lowcodepage/runApp/regularPage/myToDoPage.vue
+++ b/src/views/sysworkflow/lowcodepage/runApp/regularPage/myToDoPage.vue
@@ -106,7 +106,7 @@ const searchQuery = () => {};
     />
     <div class="app-container">
       <div class="search">
-        <div class="titleBox">代办事宜</div>
+        <div class="titleBox">待办事宜</div>
         <el-form ref="searckFormRefTd" :model="selectInfoTd" :inline="true">
           <el-form-item label="任务标题" prop="name">
             <el-input
diff --git a/src/views/taskplatform/taskmanagement/lookFlowInfoNewApp.vue b/src/views/taskplatform/taskmanagement/lookFlowInfoNewApp.vue
index 288e5dd..b1349da 100644
--- a/src/views/taskplatform/taskmanagement/lookFlowInfoNewApp.vue
+++ b/src/views/taskplatform/taskmanagement/lookFlowInfoNewApp.vue
@@ -1,7 +1,7 @@
 <!--
 @ 作者: 秦东
 @ 时间: 2026-02-05 13:51:29
-@ 备注: 代办事宜
+@ 备注: 待办事宜
 -->
 <script lang='ts' setup>
 import {
diff --git a/vite.config.ts.timestamp-1772586397203-879cadf7fb034.mjs b/vite.config.ts.timestamp-1772586397203-879cadf7fb034.mjs
new file mode 100644
index 0000000..6ffe830
--- /dev/null
+++ b/vite.config.ts.timestamp-1772586397203-879cadf7fb034.mjs
@@ -0,0 +1,215 @@
+// vite.config.ts
+import vue from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/@vitejs/plugin-vue/dist/index.mjs";
+import { loadEnv, defineConfig } from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/vite/dist/node/index.js";
+import AutoImport from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/unplugin-auto-import/dist/vite.js";
+import Components from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/unplugin-vue-components/dist/vite.mjs";
+import { ElementPlusResolver } from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/unplugin-vue-components/dist/resolvers.mjs";
+import Icons from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/unplugin-icons/dist/vite.mjs";
+import IconsResolver from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/unplugin-icons/dist/resolver.mjs";
+import { createSvgIconsPlugin } from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/vite-plugin-svg-icons/dist/index.mjs";
+import UnoCSS from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/unocss/dist/vite.mjs";
+import { terser } from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/rollup-plugin-terser/rollup-plugin-terser.mjs";
+import path from "path";
+var __vite_injected_original_dirname = "E:\\f_pang\\object\\my_object_html\\ShutongInterconnectedChemicalCloudPlatform";
+var pathSrc = path.resolve(__vite_injected_original_dirname, "src");
+var vite_config_default = defineConfig(({ mode }) => {
+  const env = loadEnv(mode, process.cwd());
+  return {
+    resolve: {
+      alias: {
+        "@": pathSrc
+      }
+    },
+    css: {
+      // CSS 预处理器
+      preprocessorOptions: {
+        //define global scss variable
+        scss: {
+          javascriptEnabled: true,
+          additionalData: `
+            @use "@/styles/variables.scss" as *;
+          `
+        }
+      }
+    },
+    server: {
+      host: "0.0.0.0",
+      port: Number(env.VITE_APP_PORT),
+      open: true,
+      // 运行是否自动打开浏览器
+      proxy: {
+        // 反向代理解决跨域
+        [env.VITE_APP_BASE_API]: {
+          target: env.VITE_APP_BASE_URL,
+          // 线上接口地址
+          // target: "http://vapi.youlai.tech", // 线上接口地址
+          // target: 'http://localhost:8989',  // 本地接口地址 , 后端工程仓库地址：https://gitee.com/youlaiorg/youlai-boot
+          changeOrigin: true,
+          rewrite: (path2) => path2.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
+          // 替换 /dev-api 为 target 接口地址
+        }
+        // '/dev-api/kpiapi': {
+        //   target: 'http://127.0.0.1:6666',
+        //   changeOrigin: true,
+        //   rewrite: (path) =>
+        //     path.replace(new RegExp("^" + '/dev-api/kpiapi'), ""),
+        // },
+        // '/dev-api/systemapi': {
+        //   target: 'http://127.0.0.1:17777',
+        //   changeOrigin: true,
+        //   rewrite: (path) =>
+        //     path.replace(new RegExp("^" + '/dev-api/systemapi'), ""),
+        // },
+        // '/dev-api/hrapi': {
+        //   target: 'http://127.0.0.1:39168',
+        //   changeOrigin: true,
+        //   rewrite: (path) =>
+        //     path.replace(new RegExp("^" + '/dev-api/hrapi'), ""),
+        // },
+        // '/dev-api/api': {
+        //   target: 'http://127.0.0.1:8888',
+        //   changeOrigin: true,
+        //   rewrite: (path) =>
+        //     path.replace(new RegExp("^" + '/dev-api/api'), ""),
+        // },
+        // '/dev-api/javasys': {
+        //   target: 'http://172.20.2.87:8111',
+        //   changeOrigin: true,
+        //   rewrite: (path) =>
+        //     path.replace(new RegExp("^" + '/dev-api/javasys'), ""),
+        // },
+        // '/dev-api/javasys/lowCode ': {
+        //   target: 'http://172.20.2.87:8112',
+        //   changeOrigin: true,
+        //   rewrite: (path) =>
+        //     path.replace(new RegExp("^" + '/dev-api/javasys/lowCode '), ""),
+        // }
+      }
+    },
+    plugins: [
+      vue(),
+      UnoCSS({
+        /* options */
+      }),
+      AutoImport({
+        // 自动导入 Vue 相关函数，如：ref, reactive, toRef 等
+        imports: ["vue", "@vueuse/core"],
+        //ignore: ['h'], // 自动添加 import { h } from '/node_modules/.vite/deps/vue.js 代码问题处理
+        eslintrc: {
+          enabled: false,
+          //  Default `false`
+          filepath: "./.eslintrc-auto-import.json",
+          // Default `./.eslintrc-auto-import.json`
+          globalsPropValue: true
+          // Default `true`, (true | false | 'readonly' | 'readable' | 'writable' | 'writeable')
+        },
+        resolvers: [
+          // 自动导入 Element Plus 相关函数，如：ElMessage, ElMessageBox... (带样式)
+          ElementPlusResolver(),
+          // 自动导入图标组件
+          IconsResolver({})
+        ],
+        vueTemplate: true,
+        // 是否在 vue 模板中自动导入
+        dts: path.resolve(pathSrc, "types", "auto-imports.d.ts")
+        //  自动导入组件类型声明文件位置，默认根目录; false 关闭自动生成
+      }),
+      Components({
+        resolvers: [
+          // 自动注册图标组件
+          IconsResolver({
+            enabledCollections: ["ep"]
+            //@iconify-json/ep 是 Element Plus 的图标库
+          }),
+          // 自动导入 Element Plus 组件
+          ElementPlusResolver()
+        ],
+        dts: path.resolve(pathSrc, "types", "components.d.ts")
+        //  自动导入组件类型声明文件位置，默认根目录; false 关闭自动生成
+      }),
+      Icons({
+        // 自动安装图标库
+        autoInstall: true
+      }),
+      createSvgIconsPlugin({
+        // 指定需要缓存的图标文件夹
+        iconDirs: [path.resolve(pathSrc, "assets/icons")],
+        // 指定symbolId格式
+        symbolId: "icon-[dir]-[name]"
+      })
+    ],
+    build: {
+      terserOptions: {
+        compress: {
+          drop_console: true
+          // 关闭所有的 console.log 打印
+        }
+      },
+      rollupOptions: {
+        plugins: [
+          terser({
+            compress: {
+              drop_console: true
+              // 关闭所有的 console.log 打印
+            }
+          })
+        ]
+      }
+    },
+    optimizeDeps: {
+      include: [
+        "vue",
+        "vue-router",
+        "pinia",
+        "axios",
+        "element-plus/es/components/form/style/css",
+        "element-plus/es/components/form-item/style/css",
+        "element-plus/es/components/button/style/css",
+        "element-plus/es/components/input/style/css",
+        "element-plus/es/components/input-number/style/css",
+        "element-plus/es/components/switch/style/css",
+        "element-plus/es/components/upload/style/css",
+        "element-plus/es/components/menu/style/css",
+        "element-plus/es/components/col/style/css",
+        "element-plus/es/components/icon/style/css",
+        "element-plus/es/components/row/style/css",
+        "element-plus/es/components/tag/style/css",
+        "element-plus/es/components/dialog/style/css",
+        "element-plus/es/components/loading/style/css",
+        "element-plus/es/components/radio/style/css",
+        "element-plus/es/components/radio-group/style/css",
+        "element-plus/es/components/popover/style/css",
+        "element-plus/es/components/scrollbar/style/css",
+        "element-plus/es/components/tooltip/style/css",
+        "element-plus/es/components/dropdown/style/css",
+        "element-plus/es/components/dropdown-menu/style/css",
+        "element-plus/es/components/dropdown-item/style/css",
+        "element-plus/es/components/sub-menu/style/css",
+        "element-plus/es/components/menu-item/style/css",
+        "element-plus/es/components/divider/style/css",
+        "element-plus/es/components/card/style/css",
+        "element-plus/es/components/link/style/css",
+        "element-plus/es/components/breadcrumb/style/css",
+        "element-plus/es/components/breadcrumb-item/style/css",
+        "element-plus/es/components/table/style/css",
+        "element-plus/es/components/tree-select/style/css",
+        "element-plus/es/components/table-column/style/css",
+        "element-plus/es/components/select/style/css",
+        "element-plus/es/components/option/style/css",
+        "element-plus/es/components/pagination/style/css",
+        "element-plus/es/components/tree/style/css",
+        "element-plus/es/components/alert/style/css",
+        "@vueuse/core",
+        "path-to-regexp",
+        "echarts",
+        "@wangeditor/editor",
+        "@wangeditor/editor-for-vue",
+        "vue-i18n"
+      ]
+    }
+  };
+});
+export {
+  vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["vite.config.ts"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"E:\\\\f_pang\\\\object\\\\my_object_html\\\\ShutongInterconnectedChemicalCloudPlatform\";const __vite_injected_original_filename = \"E:\\\\f_pang\\\\object\\\\my_object_html\\\\ShutongInterconnectedChemicalCloudPlatform\\\\vite.config.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/vite.config.ts\";import vue from \"@vitejs/plugin-vue\";\r\n\r\nimport { UserConfig, ConfigEnv, loadEnv, defineConfig } from \"vite\";\r\n\r\nimport AutoImport from \"unplugin-auto-import/vite\";\r\nimport Components from \"unplugin-vue-components/vite\";\r\nimport { ElementPlusResolver } from \"unplugin-vue-components/resolvers\";\r\n\r\nimport Icons from \"unplugin-icons/vite\";\r\nimport IconsResolver from \"unplugin-icons/resolver\";\r\n\r\nimport { createSvgIconsPlugin } from \"vite-plugin-svg-icons\";\r\n\r\nimport UnoCSS from \"unocss/vite\";\r\n\r\nimport { terser } from 'rollup-plugin-terser';\r\n\r\nimport path from \"path\";\r\nconst pathSrc = path.resolve(__dirname, \"src\");\r\n\r\nexport default defineConfig(({ mode }: ConfigEnv): UserConfig => {\r\n  const env = loadEnv(mode, process.cwd());\r\n  return {\r\n    resolve: {\r\n      alias: {\r\n        \"@\": pathSrc,\r\n      },\r\n    },\r\n    css: {\r\n      // CSS \u9884\u5904\u7406\u5668\r\n      preprocessorOptions: {\r\n        //define global scss variable\r\n        scss: {\r\n          javascriptEnabled: true,\r\n          additionalData: `\r\n            @use \"@/styles/variables.scss\" as *;\r\n          `,\r\n        },\r\n      },\r\n    },\r\n    server: {\r\n      host: \"0.0.0.0\",\r\n      port: Number(env.VITE_APP_PORT),\r\n      open: true, // \u8FD0\u884C\u662F\u5426\u81EA\u52A8\u6253\u5F00\u6D4F\u89C8\u5668\r\n      proxy: {\r\n        // \u53CD\u5411\u4EE3\u7406\u89E3\u51B3\u8DE8\u57DF\r\n        [env.VITE_APP_BASE_API]: {\r\n          target: env.VITE_APP_BASE_URL, // \u7EBF\u4E0A\u63A5\u53E3\u5730\u5740\r\n          // target: \"http://vapi.youlai.tech\", // \u7EBF\u4E0A\u63A5\u53E3\u5730\u5740\r\n          // target: 'http://localhost:8989',  // \u672C\u5730\u63A5\u53E3\u5730\u5740 , \u540E\u7AEF\u5DE5\u7A0B\u4ED3\u5E93\u5730\u5740\uFF1Ahttps://gitee.com/youlaiorg/youlai-boot\r\n          changeOrigin: true,\r\n          rewrite: (path) =>\r\n            path.replace(new RegExp(\"^\" + env.VITE_APP_BASE_API), \"\"), // \u66FF\u6362 /dev-api \u4E3A target \u63A5\u53E3\u5730\u5740\r\n        },\r\n        // '/dev-api/kpiapi': {\r\n        //   target: 'http://127.0.0.1:6666',\r\n        //   changeOrigin: true,\r\n        //   rewrite: (path) =>\r\n        //     path.replace(new RegExp(\"^\" + '/dev-api/kpiapi'), \"\"),\r\n        // },\r\n\r\n        // '/dev-api/systemapi': {\r\n        //   target: 'http://127.0.0.1:17777',\r\n        //   changeOrigin: true,\r\n        //   rewrite: (path) =>\r\n        //     path.replace(new RegExp(\"^\" + '/dev-api/systemapi'), \"\"),\r\n        // },\r\n        // '/dev-api/hrapi': {\r\n        //   target: 'http://127.0.0.1:39168',\r\n        //   changeOrigin: true,\r\n        //   rewrite: (path) =>\r\n        //     path.replace(new RegExp(\"^\" + '/dev-api/hrapi'), \"\"),\r\n        // },\r\n        // '/dev-api/api': {\r\n        //   target: 'http://127.0.0.1:8888',\r\n        //   changeOrigin: true,\r\n        //   rewrite: (path) =>\r\n        //     path.replace(new RegExp(\"^\" + '/dev-api/api'), \"\"),\r\n        // },\r\n        // '/dev-api/javasys': {\r\n        //   target: 'http://172.20.2.87:8111',\r\n        //   changeOrigin: true,\r\n        //   rewrite: (path) =>\r\n        //     path.replace(new RegExp(\"^\" + '/dev-api/javasys'), \"\"),\r\n        // },\r\n        // '/dev-api/javasys/lowCode ': {\r\n        //   target: 'http://172.20.2.87:8112',\r\n        //   changeOrigin: true,\r\n        //   rewrite: (path) =>\r\n        //     path.replace(new RegExp(\"^\" + '/dev-api/javasys/lowCode '), \"\"),\r\n        // }\r\n      },\r\n    },\r\n\r\n    plugins: [\r\n\r\n      vue(),\r\n      UnoCSS({\r\n        /* options */\r\n      }),\r\n      AutoImport({\r\n        // \u81EA\u52A8\u5BFC\u5165 Vue \u76F8\u5173\u51FD\u6570\uFF0C\u5982\uFF1Aref, reactive, toRef \u7B49\r\n        imports: [\"vue\", \"@vueuse/core\"],\r\n        //ignore: ['h'], // \u81EA\u52A8\u6DFB\u52A0 import { h } from '/node_modules/.vite/deps/vue.js \u4EE3\u7801\u95EE\u9898\u5904\u7406\r\n        eslintrc: {\r\n          enabled: false, //  Default `false`\r\n          filepath: \"./.eslintrc-auto-import.json\", // Default `./.eslintrc-auto-import.json`\r\n          globalsPropValue: true, // Default `true`, (true | false | 'readonly' | 'readable' | 'writable' | 'writeable')\r\n        },\r\n        resolvers: [\r\n          // \u81EA\u52A8\u5BFC\u5165 Element Plus \u76F8\u5173\u51FD\u6570\uFF0C\u5982\uFF1AElMessage, ElMessageBox... (\u5E26\u6837\u5F0F)\r\n          ElementPlusResolver(),\r\n          // \u81EA\u52A8\u5BFC\u5165\u56FE\u6807\u7EC4\u4EF6\r\n          IconsResolver({}),\r\n        ],\r\n        vueTemplate: true, // \u662F\u5426\u5728 vue \u6A21\u677F\u4E2D\u81EA\u52A8\u5BFC\u5165\r\n        dts: path.resolve(pathSrc, \"types\", \"auto-imports.d.ts\"), //  \u81EA\u52A8\u5BFC\u5165\u7EC4\u4EF6\u7C7B\u578B\u58F0\u660E\u6587\u4EF6\u4F4D\u7F6E\uFF0C\u9ED8\u8BA4\u6839\u76EE\u5F55; false \u5173\u95ED\u81EA\u52A8\u751F\u6210\r\n      }),\r\n\r\n      Components({\r\n        resolvers: [\r\n          // \u81EA\u52A8\u6CE8\u518C\u56FE\u6807\u7EC4\u4EF6\r\n          IconsResolver({\r\n            enabledCollections: [\"ep\"], //@iconify-json/ep \u662F Element Plus \u7684\u56FE\u6807\u5E93\r\n          }),\r\n          // \u81EA\u52A8\u5BFC\u5165 Element Plus \u7EC4\u4EF6\r\n          ElementPlusResolver(),\r\n        ],\r\n        dts: path.resolve(pathSrc, \"types\", \"components.d.ts\"), //  \u81EA\u52A8\u5BFC\u5165\u7EC4\u4EF6\u7C7B\u578B\u58F0\u660E\u6587\u4EF6\u4F4D\u7F6E\uFF0C\u9ED8\u8BA4\u6839\u76EE\u5F55; false \u5173\u95ED\u81EA\u52A8\u751F\u6210\r\n      }),\r\n\r\n      Icons({\r\n        // \u81EA\u52A8\u5B89\u88C5\u56FE\u6807\u5E93\r\n        autoInstall: true,\r\n      }),\r\n\r\n      createSvgIconsPlugin({\r\n        // \u6307\u5B9A\u9700\u8981\u7F13\u5B58\u7684\u56FE\u6807\u6587\u4EF6\u5939\r\n        iconDirs: [path.resolve(pathSrc, \"assets/icons\")],\r\n        // \u6307\u5B9AsymbolId\u683C\u5F0F\r\n        symbolId: \"icon-[dir]-[name]\",\r\n      }),\r\n    ],\r\n    build: {\r\n      terserOptions: {\r\n        compress: {\r\n          drop_console: true, // \u5173\u95ED\u6240\u6709\u7684 console.log \u6253\u5370\r\n        },\r\n      },\r\n      rollupOptions: {\r\n        plugins: [\r\n          terser({\r\n            compress: {\r\n              drop_console: true, // \u5173\u95ED\u6240\u6709\u7684 console.log \u6253\u5370\r\n            },\r\n          }),\r\n        ],\r\n      },\r\n    },\r\n    optimizeDeps: {\r\n      include: [\r\n        \"vue\",\r\n        \"vue-router\",\r\n        \"pinia\",\r\n        \"axios\",\r\n        \"element-plus/es/components/form/style/css\",\r\n        \"element-plus/es/components/form-item/style/css\",\r\n        \"element-plus/es/components/button/style/css\",\r\n        \"element-plus/es/components/input/style/css\",\r\n        \"element-plus/es/components/input-number/style/css\",\r\n        \"element-plus/es/components/switch/style/css\",\r\n        \"element-plus/es/components/upload/style/css\",\r\n        \"element-plus/es/components/menu/style/css\",\r\n        \"element-plus/es/components/col/style/css\",\r\n        \"element-plus/es/components/icon/style/css\",\r\n        \"element-plus/es/components/row/style/css\",\r\n        \"element-plus/es/components/tag/style/css\",\r\n        \"element-plus/es/components/dialog/style/css\",\r\n        \"element-plus/es/components/loading/style/css\",\r\n        \"element-plus/es/components/radio/style/css\",\r\n        \"element-plus/es/components/radio-group/style/css\",\r\n        \"element-plus/es/components/popover/style/css\",\r\n        \"element-plus/es/components/scrollbar/style/css\",\r\n        \"element-plus/es/components/tooltip/style/css\",\r\n        \"element-plus/es/components/dropdown/style/css\",\r\n        \"element-plus/es/components/dropdown-menu/style/css\",\r\n        \"element-plus/es/components/dropdown-item/style/css\",\r\n        \"element-plus/es/components/sub-menu/style/css\",\r\n        \"element-plus/es/components/menu-item/style/css\",\r\n        \"element-plus/es/components/divider/style/css\",\r\n        \"element-plus/es/components/card/style/css\",\r\n        \"element-plus/es/components/link/style/css\",\r\n        \"element-plus/es/components/breadcrumb/style/css\",\r\n        \"element-plus/es/components/breadcrumb-item/style/css\",\r\n        \"element-plus/es/components/table/style/css\",\r\n        \"element-plus/es/components/tree-select/style/css\",\r\n        \"element-plus/es/components/table-column/style/css\",\r\n        \"element-plus/es/components/select/style/css\",\r\n        \"element-plus/es/components/option/style/css\",\r\n        \"element-plus/es/components/pagination/style/css\",\r\n        \"element-plus/es/components/tree/style/css\",\r\n        \"element-plus/es/components/alert/style/css\",\r\n        \"@vueuse/core\",\r\n\r\n        \"path-to-regexp\",\r\n        \"echarts\",\r\n        \"@wangeditor/editor\",\r\n        \"@wangeditor/editor-for-vue\",\r\n        \"vue-i18n\",\r\n      ],\r\n    },\r\n  };\r\n});\r\n"],
  "mappings": ";AAA0Z,OAAO,SAAS;AAE1a,SAAgC,SAAS,oBAAoB;AAE7D,OAAO,gBAAgB;AACvB,OAAO,gBAAgB;AACvB,SAAS,2BAA2B;AAEpC,OAAO,WAAW;AAClB,OAAO,mBAAmB;AAE1B,SAAS,4BAA4B;AAErC,OAAO,YAAY;AAEnB,SAAS,cAAc;AAEvB,OAAO,UAAU;AAjBjB,IAAM,mCAAmC;AAkBzC,IAAM,UAAU,KAAK,QAAQ,kCAAW,KAAK;AAE7C,IAAO,sBAAQ,aAAa,CAAC,EAAE,KAAK,MAA6B;AAC/D,QAAM,MAAM,QAAQ,MAAM,QAAQ,IAAI,CAAC;AACvC,SAAO;AAAA,IACL,SAAS;AAAA,MACP,OAAO;AAAA,QACL,KAAK;AAAA,MACP;AAAA,IACF;AAAA,IACA,KAAK;AAAA;AAAA,MAEH,qBAAqB;AAAA;AAAA,QAEnB,MAAM;AAAA,UACJ,mBAAmB;AAAA,UACnB,gBAAgB;AAAA;AAAA;AAAA,QAGlB;AAAA,MACF;AAAA,IACF;AAAA,IACA,QAAQ;AAAA,MACN,MAAM;AAAA,MACN,MAAM,OAAO,IAAI,aAAa;AAAA,MAC9B,MAAM;AAAA;AAAA,MACN,OAAO;AAAA;AAAA,QAEL,CAAC,IAAI,iBAAiB,GAAG;AAAA,UACvB,QAAQ,IAAI;AAAA;AAAA;AAAA;AAAA,UAGZ,cAAc;AAAA,UACd,SAAS,CAACA,UACRA,MAAK,QAAQ,IAAI,OAAO,MAAM,IAAI,iBAAiB,GAAG,EAAE;AAAA;AAAA,QAC5D;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,MAsCF;AAAA,IACF;AAAA,IAEA,SAAS;AAAA,MAEP,IAAI;AAAA,MACJ,OAAO;AAAA;AAAA,MAEP,CAAC;AAAA,MACD,WAAW;AAAA;AAAA,QAET,SAAS,CAAC,OAAO,cAAc;AAAA;AAAA,QAE/B,UAAU;AAAA,UACR,SAAS;AAAA;AAAA,UACT,UAAU;AAAA;AAAA,UACV,kBAAkB;AAAA;AAAA,QACpB;AAAA,QACA,WAAW;AAAA;AAAA,UAET,oBAAoB;AAAA;AAAA,UAEpB,cAAc,CAAC,CAAC;AAAA,QAClB;AAAA,QACA,aAAa;AAAA;AAAA,QACb,KAAK,KAAK,QAAQ,SAAS,SAAS,mBAAmB;AAAA;AAAA,MACzD,CAAC;AAAA,MAED,WAAW;AAAA,QACT,WAAW;AAAA;AAAA,UAET,cAAc;AAAA,YACZ,oBAAoB,CAAC,IAAI;AAAA;AAAA,UAC3B,CAAC;AAAA;AAAA,UAED,oBAAoB;AAAA,QACtB;AAAA,QACA,KAAK,KAAK,QAAQ,SAAS,SAAS,iBAAiB;AAAA;AAAA,MACvD,CAAC;AAAA,MAED,MAAM;AAAA;AAAA,QAEJ,aAAa;AAAA,MACf,CAAC;AAAA,MAED,qBAAqB;AAAA;AAAA,QAEnB,UAAU,CAAC,KAAK,QAAQ,SAAS,cAAc,CAAC;AAAA;AAAA,QAEhD,UAAU;AAAA,MACZ,CAAC;AAAA,IACH;AAAA,IACA,OAAO;AAAA,MACL,eAAe;AAAA,QACb,UAAU;AAAA,UACR,cAAc;AAAA;AAAA,QAChB;AAAA,MACF;AAAA,MACA,eAAe;AAAA,QACb,SAAS;AAAA,UACP,OAAO;AAAA,YACL,UAAU;AAAA,cACR,cAAc;AAAA;AAAA,YAChB;AAAA,UACF,CAAC;AAAA,QACH;AAAA,MACF;AAAA,IACF;AAAA,IACA,cAAc;AAAA,MACZ,SAAS;AAAA,QACP;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QAEA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF,CAAC;",
  "names": ["path"]
}
