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

package/lib/table/src/columnInfo.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.ColumnInfo=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_util=require("./util"),_utils=require("../../ui/src/utils"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,formats}=_ui.VxeUI;class ColumnInfo{constructor(e,r,{renderHeader:t,renderCell:o,renderFooter:l,renderData:i}={}){var d,n=e.$xegrid,s=n?n.proxyOpts:null,a=r.formatter,f=!_xeUtils.default.isBoolean(r.visible)||r.visible,u=e;"development"===process.env.NODE_ENV&&(d=["seq","checkbox","radio","expand","html"],r.type&&-1===d.indexOf(r.type)&&(0,_log.warnLog)("vxe.error.errProp",["type="+r.type,d.join(", ")]),(_xeUtils.default.isBoolean(r.cellRender)||r.cellRender&&!_xeUtils.default.isObject(r.cellRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.cell-render="+r.cellRender,"column.cell-render={}"]),(_xeUtils.default.isBoolean(r.editRender)||r.editRender&&!_xeUtils.default.isObject(r.editRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.edit-render="+r.editRender,"column.edit-render={}"]),"expand"===r.type&&(d=u.treeConfig,d)&&(e.treeOpts.showLine||e.treeOpts.line)&&(0,_log.errLog)("vxe.error.errConflicts",["tree-config.line","column.type=expand"]),r.remoteSort&&(0,_log.warnLog)("vxe.error.delProp",["column.remote-sort","sort-config.remote"]),r.sortMethod&&(0,_log.warnLog)("vxe.error.delProp",["column.sort-method","sort-config.sortMethod"]),a)&&(_xeUtils.default.isString(a)?(u=formats.get(a)||_xeUtils.default[a])&&_xeUtils.default.isFunction(u.tableCellFormatMethod||u.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[a]):!_xeUtils.default.isArray(a)||(d=formats.get(a[0])||_xeUtils.default[a[0]])&&_xeUtils.default.isFunction(d.tableCellFormatMethod||d.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[a[0]])),Object.assign(this,{type:r.type,property:r.field,field:r.field,title:r.title,width:r.width,minWidth:r.minWidth,maxWidth:r.maxWidth,resizable:r.resizable,fixed:r.fixed,align:r.align,headerAlign:r.headerAlign,footerAlign:r.footerAlign,showOverflow:r.showOverflow,showHeaderOverflow:r.showHeaderOverflow,showFooterOverflow:r.showFooterOverflow,className:r.className,headerClassName:r.headerClassName,footerClassName:r.footerClassName,formatter:a,footerFormatter:r.footerFormatter,padding:r.padding,verticalAlign:r.verticalAlign,sortable:r.sortable,sortBy:r.sortBy,sortType:r.sortType,sortMethod:r.sortMethod,remoteSort:r.remoteSort,filters:(0,_util.toFilters)(r.filters),filterMultiple:!_xeUtils.default.isBoolean(r.filterMultiple)||r.filterMultiple,filterMethod:r.filterMethod,filterResetMethod:r.filterResetMethod,filterRecoverMethod:r.filterRecoverMethod,filterRender:r.filterRender,treeNode:r.treeNode,dragSort:r.dragSort,rowResize:r.rowResize,cellType:r.cellType,cellRender:r.cellRender,editRender:r.editRender,contentRender:r.contentRender,headerExportMethod:r.headerExportMethod,exportMethod:r.exportMethod,footerExportMethod:r.footerExportMethod,titleHelp:r.titleHelp,titlePrefix:r.titlePrefix,titleSuffix:r.titleSuffix,params:r.params,id:r.colId||_xeUtils.default.uniqueId("col_"),parentId:null,visible:f,halfVisible:!1,defaultVisible:f,defaultFixed:r.fixed,checked:!1,halfChecked:!1,disabled:!1,level:1,rowSpan:1,colSpan:1,order:null,sortTime:0,sortNumber:0,renderSortNumber:0,renderFixed:"",renderVisible:!1,renderWidth:0,renderHeight:0,renderResizeWidth:0,renderAutoWidth:0,resizeWidth:0,renderLeft:0,renderArgs:[],model:{},renderHeader:t||r.renderHeader,renderCell:o||r.renderCell,renderFooter:l||r.renderFooter,renderData:i,slots:r.slots}),s&&s.beforeColumn&&s.beforeColumn({$grid:n,column:this})}getTitle(){return(0,_utils.getFuncText)(this.title||("seq"===this.type?getI18n("vxe.table.seqTitle"):""))}getKey(){var e=this.type;return this.field||(e?"type="+e:null)}update(e,r){"filters"!==e&&("field"===e&&(this.property=r),this[e]=r)}}exports.ColumnInfo=ColumnInfo;
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.ColumnInfo=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_util=require("./util"),_utils=require("../../ui/src/utils"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,formats}=_ui.VxeUI;class ColumnInfo{constructor(e,r,{renderHeader:t,renderCell:o,renderFooter:l,renderData:i}={}){var d=e.$xegrid,n=d?d.proxyOpts:null,s=r.formatter,a=!_xeUtils.default.isBoolean(r.visible)||r.visible,f=e,u=["seq","checkbox","radio","expand","html"];r.type&&-1===u.indexOf(r.type)&&(0,_log.warnLog)("vxe.error.errProp",["type="+r.type,u.join(", ")]),(_xeUtils.default.isBoolean(r.cellRender)||r.cellRender&&!_xeUtils.default.isObject(r.cellRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.cell-render="+r.cellRender,"column.cell-render={}"]),(_xeUtils.default.isBoolean(r.editRender)||r.editRender&&!_xeUtils.default.isObject(r.editRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.edit-render="+r.editRender,"column.edit-render={}"]),"expand"===r.type&&(u=f.treeConfig,u)&&(e.treeOpts.showLine||e.treeOpts.line)&&(0,_log.errLog)("vxe.error.errConflicts",["tree-config.line","column.type=expand"]),r.remoteSort&&(0,_log.warnLog)("vxe.error.delProp",["column.remote-sort","sort-config.remote"]),r.sortMethod&&(0,_log.warnLog)("vxe.error.delProp",["column.sort-method","sort-config.sortMethod"]),s&&(_xeUtils.default.isString(s)?(f=formats.get(s)||_xeUtils.default[s])&&_xeUtils.default.isFunction(f.tableCellFormatMethod||f.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[s]):!_xeUtils.default.isArray(s)||(u=formats.get(s[0])||_xeUtils.default[s[0]])&&_xeUtils.default.isFunction(u.tableCellFormatMethod||u.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[s[0]])),Object.assign(this,{type:r.type,property:r.field,field:r.field,title:r.title,width:r.width,minWidth:r.minWidth,maxWidth:r.maxWidth,resizable:r.resizable,fixed:r.fixed,align:r.align,headerAlign:r.headerAlign,footerAlign:r.footerAlign,showOverflow:r.showOverflow,showHeaderOverflow:r.showHeaderOverflow,showFooterOverflow:r.showFooterOverflow,className:r.className,headerClassName:r.headerClassName,footerClassName:r.footerClassName,formatter:s,footerFormatter:r.footerFormatter,padding:r.padding,verticalAlign:r.verticalAlign,sortable:r.sortable,sortBy:r.sortBy,sortType:r.sortType,sortMethod:r.sortMethod,remoteSort:r.remoteSort,filters:(0,_util.toFilters)(r.filters),filterMultiple:!_xeUtils.default.isBoolean(r.filterMultiple)||r.filterMultiple,filterMethod:r.filterMethod,filterResetMethod:r.filterResetMethod,filterRecoverMethod:r.filterRecoverMethod,filterRender:r.filterRender,treeNode:r.treeNode,dragSort:r.dragSort,rowResize:r.rowResize,cellType:r.cellType,cellRender:r.cellRender,editRender:r.editRender,contentRender:r.contentRender,headerExportMethod:r.headerExportMethod,exportMethod:r.exportMethod,footerExportMethod:r.footerExportMethod,titleHelp:r.titleHelp,titlePrefix:r.titlePrefix,titleSuffix:r.titleSuffix,params:r.params,id:r.colId||_xeUtils.default.uniqueId("col_"),parentId:null,visible:a,halfVisible:!1,defaultVisible:a,defaultFixed:r.fixed,checked:!1,halfChecked:!1,disabled:!1,level:1,rowSpan:1,colSpan:1,order:null,sortTime:0,sortNumber:0,renderSortNumber:0,renderFixed:"",renderVisible:!1,renderWidth:0,renderHeight:0,renderResizeWidth:0,renderAutoWidth:0,resizeWidth:0,renderLeft:0,renderArgs:[],model:{},renderHeader:t||r.renderHeader,renderCell:o||r.renderCell,renderFooter:l||r.renderFooter,renderData:i,slots:r.slots}),n&&n.beforeColumn&&n.beforeColumn({$grid:d,column:this})}getTitle(){return(0,_utils.getFuncText)(this.title||("seq"===this.type?getI18n("vxe.table.seqTitle"):""))}getKey(){var e=this.type;return this.field||(e?"type="+e:null)}update(e,r){"filters"!==e&&("field"===e&&(this.property=r),this[e]=r)}}exports.ColumnInfo=ColumnInfo;

