vxe-table 4.2.0-beta.5 → 4.2.1

package/lib/index.umd.js

@@ -8477,7 +8477,7 @@ var GlobalConfig = {
       parentField: 'parentId',
       children: 'children',
       hasChild: 'hasChild',
-      mapChildren: '_X_CHILD',
+      mapChildren: '_X_ROW_CHILD',
       indent: 20,
       showIcon: true
     },
@@ -8754,7 +8754,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("4.2.0-beta.5", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("4.2.1", "] ").concat(conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -10759,7 +10759,7 @@ var v_x_e_table_config = new v_x_e_table_VXETableConfig();
 var v = 'v4';
 var VXETable = {
   v: v,
-  version: "4.2.0-beta.5",
+  version: "4.2.1",
   setup: setup_setup,
   interceptor: interceptor,
   renderer: renderer,
@@ -13049,6 +13049,10 @@ var editHook = {
               }
 
               $xetable.focus();
+
+              if (evnt) {
+                $xetable.dispatchEvent('cell-selected', params, evnt);
+              }
             }
           }
 
@@ -20651,7 +20655,7 @@ var tableExportHook = {
                 handleImport(e.target.result, options);
               };
 
-              reader.readAsText(file, 'UTF-8');
+              reader.readAsText(file, options.encoding || 'UTF-8');
             });
           }
         } else {
@@ -24542,7 +24546,7 @@ var es_array_sort = __webpack_require__("4e82");
   params: Object
 });
 // CONCATENATED MODULE: ./packages/table/src/emits.ts
-/* harmony default export */ var emits = (['update:data', 'keydown-start', 'keydown', 'keydown-end', 'paste', 'copy', 'cut', 'current-change', 'radio-change', 'checkbox-change', 'checkbox-all', 'checkbox-range-start', 'checkbox-range-change', 'checkbox-range-end', 'cell-click', 'cell-dblclick', 'cell-menu', 'cell-mouseenter', 'cell-mouseleave', 'header-cell-click', 'header-cell-dblclick', 'header-cell-menu', 'footer-cell-click', 'footer-cell-dblclick', 'footer-cell-menu', 'clear-merge', 'sort-change', 'clear-sort', 'filter-change', 'filter-visible', 'clear-filter', 'resizable-change', 'toggle-row-expand', 'toggle-tree-expand', 'menu-click', 'edit-closed', 'edit-actived', 'edit-disabled', 'valid-error', 'scroll', 'custom', 'change-fnr', 'open-fnr', 'fnr-change', 'fnr-find', 'fnr-find-all', 'fnr-replace', 'fnr-replace-all', 'cell-area-copy', 'cell-area-cut', 'cell-area-paste', 'cell-area-merge', 'clear-cell-area-merge', 'header-cell-area-selection', 'cell-area-selection-start', 'cell-area-selection-end', 'cell-area-extension-start', 'cell-area-extension-end', 'cell-area-arrows-start', 'cell-area-arrows-end', 'active-cell-change-start', 'active-cell-change-end']);
+/* harmony default export */ var emits = (['update:data', 'keydown-start', 'keydown', 'keydown-end', 'paste', 'copy', 'cut', 'current-change', 'radio-change', 'checkbox-change', 'checkbox-all', 'checkbox-range-start', 'checkbox-range-change', 'checkbox-range-end', 'cell-click', 'cell-dblclick', 'cell-menu', 'cell-mouseenter', 'cell-mouseleave', 'cell-selected', 'header-cell-click', 'header-cell-dblclick', 'header-cell-menu', 'footer-cell-click', 'footer-cell-dblclick', 'footer-cell-menu', 'clear-merge', 'sort-change', 'clear-sort', 'filter-change', 'filter-visible', 'clear-filter', 'resizable-change', 'toggle-row-expand', 'toggle-tree-expand', 'menu-click', 'edit-closed', 'edit-actived', 'edit-disabled', 'valid-error', 'scroll', 'custom', 'change-fnr', 'open-fnr', 'fnr-change', 'fnr-find', 'fnr-find-all', 'fnr-replace', 'fnr-replace-all', 'cell-area-copy', 'cell-area-cut', 'cell-area-paste', 'cell-area-merge', 'clear-cell-area-merge', 'header-cell-area-selection', 'cell-area-selection-start', 'cell-area-selection-end', 'cell-area-extension-start', 'cell-area-extension-end', 'cell-area-arrows-start', 'cell-area-arrows-end', 'active-cell-change-start', 'active-cell-change-end']);
 // CONCATENATED MODULE: ./packages/grid/src/grid.ts
 
 
@@ -32691,8 +32695,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
       }
 
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isString(val1) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isNumber(val1)) {
-        /* eslint-disable eqeqeq */
-        return val1 == val2;
+        return '' + val1 === '' + val2;
       }
 
       return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isEqual(val1, val2);
@@ -33486,7 +33489,9 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
       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 = []; // 处理列
 
@@ -33523,12 +33528,18 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
               column: column,
               field: 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 (!allRemoteFilter && filterColumns.length) {
           var handleFilter = function handleFilter(row) {
             return filterColumns.every(function (_ref2) {
@@ -34015,7 +34026,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
           }
 
           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;
 
@@ -34024,6 +34035,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
 
                 if (column && column.sortable) {
                   column.order = order;
+                  column.sortTime = Date.now() + index;
                 }
               }
             });
@@ -36347,7 +36359,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
             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;
@@ -36365,7 +36377,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
                 column.order = order;
               }
 
-              column.sortTime = Date.now();
+              column.sortTime = Date.now() + index;
             }
           }); // 如果是服务端排序，则跳过本地排序处理
 
@@ -36412,6 +36424,9 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         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) {
@@ -36423,10 +36438,16 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
               column: column,
               field: 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;
       },
 
@@ -38897,12 +38918,18 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(updateStyle);
       },
       updateScrollXData: function updateScrollXData() {
-        handleTableColumn();
-        tablePrivateMethods.updateScrollXSpace();
+        reactData.tableColumn = [];
+        Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(function () {
+          handleTableColumn();
+          tablePrivateMethods.updateScrollXSpace();
+        });
       },
       updateScrollYData: function updateScrollYData() {
-        tablePrivateMethods.handleTableData();
-        tablePrivateMethods.updateScrollYSpace();
+        reactData.tableData = [];
+        Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(function () {
+          tablePrivateMethods.handleTableData();
+          tablePrivateMethods.updateScrollYSpace();
+        });
       },
 
       /**
@@ -39319,13 +39346,13 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
 
         if (true) {
           // 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)) {
             warnLog('vxe.error.reqProp', ['row-config.keyField']);
@@ -39345,7 +39372,19 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
 
           if (props.showFooter && !props.footerMethod) {
             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,
@@ -39794,7 +39833,8 @@ dynamicApp.component(table.name, table);
       area: {
         mergeErr: '无法对合并单元格进行该操作',
         multiErr: '无法对多重选择区域进行该操作',
-        extendErr: '如果延伸的区域包含被合并的单元格，所有合并的单元格需大小相同'
+        extendErr: '如果延伸的区域包含被合并的单元格，所有合并的单元格需大小相同',
+        pasteMultiErr: '无法粘贴，需要相同大小的复制的区域和粘贴的区域才能执行此操作'
       },
       fnr: {
         title: '查找和替换',