vxe-table 3.12.10-beta.3 → 3.12.10-beta.4

package/es/table/src/header.js

@@ -73,6 +73,8 @@ const renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) => {
                 thOns.mouseup = $xeTable.handleHeaderCellDragMouseupEvent;
             }
         }
+        const isLastColumn = $columnIndex === cols.length - 1;
+        const showResizable = (XEUtils.isBoolean(column.resizable) ? column.resizable : (columnOpts.resizable || allResizable));
         const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
         let isPreLoadStatus = false;
         if (scrollXLoad && !isGroup && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex || _columnIndex > scrollXStore.visibleEndIndex)) {
@@ -82,7 +84,7 @@ const renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) => {
             class: ['vxe-header--column', colid, {
                     [`col--${headAlign}`]: headAlign,
                     [`col--${type}`]: type,
-                    'col--last': $columnIndex === cols.length - 1,
+                    'col--last': isLastColumn,
                     'col--fixed': column.fixed,
                     'col--group': isColGroup,
                     'col--ellipsis': hasEllipsis,
@@ -110,7 +112,7 @@ const renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) => {
             /**
            * 列宽拖动
            */
-            !fixedHiddenColumn && !isColGroup && (XEUtils.isBoolean(column.resizable) ? column.resizable : (columnOpts.resizable || allResizable))
+            !fixedHiddenColumn && showResizable
                 ? h('div', {
                     class: ['vxe-resizable', {
                             'is--line': !border || border === 'none'
@@ -120,7 +122,7 @@ const renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) => {
                         dblclick: (evnt) => $xeTable.handleResizeDblclickEvent(evnt, params)
                     }
                 })
-                : null
+                : renderEmptyElement($xeTable)
         ]);
     });
 };
@@ -360,6 +362,12 @@ export default {
             const wrapperElem = this.$el;
             const { clientX: dragClientX } = evnt;
             const dragBtnElem = evnt.target;
+            let resizeColumn = column;
+            if (column.children && column.children.length) {
+                XEUtils.eachTree(column.children, childColumn => {
+                    resizeColumn = childColumn;
+                });
+            }
             const cell = dragBtnElem.parentNode;
             const cellParams = Object.assign(params, { cell });
             const resizableOpts = $xeTable.computeResizableOpts;
@@ -417,7 +425,7 @@ export default {
                     // left = Math.min(left, bodyScrollElem.clientWidth + bodyScrollElem.scrollLeft - 40)
                 }
                 dragLeft = Math.max(left, dragMinLeft);
-                const resizeBarLeft = dragLeft - scrollLeft;
+                const resizeBarLeft = Math.max(1, dragLeft - scrollLeft);
                 resizeBarElem.style.left = `${resizeBarLeft}px`;
                 if (resizableOpts.showDragTip && resizeTipElem) {
                     const tableWidth = tableEl.clientWidth;
@@ -427,14 +435,14 @@ export default {
                     const resizeTipHeight = resizeTipElem.clientHeight;
                     let resizeTipLeft = -resizeTipWidth;
                     if (resizeBarLeft < resizeTipWidth + resizeBarWidth) {
-                        resizeTipLeft = resizeTipWidth + resizeBarWidth - resizeBarLeft;
+                        resizeTipLeft = 0;
                     }
                     else if (resizeBarLeft > tableWidth) {
                         resizeTipLeft += tableWidth - resizeBarLeft;
                     }
                     resizeTipElem.style.left = `${resizeTipLeft}px`;
                     resizeTipElem.style.top = `${Math.min(tableEl.clientHeight - resizeTipHeight, Math.max(0, evnt.clientY - wrapperRect.y - resizeTipHeight / 2))}px`;
-                    resizeTipElem.textContent = getI18n('vxe.table.resizeColTip', [column.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft)]);
+                    resizeTipElem.textContent = getI18n('vxe.table.resizeColTip', [resizeColumn.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft)]);
                 }
             };
             $xetable._isResize = true;
