vxe-table 4.11.16 → 4.11.18

package/lib/index.umd.js

@@ -3051,7 +3051,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.11.15";
+const version = "4.11.18";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3499,7 +3499,7 @@ var es_iterator_some = __webpack_require__(3579);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.11.15"}`;
+const log_version = `table v${"4.11.18"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -3526,40 +3526,38 @@ class ColumnInfo {
     const {
       props: tableProps
     } = $xeTable;
-    if (true) {
-      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 (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.cellRender) || _vm.cellRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(_vm.cellRender)) {
-        warnLog('vxe.error.errProp', [`column.cell-render=${_vm.cellRender}`, 'column.cell-render={}']);
-      }
-      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.editRender) || _vm.editRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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 (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.cellRender) || _vm.cellRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(_vm.cellRender)) {
+      warnLog('vxe.error.errProp', [`column.cell-render=${_vm.cellRender}`, 'column.cell-render={}']);
+    }
+    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.editRender) || _vm.editRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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 (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)) {
+        const gFormatOpts = columnInfo_formats.get(formatter) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter];
+        if (!gFormatOpts || !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
+          errLog('vxe.error.notFormats', [formatter]);
         }
-      }
-      if (formatter) {
-        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)) {
-          const gFormatOpts = columnInfo_formats.get(formatter) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter];
-          if (!gFormatOpts || !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
-            errLog('vxe.error.notFormats', [formatter]);
-          }
-        } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(formatter)) {
-          const gFormatOpts = columnInfo_formats.get(formatter[0]) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter[0]];
-          if (!gFormatOpts || !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
-            errLog('vxe.error.notFormats', [formatter[0]]);
-          }
+      } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(formatter)) {
+        const gFormatOpts = columnInfo_formats.get(formatter[0]) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter[0]];
+        if (!gFormatOpts || !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
+          errLog('vxe.error.notFormats', [formatter[0]]);
         }
       }
     }
@@ -9164,29 +9162,27 @@ const {
       }
       return renderSimplePanel();
     };
-    if (true) {
-      (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
-        const customOpts = computeCustomOpts.value;
-        const {
-          mode
-        } = customOpts;
-        if (!VxeUIModalComponent) {
-          errLog('vxe.error.reqComp', ['vxe-modal']);
-        }
-        if (!VxeUIDrawerComponent && mode === 'drawer') {
-          errLog('vxe.error.reqComp', ['vxe-drawer']);
-        }
-        if (!VxeUIButtonComponent) {
-          errLog('vxe.error.reqComp', ['vxe-button']);
-        }
-        if (!VxeUINumberInputComponent) {
-          errLog('vxe.error.reqComp', ['vxe-number-input']);
-        }
-        if (!VxeUIRadioGroupComponent) {
-          errLog('vxe.error.reqComp', ['vxe-radio-group']);
-        }
-      });
-    }
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
+      const customOpts = computeCustomOpts.value;
+      const {
+        mode
+      } = customOpts;
+      if (!VxeUIModalComponent) {
+        errLog('vxe.error.reqComp', ['vxe-modal']);
+      }
+      if (!VxeUIDrawerComponent && mode === 'drawer') {
+        errLog('vxe.error.reqComp', ['vxe-drawer']);
+      }
+      if (!VxeUIButtonComponent) {
+        errLog('vxe.error.reqComp', ['vxe-button']);
+      }
+      if (!VxeUINumberInputComponent) {
+        errLog('vxe.error.reqComp', ['vxe-number-input']);
+      }
+      if (!VxeUIRadioGroupComponent) {
+        errLog('vxe.error.reqComp', ['vxe-radio-group']);
+      }
+    });
     return renderVN;
   }
 }));
@@ -9618,19 +9614,17 @@ const {
         }
       }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)();
     };
-    if (true) {
-      (0,external_commonjs_vue_commonjs2_vue_root_Vue_.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']);
-        }
-      });
-    }
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.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;
   }
 }));
@@ -10068,25 +10062,23 @@ const {
         }
       }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)();
     };
-    if (true) {
-      (0,external_commonjs_vue_commonjs2_vue_root_Vue_.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']);
-        }
-      });
-    }
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.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;
   }
 }));
@@ -11639,14 +11631,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       if (expandColumn && expandOpts.mode !== 'fixed' && mouseOpts.area) {
         errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
       }
-      if (true) {
-        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;
@@ -13325,28 +13315,26 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       if (treeConfig) {
         if (transform) {
           // 树结构自动转换
-          if (true) {
-            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 = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArrayTree(fullData, {
             key: treeOpts.rowField,
             parentKey: treeOpts.parentField,
@@ -13410,16 +13398,14 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           //     }
           //   }
           // }
-          if (true) {
-            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) {
+            errLog('vxe.error.scrollErrProp', ['table.span-method']);
           }
         }
         handleReserveStatus();
@@ -14542,15 +14528,24 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
        */
       revertData(rows, field) {
         const {
-          keepSource
+          keepSource,
+          treeConfig
         } = props;
         const {
+          fullAllDataRowIdData,
+          fullDataRowIdData,
           tableSourceData,
-          sourceDataRowIdData
+          sourceDataRowIdData,
+          tableFullData,
+          afterFullData
         } = internalData;
+        const treeOpts = computeTreeOpts.value;
+        const {
+          transform
+        } = treeOpts;
         if (!keepSource) {
           if (true) {
-            warnLog('vxe.error.reqProp', ['keep-source']);
+            errLog('vxe.error.reqProp', ['keep-source']);
           }
           return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
         }
@@ -14562,25 +14557,50 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         } else {
           targetRows = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArray($xeTable.getUpdateRecords());
         }
+        let reDelFlag = false;
         if (targetRows.length) {
-          targetRows.forEach(row => {
-            if (!tableMethods.isInsertByRow(row)) {
-              const rowid = getRowid($xeTable, row);
-              const oRow = sourceDataRowIdData[rowid];
-              if (oRow && row) {
-                if (field) {
-                  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, field, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(oRow, field), true));
-                } else {
-                  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().destructuring(row, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(oRow, true));
+          targetRows.forEach(item => {
+            const rowid = getRowid($xeTable, item);
+            const rowRest = fullAllDataRowIdData[rowid];
+            if (rowRest) {
+              const row = rowRest.row;
+              if (!$xeTable.isInsertByRow(row)) {
+                const oRow = sourceDataRowIdData[rowid];
+                if (oRow && row) {
+                  if (field) {
+                    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, field, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(oRow, field), true));
+                  } else {
+                    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().destructuring(row, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(oRow, true));
+                  }
+                  if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
+                    tableFullData.unshift(row);
+                    afterFullData.unshift(row);
+                    reDelFlag = true;
+                  }
                 }
               }
             }
           });
         }
         if (rows) {
-          return (0,external_commonjs_vue_commonjs2_vue_root_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,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
+            $xeTable.updateCellAreas();
+            return $xeTable.recalculate();
+          });
         }
-        return tableMethods.reloadData(tableSourceData);
+        return $xeTable.reloadData(tableSourceData);
       },
       /**
        * 清空单元格内容
@@ -14713,6 +14733,13 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const rowid = getRowid($xeTable, row);
         return !!editStore.insertMaps[rowid];
       },
+      isRemoveByRow(row) {
+        const {
+          editStore
+        } = reactData;
+        const rowid = getRowid($xeTable, row);
+        return !!editStore.removeMaps[rowid];
+      },
       /**
        * 删除所有新增的临时数据
        * @returns
@@ -17792,7 +17819,15 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         if (el) {
           const parentElem = el.parentNode;
           const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
-          return Math.floor($xeGrid ? $xeGrid.getParentHeight() : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(parentElem).height) - parentPaddingSize);
+          let parentWrapperHeight = 0;
+          if (parentElem) {
+            if ($xeGrid && hasClass(parentElem, 'vxe-grid--table-wrapper')) {
+              parentWrapperHeight = $xeGrid.getParentHeight();
+            } else {
+              parentWrapperHeight = parentElem.clientHeight;
+            }
+          }
+          return Math.floor(parentWrapperHeight - parentPaddingSize);
         }
         return 0;
       },
@@ -17894,18 +17929,25 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         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 = {
+          ...fullAllDataRowIdData
+        }; // 存在已删除数据
         const fullDataRowIdMaps = {};
+        const treeTempExpandedMaps = {
+          ...treeExpandedMaps
+        };
         const handleRow = (row, index, items, path, parentRow, nodes) => {
           let rowid = getRowid($xeTable, row);
           const seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
@@ -17914,8 +17956,16 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             rowid = getRowUniqueId();
             external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, rowkey, rowid);
           }
-          if (isLazy && row[hasChildField] && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(row[childrenField])) {
-            row[childrenField] = null;
+          if (treeConfig && treeOpts.lazy) {
+            const treeExpRest = treeExpandedMaps[rowid];
+            if (row[hasChildField] && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(row[childrenField])) {
+              row[childrenField] = null;
+            }
+            if (treeExpRest) {
+              if (!row[childrenField] || !row[childrenField].length) {
+                delete treeTempExpandedMaps[rowid];
+              }
+            }
           }
           let rowRest = fullAllDataRowIdData[rowid];
           if (!rowRest) {
@@ -17936,6 +17986,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               expandHeight: 0
             };
           }
+          rowRest.treeLoaded = false;
+          rowRest.expandLoaded = false;
           rowRest.row = row;
           rowRest.items = items;
           rowRest.parent = parentRow;
@@ -17944,8 +17996,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           fullDataRowIdMaps[rowid] = rowRest;
           fullAllDataRowIdMaps[rowid] = rowRest;
         };
-        internalData.fullDataRowIdData = fullDataRowIdMaps;
-        internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
         if (treeConfig) {
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullTreeData, handleRow, {
             children: childrenField
@@ -17953,6 +18003,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         } else {
           tableFullData.forEach(handleRow);
         }
+        internalData.fullDataRowIdData = fullDataRowIdMaps;
+        internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
+        reactData.treeExpandedMaps = treeTempExpandedMaps;
       },
       cacheSourceMap(fullData) {
         const {
@@ -20935,18 +20988,16 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       }
     };
     // 检测对应模块是否安装
-    if (true) {
-      '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);
     /**
      * 渲染浮固定列
@@ -21925,20 +21976,18 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         $table: $xeTable
       });
     });
-    if (true) {
-      (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
-        if (props.loading) {
-          if (!VxeUILoadingComponent && !slots.loading) {
-            errLog('vxe.error.reqComp', ['vxe-loading']);
-          }
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.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']);
         }
-      });
-    }
+      }
+    });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.provide)('$xeColgroup', null);
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.provide)('$xeTable', $xeTable);
     $xeTable.renderVN = renderVN;
@@ -23126,11 +23175,9 @@ edit_hook_hooks.add('tableEditModule', {
               const parentLevel = parentRest ? parentRest.level : 0;
               newRecords.forEach((item, i) => {
                 const rowid = getRowid($xeTable, item);
-                if (true) {
-                  if (item[treeOpts.parentField]) {
-                    if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
-                      errLog('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`]);
-                    }
+                if (item[treeOpts.parentField]) {
+                  if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
+                    errLog('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`]);
                   }
                 }
                 if (parentRow) {
@@ -25153,9 +25200,7 @@ export_hook_hooks.add('tableExportModule', {
           }
         } else {
           // 不支持的浏览器
-          if (true) {
-            errLog('vxe.error.notExp');
-          }
+          errLog('vxe.error.notExp');
           _importResolve({
             status: true
           });
@@ -25883,10 +25928,8 @@ export_hook_hooks.add('tableExportModule', {
           message: true,
           types: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps)
         }, exportOpts, options);
-        if (true) {
-          if (!props.exportConfig) {
-            errLog('vxe.error.reqProp', ['export-config']);
-          }
+        if (!props.exportConfig) {
+          errLog('vxe.error.reqProp', ['export-config']);
         }
         handleExportAndPrint(defOpts);
       },
@@ -25896,10 +25939,8 @@ export_hook_hooks.add('tableExportModule', {
         const defOpts = Object.assign({
           message: true
         }, printOpts, options);
-        if (true) {
-          if (!props.printConfig) {
-            errLog('vxe.error.reqProp', ['print-config']);
-          }
+        if (!props.printConfig) {
+          errLog('vxe.error.reqProp', ['print-config']);
         }
         handleExportAndPrint(defOpts, true);
       }
@@ -26822,9 +26863,7 @@ validator_hook_hooks.add('tableValidatorModule', {
                         }
                       }
                     } else {
-                      if (true) {
-                        errLog('vxe.error.notValidators', [validator]);
-                      }
+                      errLog('vxe.error.notValidators', [validator]);
                     }
                   } else {
                     customValid = validator(validParams);
@@ -27541,10 +27580,8 @@ function getComponentOns(renderOpts, params, eFns) {
   const ons = {};
   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().objectEach(events, (func, key) => {
     ons[getOnName(key)] = function (...args) {
-      if (true) {
-        if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(func)) {
-          errLog('vxe.error.errFunc', [func]);
-        }
+      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(func)) {
+        errLog('vxe.error.errFunc', [func]);
       }
       func(params, ...args);
     };
@@ -28031,6 +28068,69 @@ function handleExportTreeSelectMethod(params) {
   } = params;
   return options.original ? getCellValue(row, column) : getTreeSelectCellValue(column.editRender || column.cellRender, params);
 }
+function handleNumberCell(renderOpts, params) {
+  const {
+    props = {},
+    showNegativeStatus
+  } = renderOpts;
+  const {
+    row,
+    column
+  } = params;
+  const {
+    type
+  } = props;
+  let cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
+  let isNegative = false;
+  if (!isEmptyValue(cellValue)) {
+    const numberInputConfig = render_getConfig().numberInput || {};
+    if (type === 'float') {
+      const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
+      const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 1);
+      cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().floor(cellValue, digits), digits);
+      if (!autoFill) {
+        cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue);
+      }
+      if (showNegativeStatus) {
+        if (cellValue < 0) {
+          isNegative = true;
+        }
+      }
+    } else if (type === 'amount') {
+      const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
+      const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 2);
+      const showCurrency = handleDefaultValue(props.showCurrency, numberInputConfig.showCurrency, false);
+      cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue);
+      if (showNegativeStatus) {
+        if (cellValue < 0) {
+          isNegative = true;
+        }
+      }
+      cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().commafy(cellValue, {
+        digits
+      });
+      if (!autoFill) {
+        const [iStr, dStr] = cellValue.split('.');
+        if (dStr) {
+          const dRest = dStr.replace(/0+$/, '');
+          cellValue = dRest ? [iStr, '.', dRest].join('') : iStr;
+        }
+      }
+      if (showCurrency) {
+        cellValue = `${props.currencySymbol || numberInputConfig.currencySymbol || render_getI18n('vxe.numberInput.currencySymbol') || ''}${cellValue}`;
+      }
+    } else {
+      if (showNegativeStatus) {
+        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue) < 0) {
+          isNegative = true;
+        }
+      }
+    }
+  }
+  return getCellLabelVNs(renderOpts, params, cellValue, isNegative ? {
+    class: 'is--negative'
+  } : {});
+}
 /**
  * 表格 - 渲染器
  */
