vxe-table 4.10.6-beta.3 → 4.10.6-beta.5

package/es/table/src/header.js

@@ -47,6 +47,12 @@ export default defineComponent({
             const { clientX: dragClientX } = evnt;
             const wrapperElem = refElem.value;
             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 });
             let dragLeft = 0;
@@ -83,7 +89,7 @@ export default defineComponent({
                 }
             }
             // 处理拖动事件
-            const updateEvent = function (evnt) {
+            const updateEvent = (evnt) => {
                 evnt.stopPropagation();
                 evnt.preventDefault();
                 const offsetX = evnt.clientX - dragClientX;
@@ -103,7 +109,7 @@ export default defineComponent({
                     // 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;
@@ -113,14 +119,14 @@ export default defineComponent({
                     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)]);
                 }
             };
             tableReactData._isResize = true;
@@ -130,11 +136,11 @@ export default defineComponent({
             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;
                             }
@@ -219,6 +225,8 @@ export default defineComponent({
                         thOns.onMouseup = $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)) {
@@ -227,7 +235,7 @@ export default defineComponent({
                 return h('th', Object.assign(Object.assign(Object.assign({ 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,
@@ -253,7 +261,7 @@ export default defineComponent({
                     /**
                      * 列宽拖动
                      */
-                    !fixedHiddenColumn && !isColGroup && (XEUtils.isBoolean(column.resizable) ? column.resizable : (columnOpts.resizable || allResizable))
+                    !fixedHiddenColumn && showResizable
                         ? h('div', {
                             class: ['vxe-resizable', {
                                     'is--line': !border || border === 'none'
@@ -261,7 +269,7 @@ export default defineComponent({
                             onMousedown: (evnt) => resizeMousedownEvent(evnt, params),
                             onDblclick: (evnt) => $xeTable.handleResizeDblclickEvent(evnt, params)
                         })
-                        : null
+                        : renderEmptyElement($xeTable)
                 ]);
             });
         };

package/es/table/src/table.js

@@ -1097,7 +1097,7 @@ export default defineComponent({
                     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`]);
                     }
                 }
@@ -1443,51 +1443,65 @@ export default defineComponent({
                 return cellValue;
             };
         };
+        const updateAfterListIndex = () => {
+            const { afterFullData, fullDataRowIdData, fullAllDataRowIdData } = internalData;
+            const fullMaps = {};
+            afterFullData.forEach((row, index) => {
+                const rowid = getRowid($xeTable, row);
+                const rowRest = fullAllDataRowIdData[rowid];
+                const seq = index + 1;
+                if (rowRest) {
+                    rowRest.seq = seq;
+                    rowRest._index = index;
+                }
+                else {
+                    const rest = { row, rowid, seq, index: -1, $index: -1, _index: index, items: [], parent: null, level: 0, height: 0, oTop: 0 };
+                    fullAllDataRowIdData[rowid] = rest;
+                    fullDataRowIdData[rowid] = rest;
+                }
+                fullMaps[rowid] = row;
+            });
+            internalData.afterFullRowMaps = fullMaps;
+        };
         /**
          * 预编译
          * 对渲染中的数据提前解析序号及索引。牺牲提前编译耗时换取渲染中额外损耗，使运行时更加流畅
          */
         const updateAfterDataIndex = () => {
             const { treeConfig } = props;
-            const { afterFullData, fullDataRowIdData, fullAllDataRowIdData, afterTreeFullData } = internalData;
+            const { fullDataRowIdData, fullAllDataRowIdData, afterTreeFullData } = internalData;
             const treeOpts = computeTreeOpts.value;
+            const { transform } = treeOpts;
             const childrenField = treeOpts.children || treeOpts.childrenField;
             const fullMaps = {};
             if (treeConfig) {
-                XEUtils.eachTree(afterTreeFullData, (row, index, items, path) => {
-                    const rowid = getRowid($xeTable, row);
-                    const rowRest = fullAllDataRowIdData[rowid];
-                    const seq = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('');
-                    if (rowRest) {
-                        rowRest.seq = seq;
-                        rowRest._index = index;
-                    }
-                    else {
-                        const rest = { row, rowid, seq, index: -1, $index: -1, _index: -1, items: [], parent: null, level: 0, height: 0, oTop: 0 };
-                        fullAllDataRowIdData[rowid] = rest;
-                        fullDataRowIdData[rowid] = rest;
-                    }
-                    fullMaps[rowid] = row;
-                }, { children: treeOpts.transform ? treeOpts.mapChildrenField : childrenField });
+                if (transform) {
+                    updateAfterListIndex();
+                }
+                else {
+                    XEUtils.eachTree(afterTreeFullData, (row, index, items, path) => {
+                        const rowid = getRowid($xeTable, row);
+                        const rowRest = fullAllDataRowIdData[rowid];
+                        const seq = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('');
+                        if (rowRest) {
+                            rowRest.seq = seq;
+                            if (!transform) {
+                                rowRest._index = index;
+                            }
+                        }
+                        else {
+                            const rest = { row, rowid, seq, index: -1, $index: -1, _index: -1, items: [], parent: null, level: 0, height: 0, oTop: 0 };
+                            fullAllDataRowIdData[rowid] = rest;
+                            fullDataRowIdData[rowid] = rest;
+                        }
+                        fullMaps[rowid] = row;
+                    }, { children: transform ? treeOpts.mapChildrenField : childrenField });
+                    internalData.afterFullRowMaps = fullMaps;
+                }
             }
             else {
-                afterFullData.forEach((row, index) => {
-                    const rowid = getRowid($xeTable, row);
-                    const rowRest = fullAllDataRowIdData[rowid];
-                    const seq = index + 1;
-                    if (rowRest) {
-                        rowRest.seq = seq;
-                        rowRest._index = index;
-                    }
-                    else {
-                        const rest = { row, rowid, seq, index: -1, $index: -1, _index: index, items: [], parent: null, level: 0, height: 0, oTop: 0 };
-                        fullAllDataRowIdData[rowid] = rest;
-                        fullDataRowIdData[rowid] = rest;
-                    }
-                    fullMaps[rowid] = row;
-                });
+                updateAfterListIndex();
             }
-            internalData.afterFullRowMaps = fullMaps;
         };
         /**
          * 如果为虚拟树，将树结构拍平
@@ -6520,17 +6534,23 @@ export default defineComponent({
                 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();
@@ -6768,7 +6788,7 @@ export default defineComponent({
                         }
                         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 = "4.10.6-beta.3";
+export const version = "4.10.6-beta.5";
 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${"4.10.6-beta.3"}`;
+const version = `table v${"4.10.6-beta.5"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.10.6-beta.3";
+const version = "4.10.6-beta.5";
 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.3"}`;
+const log_version = `table v${"4.10.6-beta.5"}`;
 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,
@@ -7065,6 +7066,12 @@ 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
@@ -7102,7 +7109,7 @@ const header_renderType = 'header';
         }
       }
       // 处理拖动事件
-      const updateEvent = function (evnt) {
+      const updateEvent = evnt => {
         evnt.stopPropagation();
         evnt.preventDefault();
         const offsetX = evnt.clientX - dragClientX;
@@ -7120,7 +7127,7 @@ const header_renderType = 'header';
           // 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;
@@ -7130,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;
@@ -7146,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;
               }
@@ -7283,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)) {
@@ -7292,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,
@@ -7319,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) => {
@@ -7735,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)) {
@@ -7744,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,
@@ -11522,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`]);
           }
         }
@@ -11890,6 +11900,41 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         return cellValue;
       };
     };
+    const updateAfterListIndex = () => {
+      const {
+        afterFullData,
+        fullDataRowIdData,
+        fullAllDataRowIdData
+      } = internalData;
+      const fullMaps = {};
+      afterFullData.forEach((row, index) => {
+        const rowid = getRowid($xeTable, row);
+        const rowRest = fullAllDataRowIdData[rowid];
+        const seq = index + 1;
+        if (rowRest) {
+          rowRest.seq = seq;
+          rowRest._index = index;
+        } else {
+          const rest = {
+            row,
+            rowid,
+            seq,
+            index: -1,
+            $index: -1,
+            _index: index,
+            items: [],
+            parent: null,
+            level: 0,
+            height: 0,
+            oTop: 0
+          };
+          fullAllDataRowIdData[rowid] = rest;
+          fullDataRowIdData[rowid] = rest;
+        }
+        fullMaps[rowid] = row;
+      });
+      internalData.afterFullRowMaps = fullMaps;
+    };
     /**
      * 预编译
      * 对渲染中的数据提前解析序号及索引。牺牲提前编译耗时换取渲染中额外损耗，使运行时更加流畅
@@ -11899,72 +11944,55 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         treeConfig
       } = props;
       const {
-        afterFullData,
         fullDataRowIdData,
         fullAllDataRowIdData,
         afterTreeFullData
       } = internalData;
       const treeOpts = computeTreeOpts.value;
+      const {
+        transform
+      } = treeOpts;
       const childrenField = treeOpts.children || treeOpts.childrenField;
       const fullMaps = {};
       if (treeConfig) {
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterTreeFullData, (row, index, items, path) => {
-          const rowid = getRowid($xeTable, row);
-          const rowRest = fullAllDataRowIdData[rowid];
-          const seq = path.map((num, i) => i % 2 === 0 ? Number(num) + 1 : '.').join('');
-          if (rowRest) {
-            rowRest.seq = seq;
-            rowRest._index = index;
-          } else {
-            const rest = {
-              row,
-              rowid,
-              seq,
-              index: -1,
-              $index: -1,
-              _index: -1,
-              items: [],
-              parent: null,
-              level: 0,
-              height: 0,
-              oTop: 0
-            };
-            fullAllDataRowIdData[rowid] = rest;
-            fullDataRowIdData[rowid] = rest;
-          }
-          fullMaps[rowid] = row;
-        }, {
-          children: treeOpts.transform ? treeOpts.mapChildrenField : childrenField
-        });
+        if (transform) {
+          updateAfterListIndex();
+        } else {
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterTreeFullData, (row, index, items, path) => {
+            const rowid = getRowid($xeTable, row);
+            const rowRest = fullAllDataRowIdData[rowid];
+            const seq = path.map((num, i) => i % 2 === 0 ? Number(num) + 1 : '.').join('');
+            if (rowRest) {
+              rowRest.seq = seq;
+              if (!transform) {
+                rowRest._index = index;
+              }
+            } else {
+              const rest = {
+                row,
+                rowid,
+                seq,
+                index: -1,
+                $index: -1,
+                _index: -1,
+                items: [],
+                parent: null,
+                level: 0,
+                height: 0,
+                oTop: 0
+              };
+              fullAllDataRowIdData[rowid] = rest;
+              fullDataRowIdData[rowid] = rest;
+            }
+            fullMaps[rowid] = row;
+          }, {
+            children: transform ? treeOpts.mapChildrenField : childrenField
+          });
+          internalData.afterFullRowMaps = fullMaps;
+        }
       } else {
-        afterFullData.forEach((row, index) => {
-          const rowid = getRowid($xeTable, row);
-          const rowRest = fullAllDataRowIdData[rowid];
-          const seq = index + 1;
-          if (rowRest) {
-            rowRest.seq = seq;
-            rowRest._index = index;
-          } else {
-            const rest = {
-              row,
-              rowid,
-              seq,
-              index: -1,
-              $index: -1,
-              _index: index,
-              items: [],
-              parent: null,
-              level: 0,
-              height: 0,
-              oTop: 0
-            };
-            fullAllDataRowIdData[rowid] = rest;
-            fullDataRowIdData[rowid] = rest;
-          }
-          fullMaps[rowid] = row;
-        });
+        updateAfterListIndex();
       }
-      internalData.afterFullRowMaps = fullMaps;
     };
     /**
      * 如果为虚拟树，将树结构拍平
@@ -17803,7 +17831,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;
@@ -17811,11 +17845,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();
@@ -18081,7 +18115,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;