vxe-table 3.5.0-beta.4 → 3.5.0

package/lib/index.umd.js

@@ -8756,7 +8756,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.5.0-beta.4", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.5.0", "] ").concat(conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -10025,7 +10025,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.5.0-beta.4",
+  version: "3.5.0",
   reg: reg,
   use: use,
   setup: setup,
@@ -14399,7 +14399,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 = [];
@@ -14435,11 +14436,16 @@ var Methods = {
           column: column,
           field: column.property,
           property: property,
-          order: order
+          order: order,
+          sortTime: column.sortTime
         });
       }
     });
 
+    if (sortMultiple && chronological && orderColumns.length > 1) {
+      orderColumns = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.orderBy(orderColumns, 'sortTime');
+    }
+
     if (filterColumns.length) {
       var handleFilter = function handleFilter(row) {
         return filterColumns.every(function (_ref) {
@@ -17634,7 +17640,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;
 
@@ -17643,7 +17649,7 @@ var Methods = {
 
             if (column && column.sortable) {
               column.order = order;
-              column.sortTime = Date.now();
+              column.sortTime = Date.now() + index;
             }
           }
         });
@@ -17709,7 +17715,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;
@@ -17730,6 +17736,8 @@ var Methods = {
           if (column.order !== order) {
             column.order = order;
           }
+
+          column.sortTime = Date.now() + index;
         }
       }); // 如果是服务端排序，则跳过本地排序处理
 
@@ -17784,6 +17792,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,
@@ -17794,10 +17805,16 @@ var Methods = {
           column: column,
           field: column.property,
           property: property,
-          order: order
+          order: order,
+          sortTime: column.sortTime
         });
       }
     });
+
+    if (multiple && chronological && sortList.length > 1) {
+      return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.orderBy(sortList, 'sortTime');
+    }
+
     return sortList;
   },
 
@@ -19223,7 +19240,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 (false) {}
@@ -38400,7 +38417,8 @@ var Pulldown = Object.assign(pulldown, {
       area: {
         mergeErr: '无法对合并单元格进行该操作',
         multiErr: '无法对多重选择区域进行该操作',
-        extendErr: '如果延伸的区域包含被合并的单元格，所有合并的单元格需大小相同'
+        extendErr: '如果延伸的区域包含被合并的单元格，所有合并的单元格需大小相同',
+        pasteMultiErr: '无法粘贴，需要相同大小的复制的区域和粘贴的区域才能执行此操作'
       },
       fnr: {
         title: '查找和替换',