From b402cf47d13430644ce6e700063d878e1f6a8334 Mon Sep 17 00:00:00 2001
From: han2015 <1019850453@qq.com>
Date: Wed, 4 Feb 2026 15:54:25 +0800
Subject: [PATCH 1/3] =?UTF-8?q?form=EF=BC=9A=E6=94=AF=E6=8C=81=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=B4=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/app/index.vue | 48 ++++++++++++++++++++++---
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue
index e3f3e8c..04be0e6 100644
--- a/src/components/DesignForm/app/index.vue
+++ b/src/components/DesignForm/app/index.vue
@@ -31,7 +31,7 @@ import {
 import type { FormInstance, FormRules } from "element-plus";
 import { ElLoading, ElMessage, ElNotification } from "element-plus";
 import html2canvas from "html2canvas";
-import JSZip, { forEach } from "jszip";
+import JSZip from "jszip";
 import { gainFormPageListCont } from "@/api/DesignForm/requestapi";
 import { Picture, InfoFilled, QuestionFilled } from "@element-plus/icons-vue";
 import request from "@/utils/request";
@@ -991,11 +991,19 @@ let asfQueryParams: any[] = [];
 @ 功能: 获取数据
 */
 const getPageData = () => {
+
+  // by han2015: 处理排序字段信息
+  let arr:string[]=[];
+  columnSortData.forEach((value, key) => {
+    arr.push(`${key} ${value}`)
+  });
+
   let sendData = {
     formId: props.formId,
     page: state.currentPage,
     pagesize: state.pageSize,
     searchData: json2string(props.searchData),
+    sortData: arr.join(", "),
   };
   // console.log("获取列表详细信息",sendData)
 
@@ -1025,6 +1033,7 @@ const getPageData = () => {
       break;
     default:
       state.loading = true;
+
       //by han2015, 抽成独立部分，方便其他功能调用
       doGainFormPageListCont(sendData)
         .then((datas) => {
@@ -1618,6 +1627,32 @@ const lookPageInfoIsShow = ref(false);
 const asflookPageInfoIsShow = ref(false);
 const pageInfoCont = ref<any>();
 
+//------------------ by han2015:  支持表单排序功能----------------------
+const columnSortData = new Map();
+const setHeaderClass=(params:any)=>{
+  if(columnSortData.has(params.column.property)){
+    if(columnSortData.get(params.column.property)=="DESC"){
+      params.column.order="descending"
+      return
+    }else{
+      params.column.order="ascending"
+      return
+    }
+  }
+}
+// by han2015: 列表支持表头排序
+const onUpdateSort = (data: { prop: string; order: "ascending" | "descending" | null }) => {
+  if (data.order === "descending") {
+    columnSortData.set(data.prop, "DESC");
+  } else if (data.order === "ascending") {
+    columnSortData.set(data.prop, "ASC");
+  } else {
+    columnSortData.delete(data.prop);
+  }
+  getPageData()
+}
+
+
 const lookPageInfo = (val: any) => {
   tablePageClass.value = 4;
   pageInfoCont.value = val;
@@ -2154,13 +2189,15 @@ const isObject = (obj: any) => {
       </el-col>
 
       <el-col v-if="viewType == 1" :span="24" class="tableTdClass">
-        
+        +++++++++++++++++++++
         <el-table
           v-bind="data.tableProps"
           ref="table"
           v-loading="state.loading"
           :data="tableDataList"
           table-layout="fixed"
+          @sort-change="onUpdateSort"
+          :header-cell-class-name="(params:any)=>{setHeaderClass(params)}"
           border
           @selection-change="selectionChange"
         >
@@ -2193,12 +2230,14 @@ const isObject = (obj: any) => {
                 {{ writeListTitle(scope.row, viewPage.list) }}
               </template>
             </el-table-column>
+            
             <el-table-column
               v-else-if="item.fieldClass == ''"
               :prop="item.field"
               :label="item.label"
               :min-width="readerColumnSun(item)"
               header-align="center"
+              sortable="custom"
               align="center"
             >
               <template #default="scope">
@@ -2214,7 +2253,7 @@ const isObject = (obj: any) => {
               </template>
             </el-table-column>
 
-
+           
             <el-table-column
               v-else-if="item.fieldClass == '__control'"
               :prop="item.field"
@@ -2373,6 +2412,7 @@ const isObject = (obj: any) => {
               config=""
               min-width="220"
                header-align="center"
+               sortable="custom"
               align="center"
             >
               <template v-if="item.help" #header="scope">
@@ -2423,7 +2463,7 @@ const isObject = (obj: any) => {
                   type="primary"
                   @click="showAsfDetailDialog(item, scope, asfQueryParams)"
                 >
-                  {{ scope.row[scope.column.property] }}==
+                  {{ scope.row[scope.column.property] }}
                 </el-link>
               </template>
             </el-table-column>

From b792d045a87a7d68b5ba8d159bb2fcd2d6f0e607 Mon Sep 17 00:00:00 2001
From: han2015 <1019850453@qq.com>
Date: Tue, 10 Feb 2026 16:16:18 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/DesignForm/tableButton.ts             |   6 +
 src/components/DesignForm/app/groupPage.vue   | 236 ++++++++++++++++++
 src/components/DesignForm/app/index.vue       |  54 +++-
 .../DesignForm/tableListPage/index.vue        |  18 ++
 src/directive/permission/button.ts            |  18 +-
 src/views/sysworkflow/lowCodeTasks/index.vue  |   7 +
 .../appPage/appPageForm/openAppFormPage.vue   |   9 +-
 .../appPage/appPageForm/pageList.vue          |  73 ++++++
 .../sysworkflow/lowcodepage/pageList.vue      |   1 +
 .../lowcodepage/runApp/runAppForm.vue         |   8 +
 10 files changed, 418 insertions(+), 12 deletions(-)
 create mode 100644 src/components/DesignForm/app/groupPage.vue

diff --git a/src/api/DesignForm/tableButton.ts b/src/api/DesignForm/tableButton.ts
index 346278d..7e6057a 100644
--- a/src/api/DesignForm/tableButton.ts
+++ b/src/api/DesignForm/tableButton.ts
@@ -382,6 +382,12 @@ export interface viewPageType {
 			}
 		}
 		,
+		group: {
+			status: boolean,
+			isClick: boolean,
+			form: {
+			},
+		},
 		time:{
 			status:boolean,
 			isClick:boolean,
diff --git a/src/components/DesignForm/app/groupPage.vue b/src/components/DesignForm/app/groupPage.vue
new file mode 100644
index 0000000..2dcd504
--- /dev/null
+++ b/src/components/DesignForm/app/groupPage.vue
@@ -0,0 +1,236 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-07-08 10:43:52
+@ 备注: 自定义应用时间轴视图
+-->
+<script lang='ts' setup>
+import { gainFormPageListCont } from '@/api/DesignForm/requestapi'
+
+const props = defineProps({
+	searchSend:{
+		type:Object,
+		default(){
+			return {}
+		}
+	},
+	viewSetup:{
+		type:Object,
+		default(){
+			return {}
+		}
+	},
+	columnsFilter:{
+		type:Object,
+		default(){
+			return {}
+		}
+	},
+	drawerWith:{
+		type:Number,
+		default:0
+	}
+});
+
+//---------pagination configs------
+const totalNum = ref(0)
+const pageSize = ref(props.searchSend.pagesize)
+
+
+//------------------ by han2015:  支持表单排序功能----------------------
+const columnSortData = new Map();
+const setHeaderClass=(params:any)=>{
+  if(columnSortData.has(params.column.property)){
+    if(columnSortData.get(params.column.property)=="DESC"){
+      params.column.order="descending"
+      return "sorted-desc"
+    }else{
+      params.column.order="ascending"
+      return "sorted-asc"
+    }
+  }
+  return ""
+}
+// by han2015: 列表支持表头排序
+const onUpdateSort = (data: { prop: string; order: "ascending" | "descending" | null }) => {
+  if (data.order === "descending") {
+    columnSortData.set(data.prop, "DESC");
+  } else if (data.order === "ascending") {
+    columnSortData.set(data.prop, "ASC");
+  } else {
+    columnSortData.delete(data.prop);
+  }
+  getPageData()
+}
+
+
+const tableDataList = ref([]) // 表格行数据
+
+const groupColumnSearch = (val:any,clas?:number) =>{
+  getPageData()
+}
+
+const handleSizeChange = (page: number) => {
+  // console.log("翻页操作",page)
+  pageSize.value = page;
+  getPageData();
+};
+const handleCurrentChange = (page: number) => {
+  props.searchSend.page = page
+  getPageData();
+};
+
+const getPageData=()=>{
+  // by han2015: 处理排序字段信息
+  let arr:string[]=[];
+  columnSortData.forEach((value, key) => {
+    arr.push(`${key} ${value}`)
+  });
+
+  let sendData = props.searchSend
+  sendData.sortData= arr.join(", ")
+  sendData.pagesize = 50
+  gainFormPageListCont(sendData)
+		.then(({data})=>{
+			totalNum.value = data.total
+      tableDataList.value = data.list
+	})
+}
+
+const spanMethod = (data: { row: any; rowIndex: number; column: TableColumnCtx<any>; columnIndex: number; }) => {
+  if(data.rowIndex==1){
+    console.log(data.column)
+  }
+  
+}
+
+
+onMounted(()=>{
+  nextTick(()=>{
+		getPageData()
+	})
+})
+
+defineExpose({
+	groupColumnSearch
+})
+
+</script>
+<template>
+	<div>
+		<el-row :gutter="20">
+      <el-table
+        :data="tableDataList"
+        :span-method="spanMethod"
+        @sort-change="onUpdateSort"
+        :header-cell-class-name="setHeaderClass"
+        border
+      >
+        <template v-for="item in columnsFilter" :key="item.id || item.label">
+          <el-table-column
+            v-if="['-'].includes(item.fieldClass)"
+            :type="item.type"
+            :prop="item.field"
+            :label="item.label"
+            config=""
+            width="60"
+            fixed
+              header-align="center"
+            align="center"
+          >
+            <template v-if="item.help" #header="scope">
+              {{ scope.column.label }}
+              <tooltip :content="item.help" />
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-else-if="item.fieldClass == '_lableTitle'"
+            label="标题"
+            config=""
+            min-width="90"
+            header-align="center"
+            align="center"
+          >
+            <template #default="scope">
+              {{ scope.row[scope.column.property] }}
+            </template>
+          </el-table-column>
+          
+          <el-table-column
+            v-else-if="item.fieldClass == ''"
+            :prop="item.field"
+            :label="item.label"
+            header-align="center"
+            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 #default="scopeChilder">
+                    {{scopeChilder.row[item.field]}}
+                  </template>
+                </el-table-column>
+              </template>
+            </template>
+          </el-table-column>
+
+          
+          <el-table-column
+            v-else-if="item.fieldClass == '__control'"
+            :prop="item.field"
+            :label="item.label"
+            config=""
+            min-width="1"
+              header-align="center"
+            align="center"
+            fixed="right"
+          >
+            
+          </el-table-column>
+
+
+          <el-table-column
+            v-else
+            :prop="item.field"
+            :label="item.label"
+            config=""
+            min-width="90"
+            header-align="center"
+            sortable="custom"
+            align="center"
+          >
+            <template v-if="item.fieldClass == 'associatedForms'" #default="scope">
+              <el-link
+                key="primary"
+                type="primary"
+              >
+                {{ scope.row[scope.column.property] }}
+              </el-link>
+            </template>
+            <template v-else #default="scope">
+               {{ scope.row[scope.column.property] }}
+            </template>
+
+          </el-table-column>
+        </template>
+        
+      </el-table>
+		</el-row>
+		<div class="pageBox">
+			<el-pagination
+				v-model:current-page="props.searchSend.page"
+				v-model:page-size="pageSize"
+				:page-sizes="[3, 9, 12, 30, 50, 100]"
+				:background="true"
+				layout="total, sizes, prev, pager, next, jumper"
+				:total="totalNum"
+				class="page"
+				@size-change="handleSizeChange"
+				@current-change="handleCurrentChange"
+			/>
+		</div>
+	</div>
+</template>
+<style  lang='scss' scoped>
+
+</style>
diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue
index 04be0e6..7069802 100644
--- a/src/components/DesignForm/app/index.vue
+++ b/src/components/DesignForm/app/index.vue
@@ -58,6 +58,7 @@ import NewTableFlow from "@/views/sysworkflow/lowcodepage/pageFlow/newTableFlow.
 import TimeAxisPage from "@/components/DesignForm/app/timeAxis.vue";
 import CardPage from "@/components/DesignForm/app/cardPage.vue";
 import GanttPageIng from "@/components/DesignForm/app/gannttPage.vue";
+import GroupPage from "@/components/DesignForm/app/groupPage.vue";
 import MapPage from "@/components/DesignForm/app/mapPage.vue";
 import CalendarPage from "@/components/DesignForm/app/calendar/calendar1/calendarPage.vue";
 import SearchSelect from "@/components/DesignForm/app/calendar/selectSearch.vue";
@@ -973,6 +974,7 @@ watch(
 );
 
 const timeAxisRef = ref(null);
+const groupPageRef = ref(null);
 const calendarPageRef = ref(null);
 const cardPageRef = ref(null);
 const searchSend = reactive({
@@ -1005,7 +1007,7 @@ const getPageData = () => {
     searchData: json2string(props.searchData),
     sortData: arr.join(", "),
   };
-  // console.log("获取列表详细信息",sendData)
+  console.log("获取列表详细信息??????",sendData)
 
   switch (viewType.value) {
     case 2:
@@ -1026,6 +1028,12 @@ const getPageData = () => {
       break;
     case 5:
       break;
+    case 8: //group 分组页面
+      nextTick(() => {
+        console.log("获取列表详细信息-------222---------->??????",);
+        groupPageRef.value.groupColumnSearch(sendData, 1);
+      });
+      break;
     case 6:
       nextTick(() => {
         cardPageRef.value.getCardList(sendData);
@@ -1766,6 +1774,7 @@ const tabsView = (val: any, types: number) => {
       props.viewPage.map.isClick = false;
       props.viewPage.card.isClick = false;
       props.viewPage.chart.isClick = false;
+      props.viewPage.group.isClick = false;
       break;
     case 3:
       props.viewPage.list.isClick = false;
@@ -1774,6 +1783,7 @@ const tabsView = (val: any, types: number) => {
       props.viewPage.map.isClick = false;
       props.viewPage.card.isClick = false;
       props.viewPage.chart.isClick = false;
+      props.viewPage.group.isClick = false;
       getPageData();
       break;
     case 4:
@@ -1783,6 +1793,7 @@ const tabsView = (val: any, types: number) => {
       props.viewPage.map.isClick = false;
       props.viewPage.card.isClick = false;
       props.viewPage.chart.isClick = false;
+      props.viewPage.group.isClick = false;
       break;
     case 5:
       props.viewPage.list.isClick = false;
@@ -1791,6 +1802,7 @@ const tabsView = (val: any, types: number) => {
       props.viewPage.gantt.isClick = false;
       props.viewPage.card.isClick = false;
       props.viewPage.chart.isClick = false;
+      props.viewPage.group.isClick = false;
       break;
     case 6:
       props.viewPage.list.isClick = false;
@@ -1799,6 +1811,7 @@ const tabsView = (val: any, types: number) => {
       props.viewPage.gantt.isClick = false;
       props.viewPage.map.isClick = false;
       props.viewPage.chart.isClick = false;
+      props.viewPage.group.isClick = false;
       break;
     case 7:
       props.viewPage.card.isClick = false;
@@ -1807,6 +1820,16 @@ const tabsView = (val: any, types: number) => {
       props.viewPage.time.isClick = false;
       props.viewPage.gantt.isClick = false;
       props.viewPage.map.isClick = false;
+      props.viewPage.group.isClick = false;
+      break;
+    case 8:
+      props.viewPage.card.isClick = false;
+      props.viewPage.list.isClick = false;
+      props.viewPage.date.isClick = false;
+      props.viewPage.time.isClick = false;
+      props.viewPage.gantt.isClick = false;
+      props.viewPage.map.isClick = false;
+      props.viewPage.chart.isClick = false;
       break;
     default:
       props.viewPage.date.isClick = false;
@@ -1815,6 +1838,7 @@ const tabsView = (val: any, types: number) => {
       props.viewPage.gantt.isClick = false;
       props.viewPage.map.isClick = false;
       props.viewPage.chart.isClick = false;
+      props.viewPage.group.isClick = false;
       break;
   }
 };
@@ -2113,6 +2137,23 @@ const isObject = (obj: any) => {
                   @click="tabsView(props.viewPage.card, 6)"
                 />
               </el-tooltip>
+              
+              <el-tooltip
+                v-if="props.viewPage.group && props.viewPage.group.status"
+                class="box-item"
+                effect="dark"
+                content="分组"
+                placement="top"
+              >
+                <el-button
+                  size="small"
+                  class="fa fa-list"
+                  :color="
+                    props.viewPage.group && props.viewPage.group.isClick ? '#a0cfff' : ''
+                  "
+                  @click="tabsView(props.viewPage.group, 8)"
+                />
+              </el-tooltip>
               <el-tooltip
                 v-if="viewPage.date.status"
                 class="box-item"
@@ -2189,7 +2230,6 @@ const isObject = (obj: any) => {
       </el-col>
 
       <el-col v-if="viewType == 1" :span="24" class="tableTdClass">
-        +++++++++++++++++++++
         <el-table
           v-bind="data.tableProps"
           ref="table"
@@ -2484,6 +2524,16 @@ const isObject = (obj: any) => {
           />
         </div>
       </el-col>
+      <el-col v-if="viewType == 8" :span="24">
+        <GroupPage
+          ref="groupPageRef"
+          :search-send="searchSend"
+          :columns-filter="columnsFilter"
+          :body-hight="265"
+          :drawer-with="drawerWith"
+          :view-setup="viewPage.date"
+        />
+      </el-col>
       <el-col v-if="viewType == 2" :span="24">
         <CalendarPage
           ref="calendarPageRef"
diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue
index 8b4d872..5eacb88 100644
--- a/src/components/DesignForm/tableListPage/index.vue
+++ b/src/components/DesignForm/tableListPage/index.vue
@@ -1868,6 +1868,24 @@ const isObject = (obj: any) => {
                   @click="tabsView(props.viewPage.card, 6)"
                 />
               </el-tooltip>
+
+              <el-tooltip
+                v-if="props.viewPage.group && props.viewPage.group.status"
+                class="box-item"
+                effect="dark"
+                content="分组"
+                placement="top"
+              >
+                <el-button
+                  size="small"
+                  class="fa fa-table"
+                  :color="
+                    props.viewPage.group && props.viewPage.group.isClick ? '#a0cfff' : ''
+                  "
+                  @click="tabsView(props.viewPage.group, 8)"
+                />
+              </el-tooltip>
+
               <el-tooltip
                 v-if="viewPage.date.status"
                 class="box-item"
diff --git a/src/directive/permission/button.ts b/src/directive/permission/button.ts
index 10f2acf..cd0c267 100644
--- a/src/directive/permission/button.ts
+++ b/src/directive/permission/button.ts
@@ -79,13 +79,13 @@ export const hasAppGroup: Directive = {
 */
 export const appHasPower = (signCode:string,buttonKey:string) => {
   const userStore = useUserStore();
-  console.log("判断应用级权限--appSystemPower->",userStore.myPower.appSystemPower)
+  //console.log("判断应用级权限--appSystemPower->",userStore.myPower.appSystemPower)
   return userStore.myPower.appSystemPower.some((perm: any) => {
 
-      console.log(signCode,"判断应用级权限--->",buttonKey)
+      //console.log(signCode,"判断应用级权限--->",buttonKey)
       if(perm.AppId == signCode){
-        console.log("判断应用级权限-1111-->",perm.AppId,buttonKey)
-        console.log("判断应用级权限-222-->",perm.butPower && Array.isArray(perm.butPower))
+        // console.log("判断应用级权限-1111-->",perm.AppId,buttonKey)
+        // console.log("判断应用级权限-222-->",perm.butPower && Array.isArray(perm.butPower))
         if(perm.butPower && Array.isArray(perm.butPower)){
           // console.log("判断应用级权限--->",perm.AppId,buttonKey)
           return perm.butPower.includes(buttonKey)
@@ -101,15 +101,15 @@ export const appHasPower = (signCode:string,buttonKey:string) => {
 */
 export const formHasPower = (signCode:string,tormCode:string,buttonKey:string,classType:number) => {
   const userStore = useUserStore();
-  console.log("判断表单级权限-1111-->",signCode,userStore.myPower.appSystemPower)
+  //console.log("判断表单级权限-1111-->",signCode,userStore.myPower.appSystemPower)
   if(userStore.myPower.appSystemPower && Array.isArray(userStore.myPower.appSystemPower)){
 
     return userStore.myPower.appSystemPower.some((perm: any) => {
         if(perm.AppId == signCode){
-          console.log("判断表单级权限-1112-->",signCode)
-           console.log("判断表单级权限-1113-->",tormCode)
-            console.log("判断表单级权限-1114-->",perm.formPower)
-             console.log("判断表单级权限-1115-->",buttonKey)
+          // console.log("判断表单级权限-1112-->",signCode)
+          //  console.log("判断表单级权限-1113-->",tormCode)
+          //   console.log("判断表单级权限-1114-->",perm.formPower)
+          //    console.log("判断表单级权限-1115-->",buttonKey)
              if(perm.formPower && Array.isArray(perm.formPower)){
               return perm.formPower.some((formPerm: any) => {
                 switch(classType){
diff --git a/src/views/sysworkflow/lowCodeTasks/index.vue b/src/views/sysworkflow/lowCodeTasks/index.vue
index 28789ab..1ca5996 100644
--- a/src/views/sysworkflow/lowCodeTasks/index.vue
+++ b/src/views/sysworkflow/lowCodeTasks/index.vue
@@ -102,6 +102,13 @@ const stateList = reactive({
         title: [],
       },
     },
+    group: {
+      status: false,
+      isClick: false,
+      form: {
+        title: [],
+      },
+    },
     time: {
       status: false,
       isClick: false,
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
index 5402bad..2a38643 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
@@ -116,6 +116,13 @@ const stateList = reactive({
         dayType: 1,
       },
     },
+    group: {
+      status: false,
+      isClick: false,
+      form: {
+        title: [],
+      },
+    },
     time: {
       status: false,
       isClick: false,
@@ -381,6 +388,7 @@ const gainAppFormPageInit = () => {
           stateList.view.time = stateData.view.time;
           stateList.view.gantt = stateData.view.gantt;
           stateList.view.map = stateData.view.map;
+          stateList.view.group = stateData.view.group;
         }
         stateList.view.chart.status = data.data.chart;
         // console.log("开发---->", stateList.view);
@@ -537,7 +545,6 @@ defineExpose({
 
             <!-- {{ props.formKey }}
             {{ stateForm }} -->
-
             <ak-page-list
               v-if="activePage == 1"
               v-model:look-page-is-show="lookPageIsShow"
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
index 4596c66..e4c03e1 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
@@ -167,6 +167,13 @@ const state = reactive({
         title: [],
       },
     },
+    group: {
+      status: false,
+      isClick: false,
+      form: {
+        title: [],
+      },
+    },
     date: {
       status: false,
       isClick: false,
@@ -443,6 +450,16 @@ const getListInfo = () => {
             },
           };
         }
+
+        if(!state.view.group){
+          state.view.group={
+            status: false,
+            isClick: false,
+            form: {
+              title: [],
+            },
+          }
+        }
       }
     }
 
@@ -852,6 +869,8 @@ const saveFormListData = () => {
     data: json2string(state),
     id: props.appPageKey.toString(),
   };
+    console.log(params,"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<")
+
   // console.log("添加自定义表单列表设定",params)
   editCustomerFormList(params).then((data) => {
     // console.log("添加自定义表单列表设定",data)
@@ -1656,6 +1675,16 @@ const delAllPick = () => {
               <el-button size="small" class="fa fa-id-card-o" />
             </el-tooltip>
 
+            <el-tooltip
+              v-if="state.view.group.status"
+              class="box-item"
+              effect="dark"
+              content="分组视图"
+              placement="top"
+            >
+              <el-button size="small" class="fa fa-table" />
+            </el-tooltip>
+
             <el-tooltip
               v-if="state.view.date.status"
               class="box-item"
@@ -2298,6 +2327,50 @@ const delAllPick = () => {
                 </el-form>
               </div>
             </el-collapse-item>
+
+            <el-collapse-item
+              title="Consistency"
+              name="group"
+  
+            >
+              <template #title>
+                <div class="collapse-title">
+                  <div>
+                    <i class="fa fa-table"></i>
+                    <el-text>分组视图</el-text>
+                  </div>
+                  <el-switch
+                    v-model="state.view.group.status"
+                    class="openOfClose"
+                    @click.stop="showCollapse"
+                  />
+                </div>
+              </template>
+              <div>
+                <el-form
+                  label-position="top"
+                  label-width="auto"
+                  :model="state.view.group.form"
+                  style="max-width: 600px"
+                >
+                  <el-form-item label="标题字段">
+                    <el-select
+                      v-model="state.view.group.form.title"
+                      multiple
+                      placeholder="请选择标题字段"
+                    >
+                      <el-option
+                        v-for="item in allKeyWords"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-form> 
+              </div>
+            </el-collapse-item>
+
             <el-collapse-item
               title="Consistency"
               name="date"
diff --git a/src/views/sysworkflow/lowcodepage/pageList.vue b/src/views/sysworkflow/lowcodepage/pageList.vue
index 9c18567..d101c5c 100644
--- a/src/views/sysworkflow/lowcodepage/pageList.vue
+++ b/src/views/sysworkflow/lowcodepage/pageList.vue
@@ -755,6 +755,7 @@ const saveFormListData = () => {
     data: json2string(state),
     id: props.formKey.toString(),
   };
+  console.log(params,"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<")
   // console.log("添加自定义表单列表设定",params)
   editCustomerFormList(params).then((data) => {
     // console.log("添加自定义表单列表设定",data)
diff --git a/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue b/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
index 8144246..5144906 100644
--- a/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
+++ b/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
@@ -108,6 +108,13 @@ const stateList = reactive({
         title: [],
       },
     },
+    group: {
+      status: false,
+      isClick: false,
+      form: {
+        title: [],
+      },
+    },
     time: {
       status: false,
       isClick: false,
@@ -300,6 +307,7 @@ const initLoadData = () => {
           stateList.view.time = stateData.view.time;
           stateList.view.gantt = stateData.view.gantt;
           stateList.view.map = stateData.view.map;
+          stateList.view.group = stateData.view.group;
         }
         stateList.view.chart.status = data.data.chart;
       }

From f90493883abb2c55321b4ea0b6799abad041ad40 Mon Sep 17 00:00:00 2001
From: han2015 <1019850453@qq.com>
Date: Sat, 14 Feb 2026 11:28:55 +0800
Subject: [PATCH 3/3] =?UTF-8?q?table:=20=E4=BF=AE=E5=A4=8Dgroup=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B7=B3=E8=BD=AC=E6=97=B6=E5=B4=A9=E6=BA=83=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/app/groupPage.vue | 78 +++++++++++++++++----
 src/components/DesignForm/app/index.vue     | 41 +++++++++--
 2 files changed, 98 insertions(+), 21 deletions(-)

diff --git a/src/components/DesignForm/app/groupPage.vue b/src/components/DesignForm/app/groupPage.vue
index 2dcd504..230af6d 100644
--- a/src/components/DesignForm/app/groupPage.vue
+++ b/src/components/DesignForm/app/groupPage.vue
@@ -34,7 +34,7 @@ const props = defineProps({
 //---------pagination configs------
 const totalNum = ref(0)
 const pageSize = ref(props.searchSend.pagesize)
-
+const selectedMergeKeys = ref<string[]>([]) 
 
 //------------------ by han2015:  支持表单排序功能----------------------
 const columnSortData = new Map();
@@ -59,10 +59,66 @@ const onUpdateSort = (data: { prop: string; order: "ascending" | "descending" |
   } else {
     columnSortData.delete(data.prop);
   }
-  getPageData()
+
+  selectedMergeKeys.value=Array.from(columnSortData.keys())
+  getPageData();
 }
 
+// 计算合并位置（预处理，避免每次渲染重复计算）
+const spanMap = computed(() => {
+  const map = {}
+  const pos = {}
 
+  // 按优先级排序的合并列，获取排序列
+  selectedMergeKeys.value.forEach((key, index) => {
+    map[key] = []
+    pos[key] = 0
+    
+    for (let i = 0; i < tableDataList.value.length; i++) {
+      if (i === 0) {
+        map[key][i] = 1  // 第一行总是 1
+        pos[key] = 0
+      } else {
+        // 检查：当前列及其所有前置列是否都相同
+        let shouldMerge = true
+        for (let j = 0; j <= index; j++) {
+          const checkKey = selectedMergeKeys.value[j]
+          if (tableDataList.value[i][checkKey] !== tableDataList.value[i-1][checkKey]) {
+            shouldMerge = false
+            break
+          }
+        }
+        
+        if (shouldMerge) {
+          // 合并：累加到合并起始位置，当前位置标记 0
+          map[key][pos[key]] += 1
+          map[key][i] = 0
+        } else {
+          // 不合并：新开一个合并组
+          map[key][i] = 1
+          pos[key] = i  // 更新合并起始位置
+        }
+      }
+    }
+  })
+  
+  return map
+})
+
+
+const objectSpanMethod = ({ row, column, rowIndex, columnIndex }) => {
+  const key = column.property
+  
+  if (spanMap.value[key]) {
+    const rowspan = spanMap.value[key][rowIndex]
+    return {
+      rowspan: rowspan,
+      colspan: rowspan > 0 ? 1 : 0
+    }
+  }
+  
+  return { rowspan: 1, colspan: 1 }
+}
 const tableDataList = ref([]) // 表格行数据
 
 const groupColumnSearch = (val:any,clas?:number) =>{
@@ -79,7 +135,7 @@ const handleCurrentChange = (page: number) => {
   getPageData();
 };
 
-const getPageData=()=>{
+const getPageData=async ()=>{
   // by han2015: 处理排序字段信息
   let arr:string[]=[];
   columnSortData.forEach((value, key) => {
@@ -89,21 +145,13 @@ const getPageData=()=>{
   let sendData = props.searchSend
   sendData.sortData= arr.join(", ")
   sendData.pagesize = 50
-  gainFormPageListCont(sendData)
+  await gainFormPageListCont(sendData)
 		.then(({data})=>{
 			totalNum.value = data.total
       tableDataList.value = data.list
 	})
 }
 
-const spanMethod = (data: { row: any; rowIndex: number; column: TableColumnCtx<any>; columnIndex: number; }) => {
-  if(data.rowIndex==1){
-    console.log(data.column)
-  }
-  
-}
-
-
 onMounted(()=>{
   nextTick(()=>{
 		getPageData()
@@ -114,13 +162,14 @@ defineExpose({
 	groupColumnSearch
 })
 
+
 </script>
 <template>
 	<div>
 		<el-row :gutter="20">
       <el-table
         :data="tableDataList"
-        :span-method="spanMethod"
+        :span-method="objectSpanMethod"
         @sort-change="onUpdateSort"
         :header-cell-class-name="setHeaderClass"
         border
@@ -159,6 +208,7 @@ defineExpose({
             v-else-if="item.fieldClass == ''"
             :prop="item.field"
             :label="item.label"
+            :min-width="(item.label?.length || 2) * 15 + 30"
             header-align="center"
             sortable="custom"
             align="center"
@@ -194,7 +244,7 @@ defineExpose({
             :prop="item.field"
             :label="item.label"
             config=""
-            min-width="90"
+            :min-width="(item.label?.length || 2) * 15 + 30"
             header-align="center"
             sortable="custom"
             align="center"
diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue
index 7069802..85fe6c9 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) => {
+    tabsView(props.viewPage.list, 1)
     getPageData();
   },
   {
@@ -1007,7 +1008,6 @@ const getPageData = () => {
     searchData: json2string(props.searchData),
     sortData: arr.join(", "),
   };
-  console.log("获取列表详细信息??????",sendData)
 
   switch (viewType.value) {
     case 2:
@@ -1730,6 +1730,24 @@ const recallSendMsg = (val: any) => {
     getPageData();
   });
 };
+
+//html 标签全屏操作，只支持现代浏览器
+const enterFullScreen=()=>{
+  const docEl= document.getElementById("special-table-container");
+  if(docEl){
+    //支持多种浏览器
+    if (docEl.requestFullscreen) {
+      docEl.requestFullscreen();
+    } else if (docEl.webkitRequestFullscreen) {
+        docEl.webkitRequestFullscreen();
+    } else if (docEl.mozRequestFullScreen) {
+        docEl.mozRequestFullScreen();
+    } else if (docEl.msRequestFullscreen) {
+        docEl.msRequestFullscreen();
+    }
+  }
+}
+
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-11 11:17:42
@@ -1838,7 +1856,8 @@ const tabsView = (val: any, types: number) => {
       props.viewPage.gantt.isClick = false;
       props.viewPage.map.isClick = false;
       props.viewPage.chart.isClick = false;
-      props.viewPage.group.isClick = false;
+      if(props.viewPage.group)
+        props.viewPage.group.isClick = false;
       break;
   }
 };
@@ -1918,7 +1937,7 @@ const readerColumnSun = (column: any) => {
     if(labelLong > 6 ){
       return labelLong * 15;
     }else{
-      return labelLong * 30;
+      return labelLong * 20;
     }
     
   }else{
@@ -1977,7 +1996,7 @@ const isObject = (obj: any) => {
 }
 </script>
 <template>
-  <div ref="container" v-loading="state.loading" class="table-list-comm">
+  <div ref="container" v-loading="state.loading" class="table-list-comm" >
     <el-row class="rowBox">
       <el-col :span="24">
         <el-form v-if="config.searchIsShow" ref="ruleSearchForm" class="seacherForm">
@@ -2095,6 +2114,14 @@ const isObject = (obj: any) => {
           </div>
           <div>
             <el-button-group class="ml-4">
+              <el-tooltip
+                class="box-item"
+                effect="dark"
+                content="全屏"
+                placement="bottom"
+              >
+                <el-button size="small" @click="enterFullScreen" > 全屏</el-button>
+              </el-tooltip>
               <el-tooltip
                 class="box-item"
                 effect="dark"
@@ -2229,7 +2256,7 @@ const isObject = (obj: any) => {
         </div>
       </el-col>
 
-      <el-col v-if="viewType == 1" :span="24" class="tableTdClass">
+      <el-col v-if="viewType == 1" :span="24" class="tableTdClass" id="special-table-container">
         <el-table
           v-bind="data.tableProps"
           ref="table"
@@ -2299,7 +2326,7 @@ const isObject = (obj: any) => {
               :prop="item.field"
               :label="item.label"
               config=""
-              min-width="220"
+              min-width='220'
                header-align="center"
               align="center"
               fixed="right"
@@ -2450,7 +2477,7 @@ const isObject = (obj: any) => {
               :prop="item.field"
               :label="item.label"
               config=""
-              min-width="220"
+              :min-width="(item.label?.length || 2) * 14 + 20"
                header-align="center"
                sortable="custom"
               align="center"