From 260fc95ee0430d0b08ca5fcf611825bde6d74932 Mon Sep 17 00:00:00 2001
From: han2015 <1019850453@qq.com>
Date: Thu, 26 Feb 2026 11:15:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=BB=84=EF=BC=9A=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AAform=E6=95=B0=E6=8D=AE=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/app/groupPage.vue | 36 +++++++++++++++------
 src/components/DesignForm/app/index.vue     |  2 +-
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/components/DesignForm/app/groupPage.vue b/src/components/DesignForm/app/groupPage.vue
index c8d8ed8..e5a7630 100644
--- a/src/components/DesignForm/app/groupPage.vue
+++ b/src/components/DesignForm/app/groupPage.vue
@@ -60,7 +60,6 @@ const onUpdateSort = (data: { prop: string; order: "ascending" | "descending" |
     columnSortData.delete(data.prop);
   }
 
-  selectedMergeKeys.value=Array.from(columnSortData.keys())
   getPageData();
 }
 
@@ -68,7 +67,7 @@ const onUpdateSort = (data: { prop: string; order: "ascending" | "descending" |
 const spanMap = computed(() => {
   const map = {}
   const pos = {}
-
+  selectedMergeKeys.value=Array.from(columnSortData.keys())
   // 按优先级排序的合并列，获取排序列
   selectedMergeKeys.value.forEach((key, index) => {
     map[key] = []
@@ -152,19 +151,39 @@ const getPageData=async ()=>{
 	})
 }
 
+const tableChildren = (field:string,dataList:any) => {
+  let jieguo = ""
+  if(Array.isArray(dataList)){
+    dataList.forEach((item) => {
+      if(typeof(item)=="object"){
+          for (let key in item) {
+            if (field == key){
+              if(jieguo!=""){
+                jieguo = jieguo+"<div style='width: 100%;height: 1px;border-bottom: 1px solid #EBEEF5; margin: 8px 0;'></div>"+item[key]
+              }else{
+                jieguo = item[key]
+              }
+              
+            }
+          }
+      }
+    })
+  }
+  return jieguo
+}
+
 onMounted(()=>{
+  columnSortData.clear()
+  //处理默认分组
   if(props.viewSetup.form.title&&props.viewSetup.form.title.length){
     props.viewSetup.form.title.forEach(ele => {
       if(props.viewSetup.form.sort==2){
         columnSortData.set(ele, "");  
       }else{
-        columnSortData.set(ele,'DESC');   //默认asc
+        columnSortData.set(ele,'DESC');   //默认desc
       }
     });
-
-    selectedMergeKeys.value=Array.from(columnSortData.keys())
   }
-  
 
   nextTick(()=>{
 		getPageData()
@@ -175,7 +194,6 @@ defineExpose({
 	groupColumnSearch
 })
 
-
 </script>
 <template>
 	<div id="special-table-container">
@@ -225,9 +243,9 @@ defineExpose({
           >
             <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)">
+                <el-table-column  v-if="sunItem.fieldClass == ''" :prop="sunItem.field" :label="sunItem.label"  header-align="center"  align="center" :min-width="(sunItem.label?.length || 2) * 15 + 30">
                   <template #default="scopeChilder">
-                    {{scopeChilder.row[item.field]}}
+                    <div v-html="tableChildren(sunItem.field,scopeChilder.row[item.field])"></div> 
                   </template>
                 </el-table-column>
               </template>
diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue
index 1fff451..4f177c5 100644
--- a/src/components/DesignForm/app/index.vue
+++ b/src/components/DesignForm/app/index.vue
@@ -966,6 +966,7 @@ watch(
 watch(
   () => props.formId,
   (val: any) => {
+    searchSend.formId=props.formId;
     tabsView(props.viewPage.list, 1)
     getPageData();
   },
@@ -1030,7 +1031,6 @@ const getPageData = () => {
       break;
     case 8: //group 分组页面
       nextTick(() => {
-        console.log("获取列表详细信息-------222---------->??????",);
         groupPageRef.value.groupColumnSearch(sendData, 1);
       });
       break;