@@ -444,11 +452,11 @@ export default {
             document.onmouseup = function (evnt) {
                 document.onmousemove = domMousemove;
                 document.onmouseup = domMouseup;
-                const resizeWidth = column.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft);
-                column.resizeWidth = resizeWidth;
+                const resizeWidth = resizeColumn.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft);
+                resizeColumn.resizeWidth = resizeWidth;
                 if (resizableOpts.dragMode === 'fixed') {
                     visibleColumn.forEach((item) => {
-                        if (item.id !== column.id) {
+                        if (item.id !== resizeColumn.id) {
                             if (!item.resizeWidth) {
                                 item.resizeWidth = item.renderWidth;
                             }

package/es/table/src/methods.js

@@ -196,7 +196,7 @@ function cacheColumnMap($xeTable) {
             fullColumnFieldData[field] = rest;
         }
         else {
-            if (storage || (columnOpts.drag && (isCrossDrag || isSelfToChildDrag))) {
+            if ((storage && !type) || (columnOpts.drag && (isCrossDrag || isSelfToChildDrag))) {
                 errLog('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field`]);
             }
         }
@@ -3437,17 +3437,23 @@ const Methods = {
         if (isDblclickAutoWidth && el) {
             const { fullColumnIdData } = internalData;
             const { column } = params;
-            const colid = column.id;
+            let resizeColumn = column;
+            if (column.children && column.children.length) {
+                XEUtils.eachTree(column.children, childColumn => {
+                    resizeColumn = childColumn;
+                });
+            }
+            const colid = resizeColumn.id;
             const colRest = fullColumnIdData[colid];
             const dragBtnElem = evnt.target;
             const cell = dragBtnElem.parentNode;
             const cellParams = Object.assign(params, { cell });
             const colMinWidth = getColReMinWidth(cellParams);
-            let resizeWidth = calcColumnAutoWidth(column, el);
+            let resizeWidth = calcColumnAutoWidth(resizeColumn, el);
             if (colRest) {
                 resizeWidth = Math.max(resizeWidth, colRest.width);
             }
-            column.resizeWidth = Math.max(colMinWidth, resizeWidth);
+            resizeColumn.resizeWidth = Math.max(colMinWidth, resizeWidth);
             reactData._isResize = false;
             internalData._lastResizeTime = Date.now();
             $xeTable.analyColumnWidth();
@@ -4852,7 +4858,7 @@ const Methods = {
                 }
                 vLen++;
             });
-        const isSelected = rootList.length > 0 && sLen >= vLen;
+        const isSelected = vLen > 0 ? sLen >= vLen : sLen >= rootList.length;
         const halfSelect = !isSelected && (sLen >= 1 || hLen >= 1);
         reactData.isAllSelected = isSelected;
         reactData.isIndeterminate = halfSelect;

package/es/ui/index.js

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

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.12.10-beta.3";
+const version = "3.12.10-beta.4";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2824,7 +2824,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.12.10-beta.3"}`;
+const log_version = `table v${"3.12.10-beta.4"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5291,7 +5291,7 @@ function cacheColumnMap($xeTable) {
       }
       fullColumnFieldData[field] = rest;
     } else {
-      if (storage || columnOpts.drag && (isCrossDrag || isSelfToChildDrag)) {
+      if (storage && !type || columnOpts.drag && (isCrossDrag || isSelfToChildDrag)) {
         errLog('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field`]);
       }
     }
@@ -9030,7 +9030,13 @@ const Methods = {
       const {
         column
       } = params;
-      const colid = column.id;
+      let resizeColumn = column;
+      if (column.children && column.children.length) {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(column.children, childColumn => {
+          resizeColumn = childColumn;
+        });
+      }
+      const colid = resizeColumn.id;
       const colRest = fullColumnIdData[colid];
       const dragBtnElem = evnt.target;
       const cell = dragBtnElem.parentNode;
@@ -9038,11 +9044,11 @@ const Methods = {
         cell
       });
       const colMinWidth = getColReMinWidth(cellParams);
-      let resizeWidth = calcColumnAutoWidth(column, el);
+      let resizeWidth = calcColumnAutoWidth(resizeColumn, el);
       if (colRest) {
         resizeWidth = Math.max(resizeWidth, colRest.width);
       }
-      column.resizeWidth = Math.max(colMinWidth, resizeWidth);
+      resizeColumn.resizeWidth = Math.max(colMinWidth, resizeWidth);
       reactData._isResize = false;
       internalData._lastResizeTime = Date.now();
       $xeTable.analyColumnWidth();
@@ -10681,7 +10687,7 @@ const Methods = {
       }
       vLen++;
     });
-    const isSelected = rootList.length > 0 && sLen >= vLen;
+    const isSelected = vLen > 0 ? sLen >= vLen : sLen >= rootList.length;
     const halfSelect = !isSelected && (sLen >= 1 || hLen >= 1);
     reactData.isAllSelected = isSelected;
     reactData.isIndeterminate = halfSelect;
@@ -14863,6 +14869,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
       }));
     }
   }
+  const isLastColumn = $columnIndex === columns.length - 1;
   const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
   let isPreLoadStatus = false;
   if (scrollYLoad && (_rowIndex < scrollYStore.visibleStartIndex || _rowIndex > scrollYStore.visibleEndIndex)) {
@@ -14875,7 +14882,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
       [`col--${cellAlign}`]: cellAlign,
       [`col--vertical-${verticalAlign}`]: verticalAlign,
       [`col--${type}`]: type,
-      'col--last': $columnIndex === columns.length - 1,
+      'col--last': isLastColumn,
       'col--tree-node': treeNode,
       'col--edit': isEdit,
       'col--ellipsis': hasEllipsis,
@@ -15495,6 +15502,8 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
         thOns.mouseup = $xeTable.handleHeaderCellDragMouseupEvent;
       }
     }
