vxe-table 4.12.0-beta.0 → 4.12.0-beta.2

package/es/table/module/export/export-panel.js

@@ -493,25 +493,23 @@ export default defineComponent({
                 })
                 : createCommentVNode();
         };
-        if (process.env.NODE_ENV === 'development') {
-            nextTick(() => {
-                if (!VxeUIModalComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-modal']);
-                }
-                if (!VxeUIButtonComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-button']);
-                }
-                if (!VxeUISelectComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-select']);
-                }
-                if (!VxeUIInputComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-input']);
-                }
-                if (!VxeUICheckboxComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-checkbox']);
-                }
-            });
-        }
+        nextTick(() => {
+            if (!VxeUIModalComponent) {
+                errLog('vxe.error.reqComp', ['vxe-modal']);
+            }
+            if (!VxeUIButtonComponent) {
+                errLog('vxe.error.reqComp', ['vxe-button']);
+            }
+            if (!VxeUISelectComponent) {
+                errLog('vxe.error.reqComp', ['vxe-select']);
+            }
+            if (!VxeUIInputComponent) {
+                errLog('vxe.error.reqComp', ['vxe-input']);
+            }
+            if (!VxeUICheckboxComponent) {
+                errLog('vxe.error.reqComp', ['vxe-checkbox']);
+            }
+        });
         return renderVN;
     }
 });

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

@@ -893,9 +893,7 @@ hooks.add('tableExportModule', {
                 }
                 else {
                     // 不支持的浏览器
-                    if (process.env.NODE_ENV === 'development') {
-                        errLog('vxe.error.notExp');
-                    }
+                    errLog('vxe.error.notExp');
                     _importResolve({ status: true });
                 }
             });
@@ -1512,10 +1510,8 @@ hooks.add('tableExportModule', {
                     message: true,
                     types: XEUtils.keys(exportOpts._typeMaps)
                 }, exportOpts, options);
-                if (process.env.NODE_ENV === 'development') {
-                    if (!props.exportConfig) {
-                        errLog('vxe.error.reqProp', ['export-config']);
-                    }
+                if (!props.exportConfig) {
+                    errLog('vxe.error.reqProp', ['export-config']);
                 }
                 handleExportAndPrint(defOpts);
             },
@@ -1525,10 +1521,8 @@ hooks.add('tableExportModule', {
                 const defOpts = Object.assign({
                     message: true
                 }, printOpts, options);
-                if (process.env.NODE_ENV === 'development') {
-                    if (!props.printConfig) {
-                        errLog('vxe.error.reqProp', ['print-config']);
-                    }
+                if (!props.printConfig) {
+                    errLog('vxe.error.reqProp', ['print-config']);
                 }
                 handleExportAndPrint(defOpts, true);
             }

package/es/table/module/export/import-panel.js

@@ -218,19 +218,17 @@ export default defineComponent({
                 })
                 : createCommentVNode();
         };
-        if (process.env.NODE_ENV === 'development') {
-            nextTick(() => {
-                if (!VxeUIModalComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-modal']);
-                }
-                if (!VxeUIButtonComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-button']);
-                }
-                if (!VxeUISelectComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-select']);
-                }
-            });
-        }
+        nextTick(() => {
+            if (!VxeUIModalComponent) {
+                errLog('vxe.error.reqComp', ['vxe-modal']);
+            }
+            if (!VxeUIButtonComponent) {
+                errLog('vxe.error.reqComp', ['vxe-button']);
+            }
+            if (!VxeUISelectComponent) {
+                errLog('vxe.error.reqComp', ['vxe-select']);
+            }
+        });
         return renderVN;
     }
 });

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

