vxe-table 3.15.39 → 3.15.41

package/lib/table/src/methods.js

@@ -37,6 +37,9 @@ function eqCellValue(row1, row2, field) {
   }
   return _xeUtils.default.isEqual(val1, val2);
 }
+function hangleStorageDefaultValue(value, isAll) {
+  return _xeUtils.default.isBoolean(value) ? value : isAll;
+}
 function getNextSortOrder($xeTable, column) {
   const sortOpts = $xeTable.computeSortOpts;
   const {
@@ -201,14 +204,15 @@ function restoreCustomStorage($xeTable) {
   const customOpts = $xeTable.computeCustomOpts;
   const {
     storage,
-    restoreStore
+    restoreStore,
+    storeOptions
   } = customOpts;
   const isAllCustom = storage === true;
-  const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {});
-  const isCustomResizable = isAllCustom || storageOpts.resizable;
-  const isCustomVisible = isAllCustom || storageOpts.visible;
-  const isCustomFixed = isAllCustom || storageOpts.fixed;
-  const isCustomSort = isAllCustom || storageOpts.sort;
+  const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions);
+  const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
+  const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
+  const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
+  const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
   if ((customConfig ? (0, _utils.isEnableConf)(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
     if (!tableId) {
       (0, _log.errLog)('vxe.error.reqProp', ['id']);
@@ -3136,11 +3140,18 @@ function handleRecalculateLayout($xeTable, reFull) {
 }
 const handleUpdateRowGroup = ($xeTable, groupFields) => {
   const reactData = $xeTable;
-  reactData.rowGroupList = groupFields ? (_xeUtils.default.isArray(groupFields) ? groupFields : [groupFields]).map(field => {
-    return {
-      field
-    };
-  }) : [];
+  const aggFields = [];
+  const aggConfs = [];
+  if (groupFields) {
+    (_xeUtils.default.isArray(groupFields) ? groupFields : [groupFields]).forEach(field => {
+      aggFields.push(field);
+      aggConfs.push({
+        field
+      });
+    });
+  }
+  reactData.rowGroupList = aggConfs;
+  reactData.aggHandleFields = aggFields;
 };
 function handleeGroupSummary($xeTable, aggList) {
   const aggregateOpts = $xeTable.computeAggregateOpts;
@@ -3362,9 +3373,9 @@ function loadTableData($xeTable, datas, isReset) {
   internalData.cvCacheMaps = {};
   reactData.isRowLoading = true;
   reactData.scrollVMLoading = false;
-  internalData.treeExpandedMaps = {};
+  // internalData.treeExpandedMaps = {}
   reactData.treeExpandedFlag++;
-  internalData.rowExpandedMaps = {};
+  // internalData.rowExpandedMaps = {}
   reactData.rowExpandedFlag++;
   internalData.insertRowMaps = {};
   reactData.insertRowFlag++;
@@ -5760,14 +5771,15 @@ const Methods = {
     const customOpts = $xeTable.computeCustomOpts;
     const {
       storage,
-      restoreStore
+      restoreStore,
+      storeOptions
     } = customOpts;
     const isAllCustom = storage === true;
-    const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {});
-    const isCustomResizable = isAllCustom || storageOpts.resizable;
-    const isCustomVisible = isAllCustom || storageOpts.visible;
-    const isCustomFixed = isAllCustom || storageOpts.fixed;
-    const isCustomSort = isAllCustom || storageOpts.sort;
+    const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions);
+    const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
+    const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
+    const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
+    const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
     if ((customConfig ? (0, _utils.isEnableConf)(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
       if (!tableId) {
         (0, _log.errLog)('vxe.error.reqProp', ['id']);
@@ -5804,14 +5816,15 @@ const Methods = {
     } = internalData;
     const {
       storage,
-      checkMethod
+      checkMethod,
+      storeOptions
     } = customOpts;
     const isAllCustom = storage === true;
-    const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {});
-    const isCustomResizable = isAllCustom || storageOpts.resizable;
-    const isCustomVisible = isAllCustom || storageOpts.visible;
-    const isCustomFixed = isAllCustom || storageOpts.fixed;
-    const isCustomSort = isAllCustom || storageOpts.sort;
+    const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions);
+    const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
+    const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
+    const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
+    const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
     const resizableData = {};
     const sortData = {};
     const visibleData = {};