vxe-table 4.10.6-beta.2 → 4.10.6-beta.4

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.10.6-beta.2";
+const version = "4.10.6-beta.4";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3568,7 +3568,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.10.6-beta.2"}`;
+const log_version = `table v${"4.10.6-beta.4"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -6512,6 +6512,7 @@ const renderType = 'body';
           }));
         }
       }
+      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)) {
@@ -6524,7 +6525,7 @@ const renderType = 'body';
           [`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,
@@ -7019,7 +7020,6 @@ const header_renderType = 'header';
     } = $xeTable;
     const {
       refElem: tableRefElem,
-      refTableBody,
       refLeftContainer,
       refRightContainer,
       refCellResizeBar,
@@ -7052,10 +7052,10 @@ const header_renderType = 'header';
         fixedType
       } = props;
       const {
+        elemStore,
         visibleColumn
       } = tableInternalData;
       const resizableOpts = computeResizableOpts.value;
-      const tableBody = refTableBody.value;
       const tableEl = tableRefElem.value;
       const leftContainerElem = refLeftContainer.value;
       const rightContainerElem = refRightContainer.value;
@@ -7066,12 +7066,21 @@ const header_renderType = 'header';
       } = evnt;
       const wrapperElem = refElem.value;
       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
       });
       let dragLeft = 0;
-      const tableBodyElem = tableBody.$el;
+      const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+      if (!bodyScrollElem) {
+        return;
+      }
       const pos = getOffsetPos(dragBtnElem, wrapperElem);
       const dragBtnWidth = dragBtnElem.clientWidth;
       const dragBtnOffsetWidth = Math.floor(dragBtnWidth / 2);
@@ -7100,25 +7109,25 @@ const header_renderType = 'header';
         }
       }
       // 处理拖动事件
-      const updateEvent = function (evnt) {
+      const updateEvent = evnt => {
         evnt.stopPropagation();
         evnt.preventDefault();
         const offsetX = evnt.clientX - dragClientX;
         let left = dragPosLeft + offsetX;
-        const scrollLeft = fixedType ? 0 : tableBodyElem.scrollLeft;
+        const scrollLeft = fixedType ? 0 : bodyScrollElem.scrollLeft;
         if (isLeftFixed) {
           // 左固定列（不允许超过右侧固定列、不允许超过右边距）
-          left = Math.min(left, (rightContainerElem ? rightContainerElem.offsetLeft : tableBodyElem.clientWidth) - fixedOffsetWidth - minInterval);
+          left = Math.min(left, (rightContainerElem ? rightContainerElem.offsetLeft : bodyScrollElem.clientWidth) - fixedOffsetWidth - minInterval);
         } else if (isRightFixed) {
           // 右侧固定列（不允许超过左侧固定列、不允许超过左边距）
           dragMinLeft = (leftContainerElem ? leftContainerElem.clientWidth : 0) + fixedOffsetWidth + minInterval;
           left = Math.min(left, dragPosLeft + cell.clientWidth - minInterval);
         } else {
-          dragMinLeft = Math.max(tableBodyElem.scrollLeft, dragMinLeft);
-          // left = Math.min(left, tableBodyElem.clientWidth + tableBodyElem.scrollLeft - 40)
+          dragMinLeft = Math.max(bodyScrollElem.scrollLeft, dragMinLeft);
+          // 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;
@@ -7128,13 +7137,13 @@ const header_renderType = 'header';
           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)]);
         }
       };
       tableReactData._isResize = true;
@@ -7144,11 +7153,11 @@ const header_renderType = 'header';
       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;
               }
@@ -7281,6 +7290,8 @@ const header_renderType = 'header';
             thOns.onMouseup = $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)) {
@@ -7290,7 +7301,7 @@ const header_renderType = 'header';
           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,
@@ -7317,13 +7328,13 @@ const header_renderType = 'header';
         /**
          * 列宽拖动
          */
-        !fixedHiddenColumn && !isColGroup && (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable) ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        !fixedHiddenColumn && showResizable ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
           class: ['vxe-resizable', {
             'is--line': !border || border === 'none'
           }],
           onMousedown: evnt => resizeMousedownEvent(evnt, params),
           onDblclick: evnt => $xeTable.handleResizeDblclickEvent(evnt, params)
-        }) : null]);
+        }) : header_renderEmptyElement($xeTable)]);
       });
     };
     const renderHeads = (isGroup, isOptimizeMode, headerGroups) => {
@@ -7733,6 +7744,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
             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)) {
@@ -7742,7 +7754,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
           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,
@@ -11520,7 +11532,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           }
           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`]);
           }
         }
@@ -17801,7 +17813,13 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           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;
@@ -17809,11 +17827,11 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             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();
@@ -18079,7 +18097,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           }
           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;