vxe-table 4.17.18 → 4.17.20

package/es/table/src/header.js

@@ -8,20 +8,6 @@ import { getSlotVNs } from '../../ui/src/vn';
 const { renderer, renderEmptyElement } = VxeUI;
 const sourceType = 'table';
 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: {
@@ -185,15 +171,13 @@ export default defineVxeComponent({
                     // custom
                 }
                 else 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`;
+                    let childWidth = 0;
+                    XEUtils.eachTree(column.children, (childRow) => {
+                        if (childRow.visible && (!childRow.children || !childRow.children.length)) {
+                            childWidth += childRow.renderWidth;
                         }
-                    }
+                    });
+                    tcStyle.width = `${childWidth}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,

package/es/ui/index.js

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

package/es/ui/src/dom.js

@@ -39,10 +39,10 @@ function getNodeOffset(elem, container, rest) {
     return rest;
 }
 export function isPx(val) {
-    return val && /^\d+(px)?$/.test(val);
+    return val && /^\d+(\.\d+)?(px)?$/.test(val);
 }
 export function isScale(val) {
-    return val && /^\d+%$/.test(val);
+    return val && /^\d+(\.\d+)?%$/.test(val);
 }
 export function hasClass(elem, cls) {
     return !!(elem && elem.className && elem.className.match && elem.className.match(getClsRE(cls)));

package/es/ui/src/log.js

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

package/lib/index.umd.js

@@ -3141,7 +3141,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.17.18";
+const version = "4.17.20";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3655,7 +3655,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.17.18"}`;
+const log_version = `table v${"4.17.20"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -3926,10 +3926,10 @@ function getNodeOffset(elem, container, rest) {
   return rest;
 }
 function isPx(val) {
-  return val && /^\d+(px)?$/.test(val);
+  return val && /^\d+(\.\d+)?(px)?$/.test(val);
 }
 function isScale(val) {
-  return val && /^\d+%$/.test(val);
+  return val && /^\d+(\.\d+)?%$/.test(val);
 }
 function hasClass(elem, cls) {
   return !!(elem && elem.className && elem.className.match && elem.className.match(getClsRE(cls)));
@@ -8156,24 +8156,6 @@ const {
 } = core_.VxeUI;
 const header_sourceType = 'table';
 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: {
@@ -8404,15 +8386,13 @@ function getColumnLastChild(column) {
         if (showCustomHeader) {
           // custom
         } else 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`;
+          let childWidth = 0;
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(column.children, childRow => {
+            if (childRow.visible && (!childRow.children || !childRow.children.length)) {
+              childWidth += childRow.renderWidth;
             }
-          }
+          });
+          tcStyle.width = `${childWidth}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', {