vxe-table 4.17.17 → 4.17.19

package/packages/table/module/menu/hook.ts

@@ -232,7 +232,7 @@ hooks.add('tableMenuModule', {
               handleOpenMenuEvent(evnt, layout, params)
               $xeTable.dispatchEvent(eventType, params, evnt)
               return
-            } else if (getEventTargetNode(evnt, el, `vxe-table--${layout}-wrapper`, target => target.getAttribute('xid') === xID).flag) {
+            } else if (getEventTargetNode(evnt, el, `vxe-table--${layout}-wrapper`, target => target.getAttribute('xid') === xID).flag || (layout === 'body' && getEventTargetNode(evnt, el, 'vxe-table--empty-place-wrapper', target => target.getAttribute('xid') === xID).flag)) {
               if (menuOpts.trigger === 'cell') {
                 evnt.preventDefault()
               } else {

package/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', {

package/packages/table/src/table.ts

@@ -12868,7 +12868,8 @@ export default defineVxeComponent({
         h('div', {
           key: 'tn',
           ref: refEmptyPlaceholder,
-          class: 'vxe-table--empty-place-wrapper'
+          class: 'vxe-table--empty-place-wrapper',
+          xid: xID
         }, [
           h('div', {
             class: 'vxe-table--empty-placeholder'

package/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) {

package/styles/components/table.scss

@@ -2179,12 +2179,12 @@ $btnThemeList: (
     text-align: center;
     overflow: hidden;
     width: 100%;
-    pointer-events: none;
     outline: 0;
   }
   .vxe-table--empty-block {
     display: none;
     visibility: hidden;
+    pointer-events: none;
   }
   .vxe-table--empty-place-wrapper {
     display: none;
@@ -2193,6 +2193,7 @@ $btnThemeList: (
     top: 0;
     z-index: 5;
     overflow: hidden;
+    pointer-events: none;
   }
   .vxe-table--empty-placeholder {
     display: flex;