Merge branch 'han_v5'

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">

src/components/DesignForm/app/gannttPage.vue

@@ -24,7 +24,7 @@ const props = defineProps({
 });
 </script>
 <template>
-	<div>
+	<div id="special-table-container">
 		{{viewSetup}}
 	</div>
 </template>

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] = []
@@ -105,7 +104,7 @@ const spanMap = computed(() => {
   return map
 })
 
-
+// 支持合并表单
 const objectSpanMethod = ({ row, column, rowIndex, columnIndex }) => {
   const key = column.property
   
@@ -152,7 +151,40 @@ 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');   //默认desc
+      }
+    });
+  }
+
   nextTick(()=>{
 		getPageData()
 	})
@@ -162,16 +194,13 @@ defineExpose({
 	groupColumnSearch
 })
 
-
 </script>
 <template>
-	<div>
+	<div id="special-table-container">
-		<el-row :gutter="20">
+		<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,14 +239,13 @@ defineExpose({
             :label="item.label"
             :min-width="(item.label?.length || 2) * 15 + 30"
             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)">
+                <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>
@@ -246,7 +274,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 +297,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"

src/components/DesignForm/app/index.vue

@@ -1126,6 +1126,7 @@ watch(
   () => props.formId,
 
   (val: any) => {
+    searchSend.formId=props.formId;
     tabsView(props.viewPage.list, 1)
     getPageData();
   },
@@ -1192,7 +1193,6 @@ const getPageData = () => {
       break;
     case 8: //group 分组页面
       nextTick(() => {
-        console.log("获取列表详细信息-------222---------->??????",);
         groupPageRef.value.groupColumnSearch(sendData, 1);
       });
       break;
@@ -1919,7 +1919,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();
@@ -2775,7 +2777,7 @@ const getNonValue = () => {
           :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">

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" />

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" >

src/components/DesignForm/tableListPage/index.vue

@@ -2036,7 +2036,7 @@ async function doGainFormPageListCont(sendData: any) {
               >
                 <el-button
                   size="small"
-                  class="fa fa-table"
+                  class="fa fa-list"
                   :color="
                     props.viewPage.group && props.viewPage.group.isClick ? '#a0cfff' : ''
                   "

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>