vxe-table 3.18.4 → 3.18.5

package/es/table/src/header.js

@@ -4,6 +4,20 @@ import { getClass } from '../../ui/src/utils';
 import { getCalcHeight, convertHeaderColumnToRows, convertHeaderToGridRows } from './util';
 const { renderer, renderEmptyElement } = VxeUI;
 const cellType = 'header';
+function getColumnFirstChild(column) {
+    const { children } = column;
+    if (children && children.length) {
+        return getColumnFirstChild(children[0]);
+    }
+    return column;
+}
+function getColumnLastChild(column) {
+    const { children } = column;
+    if (children && children.length) {
+        return getColumnLastChild(children[children.length - 1]);
+    }
+    return column;
+}
 function renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, $rowIndex, cols) {
     const props = _vm;
     const $xeTable = _vm.$parent;
@@ -130,6 +144,17 @@ function renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, $rowIndex, co
         else {
             tcStyle.minHeight = `${currCellHeight}px`;
         }
+        if (isColGroup && !isLastRow) {
+            const firstCol = getColumnFirstChild(column);
+            const lastCol = getColumnLastChild(column);
+            if (firstCol && lastCol && firstCol.id !== lastCol.id) {
+                const firstColRest = fullColumnIdData[firstCol.id];
+                const lastColRest = fullColumnIdData[lastCol.id];
+                if (firstColRest && lastColRest) {
+                    tcStyle.width = `${lastColRest.oLeft - firstColRest.oLeft + lastCol.renderWidth}px`;
+                }
+            }
+        }
         return h('th', {
             class: ['vxe-table--column vxe-header--column', colid, fixedHiddenColumn ? 'fixed--hidden' : 'fixed--visible', {
                     [`col--${headAlign}`]: headAlign,

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.18.4";
+export const version = "3.18.5";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.18.4"}`;
+const version = `table v${"3.18.5"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.18.4";
+const version = "3.18.5";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2678,7 +2678,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.18.4"}`;
+const log_version = `table v${"3.18.5"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -20348,6 +20348,24 @@ const {
   renderEmptyElement: header_renderEmptyElement
 } = core_.VxeUI;
 const cellType = 'header';
+function getColumnFirstChild(column) {
+  const {
+    children
+  } = column;
+  if (children && children.length) {
+    return getColumnFirstChild(children[0]);
+  }
+  return column;
+}
+function getColumnLastChild(column) {
+  const {
+    children
+  } = column;
+  if (children && children.length) {
+    return getColumnLastChild(children[children.length - 1]);
+  }
+  return column;
+}
 function header_renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, $rowIndex, cols) {
   const props = _vm;
   const $xeTable = _vm.$parent;
@@ -20514,6 +20532,17 @@ function header_renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, $rowIn
     } else {
       tcStyle.minHeight = `${currCellHeight}px`;
     }
+    if (isColGroup && !isLastRow) {
+      const firstCol = getColumnFirstChild(column);
+      const lastCol = getColumnLastChild(column);
+      if (firstCol && lastCol && firstCol.id !== lastCol.id) {
+        const firstColRest = fullColumnIdData[firstCol.id];
+        const lastColRest = fullColumnIdData[lastCol.id];
+        if (firstColRest && lastColRest) {
+          tcStyle.width = `${lastColRest.oLeft - firstColRest.oLeft + lastCol.renderWidth}px`;
+        }
+      }
+    }
     return h('th', {
       class: ['vxe-table--column vxe-header--column', colid, fixedHiddenColumn ? 'fixed--hidden' : 'fixed--visible', {
         [`col--${headAlign}`]: headAlign,