vxe-table 3.13.17 → 3.13.18

package/lib/table/src/methods.js

@@ -2680,28 +2680,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,
@@ -2765,16 +2763,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);
@@ -2918,22 +2914,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;
@@ -2942,8 +2942,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) {
@@ -2964,6 +2972,8 @@ const Methods = {
           expandHeight: 0
         };
       }
+      rowRest.treeLoaded = false;
+      rowRest.expandLoaded = false;
       rowRest.row = row;
       rowRest.items = items;
       rowRest.parent = parentRow;
@@ -2972,8 +2982,6 @@ const Methods = {
       fullDataRowIdMaps[rowid] = rowRest;
       fullAllDataRowIdMaps[rowid] = rowRest;
     };
-    internalData.fullDataRowIdData = fullDataRowIdMaps;
-    internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
     if (treeConfig) {
       _xeUtils.default.eachTree(tableFullTreeData, handleRow, {
         children: childrenField
@@ -2981,6 +2989,9 @@ const Methods = {
     } else {
       tableFullData.forEach(handleRow);
     }
+    internalData.fullDataRowIdData = fullDataRowIdMaps;
+    internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
+    reactData.treeExpandedMaps = treeTempExpandedMaps;
   },
   cacheSourceMap(fullData) {
     let {
@@ -3381,16 +3392,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) {
@@ -3398,30 +3423,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);
   },
   /**
    * 清空单元格内容
@@ -3551,12 +3598,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
@@ -10331,19 +10389,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;