+    const isLastColumn = $columnIndex === cols.length - 1;
+    const showResizable = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable;
     const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
     let isPreLoadStatus = false;
     if (scrollXLoad && !isGroup && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex || _columnIndex > scrollXStore.visibleEndIndex)) {
@@ -15504,7 +15513,7 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
       class: ['vxe-header--column', colid, {
         [`col--${headAlign}`]: headAlign,
         [`col--${type}`]: type,
-        'col--last': $columnIndex === cols.length - 1,
+        'col--last': isLastColumn,
         'col--fixed': column.fixed,
         'col--group': isColGroup,
         'col--ellipsis': hasEllipsis,
@@ -15531,7 +15540,7 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
     /**
     * 列宽拖动
     */
-    !fixedHiddenColumn && !isColGroup && (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable) ? h('div', {
+    !fixedHiddenColumn && showResizable ? h('div', {
       class: ['vxe-resizable', {
         'is--line': !border || border === 'none'
       }],
@@ -15539,7 +15548,7 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
         mousedown: evnt => _vm.resizeMousedownEvent(evnt, params),
         dblclick: evnt => $xeTable.handleResizeDblclickEvent(evnt, params)
       }
-    }) : null]);
+    }) : header_renderEmptyElement($xeTable)]);
   });
 };
 function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
@@ -15816,6 +15825,12 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
         clientX: dragClientX
       } = evnt;
       const dragBtnElem = evnt.target;
+      let resizeColumn = column;
+      if (column.children && column.children.length) {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(column.children, childColumn => {
+          resizeColumn = childColumn;
+        });
+      }
       const cell = dragBtnElem.parentNode;
       const cellParams = Object.assign(params, {
         cell
@@ -15872,7 +15887,7 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
           // left = Math.min(left, bodyScrollElem.clientWidth + bodyScrollElem.scrollLeft - 40)
         }
         dragLeft = Math.max(left, dragMinLeft);
-        const resizeBarLeft = dragLeft - scrollLeft;
+        const resizeBarLeft = Math.max(1, dragLeft - scrollLeft);
         resizeBarElem.style.left = `${resizeBarLeft}px`;
         if (resizableOpts.showDragTip && resizeTipElem) {
           const tableWidth = tableEl.clientWidth;
@@ -15882,13 +15897,13 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
           const resizeTipHeight = resizeTipElem.clientHeight;
           let resizeTipLeft = -resizeTipWidth;
           if (resizeBarLeft < resizeTipWidth + resizeBarWidth) {
-            resizeTipLeft = resizeTipWidth + resizeBarWidth - resizeBarLeft;
+            resizeTipLeft = 0;
           } else if (resizeBarLeft > tableWidth) {
             resizeTipLeft += tableWidth - resizeBarLeft;
           }
           resizeTipElem.style.left = `${resizeTipLeft}px`;
           resizeTipElem.style.top = `${Math.min(tableEl.clientHeight - resizeTipHeight, Math.max(0, evnt.clientY - wrapperRect.y - resizeTipHeight / 2))}px`;
-          resizeTipElem.textContent = header_getI18n('vxe.table.resizeColTip', [column.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft)]);
+          resizeTipElem.textContent = header_getI18n('vxe.table.resizeColTip', [resizeColumn.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft)]);
         }
       };
       $xetable._isResize = true;
@@ -15898,11 +15913,11 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
       document.onmouseup = function (evnt) {
         document.onmousemove = domMousemove;
         document.onmouseup = domMouseup;
-        const resizeWidth = column.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft);
-        column.resizeWidth = resizeWidth;
+        const resizeWidth = resizeColumn.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft);
+        resizeColumn.resizeWidth = resizeWidth;
         if (resizableOpts.dragMode === 'fixed') {
           visibleColumn.forEach(item => {
-            if (item.id !== column.id) {
+            if (item.id !== resizeColumn.id) {
               if (!item.resizeWidth) {
                 item.resizeWidth = item.renderWidth;
               }
@@ -16102,6 +16117,7 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
         attrs.colspan = colspan;
       }
     }
+    const isLastColumn = $columnIndex === tableColumn.length - 1;
     const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
     let isPreLoadStatus = false;
     if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex || _columnIndex > scrollXStore.visibleEndIndex)) {
@@ -16111,7 +16127,7 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
       class: ['vxe-footer--column', column.id, {
         [`col--${footAlign}`]: footAlign,
         [`col--${type}`]: type,
-        'col--last': $columnIndex === tableColumn.length - 1,
+        'col--last': isLastColumn,
         'fixed--width': !isAutoCellWidth,
         'fixed--hidden': fixedHiddenColumn,
         'col--ellipsis': hasEllipsis,