修改多表头树形配置

io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue

@@ -858,7 +858,7 @@ const allColumnMap = new Map();
 
 // 将所有列转换到 map 中
 const columnToMap = (column: any) => {
-  if (column && column.childrenColumns && column.childrenColumns.length > 0) {
+  if (column && column.columns && column.columns.length > 0) {
     allColumnMap.set(column.name, column);
     moreColumnTitleMap.set(column.name, {
       name: column.name,
@@ -872,7 +872,7 @@ const columnToMap = (column: any) => {
       classes: column.classes,
       parents: [],
     });
-    column.childrenColumns.forEach((item) => {
+    column.columns.forEach((item) => {
       columnToMap(item);
     });
   } else {
@@ -894,9 +894,9 @@ const columnToMap = (column: any) => {
 let tmpChildrenLevel = 0;
 let tmpColspan = 0;
 const getChildrenLevel = (column) => {
-  if (column && column.childrenColumns && column.childrenColumns.length > 0) {
+  if (column && column.columns && column.columns.length > 0) {
     tmpChildrenLevel += 1;
-    column.childrenColumns.forEach((item) => {
+    column.columns.forEach((item) => {
       getChildrenLevel(item);
     });
   } else if (column) {
@@ -911,8 +911,8 @@ function findParents(arrData: any, name: any) {
     if (arrData[i].name == name) {
       return [];
     } else {
-      if (arrData[i].childrenColumns) {
-        const res = findParents(arrData[i].childrenColumns, name);
+      if (arrData[i].columns) {
+        const res = findParents(arrData[i].columns, name);
         if (res !== undefined) {
           return res.concat(arrData[i].name).reverse();
         }
@@ -1556,10 +1556,10 @@ const stickyHeaderColumn = (time = 500) => {
   }
   tableRef.value.$el.getElementsByTagName('table')[0].style.setProperty('--tableBodyPadding', bodyPadding);
   tableRef.value.$el.getElementsByTagName('table')[0].style.setProperty('--tableBodyHeight', (denseBodyComputed.value ? 24 : 48) + 'px');
-  if (denseBottomComputed.value) {
+  if (denseBottomComputed.value && !attrs.hideBottom) {
     tableRef.value.$el.getElementsByClassName('q-table__bottom')[0].style.setProperty('--tableBottomHeight', 33 + 'px');
     tableRef.value.$el.getElementsByClassName('q-table__bottom')[0].style.setProperty('--tableBottomButtonHeight', 24 + 'px');
-  } else {
+  } else if (!attrs.hideBottom) {
     tableRef.value.$el.getElementsByClassName('q-table__bottom')[0].style.setProperty('--tableBottomHeight', 50 + 'px');
     tableRef.value.$el.getElementsByClassName('q-table__bottom')[0].style.setProperty('--tableBottomButtonHeight', 40 + 'px');
   }
@@ -1608,8 +1608,8 @@ const getMoreRowColumnTitleIndex = (name: any) => {
 
 const handlerStickyChildrenColumn = (item, columns) => {
   columns.push(item);
-  if (item.childrenColumns && item.childrenColumns.length > 0) {
-    item.childrenColumns.forEach((children) => {
+  if (item.columns && item.columns.length > 0) {
+    item.columns.forEach((children) => {
       handlerStickyChildrenColumn(children, columns);
     });
   }

io.sc.platform.core.frontend/src/platform/components/utils/componentComm.ts

@@ -269,8 +269,8 @@ function columnStyle(item: any) {
   }
 }
 function columnChildrenHandler(item: any, gridColumns: any) {
-  if (item.childrenColumns && item.childrenColumns.length > 0) {
-    item.childrenColumns.forEach((column) => {
+  if (item.columns && item.columns.length > 0) {
+    item.columns.forEach((column) => {
       columnChildrenHandler(column, gridColumns);
     });
   } else {