vxe-table 4.2.0-beta.5 → 4.2.1

package/lib/table/src/table.js

@@ -614,8 +614,7 @@ var _default = (0, _vue.defineComponent)({
       }
 
       if (_xeUtils.default.isString(val1) || _xeUtils.default.isNumber(val1)) {
-        /* eslint-disable eqeqeq */
-        return val1 == val2;
+        return '' + val1 === '' + val2;
       }
 
       return _xeUtils.default.isEqual(val1, val2);
@@ -1415,7 +1414,9 @@ var _default = (0, _vue.defineComponent)({
       var allRemoteFilter = filterOpts.remote,
           allFilterMethod = filterOpts.filterMethod;
       var allRemoteSort = sortOpts.remote,
-          allSortMethod = sortOpts.sortMethod;
+          allSortMethod = sortOpts.sortMethod,
+          sortMultiple = sortOpts.multiple,
+          chronological = sortOpts.chronological;
       var tableData = [];
       var tableTree = []; // 处理列
 
@@ -1452,12 +1453,18 @@ var _default = (0, _vue.defineComponent)({
               column: column,
               field: property,
               property: property,
-              order: order
+              order: order,
+              sortTime: column.sortTime
             });
           }
-        }); // 处理筛选
+        });
+
+        if (sortMultiple && chronological && orderColumns_1.length > 1) {
+          orderColumns_1 = _xeUtils.default.orderBy(orderColumns_1, 'sortTime');
+        } // 处理筛选
         // 支持单列、多列、组合筛选
 
+
         if (!allRemoteFilter && filterColumns_1.length) {
           var handleFilter = function handleFilter(row) {
             return filterColumns_1.every(function (_a) {
@@ -1943,7 +1950,7 @@ var _default = (0, _vue.defineComponent)({
           }
 
           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;
 
@@ -1952,6 +1959,7 @@ var _default = (0, _vue.defineComponent)({
 
                 if (column && column.sortable) {
                   column.order = order;
+                  column.sortTime = Date.now() + index;
                 }
               }
             });
@@ -4279,7 +4287,7 @@ var _default = (0, _vue.defineComponent)({
             clearAllSort();
           }
 
-          (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;
@@ -4297,7 +4305,7 @@ var _default = (0, _vue.defineComponent)({
                 column.order = order;
               }
 
-              column.sortTime = Date.now();
+              column.sortTime = Date.now() + index;
             }
           }); // 如果是服务端排序，则跳过本地排序处理
 
@@ -4344,6 +4352,9 @@ var _default = (0, _vue.defineComponent)({
         return tableMethods.getSortColumns().length > 0;
       },
       getSortColumns: function getSortColumns() {
+        var sortOpts = computeSortOpts.value;
+        var multiple = sortOpts.multiple,
+            chronological = sortOpts.chronological;
         var sortList = [];
         var tableFullColumn = internalData.tableFullColumn;
         tableFullColumn.forEach(function (column) {
@@ -4355,10 +4366,16 @@ var _default = (0, _vue.defineComponent)({
               column: column,
               field: property,
               property: property,
-              order: order
+              order: order,
+              sortTime: column.sortTime
             });
           }
         });
+
+        if (multiple && chronological && sortList.length > 1) {
+          return _xeUtils.default.orderBy(sortList, 'sortTime');
+        }
+
         return sortList;
       },
 
@@ -6830,12 +6847,18 @@ var _default = (0, _vue.defineComponent)({
         (0, _vue.nextTick)(updateStyle);
       },
       updateScrollXData: function updateScrollXData() {
-        handleTableColumn();
-        tablePrivateMethods.updateScrollXSpace();
+        reactData.tableColumn = [];
+        (0, _vue.nextTick)(function () {
+          handleTableColumn();
+          tablePrivateMethods.updateScrollXSpace();
+        });
       },
       updateScrollYData: function updateScrollYData() {
-        tablePrivateMethods.handleTableData();
-        tablePrivateMethods.updateScrollYSpace();
+        reactData.tableData = [];
+        (0, _vue.nextTick)(function () {
+          tablePrivateMethods.handleTableData();
+          tablePrivateMethods.updateScrollYSpace();
+        });
       },
 
       /**
@@ -7251,13 +7274,13 @@ var _default = (0, _vue.defineComponent)({
 
         if (process.env.NODE_ENV === 'development') {
           // if (props.rowId) {
-          //   warnLog('vxe.error.delProp', ['rowId', 'row-config.keyField'])
+          //   warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField'])
           // }
           // if (props.rowKey) {
-          //   warnLog('vxe.error.delProp', ['rowId', 'row-config.useKey'])
+          //   warnLog('vxe.error.delProp', ['row-id', 'row-config.useKey'])
           // }
           // if (props.columnKey) {
-          //   warnLog('vxe.error.delProp', ['rowId', 'column-config.useKey'])
+          //   warnLog('vxe.error.delProp', ['row-id', 'column-config.useKey'])
           // }
           if (!(props.rowId || rowOpts.keyField) && (checkboxOpts.reserve || checkboxOpts.checkRowKeys || radioOpts.reserve || radioOpts.checkRowKey || expandOpts.expandRowKeys || treeOpts.expandRowKeys)) {
             (0, _log.warnLog)('vxe.error.reqProp', ['row-config.keyField']);
@@ -7277,7 +7300,19 @@ var _default = (0, _vue.defineComponent)({
 
           if (props.showFooter && !props.footerMethod) {
             (0, _log.warnLog)('vxe.error.reqProp', ['footer-method']);
-          } // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
+          } // if (props.highlightCurrentRow) {
+          //   warnLog('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent'])
+          // }
+          // if (props.highlightHoverRow) {
+          //   warnLog('vxe.error.delProp', ['highlight-hover-row', 'row-config.isHover'])
+          // }
+          // if (props.highlightCurrentColumn) {
+          //   warnLog('vxe.error.delProp', ['highlight-current-column', 'column-config.isCurrent'])
+          // }
+          // if (props.highlightHoverColumn) {
+          //   warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover'])
+          // }
+          // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
 
 
           var exportConfig = props.exportConfig,