From ca779aa8790e5e9c6498fa892367bfeb22042596 Mon Sep 17 00:00:00 2001
From: han2015 <1019850453@qq.com>
Date: Wed, 25 Feb 2026 09:55:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=86=E7=BB=84=EF=BC=9A=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E9=85=8D=E7=BD=AE=E5=8D=95=E5=85=83=E6=A0=BC=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/app/cardPage.vue    |  2 +-
 src/components/DesignForm/app/gannttPage.vue  |  2 +-
 src/components/DesignForm/app/groupPage.vue   | 25 +++++++++++++------
 src/components/DesignForm/app/index.vue       |  4 ++-
 src/components/DesignForm/app/mapPage.vue     |  2 +-
 src/components/DesignForm/app/timeAxis.vue    |  2 +-
 .../DesignForm/tableListPage/index.vue        |  2 +-
 .../appPage/appPageForm/pageList.vue          | 16 +++++++++---
 8 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/src/components/DesignForm/app/cardPage.vue b/src/components/DesignForm/app/cardPage.vue
index cf458c0..72e662b 100644
--- a/src/components/DesignForm/app/cardPage.vue
+++ b/src/components/DesignForm/app/cardPage.vue
@@ -290,7 +290,7 @@ const lookPageInfo = (val:any) => {
 }
 </script>
 <template>
-	<div>
+	<div id="special-table-container">
 		<el-row :gutter="20">
 			
 			<el-col  v-for="item in cardDataList" :key="item.id" :span="lineRanks"  class="cardBox">
diff --git a/src/components/DesignForm/app/gannttPage.vue b/src/components/DesignForm/app/gannttPage.vue
index 2de70a1..d9d847f 100644
--- a/src/components/DesignForm/app/gannttPage.vue
+++ b/src/components/DesignForm/app/gannttPage.vue
@@ -24,7 +24,7 @@ const props = defineProps({
 });
 </script>
 <template>
-	<div>
+	<div id="special-table-container">
 		{{viewSetup}}
 	</div>
 </template>
diff --git a/src/components/DesignForm/app/groupPage.vue b/src/components/DesignForm/app/groupPage.vue
index 230af6d..c8d8ed8 100644
--- a/src/components/DesignForm/app/groupPage.vue
+++ b/src/components/DesignForm/app/groupPage.vue
@@ -105,7 +105,7 @@ const spanMap = computed(() => {
   return map
 })
 
-
+// 支持合并表单
 const objectSpanMethod = ({ row, column, rowIndex, columnIndex }) => {
   const key = column.property
   
@@ -153,6 +153,19 @@ const getPageData=async ()=>{
 }
 
 onMounted(()=>{
+  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
+      }
+    });
+
+    selectedMergeKeys.value=Array.from(columnSortData.keys())
+  }
+  
+
   nextTick(()=>{
 		getPageData()
 	})
