vxe-table 4.16.4 → 4.16.5

package/es/table/src/header.js

@@ -5,6 +5,20 @@ import { VxeUI } from '../../ui';
 import { getCalcHeight, convertHeaderColumnToRows, convertHeaderToGridRows } from './util';
 const { renderer, renderEmptyElement } = VxeUI;
 const renderType = '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;
+}
 export default defineVxeComponent({
     name: 'VxeTableHeader',
     props: {
@@ -163,6 +177,17 @@ export default defineVxeComponent({
                 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', Object.assign(Object.assign(Object.assign({ class: ['vxe-table--column vxe-header--column', colid, fixedHiddenColumn ? 'fixed--hidden' : 'fixed--visible', {
                             [`col--${headAlign}`]: headAlign,
                             [`col--${type}`]: type,

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.16.4";
+export const version = "4.16.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${"4.16.4"}`;
+const version = `table v${"4.16.5"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.16.4";
+const version = "4.16.5";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3641,7 +3641,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.16.4"}`;
+const log_version = `table v${"4.16.5"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -8128,6 +8128,24 @@ const {
   renderEmptyElement: header_renderEmptyElement
 } = core_.VxeUI;
 const header_renderType = '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;
+}
 /* harmony default export */ var header = (defineVxeComponent({
   name: 'VxeTableHeader',
   props: {
@@ -8352,6 +8370,17 @@ const header_renderType = 'header';
         } 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 (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {
           class: ['vxe-table--column vxe-header--column', colid, fixedHiddenColumn ? 'fixed--hidden' : 'fixed--visible', {
             [`col--${headAlign}`]: headAlign,