releases 4.17.19

Author: xuliangzhan

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.17.18",
+  "version": "4.17.19",
   "description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

packages/table/src/header.ts

@@ -13,22 +13,6 @@ const { renderer, renderEmptyElement } = VxeUI
 const sourceType = 'table'
 const renderType = 'header'
 
-function getColumnFirstChild (column: VxeTableDefines.ColumnInfo): VxeTableDefines.ColumnInfo {
-  const { children } = column
-  if (children && children.length) {
-    return getColumnFirstChild(children[0])
-  }
-  return column
-}
-
-function getColumnLastChild (column: VxeTableDefines.ColumnInfo): VxeTableDefines.ColumnInfo {
-  const { children } = column
-  if (children && children.length) {
-    return getColumnLastChild(children[children.length - 1])
-  }
-  return column
-}
-
 export default defineVxeComponent({
   name: 'VxeTableHeader',
   props: {
@@ -203,15 +187,13 @@ export default defineVxeComponent({
         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
+          XEUtils.eachTree(column.children, (childRow) => {
+            if (childRow.visible && (!childRow.children || !childRow.children.length)) {
+              childWidth += childRow.renderWidth
             }
-          }
+          })
+          tcStyle.width = `${childWidth}px`
         }
 
         return h('th', {

packages/ui/src/dom.ts

@@ -47,11 +47,11 @@ function getNodeOffset (elem: any, container: any, rest: any): any {
 }
 
 export function isPx (val: any) {
-  return val && /^\d+(px)?$/.test(val)
+  return val && /^\d+(\.\d+)?px?$/.test(val)
 }
 
 export function isScale (val: any) {
-  return val && /^\d+%$/.test(val)
+  return val && /^\d+(\.\d+)?%$/.test(val)
 }
 
 export function hasClass (elem: any, cls: any) {