vxe-table 3.19.17 → 3.19.19

package/es/table/src/header.js

@@ -6,20 +6,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;
-}
 function renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, $rowIndex, cols) {
     const props = _vm;
     const $xeTable = _vm.$parent;
@@ -151,15 +137,13 @@ function renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, $rowIndex, co
             // 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', {
             class: ['vxe-table--column vxe-header--column', colid, fixedHiddenColumn ? 'fixed--hidden' : 'fixed--visible', {

package/es/table/src/table.js

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

package/es/table/style.css

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