@@ -28102,72 +28202,22 @@ render_renderer.mixin({
     renderTableFilter: defaultFilterRender,
     tableFilterDefaultMethod: handleInputFilterMethod
   },
-  VxeNumberInput: {
-    tableAutoFocus: 'input',
-    renderTableEdit: defaultEditRender,
-    renderTableCell(renderOpts, params) {
-      const {
-        props = {},
-        showNegativeStatus
-      } = renderOpts;
+  FormatNumberInput: {
+    renderTableDefault: handleNumberCell,
+    tableFilterDefaultMethod: handleInputFilterMethod,
+    tableExportMethod(params) {
       const {
         row,
         column
       } = params;
-      const {
-        type
-      } = props;
-      let cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
-      let isNegative = false;
-      if (!isEmptyValue(cellValue)) {
-        const numberInputConfig = render_getConfig().numberInput || {};
-        if (type === 'float') {
-          const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
-          const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 1);
-          cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().floor(cellValue, digits), digits);
-          if (!autoFill) {
-            cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue);
-          }
-          if (showNegativeStatus) {
-            if (cellValue < 0) {
-              isNegative = true;
-            }
-          }
-        } else if (type === 'amount') {
-          const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
-          const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 2);
-          const showCurrency = handleDefaultValue(props.showCurrency, numberInputConfig.showCurrency, false);
-          cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue);
-          if (showNegativeStatus) {
-            if (cellValue < 0) {
-              isNegative = true;
-            }
-          }
-          cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().commafy(cellValue, {
-            digits
-          });
-          if (!autoFill) {
-            const [iStr, dStr] = cellValue.split('.');
-            if (dStr) {
-              const dRest = dStr.replace(/0+$/, '');
-              cellValue = dRest ? [iStr, '.', dRest].join('') : iStr;
-            }
-          }
-          if (showCurrency) {
-            cellValue = `${props.currencySymbol || numberInputConfig.currencySymbol || render_getI18n('vxe.numberInput.currencySymbol') || ''}${cellValue}`;
-          }
-        } else {
-          if (showNegativeStatus) {
-            if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue) < 0) {
-              isNegative = true;
-            }
-          }
-        }
-      }
-      return getCellLabelVNs(renderOpts, params, cellValue, isNegative ? {
-        class: 'is--negative'
-      } : {});
-    },
+      const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
+      return cellValue;
+    }
+  },
+  VxeNumberInput: {
+    tableAutoFocus: 'input',
+    renderTableEdit: defaultEditRender,
+    renderTableCell: handleNumberCell,
     renderTableFooter(renderOpts, params) {
       const {
         props = {}
@@ -28310,11 +28360,22 @@ render_renderer.mixin({
     tableFilterDefaultMethod: handleFilterMethod,
     tableExportMethod: handleExportSelectMethod
   },
+  /**
+   * 已废弃，被 FormatSelect 替换
+   * @deprecated
+   */
   formatOption: {
     renderTableDefault(renderOpts, params) {
       return getCellLabelVNs(renderOpts, params, getSelectCellValue(renderOpts, params));
     }
   },
+  FormatSelect: {
+    renderTableDefault(renderOpts, params) {
+      return getCellLabelVNs(renderOpts, params, getSelectCellValue(renderOpts, params));
+    },
+    tableFilterDefaultMethod: handleFilterMethod,
+    tableExportMethod: handleExportSelectMethod
+  },
   VxeTreeSelect: {
     tableAutoFocus: 'input',
     renderTableEdit: defaultTableOrTreeSelectEditRender,
@@ -28323,11 +28384,21 @@ render_renderer.mixin({
     },
     tableExportMethod: handleExportTreeSelectMethod
   },
+  /**
+   * 已废弃，被 FormatTreeSelect 替换
+   * @deprecated
+   */
   formatTree: {
     renderTableDefault(renderOpts, params) {
       return getCellLabelVNs(renderOpts, params, getTreeSelectCellValue(renderOpts, params));
     }
   },
+  FormatTreeSelect: {
+    renderTableDefault(renderOpts, params) {
+      return getCellLabelVNs(renderOpts, params, getTreeSelectCellValue(renderOpts, params));
+    },
+    tableExportMethod: handleExportTreeSelectMethod
+  },
   VxeTableSelect: {
     tableAutoFocus: 'input',
     renderTableEdit: defaultTableOrTreeSelectEditRender,
@@ -28825,9 +28896,7 @@ const {
             if (tCommandMethod) {
               tCommandMethod(params);
             } else {
-              if (true) {
-                errLog('vxe.error.notCommands', [code]);
-              }
+              errLog('vxe.error.notCommands', [code]);
             }
           }
           $xeToolbar.dispatchEvent('button-click', params, evnt);
@@ -28859,9 +28928,7 @@ const {
             if (tCommandMethod) {
               tCommandMethod(params);
             } else {
-              if (true) {
-                errLog('vxe.error.notCommands', [code]);
-              }
+              errLog('vxe.error.notCommands', [code]);
             }
           }
           $xeToolbar.dispatchEvent('tool-click', params, evnt);
@@ -29235,25 +29302,21 @@ const {
         warnLog('vxe.error.notFunc', ['queryMethod']);
       }
       const customOpts = computeCustomOpts.value;
-      if (true) {
-        if (customOpts.isFooter) {
-          warnLog('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter']);
-        }
-        if (customOpts.showFooter) {
-          warnLog('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter']);
-        }
-        if (customOpts.immediate) {
-          warnLog('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate']);
-        }
-        if (customOpts.trigger) {
-          warnLog('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger']);
-        }
+      if (customOpts.isFooter) {
+        warnLog('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter']);
       }
-      if (true) {
-        if (props.refresh || props.import || props.export || props.print || props.zoom) {
-          if (!VxeUIButtonComponent) {
-            errLog('vxe.error.reqComp', ['vxe-button']);
-          }
+      if (customOpts.showFooter) {
+        warnLog('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter']);
+      }
+      if (customOpts.immediate) {
+        warnLog('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate']);
+      }
+      if (customOpts.trigger) {
+        warnLog('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger']);
+      }
+      if (props.refresh || props.import || props.export || props.print || props.zoom) {
+        if (!VxeUIButtonComponent) {
+          errLog('vxe.error.reqComp', ['vxe-button']);
         }
       }
     });
