vxe-table 4.11.15 → 4.11.17

package/lib/table/src/table.js

@@ -1415,14 +1415,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
       if (expandColumn && expandOpts.mode !== 'fixed' && mouseOpts.area) {
         (0, _log.errLog)('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
       }
-      if (process.env.NODE_ENV === 'development') {
-        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;
@@ -3095,28 +3093,26 @@ var _default = exports.default = (0, _vue.defineComponent)({
       if (treeConfig) {
         if (transform) {
           // 树结构自动转换
-          if (process.env.NODE_ENV === 'development') {
-            if (!treeOpts.rowField) {
-              (0, _log.errLog)('vxe.error.reqProp', ['tree-config.rowField']);
-            }
-            if (!treeOpts.parentField) {
-              (0, _log.errLog)('vxe.error.reqProp', ['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[treeOpts.children] && row[treeOpts.children].length) {
-            //     warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${treeOpts.children}`])
-            //   }
-            // })
+          if (!treeOpts.rowField) {
+            (0, _log.errLog)('vxe.error.reqProp', ['tree-config.rowField']);
+          }
+          if (!treeOpts.parentField) {
+            (0, _log.errLog)('vxe.error.reqProp', ['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[treeOpts.children] && row[treeOpts.children].length) {
+          //     warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${treeOpts.children}`])
+          //   }
+          // })
           treeData = _xeUtils.default.toArrayTree(fullData, {
             key: treeOpts.rowField,
             parentKey: treeOpts.parentField,
@@ -3180,16 +3176,14 @@ var _default = exports.default = (0, _vue.defineComponent)({
           //     }
           //   }
           // }
-          if (process.env.NODE_ENV === 'development') {
-            if (!(props.height || props.maxHeight)) {
-              (0, _log.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) {
-              (0, _log.warnLog)('vxe.error.scrollErrProp', ['table.span-method']);
-            }
+          if (!(props.height || props.maxHeight)) {
+            (0, _log.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) {
+            (0, _log.warnLog)('vxe.error.scrollErrProp', ['table.span-method']);
           }
         }
         handleReserveStatus();
@@ -4310,12 +4304,20 @@ var _default = exports.default = (0, _vue.defineComponent)({
        */
       revertData(rows, field) {
         const {
-          keepSource
+          keepSource,
+          treeConfig
         } = props;
         const {
+          fullAllDataRowIdData,
           tableSourceData,
-          sourceDataRowIdData
+          sourceDataRowIdData,
+          tableFullData,
+          afterFullData
         } = internalData;
+        const treeOpts = computeTreeOpts.value;
+        const {
+          transform
+        } = treeOpts;
         if (!keepSource) {
           if (process.env.NODE_ENV === 'development') {
             (0, _log.warnLog)('vxe.error.reqProp', ['keep-source']);
@@ -4330,9 +4332,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } else {
           targetRows = _xeUtils.default.toArray($xeTable.getUpdateRecords());
         }
+        let reDelFlag = false;
         if (targetRows.length) {
           targetRows.forEach(row => {
-            if (!tableMethods.isInsertByRow(row)) {
+            if (!$xeTable.isInsertByRow(row)) {
               const rowid = (0, _util.getRowid)($xeTable, row);
               const oRow = sourceDataRowIdData[rowid];
               if (oRow && row) {
@@ -4341,14 +4344,38 @@ var _default = exports.default = (0, _vue.defineComponent)({
                 } 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 (0, _vue.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 (0, _vue.nextTick)().then(() => {
+            $xeTable.updateCellAreas();
+            return $xeTable.recalculate();
+          });
         }
-        return tableMethods.reloadData(tableSourceData);
+        return $xeTable.reloadData(tableSourceData);
       },
       /**
        * 清空单元格内容
@@ -4481,6 +4508,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const rowid = (0, _util.getRowid)($xeTable, row);
         return !!editStore.insertMaps[rowid];
       },
+      isRemoveByRow(row) {
+        const {
+          editStore
+        } = reactData;
+        const rowid = (0, _util.getRowid)($xeTable, row);
+        return !!editStore.removeMaps[rowid];
+      },
       /**
        * 删除所有新增的临时数据
        * @returns
@@ -7654,18 +7688,21 @@ var _default = exports.default = (0, _vue.defineComponent)({
         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 = (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;
@@ -7674,8 +7711,16 @@ var _default = exports.default = (0, _vue.defineComponent)({
             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) {
@@ -7696,6 +7741,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
               expandHeight: 0
             };
           }
+          rowRest.treeLoaded = false;
+          rowRest.expandLoaded = false;
           rowRest.row = row;
           rowRest.items = items;
           rowRest.parent = parentRow;
@@ -7704,8 +7751,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
           fullDataRowIdMaps[rowid] = rowRest;
           fullAllDataRowIdMaps[rowid] = rowRest;
         };
-        internalData.fullDataRowIdData = fullDataRowIdMaps;
-        internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
         if (treeConfig) {
           _xeUtils.default.eachTree(tableFullTreeData, handleRow, {
             children: childrenField
@@ -7713,6 +7758,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } else {
           tableFullData.forEach(handleRow);
         }
+        internalData.fullDataRowIdData = fullDataRowIdMaps;
+        internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
+        reactData.treeExpandedMaps = treeTempExpandedMaps;
       },
       cacheSourceMap(fullData) {
         const {
@@ -10690,18 +10738,16 @@ var _default = exports.default = (0, _vue.defineComponent)({
       }
     };
     // 检测对应模块是否安装
-    if (process.env.NODE_ENV === 'development') {
-      'openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').forEach(name => {
-        $xeTable[name] = function () {
-          (0, _log.errLog)('vxe.error.reqModule', ['VxeTableExportModule']);
-        };
-      });
-      'clearValidate,fullValidate,validate'.split(',').forEach(name => {
-        $xeTable[name] = function () {
-          (0, _log.errLog)('vxe.error.reqModule', ['VxeTableValidatorModule']);
-        };
-      });
-    }
+    'openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').forEach(name => {
+      $xeTable[name] = function () {
+        (0, _log.errLog)('vxe.error.reqModule', ['VxeTableExportModule']);
+      };
+    });
+    'clearValidate,fullValidate,validate'.split(',').forEach(name => {
+      $xeTable[name] = function () {
+        (0, _log.errLog)('vxe.error.reqModule', ['VxeTableValidatorModule']);
+      };
+    });
     Object.assign($xeTable, tableMethods, tablePrivateMethods);
     /**
      * 渲染浮固定列
@@ -11680,20 +11726,18 @@ var _default = exports.default = (0, _vue.defineComponent)({
         $table: $xeTable
       });
     });
-    if (process.env.NODE_ENV === 'development') {
-      (0, _vue.nextTick)(() => {
-        if (props.loading) {
-          if (!VxeUILoadingComponent && !slots.loading) {
-            (0, _log.errLog)('vxe.error.reqComp', ['vxe-loading']);
-          }
+    (0, _vue.nextTick)(() => {
+      if (props.loading) {
+        if (!VxeUILoadingComponent && !slots.loading) {
+          (0, _log.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) {
-            (0, _log.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) {
+          (0, _log.errLog)('vxe.error.reqComp', ['vxe-tooltip']);
         }
-      });
-    }
+      }
+    });
     (0, _vue.provide)('$xeColgroup', null);
     (0, _vue.provide)('$xeTable', $xeTable);
     $xeTable.renderVN = renderVN;