vxe-table 4.19.12 → 4.19.14

package/es/table/module/edit/hook.js

@@ -77,7 +77,7 @@ hooks.add('tableEditModule', {
                     }
                     pChilds[funcName](item);
                     pMapChilds[funcName](item);
-                    const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: pChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                    const rest = { row: item, rowid, _seq: -1, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: pChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
                     fullDataRowIdData[rowid] = rest;
                     fullAllDataRowIdData[rowid] = rest;
                 }
@@ -87,7 +87,7 @@ hooks.add('tableEditModule', {
                     }
                     afterFullData[funcName](item);
                     tableFullTreeData[funcName](item);
-                    const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: tableFullTreeData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                    const rest = { row: item, rowid, _seq: -1, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: tableFullTreeData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
                     fullDataRowIdData[rowid] = rest;
                     fullAllDataRowIdData[rowid] = rest;
                 }
@@ -137,7 +137,7 @@ hooks.add('tableEditModule', {
                 else {
                     newRecords.forEach(item => {
                         const rowid = getRowid($xeTable, item);
-                        const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: afterFullData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                        const rest = { row: item, rowid, _seq: -1, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: afterFullData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
                         fullDataRowIdData[rowid] = rest;
                         fullAllDataRowIdData[rowid] = rest;
                         afterFullData.unshift(item);
@@ -169,7 +169,7 @@ hooks.add('tableEditModule', {
                     else {
                         newRecords.forEach(item => {
                             const rowid = getRowid($xeTable, item);
-                            const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, treeIndex: -1, _tIndex: -1, $index: -1, items: afterFullData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                            const rest = { row: item, rowid, _seq: -1, seq: -1, index: -1, _index: -1, treeIndex: -1, _tIndex: -1, $index: -1, items: afterFullData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
                             fullDataRowIdData[rowid] = rest;
                             fullAllDataRowIdData[rowid] = rest;
                             afterFullData.push(item);
@@ -209,7 +209,7 @@ hooks.add('tableEditModule', {
                             });
                             XEUtils.eachTree(treeRecords, (item) => {
                                 const rowid = getRowid($xeTable, item);
-                                const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: parentMapChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                                const rest = { row: item, rowid, _seq: -1, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: parentMapChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
                                 if (item[childrenField]) {
                                     item[mapChildrenField] = item[childrenField];
                                 }

package/es/table/module/menu/panel.js

@@ -42,7 +42,7 @@ export default defineVxeComponent({
                         return options.every(item => item.visible === false)
                             ? renderEmptyElement($xeTable)
                             : h('ul', {
-                                class: 'vxe-context-menu--option-wrapper',
+                                class: 'vxe-table--context-menu-group-wrapper',
                                 key: gIndex
                             }, options.map((item, index) => {
                                 const { children, loading } = item;
@@ -55,7 +55,7 @@ export default defineVxeComponent({
                                 return item.visible === false
                                     ? renderEmptyElement($xeTable)
                                     : h('li', {
-                                        class: [item.className, {
+                                        class: ['vxe-table--context-menu--option', item.className, {
                                                 'link--loading': loading,
                                                 'link--disabled': item.disabled,
                                                 'link--active': item === ctxMenuStore.selected
@@ -105,12 +105,12 @@ export default defineVxeComponent({
                                                 suffixOpts.content ? h('span', `${suffixOpts.content}`) : renderEmptyElement($xeTable)
                                             ])
                                         ]),
-                                        hasChildMenus && item.children
+                                        hasChildMenus && children
                                             ? h('ul', {
                                                 class: ['vxe-table--context-menu-clild-wrapper', {
                                                         'is--show': item === ctxMenuStore.selected && ctxMenuStore.showChild
                                                     }]
-                                            }, item.children.map((child, cIndex) => {
+                                            }, children.map((child, cIndex) => {
                                                 const { loading: childLoading } = child;
                                                 const childPrefixOpts = Object.assign({}, child.prefixConfig);
                                                 const childPrefixIcon = childPrefixOpts.icon || child.prefixIcon;
@@ -120,7 +120,7 @@ export default defineVxeComponent({
                                                 return child.visible === false
                                                     ? null
                                                     : h('li', {
-                                                        class: [child.className, {
+                                                        class: ['vxe-table--context-menu--option', child.className, {
                                                                 'link--loading': childLoading,
                                                                 'link--disabled': child.disabled,
                                                                 'link--active': child === ctxMenuStore.selectChild

package/es/table/src/table.js

@@ -1,6 +1,6 @@
 import { h, reactive, ref, provide, inject, nextTick, Teleport, onActivated, onDeactivated, onBeforeUnmount, onUnmounted, watch, computed, onMounted } from 'vue';
 import { defineVxeComponent } from '../../ui/src/comp';
-import XEUtils from 'xe-utils';
+import XEUtils, { isNaN } from 'xe-utils';
 import { initTpImg, getTpImg, isPx, isScale, hasClass, addClass, removeClass, wheelScrollTopTo, wheelScrollLeftTo, getEventTargetNode, getPaddingTopBottomSize, setScrollTop, setScrollLeft, toCssUnit, hasControlKey, checkTargetElement, hasEventInputTarget } from '../../ui/src/dom';
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils';
 import { VxeUI } from '../../ui';
@@ -584,22 +584,32 @@ export default defineVxeComponent({
             const { tableFullColumn } = internalData;
             const { updateColFlag } = reactData;
             const editDirtyOpts = computeEditDirtyOpts.value;
-            const { includeFields, excludeFields } = editDirtyOpts;
+            const { extraFields, includeFields, excludeFields } = editDirtyOpts;
             const kpFields = [];
             if (updateColFlag) {
                 if (includeFields && includeFields.length) {
                     return includeFields;
                 }
-                const exfMaps = {};
+                const excludeFdMaps = {};
                 if (excludeFields && excludeFields.length) {
                     excludeFields.forEach(field => {
-                        exfMaps[field] = 1;
+                        excludeFdMaps[field] = 1;
+                    });
+                }
+                const addFdMaps = {};
+                if (extraFields && extraFields.length) {
+                    extraFields.forEach(field => {
+                        if (!addFdMaps[field]) {
+                            addFdMaps[field] = 1;
+                            kpFields.push(field);
+                        }
                     });
                 }
                 for (let i = 0; i < tableFullColumn.length; i++) {
                     const column = tableFullColumn[i];
                     const { field, type, editRender, cellRender } = column;
-                    if (field && !type && (editRender || cellRender) && !exfMaps[field]) {
+                    if (field && !type && (editRender || cellRender) && !addFdMaps[field] && !excludeFdMaps[field]) {
+                        addFdMaps[field] = 1;
                         kpFields.push(field);
                     }
                 }
@@ -2071,26 +2081,63 @@ export default defineVxeComponent({
                     return cellValue;
                 };
         };
+        const updateAfterTreeIndex = () => {
+            const { fullDataRowIdData, fullAllDataRowIdData, afterFullData, afterTreeFullData } = internalData;
+            const treeOpts = computeTreeOpts.value;
+            const { transform, mapChildrenField } = treeOpts;
+            const childrenField = treeOpts.children || treeOpts.childrenField;
+            const fullMaps = {};
+            let rowNum = 0;
+            const { handleGetRowId } = createHandleGetRowId($xeTable);
+            XEUtils.eachTree(afterTreeFullData, (row, index, items, path) => {
+                const rowid = handleGetRowId(row);
+                const rowRest = fullAllDataRowIdData[rowid];
+                const seq = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('');
+                if (rowRest) {
+                    rowRest.seq = seq;
+                    rowRest._seq = rowNum;
+                    rowRest.treeIndex = index;
+                    rowRest._tIndex = rowNum;
+                }
+                else {
+                    const rest = { row, rowid, _seq: rowNum, seq, index: -1, $index: -1, _index: -1, treeIndex: -1, _tIndex: rowNum, items: [], parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                    fullAllDataRowIdData[rowid] = rest;
+                    fullDataRowIdData[rowid] = rest;
+                }
+                rowNum++;
+                fullMaps[rowid] = row;
+            }, { children: transform ? mapChildrenField : childrenField });
+            if (transform) {
+                afterFullData.forEach((row, index) => {
+                    const rowid = handleGetRowId(row);
+                    const rowRest = fullAllDataRowIdData[rowid];
+                    if (rowRest) {
+                        rowRest._index = index;
+                    }
+                });
+            }
+            internalData.afterFullRowMaps = fullMaps;
+        };
         const updateAfterListIndex = () => {
-            const { treeConfig } = props;
             const { afterFullData, fullDataRowIdData, fullAllDataRowIdData } = internalData;
             const { handleGetRowId } = createHandleGetRowId($xeTable);
             const fullMaps = {};
+            let rowNum = 0;
             afterFullData.forEach((row, index) => {
                 const rowid = handleGetRowId(row);
                 const rowRest = fullAllDataRowIdData[rowid];
                 const seq = index + 1;
                 if (rowRest) {
-                    if (!treeConfig) {
-                        rowRest.seq = seq;
-                    }
+                    rowRest.seq = seq;
+                    rowRest._seq = rowNum;
                     rowRest._index = index;
                 }
                 else {
-                    const rest = { row, rowid, seq, index: -1, $index: -1, _index: index, treeIndex: -1, _tIndex: -1, items: [], parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                    const rest = { row, rowid, _seq: rowNum, seq, index: -1, $index: -1, _index: index, treeIndex: -1, _tIndex: -1, items: [], parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
                     fullAllDataRowIdData[rowid] = rest;
                     fullDataRowIdData[rowid] = rest;
                 }
+                rowNum++;
                 fullMaps[rowid] = row;
             });
             internalData.afterFullRowMaps = fullMaps;
@@ -2101,45 +2148,8 @@ export default defineVxeComponent({
          */
         const updateAfterDataIndex = () => {
             const { treeConfig } = props;
-            const { fullDataRowIdData, fullAllDataRowIdData, afterFullData, afterTreeFullData } = internalData;
-            const treeOpts = computeTreeOpts.value;
-            const { transform } = treeOpts;
-            const childrenField = treeOpts.children || treeOpts.childrenField;
-            const fullMaps = {};
             if (treeConfig) {
-                let _treeIndex = 0;
-                const { handleGetRowId } = createHandleGetRowId($xeTable);
-                XEUtils.eachTree(afterTreeFullData, (row, index, items, path) => {
-                    const rowid = handleGetRowId(row);
-                    const rowRest = fullAllDataRowIdData[rowid];
-                    const seq = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('');
-                    if (rowRest) {
-                        rowRest.seq = seq;
-                        rowRest.treeIndex = index;
-                        rowRest._tIndex = _treeIndex;
-                    }
-                    else {
-                        const rest = { row, rowid, seq, index: -1, $index: -1, _index: -1, treeIndex: -1, _tIndex: _treeIndex, items: [], parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
-                        fullAllDataRowIdData[rowid] = rest;
-                        fullDataRowIdData[rowid] = rest;
-                    }
-                    _treeIndex++;
-                    fullMaps[rowid] = row;
-                }, { children: transform ? treeOpts.mapChildrenField : childrenField });
-                if (transform) {
-                    afterFullData.forEach((row, index) => {
-                        const rowid = handleGetRowId(row);
-                        const rowRest = fullAllDataRowIdData[rowid];
-                        const seq = index + 1;
-                        if (rowRest) {
-                            if (!treeConfig) {
-                                rowRest.seq = seq;
-                            }
-                            rowRest._index = index;
-                        }
-                    });
-                }
-                internalData.afterFullRowMaps = fullMaps;
+                updateAfterTreeIndex();
             }
             else {
                 updateAfterListIndex();
@@ -3335,8 +3345,9 @@ export default defineVxeComponent({
                 }
             });
         };
-        const minRunDelay = 50;
-        const handleLazyRecalculate = (reFull, reWidth, reHeight) => {
+        const defaultMinRunDelay = 50;
+        const handleLazyRecalculate = (reFull, reWidth, reHeight, options) => {
+            const minRunDelay = (options ? options.minRunDelay : defaultMinRunDelay) || defaultMinRunDelay;
             return new Promise(resolve => {
                 const $xeGanttView = internalData.xeGanttView;
                 const { customStore } = reactData;
@@ -3363,6 +3374,7 @@ export default defineVxeComponent({
                 }
                 if (rceTimeout) {
                     clearTimeout(rceTimeout);
+                    // 多少毫秒内至少执行一次
                     if (rceRunTime && rceRunTime + minRunDelay < Date.now()) {
                         resolve(handleRecalculateStyle(reFull, reWidth, reHeight));
                     }
@@ -3387,16 +3399,17 @@ export default defineVxeComponent({
                 }, reDelay);
             });
         };
-        let resizePending = false;
         const handleResizeEvent = () => {
-            if (resizePending) {
+            if (internalData.rsePending) {
                 return;
             }
-            resizePending = true;
-            handleLazyRecalculate(true, true, true).then(() => {
-                resizePending = false;
+            internalData.rsePending = true;
+            handleLazyRecalculate(true, true, true, {
+                minRunDelay: 200
+            }).then(() => {
+                internalData.rsePending = false;
             }).catch(() => {
-                resizePending = false;
+                internalData.rsePending = false;
             });
         };
         const handleUpdateAggValues = () => {
@@ -4170,7 +4183,11 @@ export default defineVxeComponent({
             const { transform } = treeOpts;
             const allList = fullData || internalData.tableFullData;
             // 如果gt为0，则总是启用
-            const scrollYLoad = (transform || !treeConfig) && !!virtualYOpts.enabled && virtualYOpts.gt > -1 && (virtualYOpts.gt === 0 || virtualYOpts.gt < allList.length);
+            let scrollYLoad = !!virtualYOpts.enabled && virtualYOpts.gt > -1 && (virtualYOpts.gt === 0 || virtualYOpts.gt < allList.length);
+            if (scrollYLoad && (treeConfig && !transform)) {
+                errLog('vxe.error.notSupportProp', ['[table] virtual-y-config.enabled=true', 'tree-config.transform=false', 'tree-config.transform=true']);
+                scrollYLoad = false;
+            }
             reactData.scrollYLoad = scrollYLoad;
             syncGanttScrollYStatus();
             return scrollYLoad;
@@ -4980,7 +4997,7 @@ export default defineVxeComponent({
                     XEUtils.eachTree(rows, (childRow, index, items, path, parentItem, nodes) => {
                         const rowid = getRowid($xeTable, childRow);
                         const parentRow = parentItem || parentRest.row;
-                        const rest = { row: childRow, rowid, seq: -1, index, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items, parent: parentRow, level: parentLevel + nodes.length, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                        const rest = { row: childRow, rowid, _seq: -1, seq: -1, index, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items, parent: parentRow, level: parentLevel + nodes.length, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
                         fullDataRowIdData[rowid] = rest;
                         fullAllDataRowIdData[rowid] = rest;
                     }, { children: childrenField });
@@ -9394,18 +9411,20 @@ export default defineVxeComponent({
                 const fullDataRowIdMaps = {};
                 const idMaps = {};
                 const { handleUpdateRowId } = createHandleUpdateRowId($xeTable);
+                let rowNum = 0;
                 const handleRowCache = (row, index, items, currIndex, parentRow, rowid, level, seq) => {
                     let rowRest = fullAllDataRowIdMaps[rowid];
                     if (idMaps[rowid]) {
                         errLog('vxe.error.repeatKey', [currKeyField, rowid]);
                     }
                     if (!rowRest) {
-                        rowRest = { row, rowid, seq, index: -1, _index: -1, $index: -1, treeIndex: index, _tIndex: -1, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                        rowRest = { row, rowid, _seq: -1, seq, index: -1, _index: -1, $index: -1, treeIndex: index, _tIndex: -1, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
                         fullDataRowIdMaps[rowid] = rowRest;
                         fullAllDataRowIdMaps[rowid] = rowRest;
                     }
                     rowRest.treeLoaded = false;
                     rowRest.expandLoaded = false;
+                    rowRest._seq = rowNum++;
                     rowRest.row = row;
                     rowRest.items = items;
                     rowRest.parent = parentRow;
@@ -9419,6 +9438,7 @@ export default defineVxeComponent({
                     if (rowExpandedMaps[rowid]) {
                         rowExpandedMaps[rowid] = row;
                     }
+                    rowNum++;
                     idMaps[rowid] = true;
                     fullDataRowIdMaps[rowid] = rowRest;
                     fullAllDataRowIdMaps[rowid] = rowRest;
@@ -9430,7 +9450,7 @@ export default defineVxeComponent({
                     const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
                     XEUtils.eachTree(tableFullTreeData, (row, index, items, path, parentRow, nodes) => {
                         const rowid = handleUpdateRowId(row);
-                        if (treeConfig && lazy) {
+                        if (lazy) {
                             if (row[hasChildField] && row[childrenField] === undefined) {
                                 row[childrenField] = null;
                             }
@@ -10719,31 +10739,162 @@ export default defineVxeComponent({
                 const { treeConfig } = props;
                 const { row } = params;
                 const { isRowGroupStatus } = reactData;
-                const { afterFullData } = internalData;
+                const { fullAllDataRowIdData, afterFullData, afterTreeFullData, afterGroupFullData } = internalData;
                 const checkboxOpts = computeCheckboxOpts.value;
-                const { checkMethod, trigger } = checkboxOpts;
+                const aggregateOpts = computeAggregateOpts.value;
+                const treeOpts = computeTreeOpts.value;
+                const { checkMethod, trigger, checkStrictly } = checkboxOpts;
                 if (trigger === 'manual') {
                     return;
                 }
                 evnt.stopPropagation();
-                if (checkboxOpts.isShiftKey && evnt.shiftKey && !(treeConfig || isRowGroupStatus)) {
+                if (checkboxOpts.isShiftKey && evnt.shiftKey) {
+                    const { handleGetRowId } = createHandleGetRowId($xeTable);
                     const checkboxRecords = $xeTable.getCheckboxRecords();
-                    if (checkboxRecords.length) {
-                        const firstRow = checkboxRecords[0];
-                        const _rowIndex = $xeTable.getVTRowIndex(row);
-                        const _firstRowIndex = $xeTable.getVTRowIndex(firstRow);
-                        if (_rowIndex !== _firstRowIndex) {
+                    let currSeq = -1;
+                    let currRow = null;
+                    const currRowid = handleGetRowId(row);
+                    const rowRest = fullAllDataRowIdData[currRowid];
+                    if (rowRest) {
+                        currRow = rowRest.row;
+                        currSeq = rowRest._seq;
+                    }
+                    if (currRow && checkboxRecords.length) {
+                        let rangeRows = [];
+                        let firstSeq = -1;
+                        let firstRow = null;
+                        let firstRowid = '';
+                        let lastSeq = -1;
+                        let lastRow = null;
+                        let lastRowid = '';
+                        // 根据序号取出范围最小/最大的行
+                        const selectMaps = {};
+                        checkboxRecords.forEach(item => {
+                            const rowid = handleGetRowId(item);
+                            const rowRest = fullAllDataRowIdData[rowid];
+                            if (rowRest) {
+                                if (!firstRow || firstSeq > rowRest._seq) {
+                                    firstRowid = rowRest.rowid;
+                                    firstRow = rowRest.row;
+                                    firstSeq = rowRest._seq;
+                                }
+                                if (!lastRow || lastSeq < rowRest._seq) {
+                                    lastRowid = rowRest.rowid;
+                                    lastRow = rowRest.row;
+                                    lastSeq = rowRest._seq;
+                                }
+                            }
+                            selectMaps[rowid] = item;
+                        });
+                        // 如果已选只有一条并选择当前则跳过
+                        if (firstRow && lastRow && (checkboxRecords.length > 1 || currRowid !== firstRowid) && (Math.abs(firstSeq - lastSeq) > 1 || Math.abs(currSeq - firstSeq) > 1 || Math.abs(currSeq - lastSeq) > 1)) {
+                            // 树与分组
+                            if (treeConfig || isRowGroupStatus) {
+                                const { transform } = treeOpts;
+                                const childrenField = treeOpts.children || treeOpts.childrenField;
+                                const iteratorChildField = treeConfig ? (transform ? treeOpts.mapChildrenField : childrenField) : aggregateOpts.mapChildrenField;
+                                let isMatchFirst = false;
+                                let matchStartRowid = '';
+                                let matchEndRowid = '';
+                                const handleGetChildRowid = (rowid, isLast) => {
+                                    const rowRest = fullAllDataRowIdData[rowid];
+                                    if (rowRest) {
+                                        const item = rowRest.row;
+                                        const childList = item[iteratorChildField];
+                                        if (childList && childList.length) {
+                                            const targetRow = isLast ? XEUtils.last(childList) : XEUtils.first(childList);
+                                            return handleGetChildRowid(handleGetRowId(targetRow), isLast);
+                                        }
+                                    }
+                                    return rowid;
+                                };
+                                const handleGetSelectParentRowid = (rowid) => {
+                                    const rowRest = fullAllDataRowIdData[rowid];
+                                    if (rowRest) {
+                                        const parentItem = rowRest.parent;
+                                        if (parentItem) {
+                                            const parentRowid = handleGetRowId(parentItem);
+                                            if (selectMaps[parentRowid]) {
+                                                return handleGetSelectParentRowid(parentRowid);
+                                            }
+                                        }
+                                    }
+                                    return rowid;
+                                };
+                                const handleGetRootRow = (row) => {
+                                    const rowid = handleGetRowId(row);
+                                    if (rowid) {
+                                        const rest = fullAllDataRowIdData[rowid];
+                                        if (rest) {
+                                            return rest.parent ? handleGetRootRow(rest.parent) : rest;
+                                        }
+                                    }
+                                    return null;
+                                };
+                                if (currSeq < firstSeq) {
+                                    matchStartRowid = handleGetChildRowid(currRowid, 0);
+                                    matchEndRowid = handleGetChildRowid(firstRowid, 1);
+                                }
+                                else {
+                                    if (currSeq > lastSeq) {
+                                        matchStartRowid = handleGetSelectParentRowid(lastRowid);
+                                    }
+                                    else {
+                                        matchStartRowid = handleGetChildRowid(firstRowid, 0);
+                                    }
+                                    matchEndRowid = handleGetChildRowid(currRowid, 1);
+                                }
+                                const handleRangeRow = (item) => {
+                                    const rowid = handleGetRowId(item);
+                                    const childList = item[iteratorChildField];
+                                    if (!isMatchFirst && rowid === matchStartRowid) {
+                                        isMatchFirst = true;
+                                    }
+                                    // 如果是父子关联，则排除父节点
+                                    if (isMatchFirst && (checkStrictly || !childList || !childList.length)) {
+                                        rangeRows.push(item);
+                                    }
+                                    // break
+                                    return rowid === matchEndRowid;
+                                };
+                                if (treeConfig) {
+                                    const matchStartRowRest = fullAllDataRowIdData[matchStartRowid];
+                                    const firstRootRowRest = matchStartRowRest ? handleGetRootRow(matchStartRowRest.row) : null;
+                                    if (firstRootRowRest) {
+                                        // 优化查找复杂度
+                                        XEUtils.findTree(afterTreeFullData.slice(firstRootRowRest.treeIndex), handleRangeRow, { children: iteratorChildField });
+                                    }
+                                    else {
+                                        XEUtils.findTree(afterTreeFullData, handleRangeRow, { children: iteratorChildField });
+                                    }
+                                }
+                                else {
+                                    XEUtils.findTree(afterGroupFullData, handleRangeRow, { children: iteratorChildField });
+                                }
+                            }
+                            else {
+                                const _currRowIndex = $xeTable.getVTRowIndex(currRow);
+                                const _firstRowIndex = $xeTable.getVTRowIndex(firstRow);
+                                const _lastRowIndex = $xeTable.getVTRowIndex(lastRow);
+                                if (_currRowIndex < _firstRowIndex) {
+                                    rangeRows = afterFullData.slice(_currRowIndex, _firstRowIndex + 1);
+                                }
+                                else if (_currRowIndex > _lastRowIndex) {
+                                    rangeRows = afterFullData.slice(_lastRowIndex, _currRowIndex + 1);
+                                }
+                                else {
+                                    rangeRows = afterFullData.slice(_firstRowIndex, _currRowIndex + 1);
+                                }
+                            }
                             $xeTable.setAllCheckboxRow(false);
-                            const rangeRows = _rowIndex < _firstRowIndex ? afterFullData.slice(_rowIndex, _firstRowIndex + 1) : afterFullData.slice(_firstRowIndex, _rowIndex + 1);
                             nextTick(() => {
                                 handleCheckedCheckboxRow(rangeRows, true, false);
                             });
                             dispatchEvent('checkbox-range-select', Object.assign({ rangeRecords: rangeRows }, params), evnt);
-                            return;
                         }
                     }
                 }
-                if (isRowGroupStatus || !checkMethod || checkMethod({ $table: $xeTable, row })) {
+                if (!checkMethod || checkMethod({ $table: $xeTable, row })) {
                     $xeTable.handleBatchSelectRows([row], checked);
                     $xeTable.checkSelectionStatus();
                     dispatchEvent('checkbox-change', Object.assign({
@@ -14236,9 +14387,6 @@ export default defineVxeComponent({
             if (props.editConfig && editOpts.activeMethod) {
                 warnLog('vxe.error.delProp', ['edit-config.activeMethod', 'edit-config.beforeEditMethod']);
             }
-            if (props.treeConfig && checkboxOpts.isShiftKey) {
-                errLog('vxe.error.errConflicts', ['tree-config', 'checkbox-config.isShiftKey']);
-            }
             if (checkboxOpts.halfField) {
                 warnLog('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField']);
             }

package/es/table/style.css

@@ -1698,13 +1698,17 @@
   background-color: var(--vxe-ui-layout-background-color);
 }
 
+.vxe-context-menu--option {
+  color: var(--vxe-ui-font-color);
+}
+
 .vxe-context-menu--link {
   display: flex;
   flex-direction: row;
   width: var(--vxe-ui-table-menu-item-width);
   line-height: 26px;
   padding: 0 0.8em;
-  color: var(--vxe-ui-font-color);
+  color: inherit;
   cursor: pointer;
 }
 .vxe-context-menu--link .vxe-context-menu--link-prefix,
@@ -1722,35 +1726,35 @@
   white-space: nowrap;
 }
 
-.vxe-context-menu--option-wrapper,
+.vxe-table--context-menu-group-wrapper,
 .vxe-table--context-menu-clild-wrapper {
   margin: 0;
   padding: 0;
   list-style-type: none;
   border-bottom: 1px solid var(--vxe-ui-base-popup-border-color);
 }
-.vxe-context-menu--option-wrapper li,
+.vxe-table--context-menu-group-wrapper li,
 .vxe-table--context-menu-clild-wrapper li {
   position: relative;
   margin: 1px 0;
   border: 1px solid transparent;
 }
-.vxe-context-menu--option-wrapper li:last-child,
+.vxe-table--context-menu-group-wrapper li:last-child,
 .vxe-table--context-menu-clild-wrapper li:last-child {
   border: 0;
 }
-.vxe-context-menu--option-wrapper li.link--active,
+.vxe-table--context-menu-group-wrapper li.link--active,
 .vxe-table--context-menu-clild-wrapper li.link--active {
   background-color: var(--vxe-ui-base-hover-background-color);
   border-color: var(--vxe-ui-base-hover-background-color);
 }
-.vxe-context-menu--option-wrapper li.link--loading > .vxe-context-menu--link, .vxe-context-menu--option-wrapper li.link--disabled > .vxe-context-menu--link,
+.vxe-table--context-menu-group-wrapper li.link--loading > .vxe-context-menu--link, .vxe-table--context-menu-group-wrapper li.link--disabled > .vxe-context-menu--link,
 .vxe-table--context-menu-clild-wrapper li.link--loading > .vxe-context-menu--link,
 .vxe-table--context-menu-clild-wrapper li.link--disabled > .vxe-context-menu--link {
   color: var(--vxe-ui-font-disabled-color);
   cursor: no-drop;
 }
-.vxe-context-menu--option-wrapper li.link--loading.link--active:hover, .vxe-context-menu--option-wrapper li.link--disabled.link--active:hover,
+.vxe-table--context-menu-group-wrapper li.link--loading.link--active:hover, .vxe-table--context-menu-group-wrapper li.link--disabled.link--active:hover,
 .vxe-table--context-menu-clild-wrapper li.link--loading.link--active:hover,
 .vxe-table--context-menu-clild-wrapper li.link--disabled.link--active:hover {
   background-color: inherit;