vxe-table 3.5.0-beta.3 → 3.5.1

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.3", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.5.1", "] ").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.3",
+  version: "3.5.1",
   reg: reg,
   use: use,
   setup: setup,
@@ -10124,6 +10124,9 @@ var es_string_includes = __webpack_require__("2532");
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.fixed.js
 var es_string_fixed = __webpack_require__("c7cd");
 
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.promise.js
+var es_promise = __webpack_require__("e6cf");
+
 // CONCATENATED MODULE: ./packages/table/src/columnInfo.js
 
 
@@ -10270,9 +10273,6 @@ var es_regexp_to_string = __webpack_require__("25f0");
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.match.js
 var es_string_match = __webpack_require__("466d");
 
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.promise.js
-var es_promise = __webpack_require__("e6cf");
-
 // CONCATENATED MODULE: ./packages/tools/dom.js
 
 
@@ -10281,10 +10281,6 @@ var es_promise = __webpack_require__("e6cf");
 
 
 
-
-
-
-var getRowid = utils.getRowid;
 var browse = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.browse();
 var reClsMap = {};
 
@@ -10394,77 +10390,6 @@ var DomTools = {
       overflowElem.setAttribute('title', content);
     }
   },
-  rowToVisible: function rowToVisible($xetable, row) {
-    var tableBody = $xetable.$refs.tableBody;
-    var bodyElem = tableBody ? tableBody.$el : null;
-
-    if (bodyElem) {
-      var trElem = bodyElem.querySelector("[rowid=\"".concat(getRowid($xetable, row), "\"]"));
-
-      if (trElem) {
-        var bodyHeight = bodyElem.clientHeight;
-        var bodySrcollTop = bodyElem.scrollTop;
-        var trOffsetTop = trElem.offsetTop + (trElem.offsetParent ? trElem.offsetParent.offsetTop : 0);
-        var trHeight = trElem.clientHeight; // 检测行是否在可视区中
-
-        if (trOffsetTop < bodySrcollTop || trOffsetTop > bodySrcollTop + bodyHeight) {
-          // 向上定位
-          return $xetable.scrollTo(null, trOffsetTop);
-        } else if (trOffsetTop + trHeight >= bodyHeight + bodySrcollTop) {
-          // 向下定位
-          return $xetable.scrollTo(null, bodySrcollTop + trHeight);
-        }
-      } else {
-        // 如果是虚拟渲染跨行滚动
-        if ($xetable.scrollYLoad) {
-          return $xetable.scrollTo(null, ($xetable.afterFullData.indexOf(row) - 1) * $xetable.scrollYStore.rowHeight);
-        }
-      }
-    }
-
-    return Promise.resolve();
-  },
-  colToVisible: function colToVisible($xetable, column) {
-    var tableBody = $xetable.$refs.tableBody;
-    var bodyElem = tableBody ? tableBody.$el : null;
-
-    if (bodyElem) {
-      var tdElem = bodyElem.querySelector(".".concat(column.id));
-
-      if (tdElem) {
-        var bodyWidth = bodyElem.clientWidth;
-        var bodySrcollLeft = bodyElem.scrollLeft;
-        var tdOffsetLeft = tdElem.offsetLeft + (tdElem.offsetParent ? tdElem.offsetParent.offsetLeft : 0);
-        var tdWidth = tdElem.clientWidth; // 检测行是否在可视区中
-
-        if (tdOffsetLeft < bodySrcollLeft || tdOffsetLeft > bodySrcollLeft + bodyWidth) {
-          // 向左定位
-          return $xetable.scrollTo(tdOffsetLeft);
-        } else if (tdOffsetLeft + tdWidth >= bodyWidth + bodySrcollLeft) {
-          // 向右定位
-          return $xetable.scrollTo(bodySrcollLeft + tdWidth);
-        }
-      } else {
-        // 如果是虚拟渲染跨行滚动
-        if ($xetable.scrollXLoad) {
-          var visibleColumn = $xetable.visibleColumn;
-          var scrollLeft = 0;
-
-          for (var index = 0; index < visibleColumn.length; index++) {
-            if (visibleColumn[index] === column) {
-              break;
-            }
-
-            scrollLeft += visibleColumn[index].renderWidth;
-          }
-
-          return $xetable.scrollTo(scrollLeft);
-        }
-      }
-    }
-
-    return Promise.resolve();
-  },
   getDomNode: getDomNode,
 
   /**
@@ -10572,6 +10497,8 @@ var DomTools = {
 
 
 
+
+
 var lineOffsetSizes = {
   mini: 3,
   small: 2,
@@ -10608,7 +10535,7 @@ function getRowkey($xetable) {
   return $xetable.rowOpts.keyField || $xetable.rowId || '_X_ROW_KEY';
 } // 行主键 value
 
-function util_getRowid($xetable, row) {
+function getRowid($xetable, row) {
   var rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, getRowkey($xetable));
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(rowid) ? '' : encodeURIComponent(rowid);
 }
@@ -10833,6 +10760,77 @@ function isColumnInfo(column) {
 function getColumnConfig($xetable, _vm, options) {
   return isColumnInfo(_vm) ? _vm : new columnInfo_ColumnInfo($xetable, _vm, options);
 }
+function rowToVisible($xetable, row) {
+  var tableBody = $xetable.$refs.tableBody;
+  var bodyElem = tableBody ? tableBody.$el : null;
+
+  if (bodyElem) {
+    var trElem = bodyElem.querySelector("[rowid=\"".concat(getRowid($xetable, row), "\"]"));
+
+    if (trElem) {
+      var bodyHeight = bodyElem.clientHeight;
+      var bodySrcollTop = bodyElem.scrollTop;
+      var trOffsetTop = trElem.offsetTop + (trElem.offsetParent ? trElem.offsetParent.offsetTop : 0);
+      var trHeight = trElem.clientHeight; // 检测行是否在可视区中
+
+      if (trOffsetTop < bodySrcollTop || trOffsetTop > bodySrcollTop + bodyHeight) {
+        // 向上定位
+        return $xetable.scrollTo(null, trOffsetTop);
+      } else if (trOffsetTop + trHeight >= bodyHeight + bodySrcollTop) {
+        // 向下定位
+        return $xetable.scrollTo(null, bodySrcollTop + trHeight);
+      }
+    } else {
+      // 如果是虚拟渲染跨行滚动
+      if ($xetable.scrollYLoad) {
+        return $xetable.scrollTo(null, ($xetable.afterFullData.indexOf(row) - 1) * $xetable.scrollYStore.rowHeight);
+      }
+    }
+  }
+
+  return Promise.resolve();
+}
+function colToVisible($xetable, column) {
+  var tableBody = $xetable.$refs.tableBody;
+  var bodyElem = tableBody ? tableBody.$el : null;
+
+  if (bodyElem) {
+    var tdElem = bodyElem.querySelector(".".concat(column.id));
+
+    if (tdElem) {
+      var bodyWidth = bodyElem.clientWidth;
+      var bodySrcollLeft = bodyElem.scrollLeft;
+      var tdOffsetLeft = tdElem.offsetLeft + (tdElem.offsetParent ? tdElem.offsetParent.offsetLeft : 0);
+      var tdWidth = tdElem.clientWidth; // 检测行是否在可视区中
+
+      if (tdOffsetLeft < bodySrcollLeft || tdOffsetLeft > bodySrcollLeft + bodyWidth) {
+        // 向左定位
+        return $xetable.scrollTo(tdOffsetLeft);
+      } else if (tdOffsetLeft + tdWidth >= bodyWidth + bodySrcollLeft) {
+        // 向右定位
+        return $xetable.scrollTo(bodySrcollLeft + tdWidth);
+      }
+    } else {
+      // 如果是虚拟渲染跨行滚动
+      if ($xetable.scrollXLoad) {
+        var visibleColumn = $xetable.visibleColumn;
+        var scrollLeft = 0;
+
+        for (var index = 0; index < visibleColumn.length; index++) {
+          if (visibleColumn[index] === column) {
+            break;
+          }
+
+          scrollLeft += visibleColumn[index].renderWidth;
+        }
+
+        return $xetable.scrollTo(scrollLeft);
+      }
+    }
+  }
+
+  return Promise.resolve();
+}
 // CONCATENATED MODULE: ./packages/table/src/body.js
 
 
@@ -10862,7 +10860,7 @@ function renderLine(h, _vm, $xetable, params) {
       fullAllDataRowIdData = $xetable.fullAllDataRowIdData;
   var slots = column.slots,
       treeNode = column.treeNode;
-  var rowid = util_getRowid($xetable, row);
+  var rowid = getRowid($xetable, row);
   var rest = fullAllDataRowIdData[rowid];
   var rLevel = 0;
   var rIndex = 0;
@@ -11210,7 +11208,7 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
       };
     }
 
-    var rowid = util_getRowid($xetable, row);
+    var rowid = getRowid($xetable, row);
     var rest = fullAllDataRowIdData[rowid];
     var rowLevel = rest ? rest.level : 0;
     var seq = rest ? rest.seq : -1;
@@ -12962,8 +12960,7 @@ function eqCellValue(row1, row2, field) {
   }
 
   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);
@@ -13367,7 +13364,7 @@ var Methods = {
 
     var tableData = scrollYLoad ? fullList.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullList.slice(0);
     tableData.forEach(function (row, $index) {
-      var rowid = util_getRowid(_this3, row);
+      var rowid = getRowid(_this3, row);
       var rest = fullDataRowIdData[rowid];
 
       if (rest) {
@@ -13648,7 +13645,7 @@ var Methods = {
     var isLazy = treeConfig && treeOpts.lazy;
 
     var handleCache = function handleCache(row, index, items, path, parent, nodes) {
-      var rowid = util_getRowid(_this10, row);
+      var rowid = getRowid(_this10, row);
       var seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
       var level = nodes ? nodes.length - 1 : 0;
 
@@ -13709,13 +13706,13 @@ var Methods = {
     var transform = treeOpts.transform,
         children = treeOpts.children,
         mapChildren = treeOpts.mapChildren;
-    var rest = fullAllDataRowIdData[util_getRowid(this, row)];
+    var rest = fullAllDataRowIdData[getRowid(this, row)];
     var parentLevel = rest ? rest.level : 0;
     return this.createData(childRecords).then(function (rows) {
       if (keepSource) {
-        var rowid = util_getRowid(_this11, row);
+        var rowid = getRowid(_this11, row);
         var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(tableSourceData, function (item) {
-          return rowid === util_getRowid(_this11, item);
+          return rowid === getRowid(_this11, item);
         }, treeOpts);
 
         if (matchObj) {
@@ -13724,7 +13721,7 @@ var Methods = {
       }
 
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(rows, function (childRow, index, items, path, parent, nodes) {
-        var rowid = util_getRowid(_this11, childRow);
+        var rowid = getRowid(_this11, childRow);
         var rest = {
           row: childRow,
           rowid: rowid,
@@ -13903,7 +13900,7 @@ var Methods = {
     var fullDataRowIdData = this.fullDataRowIdData;
 
     if (row) {
-      var rowid = util_getRowid(this, row);
+      var rowid = getRowid(this, row);
       var rest = fullDataRowIdData[rowid];
 
       if (rest) {
@@ -14216,7 +14213,7 @@ var Methods = {
 
     if (keepSource) {
       var oRow, property;
-      var rowid = util_getRowid(this, row); // 新增的数据不需要检测
+      var rowid = getRowid(this, row); // 新增的数据不需要检测
 
       if (!fullDataRowIdData[rowid]) {
         return false;
@@ -14225,7 +14222,7 @@ var Methods = {
       if (treeConfig) {
         var children = treeOpts.children;
         var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(tableSourceData, function (item) {
-          return rowid === util_getRowid(_this16, item);
+          return rowid === getRowid(_this16, item);
         }, treeOpts);
         row = Object.assign({}, row, _defineProperty({}, children, null));
 
@@ -14400,7 +14397,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 = [];
@@ -14436,11 +14434,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) {
@@ -14615,7 +14618,7 @@ var Methods = {
 
     if (treeConfig) {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(afterTreeFullData, function (row, index, items, path) {
-        var rowid = util_getRowid(_this18, row);
+        var rowid = getRowid(_this18, row);
         var allrest = fullAllDataRowIdData[rowid];
         var seq = path.map(function (num, i) {
           return i % 2 === 0 ? Number(num) + 1 : '.';
@@ -14644,7 +14647,7 @@ var Methods = {
       });
     } else {
       afterFullData.forEach(function (row, index) {
-        var rowid = util_getRowid(_this18, row);
+        var rowid = getRowid(_this18, row);
         var allrest = fullAllDataRowIdData[rowid];
         var seq = index + 1;
 
@@ -14683,7 +14686,7 @@ var Methods = {
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isString(rowOrRowid)) {
         rowid = rowOrRowid;
       } else {
-        rowid = util_getRowid(this, rowOrRowid);
+        rowid = getRowid(this, rowOrRowid);
       }
 
       if (rowid) {
@@ -16857,7 +16860,7 @@ var Methods = {
       if (reserve) {
         if (value) {
           selectRows.forEach(function (row) {
-            checkboxReserveRowMap[util_getRowid(_this32, row)] = row;
+            checkboxReserveRowMap[getRowid(_this32, row)] = row;
           });
         } else {
           afterFullData.forEach(function (row) {
@@ -16989,7 +16992,7 @@ var Methods = {
 
 
     if (radioOpts.reserve && radioReserveRow) {
-      var rowid = util_getRowid(this, radioReserveRow);
+      var rowid = getRowid(this, radioReserveRow);
 
       if (fullDataRowIdData[rowid]) {
         this.setRadioRow(fullDataRowIdData[rowid].row);
@@ -17036,7 +17039,7 @@ var Methods = {
         treeOpts = this.treeOpts;
 
     if (radioOpts.reserve && radioReserveRow) {
-      var rowid = util_getRowid(this, radioReserveRow);
+      var rowid = getRowid(this, radioReserveRow);
 
       if (isFull) {
         if (!fullDataRowIdData[rowid]) {
@@ -17096,11 +17099,11 @@ var Methods = {
 
       if (treeConfig) {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(afterFullData, function (row) {
-          afterFullIdMaps[util_getRowid(_this33, row)] = 1;
+          afterFullIdMaps[getRowid(_this33, row)] = 1;
         }, treeOpts);
       } else {
         afterFullData.forEach(function (row) {
-          afterFullIdMaps[util_getRowid(_this33, row)] = 1;
+          afterFullIdMaps[getRowid(_this33, row)] = 1;
         });
       }
 
@@ -17130,7 +17133,7 @@ var Methods = {
         checkboxOpts = this.checkboxOpts;
 
     if (checkboxOpts.reserve) {
-      var rowid = util_getRowid(this, row);
+      var rowid = getRowid(this, row);
 
       if (checked) {
         checkboxReserveRowMap[rowid] = row;
@@ -17276,7 +17279,7 @@ var Methods = {
 
     if (rowOpts.isCurrent || this.highlightCurrentRow) {
       if ($el) {
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.arrayEach($el.querySelectorAll("[rowid=\"".concat(util_getRowid(this, row), "\"]")), function (elem) {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.arrayEach($el.querySelectorAll("[rowid=\"".concat(getRowid(this, row), "\"]")), function (elem) {
           return addClass(elem, 'row--current');
         });
       }
@@ -17349,7 +17352,7 @@ var Methods = {
         afterFullData = this.afterFullData;
 
     if (selectRow) {
-      var rowid = util_getRowid(this, selectRow);
+      var rowid = getRowid(this, selectRow);
 
       if (isFull) {
         if (!fullDataRowIdData[rowid]) {
@@ -17385,7 +17388,7 @@ var Methods = {
   },
   setHoverRow: function setHoverRow(row) {
     var $el = this.$el;
-    var rowid = util_getRowid(this, row);
+    var rowid = getRowid(this, row);
     this.clearHoverRow();
 
     if ($el) {
@@ -17635,7 +17638,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;
 
@@ -17644,7 +17647,7 @@ var Methods = {
 
             if (column && column.sortable) {
               column.order = order;
-              column.sortTime = Date.now();
+              column.sortTime = Date.now() + index;
             }
           }
         });
@@ -17710,7 +17713,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;
@@ -17731,6 +17734,8 @@ var Methods = {
           if (column.order !== order) {
             column.order = order;
           }
+
+          column.sortTime = Date.now() + index;
         }
       }); // 如果是服务端排序，则跳过本地排序处理
 
@@ -17785,6 +17790,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,
@@ -17795,10 +17803,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;
   },
 
@@ -18104,7 +18118,7 @@ var Methods = {
         expandOpts = this.expandOpts;
 
     if (expandOpts.reserve) {
-      var rowid = util_getRowid(this, row);
+      var rowid = getRowid(this, row);
 
       if (expanded) {
         rowExpandedReserveRowMap[rowid] = row;
@@ -18518,7 +18532,7 @@ var Methods = {
         treeOpts = this.treeOpts;
 
     if (treeOpts.reserve) {
-      var rowid = util_getRowid(this, row);
+      var rowid = getRowid(this, row);
 
       if (expanded) {
         treeExpandedReserveRowMap[rowid] = row;
@@ -18846,7 +18860,7 @@ var Methods = {
       if (this.treeConfig) {
         rest.push(this.scrollToTreeRow(row));
       } else {
-        rest.push(dom.rowToVisible(this, row));
+        rest.push(rowToVisible(this, row));
       }
     }
 
@@ -18865,7 +18879,7 @@ var Methods = {
     var column = handleFieldOrColumn(this, fieldOrColumn);
 
     if (column && this.fullColumnMap.has(column)) {
-      return dom.colToVisible(this, column);
+      return colToVisible(this, column);
     }
 
     return this.$nextTick();
@@ -18900,7 +18914,7 @@ var Methods = {
     }
 
     return Promise.all(rests).then(function () {
-      return dom.rowToVisible(_this52, row);
+      return rowToVisible(_this52, row);
     });
   },
 
@@ -19151,7 +19165,7 @@ var Methods = {
    *************************/
   getCell: function getCell(row, column) {
     var $refs = this.$refs;
-    var rowid = util_getRowid(this, row);
+    var rowid = getRowid(this, row);
     var bodyElem = $refs["".concat(column.fixed || 'table', "Body")] || $refs.tableBody;
 
     if (bodyElem && bodyElem.$el) {
@@ -19224,7 +19238,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) {}
@@ -29344,7 +29358,7 @@ function handleFileImport($xetable, file, opts) {
             handleImport($xetable, e.target.result, options);
           };
 
-          reader.readAsText(file, 'UTF-8');
+          reader.readAsText(file, options.encoding || 'UTF-8');
         });
       }
     } else {
@@ -38401,7 +38415,8 @@ var Pulldown = Object.assign(pulldown, {
       area: {
         mergeErr: '无法对合并单元格进行该操作',
         multiErr: '无法对多重选择区域进行该操作',
-        extendErr: '如果延伸的区域包含被合并的单元格，所有合并的单元格需大小相同'
+        extendErr: '如果延伸的区域包含被合并的单元格，所有合并的单元格需大小相同',
+        pasteMultiErr: '无法粘贴，需要相同大小的复制的区域和粘贴的区域才能执行此操作'
       },
       fnr: {
         title: '查找和替换',