vxe-table 3.5.0-beta.2 → 3.5.0

package/lib/table/src/methods.js

@@ -80,8 +80,7 @@ function eqCellValue(row1, row2, field) {
   }
 
   if (_xeUtils.default.isString(val1) || _xeUtils.default.isNumber(val1)) {
-    /* eslint-disable eqeqeq */
-    return val1 == val2;
+    return '' + val1 === '' + val2;
   }
 
   return _xeUtils.default.isEqual(val1, val2);
@@ -1636,7 +1635,8 @@ var Methods = {
         allFilterMethod = filterOpts.filterMethod;
     var allRemoteSort = sortOpts.remote,
         allSortMethod = sortOpts.sortMethod,
-        sortMultiple = sortOpts.multiple;
+        sortMultiple = sortOpts.multiple,
+        chronological = sortOpts.chronological;
     var transform = treeOpts.transform;
     var tableData = [];
     var tableTree = [];
@@ -1672,11 +1672,16 @@ var Methods = {
           column: column,
           field: column.property,
           property: property,
-          order: order
+          order: order,
+          sortTime: column.sortTime
         });
       }
     });
 
+    if (sortMultiple && chronological && orderColumns.length > 1) {
+      orderColumns = _xeUtils.default.orderBy(orderColumns, 'sortTime');
+    }
+
     if (filterColumns.length) {
       var handleFilter = function handleFilter(row) {
         return filterColumns.every(function (_ref) {
@@ -4901,7 +4906,7 @@ var Methods = {
       }
 
       if (defaultSort.length) {
-        (sortConfig.multiple ? defaultSort : defaultSort.slice(0, 1)).forEach(function (item) {
+        (sortConfig.multiple ? defaultSort : defaultSort.slice(0, 1)).forEach(function (item, index) {
           var field = item.field,
               order = item.order;
 
@@ -4910,7 +4915,7 @@ var Methods = {
 
             if (column && column.sortable) {
               column.order = order;
-              column.sortTime = Date.now();
+              column.sortTime = Date.now() + index;
             }
           }
         });
@@ -4976,7 +4981,7 @@ var Methods = {
         clearAllSort(this);
       }
 
-      (multiple ? sortConfs : [sortConfs[0]]).forEach(function (confs) {
+      (multiple ? sortConfs : [sortConfs[0]]).forEach(function (confs, index) {
         var field = confs.field,
             order = confs.order;
         var column = field;
@@ -4997,6 +5002,8 @@ var Methods = {
           if (column.order !== order) {
             column.order = order;
           }
+
+          column.sortTime = Date.now() + index;
         }
       }); // 如果是服务端排序，则跳过本地排序处理
 
@@ -5053,6 +5060,9 @@ var Methods = {
     return this.getSortColumns().length > 0;
   },
   getSortColumns: function getSortColumns() {
+    var _this$sortOpts = this.sortOpts,
+        multiple = _this$sortOpts.multiple,
+        chronological = _this$sortOpts.chronological;
     var sortList = [];
     this.tableFullColumn.forEach(function (column) {
       var property = column.property,
@@ -5063,10 +5073,16 @@ var Methods = {
           column: column,
           field: column.property,
           property: property,
-          order: order
+          order: order,
+          sortTime: column.sortTime
         });
       }
     });
+
+    if (multiple && chronological && sortList.length > 1) {
+      return _xeUtils.default.orderBy(sortList, 'sortTime');
+    }
+
     return sortList;
   },
 
@@ -5967,8 +5983,14 @@ var Methods = {
     this.tableColumn = scrollXLoad ? visibleColumn.slice(scrollXStore.startIndex, scrollXStore.endIndex) : visibleColumn.slice(0);
   },
   updateScrollXData: function updateScrollXData() {
-    this.handleTableColumn();
-    this.updateScrollXSpace();
+    var _this49 = this;
+
+    this.tableColumn = [];
+    this.$nextTick(function () {
+      _this49.handleTableColumn();
+
+      _this49.updateScrollXSpace();
+    });
   },
   // 更新横向 X 可视渲染上下剩余空间大小
   updateScrollXSpace: function updateScrollXSpace() {
@@ -6024,8 +6046,14 @@ var Methods = {
     }
   },
   updateScrollYData: function updateScrollYData() {
-    this.handleTableData();
-    this.updateScrollYSpace();
+    var _this50 = this;
+
+    this.tableData = [];
+    this.$nextTick(function () {
+      _this50.handleTableData();
+
+      _this50.updateScrollYSpace();
+    });
   },
   // 更新纵向 Y 可视渲染上下剩余空间大小
   updateScrollYSpace: function updateScrollYSpace() {
@@ -6071,7 +6099,7 @@ var Methods = {
    * @param {Number} scrollTop 上距离
    */
   scrollTo: function scrollTo(scrollLeft, scrollTop) {
-    var _this49 = this;
+    var _this51 = this;
 
     var $refs = this.$refs;
     var tableBody = $refs.tableBody,
@@ -6092,7 +6120,7 @@ var Methods = {
     if (this.scrollXLoad || this.scrollYLoad) {
       return new Promise(function (resolve) {
         return setTimeout(function () {
-          return resolve(_this49.$nextTick());
+          return resolve(_this51.$nextTick());
         }, 50);
       });
     }
@@ -6143,7 +6171,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   scrollToTreeRow: function scrollToTreeRow(row) {
-    var _this50 = this;
+    var _this52 = this;
 
     var tableFullData = this.tableFullData,
         treeConfig = this.treeConfig,
@@ -6158,15 +6186,15 @@ var Methods = {
       if (matchObj) {
         var nodes = matchObj.nodes;
         nodes.forEach(function (row, index) {
-          if (index < nodes.length - 1 && !_this50.isTreeExpandByRow(row)) {
-            rests.push(_this50.setTreeExpand(row, true));
+          if (index < nodes.length - 1 && !_this52.isTreeExpandByRow(row)) {
+            rests.push(_this52.setTreeExpand(row, true));
           }
         });
       }
     }
 
     return Promise.all(rests).then(function () {
-      return _dom.default.rowToVisible(_this50, row);
+      return _dom.default.rowToVisible(_this52, row);
     });
   },
 
@@ -6230,29 +6258,29 @@ var Methods = {
    * 如果单元格配置了校验规则，则会进行校验
    */
   updateStatus: function updateStatus(scope, cellValue) {
-    var _this51 = this;
+    var _this53 = this;
 
     var customVal = !_xeUtils.default.isUndefined(cellValue);
     return this.$nextTick().then(function () {
-      var $refs = _this51.$refs,
-          editRules = _this51.editRules,
-          validStore = _this51.validStore;
+      var $refs = _this53.$refs,
+          editRules = _this53.editRules,
+          validStore = _this53.validStore;
 
       if (scope && $refs.tableBody && editRules) {
         var row = scope.row,
             column = scope.column;
         var type = 'change';
 
-        if (_this51.hasCellRules(type, row, column)) {
-          var cell = _this51.getCell(row, column);
+        if (_this53.hasCellRules(type, row, column)) {
+          var cell = _this53.getCell(row, column);
 
           if (cell) {
-            return _this51.validCellRules(type, row, column, cellValue).then(function () {
+            return _this53.validCellRules(type, row, column, cellValue).then(function () {
               if (customVal && validStore.visible) {
                 setCellValue(row, column, cellValue);
               }
 
-              _this51.clearValidate();
+              _this53.clearValidate();
             }).catch(function (_ref8) {
               var rule = _ref8.rule;
 
@@ -6260,7 +6288,7 @@ var Methods = {
                 setCellValue(row, column, cellValue);
               }
 
-              _this51.showValidTooltip({
+              _this53.showValidTooltip({
                 rule: rule,
                 row: row,
                 column: column,
@@ -6281,7 +6309,7 @@ var Methods = {
    * @param {TableMergeConfig[]} merges { row: Row|number, column: ColumnInfo|number, rowspan: number, colspan: number }
    */
   setMergeCells: function setMergeCells(merges) {
-    var _this52 = this;
+    var _this54 = this;
 
     if (this.spanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-cells', 'span-method']);
@@ -6289,7 +6317,7 @@ var Methods = {
 
     setMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      return _this52.updateCellAreas();
+      return _this54.updateCellAreas();
     });
   },
 
@@ -6298,7 +6326,7 @@ var Methods = {
    * @param {TableMergeConfig[]} merges 多个或数组 [{row:Row|number, col:ColumnInfo|number}]
    */
   removeMergeCells: function removeMergeCells(merges) {
-    var _this53 = this;
+    var _this55 = this;
 
     if (this.spanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-cells', 'span-method']);
@@ -6306,7 +6334,7 @@ var Methods = {
 
     var rest = removeMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      _this53.updateCellAreas();
+      _this55.updateCellAreas();
 
       return rest;
     });
@@ -6330,7 +6358,7 @@ var Methods = {
     this.setMergeFooterItems(this.mergeFooterItems);
   },
   setMergeFooterItems: function setMergeFooterItems(merges) {
-    var _this54 = this;
+    var _this56 = this;
 
     if (this.footerSpanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
@@ -6338,11 +6366,11 @@ var Methods = {
 
     setMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      return _this54.updateCellAreas();
+      return _this56.updateCellAreas();
     });
   },
   removeMergeFooterItems: function removeMergeFooterItems(merges) {
-    var _this55 = this;
+    var _this57 = this;
 
     if (this.footerSpanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
@@ -6350,7 +6378,7 @@ var Methods = {
 
     var rest = removeMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      _this55.updateCellAreas();
+      _this57.updateCellAreas();
 
       return rest;
     });
@@ -6493,7 +6521,7 @@ var Methods = {
   }
 }; // Module methods
 
-var funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,clearCopyCellArea,setCellAreas,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearActived,getActiveRecord,isActiveByRow,setActiveRow,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',');
+var funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearActived,getActiveRecord,isActiveByRow,setActiveRow,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',');
 funcs.forEach(function (name) {
   Methods[name] = function () {
     if (process.env.NODE_ENV === 'development') {