vxe-table 3.8.16 → 3.8.18

package/lib/table/src/methods.js

@@ -464,11 +464,11 @@ var Methods = {
           if (childrenField === treeOpts.mapChildrenField) {
             (0, _log.errLog)('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
           }
-          fullData.forEach(function (row) {
-            if (row[childrenField] && row[childrenField].length) {
-              (0, _log.warnLog)('vxe.error.errConflicts', ['tree-config.transform', "row.".concat(childrenField)]);
-            }
-          });
+          // 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,
@@ -2040,7 +2040,6 @@ var Methods = {
     return this.refreshColumn(true);
   },
   handleCustomRestore: function handleCustomRestore(storeData) {
-    var tableFullColumn = this.tableFullColumn;
     var collectColumn = this.collectColumn;
     var resizableData = storeData.resizableData,
       sortData = storeData.sortData,
@@ -2049,7 +2048,7 @@ var Methods = {
     var hasCustomSort = false;
     // 处理还原
     if (resizableData || sortData || visibleData || fixedData) {
-      tableFullColumn.forEach(function (column) {
+      _xeUtils.default.eachTree(collectColumn, function (column, index, items, path, parent) {
         var colKey = column.getKey();
         // 支持一级
         if (!parent) {
@@ -2081,7 +2080,7 @@ var Methods = {
    */
   restoreCustomStorage: function restoreCustomStorage() {
     var _this21 = this;
-    var id = this.id,
+    var tableId = this.tableId,
       customConfig = this.customConfig,
       customOpts = this.customOpts;
     var storage = customOpts.storage,
@@ -2093,14 +2092,14 @@ var Methods = {
     var isCustomFixed = isAllCustom || storageOpts.fixed;
     var isCustomSort = isAllCustom || storageOpts.sort;
     if (customConfig && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
-      if (!id) {
+      if (!tableId) {
         (0, _log.errLog)('vxe.error.reqProp', ['id']);
         return;
       }
-      var storeData = getCustomStorageMap(id);
+      var storeData = getCustomStorageMap(tableId);
       if (restoreStore) {
         return Promise.resolve(restoreStore({
-          id: id,
+          id: tableId,
           type: 'restore',
           storeData: storeData
         })).then(function (storeData) {
@@ -2197,7 +2196,7 @@ var Methods = {
     return storeData;
   },
   saveCustomStore: function saveCustomStore(type) {
-    var id = this.id,
+    var tableId = this.tableId,
       customOpts = this.customOpts;
     var updateStore = customOpts.updateStore,
       storage = customOpts.storage;
@@ -2208,7 +2207,7 @@ var Methods = {
     var isCustomFixed = isAllCustom || storageOpts.fixed;
     var isCustomSort = isAllCustom || storageOpts.sort;
     if (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort) {
-      if (!id) {
+      if (!tableId) {
         (0, _log.errLog)('vxe.error.reqProp', ['id']);
         return this.$nextTick();
       }
@@ -2220,12 +2219,12 @@ var Methods = {
       } : this.getCustomStoreData();
       if (updateStore) {
         return updateStore({
-          id: id,
+          id: tableId,
           type: type,
           storeData: storeData
         });
       } else {
-        setCustomStorageMap(id, type === 'reset' ? null : storeData);
+        setCustomStorageMap(tableId, type === 'reset' ? null : storeData);
       }
     }
     return this.$nextTick();
@@ -3088,15 +3087,17 @@ var Methods = {
           this.clearSelected();
         }
         if (areaOpts.autoClear) {
-          var cellAreas = this.getCellAreas();
-          if (cellAreas.length && !getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
-            this.preventEvent(evnt, 'event.clearAreas', {}, function () {
-              _this29.clearCellAreas();
-              _this29.clearCopyCellArea();
-              _this29.emitEvent('clear-cell-area-selection', {
-                cellAreas: cellAreas
-              }, evnt);
-            });
+          if (this.getCellAreas) {
+            var cellAreas = this.getCellAreas();
+            if (cellAreas && cellAreas.length && !getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
+              this.preventEvent(evnt, 'event.clearAreas', {}, function () {
+                _this29.clearCellAreas();
+                _this29.clearCopyCellArea();
+                _this29.emitEvent('clear-cell-area-selection', {
+                  cellAreas: cellAreas
+                }, evnt);
+              });
+            }
           }
         }
       }