@@ -267,8 +267,8 @@ hooks.add('tableKeyboardModule', {
             const checkboxOpts = computeCheckboxOpts.value;
             const mouseOpts = computeMouseOpts.value;
             const editOpts = computeEditOpts.value;
-            if (mouseConfig && mouseOpts.area && $xeTable.handleMousedownCellAreaEvent) {
-                return $xeTable.handleMousedownCellAreaEvent(evnt, params);
+            if (mouseConfig && mouseOpts.area && $xeTable.handleCellAreaMousedownEvent) {
+                return $xeTable.handleCellAreaMousedownEvent(evnt, params);
             }
             else {
                 if (checkboxConfig && checkboxOpts.range) {

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

@@ -392,9 +392,7 @@ hooks.add('tableValidatorModule', {
                                             }
                                         }
                                         else {
-                                            if (process.env.NODE_ENV === 'development') {
-                                                errLog('vxe.error.notValidators', [validator]);
-                                            }
+                                            errLog('vxe.error.notValidators', [validator]);
                                         }
                                     }
                                     else {

package/es/table/render/index.js

@@ -152,10 +152,8 @@ function getComponentOns(renderOpts, params, eFns) {
     const ons = {};
     XEUtils.objectEach(events, (func, key) => {
         ons[getOnName(key)] = function (...args) {
-            if (process.env.NODE_ENV === 'development') {
-                if (!XEUtils.isFunction(func)) {
-                    errLog('vxe.error.errFunc', [func]);
-                }
+            if (!XEUtils.isFunction(func)) {
+                errLog('vxe.error.errFunc', [func]);
             }
             func(params, ...args);
         };

package/es/table/src/body.js

@@ -79,7 +79,7 @@ export default defineComponent({
          */
         const renderTdColumn = (seq, rowid, fixedType, isOptimizeMode, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) => {
             const { fullAllDataRowIdData } = tableInternalData;
-            const { columnKey, resizable: allResizable, border, height, cellClassName: allCellClassName, cellStyle, align: allAlign, spanMethod, mouseConfig, editConfig, editRules, tooltipConfig, padding: allPadding } = tableProps;
+            const { columnKey, resizable: allResizable, showOverflow: allShowOverflow, border, height, cellClassName: allCellClassName, cellStyle, align: allAlign, spanMethod, mouseConfig, editConfig, editRules, tooltipConfig, padding: allPadding } = tableProps;
             const { tableData, dragRow, overflowX, currentColumn, scrollXLoad, scrollYLoad, calcCellHeightFlag, resizeHeightFlag, mergeList, editStore, isAllOverflow, validErrorMaps } = tableReactData;
             const { afterFullData, scrollXStore, scrollYStore } = tableInternalData;
             const cellOpts = computeCellOpts.value;
@@ -114,7 +114,7 @@ export default defineComponent({
             const resizeHeight = resizeHeightFlag ? rowRest.resizeHeight : 0;
             let fixedHiddenColumn = fixedType ? column.fixed !== fixedType : column.fixed && overflowX;
             const isCellPadding = XEUtils.eqNull(padding) ? (allPadding === null ? cellOpts.padding : allPadding) : padding;
-            const cellOverflow = XEUtils.eqNull(showOverflow) ? isAllOverflow : showOverflow;
+            const cellOverflow = XEUtils.eqNull(showOverflow) ? allShowOverflow : showOverflow;
             const showEllipsis = cellOverflow === 'ellipsis';
             const showTitle = cellOverflow === 'title';
             const showTooltip = cellOverflow === true || cellOverflow === 'tooltip';

package/es/table/src/columnInfo.js

@@ -11,37 +11,35 @@ export class ColumnInfo {
         const formatter = _vm.formatter;
         const visible = XEUtils.isBoolean(_vm.visible) ? _vm.visible : true;
         const { props: tableProps } = $xeTable;
-        if (process.env.NODE_ENV === 'development') {
-            const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
-            if (_vm.type && types.indexOf(_vm.type) === -1) {
-                warnLog('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')]);
-            }
-            if (XEUtils.isBoolean(_vm.cellRender) || (_vm.cellRender && !XEUtils.isObject(_vm.cellRender))) {
-                warnLog('vxe.error.errProp', [`column.cell-render=${_vm.cellRender}`, 'column.cell-render={}']);
-            }
-            if (XEUtils.isBoolean(_vm.editRender) || (_vm.editRender && !XEUtils.isObject(_vm.editRender))) {
-                warnLog('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}']);
+        const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
+        if (_vm.type && types.indexOf(_vm.type) === -1) {
+            warnLog('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')]);
+        }
+        if (XEUtils.isBoolean(_vm.cellRender) || (_vm.cellRender && !XEUtils.isObject(_vm.cellRender))) {
+            warnLog('vxe.error.errProp', [`column.cell-render=${_vm.cellRender}`, 'column.cell-render={}']);
+        }
+        if (XEUtils.isBoolean(_vm.editRender) || (_vm.editRender && !XEUtils.isObject(_vm.editRender))) {
+            warnLog('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}']);
+        }
+        if (_vm.type === 'expand') {
+            const { treeConfig } = tableProps;
+            const { computeTreeOpts } = $xeTable.getComputeMaps();
+            const treeOpts = computeTreeOpts.value;
+            if (treeConfig && (treeOpts.showLine || treeOpts.line)) {
+                errLog('vxe.error.errConflicts', ['tree-config.showLine', 'column.type=expand']);
             }
-            if (_vm.type === 'expand') {
-                const { treeConfig } = tableProps;
-                const { computeTreeOpts } = $xeTable.getComputeMaps();
-                const treeOpts = computeTreeOpts.value;
-                if (treeConfig && (treeOpts.showLine || treeOpts.line)) {
-                    errLog('vxe.error.errConflicts', ['tree-config.showLine', 'column.type=expand']);
+        }
+        if (formatter) {
+            if (XEUtils.isString(formatter)) {
+                const gFormatOpts = formats.get(formatter) || XEUtils[formatter];
+                if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
+                    errLog('vxe.error.notFormats', [formatter]);
                 }
             }
-            if (formatter) {
-                if (XEUtils.isString(formatter)) {
-                    const gFormatOpts = formats.get(formatter) || XEUtils[formatter];
-                    if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
-                        errLog('vxe.error.notFormats', [formatter]);
-                    }
-                }
-                else if (XEUtils.isArray(formatter)) {
-                    const gFormatOpts = formats.get(formatter[0]) || XEUtils[formatter[0]];
-                    if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
-                        errLog('vxe.error.notFormats', [formatter[0]]);
-                    }
+            else if (XEUtils.isArray(formatter)) {
+                const gFormatOpts = formats.get(formatter[0]) || XEUtils[formatter[0]];
+                if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
+                    errLog('vxe.error.notFormats', [formatter[0]]);
                 }
             }
         }

package/es/table/src/table.js

@@ -1265,14 +1265,12 @@ export default defineComponent({
             if ((expandColumn && expandOpts.mode !== 'fixed') && mouseOpts.area) {
                 errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
             }
-            if (process.env.NODE_ENV === 'development') {
-                if (htmlColumn) {
-                    if (!columnOpts.useKey) {
-                        errLog('vxe.error.reqProp', ['column-config.useKey & column.type=html']);
-                    }
-                    if (!rowOpts.useKey) {
-                        errLog('vxe.error.reqProp', ['row-config.useKey & column.type=html']);
-                    }
+            if (htmlColumn) {
+                if (!columnOpts.useKey) {
+                    errLog('vxe.error.reqProp', ['column-config.useKey & column.type=html']);
+                }
+                if (!rowOpts.useKey) {
+                    errLog('vxe.error.reqProp', ['row-config.useKey & column.type=html']);
                 }
             }
             reactData.isGroup = isGroup;
@@ -2505,12 +2503,12 @@ export default defineComponent({
                     rExpandLazyLoadedMaps[rowid] = row;
                     reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
                     loadMethod({ $table: $xeTable, row, rowIndex: tableMethods.getRowIndex(row), $rowIndex: tableMethods.getVMRowIndex(row) }).then(() => {
-                        const rExpandedMaps = Object.assign({}, reactData.rowExpandedMaps);
+                        const rowTempExpandedMaps = Object.assign({}, reactData.rowExpandedMaps);
                         if (rowRest) {
                             rowRest.expandLoaded = true;
                         }
-                        rExpandedMaps[rowid] = row;
-                        reactData.rowExpandedMaps = rExpandedMaps;
+                        rowTempExpandedMaps[rowid] = row;
+                        reactData.rowExpandedMaps = rowTempExpandedMaps;
                     }).catch(() => {
                         if (rowRest) {
                             rowRest.expandLoaded = false;
@@ -2657,28 +2655,26 @@ export default defineComponent({
             if (treeConfig) {
                 if (transform) {
                     // 树结构自动转换
-                    if (process.env.NODE_ENV === 'development') {
-                        if (!treeOpts.rowField) {
-                            errLog('vxe.error.reqProp', ['tree-config.rowField']);
-                        }
-                        if (!treeOpts.parentField) {
-                            errLog('vxe.error.reqProp', ['tree-config.parentField']);
-                        }
-                        if (!childrenField) {
-                            errLog('vxe.error.reqProp', ['tree-config.childrenField']);
-                        }
-                        if (!treeOpts.mapChildrenField) {
-                            errLog('vxe.error.reqProp', ['tree-config.mapChildrenField']);
-                        }
-                        if (childrenField === treeOpts.mapChildrenField) {
-                            errLog('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
-                        }
-                        // fullData.forEach(row => {
-                        //   if (row[treeOpts.children] && row[treeOpts.children].length) {
-                        //     warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${treeOpts.children}`])
-                        //   }
-                        // })
+                    if (!treeOpts.rowField) {
+                        errLog('vxe.error.reqProp', ['tree-config.rowField']);
+                    }
+                    if (!treeOpts.parentField) {
+                        errLog('vxe.error.reqProp', ['tree-config.parentField']);
+                    }
+                    if (!childrenField) {
+                        errLog('vxe.error.reqProp', ['tree-config.childrenField']);
+                    }
+                    if (!treeOpts.mapChildrenField) {
+                        errLog('vxe.error.reqProp', ['tree-config.mapChildrenField']);
                     }
+                    if (childrenField === treeOpts.mapChildrenField) {
+                        errLog('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
+                    }
+                    // fullData.forEach(row => {
+                    //   if (row[treeOpts.children] && row[treeOpts.children].length) {
+                    //     warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${treeOpts.children}`])
+                    //   }
+                    // })
                     treeData = XEUtils.toArrayTree(fullData, {
                         key: treeOpts.rowField,
                         parentKey: treeOpts.parentField,
@@ -2743,16 +2739,14 @@ export default defineComponent({
                     //     }
                     //   }
                     // }
-                    if (process.env.NODE_ENV === 'development') {
-                        if (!(props.height || props.maxHeight)) {
-                            errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
-                        }
-                        // if (!props.showOverflow) {
-                        //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
-                        // }
-                        if (props.spanMethod) {
-                            warnLog('vxe.error.scrollErrProp', ['table.span-method']);
-                        }
+                    if (!(props.height || props.maxHeight)) {
+                        errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
+                    }
+                    // if (!props.showOverflow) {
+                    //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
+                    // }
+                    if (props.spanMethod) {
+                        warnLog('vxe.error.scrollErrProp', ['table.span-method']);
                     }
                 }
                 handleReserveStatus();
@@ -3737,23 +3731,6 @@ export default defineComponent({
                 }
                 return tableMethods.createData(records).then((rows) => isArr ? rows : rows[0]);
             },
-            // toOriginalRecords (rows: any[]) {
-            //   const { treeConfig } = props
-            //   const treeOpts = computeTreeOpts.value
-            //   const { transform, mapChildrenField } = treeOpts
-            //   const rowkey = getRowkey($xeTable)
-            //   if (treeConfig) {
-            //     if (transform) {
-            //       return []
-            //     }
-            //     return []
-            //   }
-            //   return rows.map(item => {
-            //     const obj = Object.assign({}, item)
-            //     delete obj.rowkey
-            //     return obj
-            //   })
-            // },
             /**
              * 还原数据
              * 如果不传任何参数，则还原整个表格
@@ -3762,8 +3739,10 @@ export default defineComponent({
              * 如果还额外传了 field 则还原指定的单元格数据
              */
             revertData(rows, field) {
-                const { keepSource } = props;
-                const { tableSourceData, sourceDataRowIdData } = internalData;
+                const { keepSource, treeConfig } = props;
+                const { fullAllDataRowIdData, tableSourceData, sourceDataRowIdData, tableFullData, afterFullData } = internalData;
+                const treeOpts = computeTreeOpts.value;
+                const { transform } = treeOpts;
                 if (!keepSource) {
                     if (process.env.NODE_ENV === 'development') {
                         warnLog('vxe.error.reqProp', ['keep-source']);
@@ -3779,9 +3758,10 @@ export default defineComponent({
                 else {
                     targetRows = XEUtils.toArray($xeTable.getUpdateRecords());
                 }
+                let reDelFlag = false;
                 if (targetRows.length) {
                     targetRows.forEach((row) => {
-                        if (!tableMethods.isInsertByRow(row)) {
+                        if (!$xeTable.isInsertByRow(row)) {
                             const rowid = getRowid($xeTable, row);
                             const oRow = sourceDataRowIdData[rowid];
                             if (oRow && row) {
@@ -3791,14 +3771,38 @@ export default defineComponent({
                                 else {
                                     XEUtils.destructuring(row, XEUtils.clone(oRow, true));
                                 }
+                                if ($xeTable.isRemoveByRow(row)) {
+                                    const rowRest = fullAllDataRowIdData[rowid];
+                                    if (rowRest) {
+                                        const reRow = rowRest.row;
+                                        tableFullData.unshift(reRow);
+                                        afterFullData.unshift(reRow);
+                                        reDelFlag = true;
+                                    }
+                                }
                             }
                         }
                     });
                 }
                 if (rows) {
-                    return nextTick();
+                    if (reDelFlag) {
+                        $xeTable.updateFooter();
+                        $xeTable.cacheRowMap(false);
+                        $xeTable.handleTableData(treeConfig && transform);
+                        if (!(treeConfig && transform)) {
+                            $xeTable.updateAfterDataIndex();
+                        }
+                        $xeTable.checkSelectionStatus();
+                        if (reactData.scrollYLoad) {
+                            $xeTable.updateScrollYSpace();
+                        }
+                    }
+                    return nextTick().then(() => {
+                        $xeTable.updateCellAreas();
+                        return $xeTable.recalculate();
+                    });
                 }
-                return tableMethods.reloadData(tableSourceData);
+                return $xeTable.reloadData(tableSourceData);
             },
             /**
              * 清空单元格内容
@@ -3918,6 +3922,11 @@ export default defineComponent({
                 const rowid = getRowid($xeTable, row);
                 return !!editStore.insertMaps[rowid];
             },
+            isRemoveByRow(row) {
+                const { editStore } = reactData;
+                const rowid = getRowid($xeTable, row);
+                return !!editStore.removeMaps[rowid];
+            },
             /**
              * 删除所有新增的临时数据
              * @returns
@@ -6727,14 +6736,15 @@ export default defineComponent({
              */
             cacheRowMap() {
                 const { treeConfig } = props;
-                const treeOpts = computeTreeOpts.value;
+                const { treeExpandedMaps } = reactData;
                 const { fullAllDataRowIdData, tableFullData, tableFullTreeData } = internalData;
+                const treeOpts = computeTreeOpts.value;
                 const childrenField = treeOpts.children || treeOpts.childrenField;
                 const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
                 const rowkey = getRowkey($xeTable);
-                const isLazy = treeConfig && treeOpts.lazy;
-                const fullAllDataRowIdMaps = {};
+                const fullAllDataRowIdMaps = Object.assign({}, fullAllDataRowIdData); // 存在已删除数据
                 const fullDataRowIdMaps = {};
+                const treeTempExpandedMaps = Object.assign({}, treeExpandedMaps);
                 const handleRow = (row, index, items, path, parentRow, nodes) => {
                     let rowid = getRowid($xeTable, row);
                     const seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
@@ -6743,13 +6753,23 @@ export default defineComponent({
                         rowid = getRowUniqueId();
                         XEUtils.set(row, rowkey, rowid);
                     }
-                    if (isLazy && row[hasChildField] && XEUtils.isUndefined(row[childrenField])) {
-                        row[childrenField] = null;
+                    if (treeConfig && treeOpts.lazy) {
+                        const treeExpRest = treeExpandedMaps[rowid];
+                        if (row[hasChildField] && XEUtils.isUndefined(row[childrenField])) {
+                            row[childrenField] = null;
+                        }
+                        if (treeExpRest) {
+                            if (!row[childrenField] || !row[childrenField].length) {
+                                delete treeTempExpandedMaps[rowid];
+                            }
+                        }
                     }
                     let rowRest = fullAllDataRowIdData[rowid];
                     if (!rowRest) {
                         rowRest = { row, rowid, seq, index: -1, _index: -1, $index: -1, treeIndex: index, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
                     }
+                    rowRest.treeLoaded = false;
+                    rowRest.expandLoaded = false;
                     rowRest.row = row;
                     rowRest.items = items;
                     rowRest.parent = parentRow;
@@ -6758,14 +6778,15 @@ export default defineComponent({
                     fullDataRowIdMaps[rowid] = rowRest;
                     fullAllDataRowIdMaps[rowid] = rowRest;
                 };
-                internalData.fullDataRowIdData = fullDataRowIdMaps;
-                internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
                 if (treeConfig) {
                     XEUtils.eachTree(tableFullTreeData, handleRow, { children: childrenField });
                 }
                 else {
                     tableFullData.forEach(handleRow);
                 }
+                internalData.fullDataRowIdData = fullDataRowIdMaps;
+                internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
+                reactData.treeExpandedMaps = treeTempExpandedMaps;
             },
             cacheSourceMap(fullData) {
                 const { treeConfig } = props;
@@ -7355,8 +7376,8 @@ export default defineComponent({
                 const { treeConfig } = props;
                 const { selectCheckboxMaps, treeIndeterminateMaps } = reactData;
                 const checkboxOpts = computeCheckboxOpts.value;
-                const { checkField, checkMethod } = checkboxOpts;
-                const { afterFullData, afterTreeFullData } = internalData;
+                const { checkField, checkMethod, showReserveStatus } = checkboxOpts;
+                const { afterFullData, afterTreeFullData, checkboxReserveRowMap } = internalData;
                 let sLen = 0; // 已选
                 let hLen = 0; // 半选
                 let vLen = 0; // 有效行
@@ -7395,7 +7416,11 @@ export default defineComponent({
                         vLen++;
                     });
                 const isSelected = rootList.length > 0 ? (vLen > 0 ? (sLen >= vLen) : (sLen >= rootList.length)) : false;
-                const halfSelect = !isSelected && (sLen >= 1 || hLen >= 1);
+                let halfSelect = !isSelected && (sLen >= 1 || hLen >= 1);
+                // 如果复选框启用保留记录，当保留数据存在时显示半选
+                if (!isSelected && !halfSelect && showReserveStatus) {
+                    halfSelect = !XEUtils.isEmpty(checkboxReserveRowMap);
+                }
                 reactData.isAllSelected = isSelected;
                 reactData.isIndeterminate = halfSelect;
             },
@@ -9331,18 +9356,16 @@ export default defineComponent({
             }
         };
         // 检测对应模块是否安装
-        if (process.env.NODE_ENV === 'development') {
-            'openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').forEach(name => {
-                $xeTable[name] = function () {
-                    errLog('vxe.error.reqModule', ['VxeTableExportModule']);
-                };
-            });
-            'clearValidate,fullValidate,validate'.split(',').forEach(name => {
-                $xeTable[name] = function () {
-                    errLog('vxe.error.reqModule', ['VxeTableValidatorModule']);
-                };
-            });
-        }
+        'openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').forEach(name => {
+            $xeTable[name] = function () {
+                errLog('vxe.error.reqModule', ['VxeTableExportModule']);
+            };
+        });
+        'clearValidate,fullValidate,validate'.split(',').forEach(name => {
+            $xeTable[name] = function () {
+                errLog('vxe.error.reqModule', ['VxeTableValidatorModule']);
+            };
+        });
         Object.assign($xeTable, tableMethods, tablePrivateMethods);
         /**
          * 渲染浮固定列
@@ -10171,7 +10194,7 @@ export default defineComponent({
                 if (rowOpts.height && !props.showOverflow) {
                     warnLog('vxe.error.notProp', ['table.show-overflow']);
                 }
-                if (!$xeTable.handleMousedownCellAreaEvent) {
+                if (!$xeTable.handleCellAreaMousedownEvent) {
                     if (props.areaConfig) {
                         warnLog('vxe.error.notProp', ['area-config']);
                     }
@@ -10303,23 +10326,21 @@ export default defineComponent({
             globalEvents.off($xeTable, 'contextmenu');
             tablePrivateMethods.preventEvent(null, 'unmounted', { $table: $xeTable });
         });
-        if (process.env.NODE_ENV === 'development') {
-            nextTick(() => {
-                if (props.loading) {
-                    if (!VxeUILoadingComponent && !slots.loading) {
-                        errLog('vxe.error.reqComp', ['vxe-loading']);
-                    }
+        nextTick(() => {
+            if (props.loading) {
+                if (!VxeUILoadingComponent && !slots.loading) {
+                    errLog('vxe.error.reqComp', ['vxe-loading']);
                 }
-                if ((props.showOverflow === true || props.showOverflow === 'tooltip') ||
-                    (props.showHeaderOverflow === true || props.showHeaderOverflow === 'tooltip') ||
-                    (props.showFooterOverflow === true || props.showFooterOverflow === 'tooltip') ||
-                    props.tooltipConfig || props.editRules) {
-                    if (!VxeUITooltipComponent) {
-                        errLog('vxe.error.reqComp', ['vxe-tooltip']);
-                    }
+            }
+            if ((props.showOverflow === true || props.showOverflow === 'tooltip') ||
+                (props.showHeaderOverflow === true || props.showHeaderOverflow === 'tooltip') ||
+                (props.showFooterOverflow === true || props.showFooterOverflow === 'tooltip') ||
+                props.tooltipConfig || props.editRules) {
+                if (!VxeUITooltipComponent) {
+                    errLog('vxe.error.reqComp', ['vxe-tooltip']);
                 }
-            });
-        }
+            }
+        });
         provide('$xeColgroup', null);
         provide('$xeTable', $xeTable);
         $xeTable.renderVN = renderVN;