vxe-table 3.8.5 → 3.8.6-beta.0

package/lib/table/src/methods.js

@@ -655,13 +655,22 @@ var Methods = {
       return _this8.loadColumn(columns);
     });
   },
+  initColumnSort: function initColumnSort() {
+    var collectColumn = this.collectColumn;
+    collectColumn.forEach(function (column, index) {
+      var sortIndex = index + 1;
+      column.sortNumber = sortIndex;
+      column.renderSortNumber = sortIndex;
+    });
+  },
   handleColumn: function handleColumn(collectColumn) {
     var _this9 = this;
     this.collectColumn = collectColumn;
     var tableFullColumn = getColumnList(collectColumn);
     this.tableFullColumn = tableFullColumn;
-    this.cacheColumnMap(true);
+    this.initColumnSort();
     this.restoreCustomStorage();
+    this.cacheColumnMap();
     this.parseColumns().then(function () {
       if (_this9.scrollXLoad) {
         _this9.loadScrollXData(true);
@@ -840,7 +849,7 @@ var Methods = {
    * 更新数据列的 Map
    * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
-  cacheColumnMap: function cacheColumnMap(isInit) {
+  cacheColumnMap: function cacheColumnMap() {
     var _this13 = this;
     var tableFullColumn = this.tableFullColumn,
       collectColumn = this.collectColumn,
@@ -948,9 +957,6 @@ var Methods = {
       if (fullColumnIdData[colid]) {
         (0, _log.errLog)('vxe.error.colRepet', ['colId', colid]);
       }
-      if (isInit) {
-        column.sortNumber = index;
-      }
       fullColumnIdData[colid] = rest;
       fullColumnMap.set(column, rest);
     };
@@ -1917,6 +1923,9 @@ var Methods = {
     if (opts.resizable) {
       this.saveCustomResizable(true);
     }
+    if (opts.sort) {
+      this.saveCustomSort(true);
+    }
     if (opts.fixed) {
       this.saveCustomFixed();
     }
@@ -1934,6 +1943,7 @@ var Methods = {
       }
     }
     this.saveCustomVisible();
+    this.saveCustomSort();
     this.analyColumnWidth();
     return this.refreshColumn(true);
   },
@@ -1942,7 +1952,6 @@ var Methods = {
    */
   restoreCustomStorage: function restoreCustomStorage() {
     var id = this.id,
-      collectColumn = this.collectColumn,
       customConfig = this.customConfig,
       customOpts = this.customOpts;
     var storage = customOpts.storage;
@@ -1991,22 +2000,21 @@ var Methods = {
         }
       }
       // 自定义顺序
+      var hasCustomSort = false;
       if (isCustomSort) {
         var columnSortStorage = getCustomStorageMap(sortStorageKey)[id];
         if (columnSortStorage) {
-          var colOrderSeqs = columnSortStorage.split(',');
-          colOrderSeqs.forEach(function (orderConf) {
-            var _orderConf$split = orderConf.split('|'),
-              _orderConf$split2 = _slicedToArray(_orderConf$split, 2),
-              colKey = _orderConf$split2[0],
-              sortNumber = _orderConf$split2[1];
+          _xeUtils.default.each(columnSortStorage, function (renderSortNumber, colKey) {
             if (customMap[colKey]) {
-              customMap[colKey].sortNumber = sortNumber;
+              customMap[colKey].renderSortNumber = renderSortNumber;
             } else {
               customMap[colKey] = {
-                sortNumber: sortNumber
+                renderSortNumber: renderSortNumber
               };
             }
+            if (!hasCustomSort) {
+              hasCustomSort = true;
+            }
           });
         }
       }
@@ -2038,6 +2046,7 @@ var Methods = {
           });
         }
       }
+      var collectColumn = this.collectColumn;
       var keyMap = {};
       _xeUtils.default.eachTree(collectColumn, function (column) {
         var colKey = column.getKey();
@@ -2049,7 +2058,7 @@ var Methods = {
         var visible = _ref5.visible,
           resizeWidth = _ref5.resizeWidth,
           fixed = _ref5.fixed,
-          sortNumber = _ref5.sortNumber;
+          renderSortNumber = _ref5.renderSortNumber;
         var column = keyMap[field];
         if (column) {
           if (_xeUtils.default.isNumber(resizeWidth)) {
@@ -2061,11 +2070,17 @@ var Methods = {
           if (fixed) {
             column.fixed = fixed;
           }
-          if (sortNumber) {
-            column.colSeq = Number(sortNumber);
+          if (renderSortNumber) {
+            column.renderSortNumber = Number(renderSortNumber);
           }
         }
       });
+      // 如果自定义了顺序
+      if (hasCustomSort) {
+        collectColumn = _xeUtils.default.orderBy(collectColumn, 'renderSortNumber');
+        this.collectColumn = collectColumn;
+        this.tableFullColumn = getColumnList(collectColumn);
+      }
     }
   },
   saveCustomFixed: function saveCustomFixed() {
@@ -2166,6 +2181,38 @@ var Methods = {
       localStorage.setItem(resizableStorageKey, _xeUtils.default.toJSONString(columnWidthStorageMap));
     }
   },
+  saveCustomSort: function saveCustomSort(isReset) {
+    var id = this.id,
+      collectColumn = this.collectColumn,
+      customConfig = this.customConfig,
+      customOpts = this.customOpts;
+    var storage = customOpts.storage;
+    var isAllStorage = storage === true;
+    var storageOpts = isAllStorage ? {} : Object.assign({}, storage || {});
+    var isSort = isAllStorage || storageOpts.sort;
+    if (customConfig && isSort) {
+      var columnSortStorageMap = getCustomStorageMap(sortStorageKey);
+      var columnWidthStorage;
+      if (!id) {
+        (0, _log.errLog)('vxe.error.reqProp', ['id']);
+        return;
+      }
+      if (!isReset) {
+        columnWidthStorage = _xeUtils.default.isPlainObject(columnSortStorageMap[id]) ? columnSortStorageMap[id] : {};
+        // 排序只支持一级
+        collectColumn.forEach(function (column) {
+          if (column.sortNumber !== column.renderSortNumber) {
+            var colKey = column.getKey();
+            if (colKey) {
+              columnWidthStorage[colKey] = column.renderSortNumber;
+            }
+          }
+        });
+      }
+      columnSortStorageMap[id] = _xeUtils.default.isEmpty(columnWidthStorage) ? undefined : columnWidthStorage;
+      localStorage.setItem(sortStorageKey, _xeUtils.default.toJSONString(columnSortStorageMap));
+    }
+  },
   handleUpdateDataQueue: function handleUpdateDataQueue() {
     this.upDataFlag++;
   },