@@ -29772,9 +29835,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
           if (slots[funcSlot]) {
             return slots[funcSlot];
           } else {
-            if (true) {
-              errLog('vxe.error.notSlot', [funcSlot]);
-            }
+            errLog('vxe.error.notSlot', [funcSlot]);
           }
         } else {
           return funcSlot;
@@ -30365,9 +30426,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                   };
                 });
               } else {
-                if (true) {
-                  errLog('vxe.error.notFunc', ['proxy-config.ajax.query']);
-                }
+                errLog('vxe.error.notFunc', ['proxy-config.ajax.query']);
               }
               break;
             }
@@ -30455,9 +30514,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                   }
                 }
               } else {
-                if (true) {
-                  errLog('vxe.error.notFunc', ['proxy-config.ajax.delete']);
-                }
+                errLog('vxe.error.notFunc', ['proxy-config.ajax.delete']);
               }
               break;
             }
@@ -30561,9 +30618,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                   }
                 });
               } else {
-                if (true) {
-                  errLog('vxe.error.notFunc', ['proxy-config.ajax.save']);
-                }
+                errLog('vxe.error.notFunc', ['proxy-config.ajax.save']);
               }
               break;
             }
@@ -30580,9 +30635,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                     $table: $xeTable
                   }, ...args);
                 } else {
-                  if (true) {
-                    errLog('vxe.error.notCommands', [code]);
-                  }
+                  errLog('vxe.error.notCommands', [code]);
                 }
               }
             }
@@ -30786,24 +30839,20 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
     });
     initPages();
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onMounted)(() => {
-      if (true) {
-        (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
-          if (props.formConfig) {
-            if (!VxeUIFormComponent) {
-              errLog('vxe.error.reqComp', ['vxe-form']);
-            }
-          }
-          if (props.pagerConfig) {
-            if (!VxeUIPagerComponent) {
-              errLog('vxe.error.reqComp', ['vxe-pager']);
-            }
-          }
-        });
-      }
       (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
         const {
           columns
         } = props;
+        if (props.formConfig) {
+          if (!VxeUIFormComponent) {
+            errLog('vxe.error.reqComp', ['vxe-form']);
+          }
+        }
+        if (props.pagerConfig) {
+          if (!VxeUIPagerComponent) {
+            errLog('vxe.error.reqComp', ['vxe-pager']);
+          }
+        }
         // const { data, columns, proxyConfig } = props
         // const proxyOpts = computeProxyOpts.value
         // const formOpts = computeFormOpts.value