@@ -165,13 +178,11 @@ defineExpose({
 
 </script>
 <template>
-	<div>
-		<el-row :gutter="20">
+	<div id="special-table-container">
+		<el-row :gutter="20" >
       <el-table
         :data="tableDataList"
         :span-method="objectSpanMethod"
-        @sort-change="onUpdateSort"
-        :header-cell-class-name="setHeaderClass"
         border
       >
         <template v-for="item in columnsFilter" :key="item.id || item.label">
@@ -210,7 +221,6 @@ defineExpose({
             :label="item.label"
             :min-width="(item.label?.length || 2) * 15 + 30"
             header-align="center"
-            sortable="custom"
             align="center"
           >
             <template #default="scope">
@@ -246,7 +256,6 @@ defineExpose({
             config=""
             :min-width="(item.label?.length || 2) * 15 + 30"
             header-align="center"
-            sortable="custom"
             align="center"
           >
             <template v-if="item.fieldClass == 'associatedForms'" #default="scope">
@@ -270,7 +279,7 @@ defineExpose({
 			<el-pagination
 				v-model:current-page="props.searchSend.page"
 				v-model:page-size="pageSize"
-				:page-sizes="[3, 9, 12, 30, 50, 100]"
+				:page-sizes="[30, 50, 100]"
 				:background="true"
 				layout="total, sizes, prev, pager, next, jumper"
 				:total="totalNum"
diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue
index 85fe6c9..1fff451 100644
--- a/src/components/DesignForm/app/index.vue
+++ b/src/components/DesignForm/app/index.vue
@@ -1734,7 +1734,9 @@ const recallSendMsg = (val: any) => {
 //html 标签全屏操作，只支持现代浏览器
 const enterFullScreen=()=>{
   const docEl= document.getElementById("special-table-container");
+  
   if(docEl){
+    docEl.style.backgroundColor = '#ffffff';
     //支持多种浏览器
     if (docEl.requestFullscreen) {
       docEl.requestFullscreen();
@@ -2558,7 +2560,7 @@ const isObject = (obj: any) => {
           :columns-filter="columnsFilter"
           :body-hight="265"
           :drawer-with="drawerWith"
-          :view-setup="viewPage.date"
+          :view-setup="viewPage.group"
         />
       </el-col>
       <el-col v-if="viewType == 2" :span="24">
diff --git a/src/components/DesignForm/app/mapPage.vue b/src/components/DesignForm/app/mapPage.vue
index 4d4b3ce..e4603ee 100644
--- a/src/components/DesignForm/app/mapPage.vue
+++ b/src/components/DesignForm/app/mapPage.vue
@@ -173,7 +173,7 @@ const currentChange = (current: number) => {
 }
 </script>
 <template>
-	<div>
+	<div id="special-table-container">
 		<div id="pickMapView" :ref="mapId" class="openMapView"></div>
 		<div class="mapPage">
 			<el-pagination layout="prev, pager, next" :total="totalNum" @current-change="currentChange" />
diff --git a/src/components/DesignForm/app/timeAxis.vue b/src/components/DesignForm/app/timeAxis.vue
index e831d97..0cecbd1 100644
--- a/src/components/DesignForm/app/timeAxis.vue
+++ b/src/components/DesignForm/app/timeAxis.vue
@@ -217,7 +217,7 @@ const writeListTitle = (val:any) => {
 }
 </script>
 <template>
-	<ul v-infinite-scroll="loadTimeLog" class="infinite-list" :infinite-scroll-disabled="timeDisabled">
+	<ul v-infinite-scroll="loadTimeLog" class="infinite-list" :infinite-scroll-disabled="timeDisabled" id="special-table-container">
 		
 
 		<el-timeline :reverse="true" class="timeLineStyle" >
diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue
index 5eacb88..d201337 100644
--- a/src/components/DesignForm/tableListPage/index.vue
+++ b/src/components/DesignForm/tableListPage/index.vue
@@ -1878,7 +1878,7 @@ const isObject = (obj: any) => {
               >
                 <el-button
                   size="small"
-                  class="fa fa-table"
+                  class="fa fa-list"
                   :color="
                     props.viewPage.group && props.viewPage.group.isClick ? '#a0cfff' : ''
                   "
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
index e4c03e1..6bdf2ed 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
@@ -41,6 +41,7 @@ import {
 } from "@/api/displayboardapi/indexapi";
 
 import Sortable from "sortablejs";
+
 //引入子组件
 import PageListHeadTools from "@/views/sysworkflow/lowcodepage/pageListHeadToolsApp.vue";
 import ControlSetup from "@/views/sysworkflow/lowcodepage/pageSetUpDialog/controlSetup.vue";
@@ -172,6 +173,7 @@ const state = reactive({
       isClick: false,
       form: {
         title: [],
+        sort: 1,
       },
     },
     date: {
@@ -321,6 +323,7 @@ const jieForm = () => {
 */
 onMounted(() => {
   jieForm();
+  
   nextTick(() => {
     gainFormTableKeyWord(props.appPageKey.toString());
   });
@@ -2353,20 +2356,27 @@ const delAllPick = () => {
                   :model="state.view.group.form"
                   style="max-width: 600px"
                 >
-                  <el-form-item label="标题字段">
+                  <el-form-item label="排序分组字段">
                     <el-select
+                      ref="groupsorter" 
                       v-model="state.view.group.form.title"
                       multiple
-                      placeholder="请选择标题字段"
+                      placeholder="请选择分组字段"
                     >
                       <el-option
                         v-for="item in allKeyWords"
-                        :key="item.value"
+                        :key="item"
                         :label="item.label"
                         :value="item.value"
                       />
                     </el-select>
                   </el-form-item>
+                  <el-form-item label="排序方式">
+                    <el-radio-group v-model="state.view.group.form.sort">
+                      <el-radio :label="1">降序</el-radio>
+                      <el-radio :label="2">升序</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
                 </el-form> 
               </div>
             </el-collapse-item>

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 2/2] =?UTF-8?q?=E5=88=86=E7=BB=84=EF=BC=9A=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E5=A4=9A=E4=B8=AAform=E6=95=B0=E6=8D=AE=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=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;