From 94f29ed40f7adde4dd991f5d52a17ffa144bffe3 Mon Sep 17 00:00:00 2001
From: herenshan112 <hreenshan112@163.com>
Date: Tue, 10 Mar 2026 11:32:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E8=BD=A9=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/formControlAttr.vue |   2 +-
 .../DesignForm/formControlPropertiNew.vue     |   2 +-
 .../DesignForm/public/expand/lowcodeImage.vue |   3 +-
 .../DesignForm/public/form/formItem.vue       |   6 +-
 .../appPage/appPageForm/pageFormNew.vue       |   6 +
 .../appPageForm/unitsPageFrom/attribute.vue   | 455 +++++++++++++++++-
 6 files changed, 456 insertions(+), 18 deletions(-)

diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index 98dab81..8d3c5b4 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -1832,7 +1832,7 @@ const append = (data: Tree) => {
 };
 
 const remove = (node: Node, data: Tree) => {
-  let really = confirm("确认删除吗?\n将删除本节点与本节点的所有子孙节点!");
+  let really = confirm("确认删除吗?\n将删除本节点与本节点的所有子孙节点!3333");
   if (really) {
     const parent = node.parent;
     const children: Tree[] = parent.data.children || parent.data;
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 3717997..f44819d 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -2328,7 +2328,7 @@ const append = (data: Tree) => {
 };
 
 const remove = (node: Node, data: Tree) => {
-  let really = confirm("确认删除吗?\n将删除本节点与本节点的所有子孙节点!");
+  let really = confirm("确认删除吗?\n将删除本节点与本节点的所有子孙节点!2222");
   if (really) {
     const parent = node.parent;
     const children: Tree[] = parent.data.children || parent.data;
diff --git a/src/components/DesignForm/public/expand/lowcodeImage.vue b/src/components/DesignForm/public/expand/lowcodeImage.vue
index 9d09afd..97bb37b 100644
--- a/src/components/DesignForm/public/expand/lowcodeImage.vue
+++ b/src/components/DesignForm/public/expand/lowcodeImage.vue
@@ -7,7 +7,7 @@
 import {
   AnalysisCss,
   AnalysisInputCss,
-} from "@/components/DesignForm/public/form/calculate/cssInfo.ts";
+} from "@/components/DesignForm/public/form/calculate/cssInfo";
 import errimg from "@/assets/404_images/imgNotFound.png";
 import { uploadUrl, getRequest } from "@/api/DesignForm";
 import { ref,useAttrs } from 'vue'
@@ -309,6 +309,7 @@ const fit = computed(()=>{
 })
 </script>
 <template>
+
   <el-image
         v-if="(!hasELCard(ancestors))&&props.data.control.useDefaultImg&&props.type==5"
         :src="value"
diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue
index ae50705..a641b3d 100644
--- a/src/components/DesignForm/public/form/formItem.vue
+++ b/src/components/DesignForm/public/form/formItem.vue
@@ -25,9 +25,9 @@ import OrgCentent from "@/components/DesignForm/public/expand/org.vue";
 import LokOrgCentent from "@/widget/org/cont.vue";
 
 import DigitpagePage from "@/components/DesignForm/public/expand/digitpage.vue";
-import LowcodeImagePage from "@/components/DesignForm/public/expand/lowcodeImage.vue";
+// import LowcodeImagePage from "@/components/DesignForm/public/expand/lowcodeImage.vue";
 
-// import LowcodeImagePage from '@/widget/lowcodeimage/index.vue'
+import LowcodeImagePage from '@/widget/lowcodeimage/index.vue'
 
 import UploadPage from "@/components/DesignForm/public/expand/uploadPage.vue";
 import UploadPageList from "@/components/DesignForm/public/expand/uploadPageList.vue";
@@ -1118,7 +1118,7 @@ const diGuiJilian = (val: any, options: any[]) => {
 
 </script>
 <template>
-
+{{ data.type }}
   <BaiduMap
     v-if="judgeIsShow(data.name) && data.type === 'baidumap' && type != 4"
     :data="data"
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFormNew.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFormNew.vue
index 3e792fc..cdf2f4f 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFormNew.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFormNew.vue
@@ -394,6 +394,11 @@ const editAppFormTable = () => {
   editAppPageInfo(sendData)
     .then((data: any) => {
       state.value.loading = false;
+      if(data.code == 0){
+        ElMessage.success(data.msg)
+      }else{
+        ElMessage.error("编辑App自定义表单失败")
+      }
       // console.log("编辑App自定义表单--->",data)
       emits("update:formVersion", versionId.value.toString());
       gainTableForm();
@@ -429,6 +434,7 @@ const saveAppFormData = () => {
       // console.log("写入自建应用App表单--->",data)
       // appPageKey.value = data.data.customerFormCont.id
       // appPageKey.set(data.data.customerFormCont.id.toString())
+      ElMessage.success(data.msg)
       versionId.value = data.data.formVersion.id.toString();
       emits("update:formVersion", data.data.formVersion.id.toString());
       emits("update:appPageKey", data.data.customerFormCont.id.toString());
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/unitsPageFrom/attribute.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/unitsPageFrom/attribute.vue
index 392768d..fb9537a 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/unitsPageFrom/attribute.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/unitsPageFrom/attribute.vue
@@ -7,7 +7,7 @@
 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 { validateTextConfig, type ValidateTextTypes,scanTypes,transferDataSourceOptions }  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";
@@ -1991,6 +1991,7 @@ const lowcodeImageUploadSuccess = (
 const preFillDialogFlag = ref(false)
 const preFillDialogShow = () => {
   preFillDialogFlag.value = true
+  console.log("子表预填充设置----->",preFillDialogFlag.value)
 }
 
 const preFillDialogDetermine = () => {
@@ -2003,6 +2004,7 @@ const preFillDialogDetermine = () => {
 */
 const selectOrgConnectUserDialogFlag = ref(false)
 const showSelectOrgConnectUser = () => {
+    console.log("showSelectOrgConnectUser--------->",selectOrgConnectUserDialogFlag.value)
   selectOrgConnectUserDialogFlag.value = true
 }
 
@@ -3782,8 +3784,16 @@ const changeLabel = (node: TreeNode, data: Tree) => {
 const setNodeEnable = (node: TreeNode, data: Tree) => {
     const parent = node.parent;
     const children: Tree[] = parent.data.children || [parent.data];
+
+    console.log("设为可选/不可选------->",children)
+
     const index = children.findIndex((d) => d.id === data.id);
-    children[index].disabled = !children[index].disabled;
+
+    
+    if(children[index].disabled){
+        children[index].disabled = !children[index].disabled;
+    }
+    
     dataSource.value = [...dataSource.value];
 };
 /**
@@ -3792,7 +3802,7 @@ const setNodeEnable = (node: TreeNode, data: Tree) => {
 @ 功能: 删除节点
 */
 const remove = (node: TreeNode, data: Tree) => {
-    let really = confirm("确认删除吗?\n将删除本节点与本节点的所有子孙节点!");
+    let really = confirm("确认删除吗?\n将删除本节点与本节点的所有子孙节点!1111");
     if (really) {
         const parent = node.parent;
         const children: Tree[] = parent.data.children || [parent.data];
@@ -4935,14 +4945,14 @@ const expandUserNames = computed(()=>{
 })
                                                                                                                                                                                                   
 
-function findExpandUserNames(data:any) {
+function findExpandUserNames(data) {
     //console.log(data)
-    const result: never[][] = [];
+    const result = [];
     
     // 定义需要特殊处理的布局组件类型
     const layoutTypes = ['tabs', 'grid', 'card', 'div']; // 注意：flex不在这里面
     
-    function traverse(node:any, ancestors:any[]) {
+    function traverse(node, ancestors = []) {                                                                                                                                                                                   
         // 处理_custom包装的数据结构
         if (node && node._custom && node._custom.value) {
             node = node._custom.value;
@@ -4974,6 +4984,7 @@ function findExpandUserNames(data:any) {
             // 处理不同类型的组件
             if (layoutTypes.includes(node.type)) {
                 // 对于特殊布局组件，使用类型标志
+                console.log("ancestors----------------------->",ancestors)
                 const newAncestors = [...ancestors, node.type];
                 
                 switch (node.type) {
@@ -5590,6 +5601,425 @@ function getAfterLastColon(str:string) {
     // 截取最后一个冒号后面的字符（索引+1 开始到字符串结尾）
     return str.slice(lastColonIndex + 1);
 } 
+
+const xTree = 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
+    //console.log(currentCompId)
+    const treeC = mergeAndFilterAssociatedForms(datapropsformList, datab);
+    return treeC
+  }else{
+    return []
+  }
+})
+
+/**
+ * 合并两个组件树，仅保留type为table内的type为associatedForms的节点
+ * @param {Array} treeA - 组件树a，包含表单结构信息
+ * @param {Array} treeB - 组件树b，包含字段数据信息
+ * @returns {Array} - 合并后仅包含table内的associatedForms节点的组件树c
+ */
+function mergeAndFilterAssociatedForms(treeA, treeB) {
+  // 构建b树的映射，key为name（从id中提取），value为b树节点
+  const bMap = new Map();
+  
+  // 从b树中提取通用的parentId（假设所有节点有相同的parentId）
+  let commonParentId = null;
+  
+  // 从id中提取name：formField:30540:upload1765154030446 -> upload1765154030446
+  treeB.forEach(node => {
+    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 tableCount = 0;
+  let gridCount = 0;
+  let tabsCount = 0;
+  let divCount = 0;
+  let cardCount = 0;
+  
+  // 递归处理a树，仅保留table内的associatedForms节点
+  function processANode(node, parentId = commonParentId, isInTable = false) {
+    // 获取当前节点的name和type
+    const nodeName = node.name;
+    const nodeType = node.type;
+    
+    // 如果是table类型
+    if (nodeType === 'table') {
+      tableCount++;
+      
+      // 查找b树中对应的节点
+      let bNode = null;
+      if (nodeName && bMap.has(nodeName)) {
+        bNode = bMap.get(nodeName);
+        bMap.delete(nodeName);
+      }
+      
+      let cNode;
+      const tableLabel = `子表${node.item?.label || nodeName || tableCount}`;
+      
+      if (bNode) {
+        // 复制b节点的所有属性
+        cNode = { ...bNode };
+        // 确保children数组存在
+        if (!cNode.children) {
+          cNode.children = [];
+        }
+        // 使用b节点的parentId
+        cNode.parentId = bNode.parentId || parentId;
+        // 更新label
+        cNode.label = tableLabel;
+        // 更新treeAttrs.show
+        if (cNode.treeAttrs) {
+          cNode.treeAttrs.show = tableLabel;
+        } else {
+          cNode.treeAttrs = { show: tableLabel };
+        }
+        // 保留treeA中的name属性
+        cNode.name = nodeName;
+      } else {
+        // 如果b中不存在，则创建新节点
+        const id = nodeName ? `${commonParentId}:${nodeName}` : null;
+        cNode = {
+          id: id,
+          name: nodeName, // 保留treeA中的name属性
+          label: tableLabel,
+          parentId: parentId,
+          children: [],
+          value: id,
+          treeAttrs: {
+            show: tableLabel
+          },
+          disabled: false, // table类型即使叶子节点也可以选择
+          type: 'table'
+        };
+      }
+      
+      // 处理子组件，只在table内寻找associatedForms类型
+      let hasAssociatedForms = false;
+      if (node.list && Array.isArray(node.list)) {
+        const childNodes = [];
+        node.list.forEach(child => {
+          const processedChild = processANode(child, cNode.id, true); // 传递isInTable=true
+          if (processedChild) {
+            childNodes.push(processedChild);
+            hasAssociatedForms = true;
+          }
+        });
+        cNode.children = childNodes;
+      }
+      
+      // 如果table没有associatedForms子节点，则不保留table节点
+      if (!hasAssociatedForms) {
+        return null;
+      }
+      
+      return cNode;
+    }
+    
+    // 如果是associatedForms类型，且正在table内
+    if (nodeType === 'associatedForms' && isInTable) {
+      // 查找b树中对应的节点
+      let bNode = null;
+      if (nodeName && bMap.has(nodeName)) {
+        bNode = bMap.get(nodeName);
+        bMap.delete(nodeName); // 从map中删除，标记为已使用
+      }
+      
+      let cNode;
+      if (bNode) {
+        // 复制b节点的所有属性
+        cNode = { ...bNode };
+        // 确保children数组存在
+        if (!cNode.children) {
+          cNode.children = [];
+        }
+        // 使用b节点的parentId
+        cNode.parentId = bNode.parentId || parentId;
+        // 保留treeA中的name属性
+        cNode.name = nodeName;
+        
+        // 保留a节点中的配置属性
+        if (node.options && Array.isArray(node.options)) {
+          cNode.options = node.options;
+        }
+        
+        if (node.control) {
+          if (!cNode.control) {
+            cNode.control = {};
+          }
+          // 保留control中的相关属性
+          if (node.control.glxxsz) {
+            cNode.control.glxxsz = node.control.glxxsz;
+          }
+          if (node.control.modelValue !== undefined) {
+            cNode.control.modelValue = node.control.modelValue;
+          }
+        }
+        
+        if (node.config) {
+          cNode.config = node.config;
+        }
+      } else {
+        // 如果b中不存在，则创建新节点
+        const label = node.item?.label || nodeName || 'associatedForms';
+        const id = nodeName ? `${commonParentId}:${nodeName}` : null;
+        cNode = {
+          id: id,
+          name: nodeName, // 保留treeA中的name属性
+          label: label,
+          parentId: parentId,
+          children: [],
+          value: id,
+          treeAttrs: {
+            show: label
+          },
+          disabled: false, // associatedForms类型，叶子节点disabled为false
+          type: 'associatedForms'
+        };
+        
+        // 保留a节点中的配置属性
+        if (node.options && Array.isArray(node.options)) {
+          cNode.options = node.options;
+        }
+        
+        if (node.control) {
+          cNode.control = { ...node.control };
+        }
+        
+        if (node.config) {
+          cNode.config = { ...node.config };
+        }
+      }
+      
+      return cNode;
+    }
+    
+    // 其他容器类型，需要处理其子节点
+    const containerTypes = ['card', 'flex', 'div', 'grid', 'tabs'];
+    if (containerTypes.includes(nodeType)) {
+      // 创建一个容器节点占位符
+      let containerId;
+      let containerLabel;
+      
+      // 根据容器类型设置不同的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 'flex':
+          // 对于flex，查找b树中对应的节点
+          let bNode = null;
+          if (nodeName && bMap.has(nodeName)) {
+            bNode = bMap.get(nodeName);
+            bMap.delete(nodeName);
+          }
+          
+          if (bNode) {
+            containerId = bNode.id || `${commonParentId}:${nodeName}`;
+            containerLabel = `弹性布局${bNode.label || nodeName}`;
+          } else {
+            containerId = `${commonParentId}:${nodeName}`;
+            containerLabel = `弹性布局${node.item?.label || nodeName}`;
+          }
+          break;
+        default:
+          containerId = `${commonParentId}:${nodeName}`;
+          containerLabel = node.item?.label || nodeName || nodeType;
+      }
+      
+      // 创建容器节点
+      const containerNode = {
+        id: containerId,
+        name: nodeName, // 保留treeA中的name属性
+        label: containerLabel,
+        parentId: parentId,
+        children: [],
+        value: containerId,
+        treeAttrs: {
+          show: containerLabel
+        },
+        disabled: null, // 容器节点，非叶子节点
+        type: nodeType
+      };
+      
+      // 处理子组件
+      let hasValidChildren = false;
+      
+      if (nodeType === 'card' || nodeType === 'flex' || nodeType === 'div') {
+        // 这些类型的子组件在list中
+        if (node.list && Array.isArray(node.list)) {
+          const childNodes = [];
+          node.list.forEach(child => {
+            const processedChild = processANode(child, containerId, false);
+            if (processedChild) {
+              childNodes.push(processedChild);
+              hasValidChildren = true;
+            }
+          });
+          containerNode.children = childNodes;
+        }
+      } else if (nodeType === 'grid' || nodeType === 'tabs') {
+        // 这些类型的子组件在columns.list中
+        if (node.columns && Array.isArray(node.columns)) {
+          // 对于tabs，需要为每个column创建子节点
+          if (nodeType === 'tabs') {
+            const tabNodes = [];
+            node.columns.forEach((column, index) => {
+              // 为每个column创建一个节点
+              const columnId = `${containerId}:${column.label}`;
+              const columnNode = {
+                id: columnId,
+                name: column.label || `Tab${index + 1}`, // 使用column.label作为name
+                label: column.label || `Tab${index + 1}`,
+                parentId: containerId,
+                children: [],
+                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 = [];
+                column.list.forEach(child => {
+                  const processedChild = processANode(child, columnId, false);
+                  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 = [];
+            node.columns.forEach(column => {
+              if (column.list && Array.isArray(column.list)) {
+                column.list.forEach(child => {
+                  const processedChild = processANode(child, containerId, false);
+                  if (processedChild) {
+                    childNodes.push(processedChild);
+                    hasValidChildren = true;
+                  }
+                });
+              }
+            });
+            containerNode.children = childNodes;
+          }
+        }
+      }
+      
+      // 如果容器没有有效的子节点，则返回null
+      if (!hasValidChildren) {
+        // 对于flex，即使没有子节点也要保留（因为可以选择）
+        if (nodeType === 'flex') {
+          containerNode.disabled = false;
+          return containerNode;
+        }
+        return null;
+      }
+      
+      // 设置容器节点的disabled属性
+      // 对于flex，即使有子节点也可以选择，disabled为false
+      if (nodeType === 'flex') {
+        containerNode.disabled = false;
+      } else {
+        // 其他容器类型，有子节点为null，没有子节点为true
+        containerNode.disabled = null;
+      }
+      
+      return containerNode;
+    }
+    
+    // 其他非相关类型，直接返回null
+    return null;
+  }
+  
+  // 处理a树的所有根节点
+  const cTree = [];
+  treeA.forEach(rootNode => {
+    const processedNode = processANode(rootNode);
+    if (processedNode) {
+      cTree.push(processedNode);
+    }
+  });
+  
+  // 将b树中剩余的associatedForms元素（在a中不存在的）添加到c树中
+  // 注意：我们不知道这些associatedForms节点是否在table内，所以只添加那些可能在table内的节点
+  // 这里我们简单地从bMap中提取所有associatedForms类型的节点
+  bMap.forEach((bNode, nodeName) => {
+    if (bNode.type === 'associatedForms') {
+      // 保留b节点的原始结构
+      const newNode = { ...bNode };
+      
+      // 确保children数组存在
+      if (!newNode.children) {
+        newNode.children = [];
+      }
+      
+      // 设置disabled属性为false
+      newNode.disabled = false;
+      
+      // 添加name属性
+      newNode.name = nodeName;
+      
+      cTree.push(newNode);
+    }
+  });
+  
+  return cTree;
+}
+
 const asfsCurrentTable = computed(()=>{
     let currentTable: any[] = []
     let count = 0
@@ -6020,6 +6450,7 @@ const updataBase = (val: any) => {
                                     />
                                 </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"
@@ -6535,7 +6966,7 @@ const updataBase = (val: any) => {
                                     <el-button  size="small" style="margin-right: 12px;" @click="openDialog">
                                         批量导入
                                     </el-button>
-                                    <!-- <div style="width:100%; position: relative;  top: 6px; display: flex;">
+                                    <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>
@@ -6556,7 +6987,7 @@ const updataBase = (val: any) => {
                                         >
                                             <el-button  style="position: relative; top: -1px;right:-12px" @click="handelZdtcszDialog">矩阵填充设置</el-button>
                                         </div>
-                                    </div> -->
+                                    </div>
                                 </el-form-item>
                             </template>
                             <template v-else-if="controlData.config.optionsType === 3">
@@ -8081,7 +8512,7 @@ const updataBase = (val: any) => {
         :title="`矩阵填充设置--` + controlData.name"
         :show-close="false"
         style="margin-top: 70px"
-        width="50%"
+        width="700"
     >
         <div v-if="ZdtcszDialogFlag" style="width: 100%; display: flex; align-items: center; flex-wrap: nowrap; gap: 10px; padding: 8px 0;">
             <!-- 标题行文本 -->
@@ -8200,7 +8631,7 @@ const updataBase = (val: any) => {
         top="150px"
         style="margin-top: 70px"
     >
-        <!-- {{ expandUserComponentsTree }} -->
+        
         <el-tree-select
             v-if="controlData.type == 'orgCentent'"
             ref="treeSelectRef"
@@ -8262,7 +8693,7 @@ const updataBase = (val: any) => {
     >
         <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
+           <el-tree-select
                 v-model="controlData.control.preFill.asf"
                 style="width: 60%"
                 :data="asfsCurrentTable"
@@ -8276,7 +8707,7 @@ const updataBase = (val: any) => {
             style="width: 60%"
             @value-changed="tablePreFillValueChanged"
             :data="asfPropsData"
-            :ids = controlData.control.preFill.ids
+            :ids = "controlData.control.preFill?.ids?controlData.control.preFill.ids:[]"
           />
         </div>
         <template #footer>