package/lib/table/src/group.js

@@ -9,7 +9,7 @@ var _comp = require("../../ui/src/comp");
 var _util = require("./util");
 var _column = require("./column");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-var _default = exports.default = (0, _comp.defineVxeComponent)({
+var _default = exports.default = /* define-vxe-component start */(0, _comp.defineVxeComponent)({
   name: 'VxeColgroup',
   props: _column.columnProps,
   provide() {
@@ -48,4 +48,5 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
     return h('div', this.$slots.default);
   },
   methods: _cell.default
-});
+});
+/* define-vxe-component end */

package/lib/table/src/methods.js

@@ -351,14 +351,12 @@ function cacheColumnMap($xeTable) {
   if (expandColumn && expandOpts.mode !== 'fixed' && mouseOpts.area) {
     (0, _log.errLog)('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
   }
-  if (process.env.NODE_ENV === 'developmeznt') {
-    if (htmlColumn) {
-      if (!columnOpts.useKey) {
-        (0, _log.errLog)('vxe.error.reqProp', ['column-config.useKey & column.type=html']);
-      }
-      if (!rowOpts.useKey) {
-        (0, _log.errLog)('vxe.error.reqProp', ['row-config.useKey & column.type=html']);
-      }
+  if (htmlColumn) {
+    if (!columnOpts.useKey) {
+      (0, _log.errLog)('vxe.error.reqProp', ['column-config.useKey & column.type=html']);
+    }
+    if (!rowOpts.useKey) {
+      (0, _log.errLog)('vxe.error.reqProp', ['row-config.useKey & column.type=html']);
     }
   }
   reactData.isGroup = isGroup;
@@ -2767,28 +2765,26 @@ const Methods = {
     if (treeConfig) {
       // 树结构自动转换
       if (treeOpts.transform) {
-        if (process.env.NODE_ENV === 'development') {
-          if (!treeOpts.rowField) {
-            (0, _log.errLog)('vxe.error.reqProp', ['table.tree-config.rowField']);
-          }
-          if (!treeOpts.parentField) {
-            (0, _log.errLog)('vxe.error.reqProp', ['table.tree-config.parentField']);
-          }
-          if (!childrenField) {
-            (0, _log.errLog)('vxe.error.reqProp', ['tree-config.childrenField']);
-          }
-          if (!treeOpts.mapChildrenField) {
-            (0, _log.errLog)('vxe.error.reqProp', ['tree-config.mapChildrenField']);
-          }
-          if (childrenField === treeOpts.mapChildrenField) {
-            (0, _log.errLog)('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
-          }
-          // fullData.forEach(row => {
-          //   if (row[childrenField] && row[childrenField].length) {
-          //     warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${childrenField}`])
-          //   }
-          // })
+        if (!treeOpts.rowField) {
+          (0, _log.errLog)('vxe.error.reqProp', ['table.tree-config.rowField']);
+        }
+        if (!treeOpts.parentField) {
+          (0, _log.errLog)('vxe.error.reqProp', ['table.tree-config.parentField']);
+        }
+        if (!childrenField) {
+          (0, _log.errLog)('vxe.error.reqProp', ['tree-config.childrenField']);
+        }
+        if (!treeOpts.mapChildrenField) {
+          (0, _log.errLog)('vxe.error.reqProp', ['tree-config.mapChildrenField']);
         }
+        if (childrenField === treeOpts.mapChildrenField) {
+          (0, _log.errLog)('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
+        }
+        // fullData.forEach(row => {
+        //   if (row[childrenField] && row[childrenField].length) {
+        //     warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${childrenField}`])
+        //   }
+        // })
         treeData = _xeUtils.default.toArrayTree(fullData, {
           key: treeOpts.rowField,
           parentKey: treeOpts.parentField,
@@ -2852,16 +2848,14 @@ const Methods = {
         //     }
         //   }
         // }
-        if (process.env.NODE_ENV === 'development') {
-          if (!(this.height || this.maxHeight)) {
-            (0, _log.errLog)('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
-          }
-          // if (!this.showOverflow) {
-          //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
-          // }
-          if (this.spanMethod) {
-            (0, _log.warnLog)('vxe.error.scrollErrProp', ['table.span-method']);
-          }
+        if (!(this.height || this.maxHeight)) {
+          (0, _log.errLog)('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
+        }
+        // if (!this.showOverflow) {
+        //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
+        // }
+        if (this.spanMethod) {
+          (0, _log.warnLog)('vxe.error.scrollErrProp', ['table.span-method']);
         }
       }
       handleReserveStatus($xeTable);
@@ -3005,22 +2999,26 @@ const Methods = {
   cacheRowMap() {
     const $xeTable = this;
     const props = $xeTable;
+    const reactData = $xeTable;
     const internalData = $xeTable;
     const {
       treeConfig
     } = props;
-    const treeOpts = $xeTable.computeTreeOpts;
+    const {
+      treeExpandedMaps
+    } = reactData;
     const {
       fullAllDataRowIdData,
       tableFullData,
       tableFullTreeData
     } = internalData;
+    const treeOpts = $xeTable.computeTreeOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
     const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
     const rowkey = (0, _util.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 = (0, _util.getRowid)($xeTable, row);
       const seq = treeConfig && path ? (0, _util.toTreePathSeq)(path) : index + 1;
@@ -3029,8 +3027,16 @@ const Methods = {
         rowid = (0, _util.getRowUniqueId)();
         _xeUtils.default.set(row, rowkey, rowid);
       }
-      if (isLazy && row[hasChildField] && _xeUtils.default.isUndefined(row[childrenField])) {
-        row[childrenField] = null;
+      if (treeConfig && treeOpts.lazy) {
+        const treeExpRest = treeExpandedMaps[rowid];
+        if (row[hasChildField] && _xeUtils.default.isUndefined(row[childrenField])) {
+          row[childrenField] = null;
+        }
+        if (treeExpRest) {
+          if (!row[childrenField] || !row[childrenField].length) {
+            delete treeTempExpandedMaps[rowid];
+          }
+        }
       }
       let rowRest = fullAllDataRowIdData[rowid];
       if (!rowRest) {
@@ -3051,6 +3057,8 @@ const Methods = {
           expandHeight: 0
         };
       }
+      rowRest.treeLoaded = false;
+      rowRest.expandLoaded = false;
       rowRest.row = row;
       rowRest.items = items;
       rowRest.parent = parentRow;
@@ -3059,8 +3067,6 @@ const Methods = {
       fullDataRowIdMaps[rowid] = rowRest;
       fullAllDataRowIdMaps[rowid] = rowRest;
     };
-    internalData.fullDataRowIdData = fullDataRowIdMaps;
-    internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
     if (treeConfig) {
       _xeUtils.default.eachTree(tableFullTreeData, handleRow, {
         children: childrenField
@@ -3068,6 +3074,9 @@ const Methods = {
     } else {
       tableFullData.forEach(handleRow);
     }
+    internalData.fullDataRowIdData = fullDataRowIdMaps;
+    internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
+    reactData.treeExpandedMaps = treeTempExpandedMaps;
   },
   cacheSourceMap(fullData) {
     let {
@@ -3443,23 +3452,6 @@ const Methods = {
     }
     return this.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
-  //   })
-  // },
   /**
    * 还原数据
    * 如果不传任何参数，则还原整个表格
@@ -3468,16 +3460,30 @@ const Methods = {
    * 如果还额外传了 field 则还原指定的单元格数据
    */
   revertData(rows, field) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
     const {
       keepSource,
-      tableSourceData,
       treeConfig
-    } = this;
+    } = props;
+    const {
+      fullAllDataRowIdData,
+      tableSourceData,
+      sourceDataRowIdData,
+      tableFullData,
+      afterFullData
+    } = internalData;
+    const treeOpts = $xeTable.computeTreeOpts;
+    const {
+      transform
+    } = treeOpts;
     if (!keepSource) {
       if (process.env.NODE_ENV === 'development') {
         (0, _log.warnLog)('vxe.error.reqProp', ['keep-source']);
       }
-      return this.$nextTick();
+      return $xeTable.$nextTick();
     }
     let targetRows = rows;
     if (rows) {
@@ -3485,30 +3491,52 @@ const Methods = {
         targetRows = [rows];
       }
     } else {
-      targetRows = _xeUtils.default.toArray(this.getUpdateRecords());
+      targetRows = _xeUtils.default.toArray($xeTable.getUpdateRecords());
     }
+    let reDelFlag = false;
     if (targetRows.length) {
       targetRows.forEach(row => {
-        if (!this.isInsertByRow(row)) {
-          const rowIndex = this.getRowIndex(row);
-          if (treeConfig && rowIndex === -1) {
-            (0, _log.errLog)('vxe.error.noTree', ['revertData']);
-          }
-          const oRow = tableSourceData[rowIndex];
+        if (!$xeTable.isInsertByRow(row)) {
+          const rowid = (0, _util.getRowid)($xeTable, row);
+          const oRow = sourceDataRowIdData[rowid];
           if (oRow && row) {
             if (field) {
               _xeUtils.default.set(row, field, _xeUtils.default.clone(_xeUtils.default.get(oRow, field), true));
             } else {
               _xeUtils.default.destructuring(row, _xeUtils.default.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 this.$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 $xeTable.$nextTick().then(() => {
+        $xeTable.updateCellAreas();
+        return $xeTable.recalculate();
+      });
     }
-    return this.reloadData(tableSourceData);
+    return $xeTable.reloadData(tableSourceData);
   },
   /**
    * 清空单元格内容
@@ -3580,6 +3608,7 @@ const Methods = {
   },
   getCellLabel(row, fieldOrColumn) {
     const $xeTable = this;
+    const internalData = $xeTable;
     const column = (0, _util.handleFieldOrColumn)(this, fieldOrColumn);
     if (!column) {
       return null;
@@ -3591,7 +3620,7 @@ const Methods = {
       let formatData;
       const {
         fullAllDataRowIdData
-      } = $xeTable;
+      } = internalData;
       const rowid = (0, _util.getRowid)($xeTable, row);
       const colid = column.id;
       const rowRest = fullAllDataRowIdData[rowid];
@@ -3638,12 +3667,23 @@ const Methods = {
    * @param {Row} row 行对象
    */
   isInsertByRow(row) {
+    const $xeTable = this;
+    const reactData = $xeTable;
     const {
       editStore
-    } = this;
-    const rowid = (0, _util.getRowid)(this, row);
+    } = reactData;
+    const rowid = (0, _util.getRowid)($xeTable, row);
     return !!editStore.insertMaps[rowid];
   },
+  isRemoveByRow(row) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const {
+      editStore
+    } = reactData;
+    const rowid = (0, _util.getRowid)($xeTable, row);
+    return !!editStore.removeMaps[rowid];
+  },
   /**
    * 删除所有新增的临时数据
    * @returns
@@ -6583,11 +6623,13 @@ const Methods = {
     const checkboxOpts = $xeTable.computeCheckboxOpts;
     const {
       checkField,
-      checkMethod
+      checkMethod,
+      showReserveStatus
     } = checkboxOpts;
     const {
       afterFullData,
-      afterTreeFullData
+      afterTreeFullData,
+      checkboxReserveRowMap
     } = internalData;
     let sLen = 0; // 已选
     let hLen = 0; // 半选
@@ -6623,7 +6665,11 @@ const Methods = {
       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.default.isEmpty(checkboxReserveRowMap);
+    }
     reactData.isAllSelected = isSelected;
     reactData.isIndeterminate = halfSelect;
   },
@@ -10454,19 +10500,17 @@ const Methods = {
 const funcs = 'setFilter,openFilter,clearFilter,saveFilterPanel,resetFilterPanel,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,insertChild,insertChildAt,insertChildNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,fullValidateField,validateField,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',');
 funcs.forEach(name => {
   Methods[name] = function (...args) {
-    if (process.env.NODE_ENV === 'development') {
-      if (!this[`_${name}`]) {
-        if ('openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').includes(name)) {
-          (0, _log.errLog)('vxe.error.reqModule', ['VxeTableExportModule']);
-        } else if ('fullValidate,validate'.split(',').includes(name)) {
-          (0, _log.errLog)('vxe.error.reqModule', ['VxeTableValidatorModule']);
-        } else if ('setFilter,openFilter,clearFilter,getCheckedFilters'.split(',').includes(name)) {
-          (0, _log.errLog)('vxe.error.reqModule', ['VxeTableFilterModule']);
-        } else if ('insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell'.split(',').includes(name)) {
-          (0, _log.errLog)('vxe.error.reqModule', ['VxeTableEditModule']);
-        } else if ('openCustom'.split(',').includes(name)) {
-          (0, _log.errLog)('vxe.error.reqModule', ['VxeTableCustomModule']);
-        }
+    if (!this[`_${name}`]) {
+      if ('openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').includes(name)) {
+        (0, _log.errLog)('vxe.error.reqModule', ['VxeTableExportModule']);
+      } else if ('fullValidate,validate'.split(',').includes(name)) {
+        (0, _log.errLog)('vxe.error.reqModule', ['VxeTableValidatorModule']);
+      } else if ('setFilter,openFilter,clearFilter,getCheckedFilters'.split(',').includes(name)) {
+        (0, _log.errLog)('vxe.error.reqModule', ['VxeTableFilterModule']);
+      } else if ('insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell'.split(',').includes(name)) {
+        (0, _log.errLog)('vxe.error.reqModule', ['VxeTableEditModule']);
+      } else if ('openCustom'.split(',').includes(name)) {
+        (0, _log.errLog)('vxe.error.reqModule', ['VxeTableCustomModule']);
       }
     }
     return this[`_${name}`] ? this[`_${name}`](...args) : null;