vxe-table 3.5.0-beta.3 → 3.5.1

package/lib/table/src/util.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.calcTreeLine = calcTreeLine;
 exports.clearTableAllStatus = clearTableAllStatus;
 exports.clearTableDefaultStatus = clearTableDefaultStatus;
+exports.colToVisible = colToVisible;
 exports.getColMinWidth = getColMinWidth;
 exports.getColumnConfig = getColumnConfig;
 exports.getOffsetSize = getOffsetSize;
@@ -17,6 +18,7 @@ exports.mergeBodyMethod = mergeBodyMethod;
 exports.removeScrollListener = removeScrollListener;
 exports.restoreScrollListener = restoreScrollListener;
 exports.restoreScrollLocation = restoreScrollLocation;
+exports.rowToVisible = rowToVisible;
 exports.toFilters = toFilters;
 exports.toTreePathSeq = toTreePathSeq;
 
@@ -312,4 +314,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();
 }

package/lib/table/src/util.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.calcTreeLine=calcTreeLine,exports.clearTableAllStatus=clearTableAllStatus,exports.clearTableDefaultStatus=clearTableDefaultStatus,exports.getColMinWidth=getColMinWidth,exports.getColumnConfig=getColumnConfig,exports.getOffsetSize=getOffsetSize,exports.getRowid=getRowid,exports.getRowkey=getRowkey,exports.handleFieldOrColumn=handleFieldOrColumn,exports.isColumnInfo=isColumnInfo,exports.mergeBodyMethod=mergeBodyMethod,exports.removeScrollListener=removeScrollListener,exports.restoreScrollListener=restoreScrollListener,exports.restoreScrollLocation=restoreScrollLocation,exports.toFilters=toFilters,exports.toTreePathSeq=toTreePathSeq;var _vXETable=_interopRequireDefault(require("../../v-x-e-table")),_xeUtils=_interopRequireDefault(require("xe-utils")),_columnInfo=require("./columnInfo"),_dom=_interopRequireDefault(require("../../tools/dom"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var lineOffsetSizes={mini:3,small:2,medium:1};function restoreScrollLocation(e,t,l){return e.clearScroll().then(function(){if(t||l)return e.lastScrollLeft=0,e.lastScrollTop=0,e.scrollTo(t,l)})}function toTreePathSeq(e){return e.map(function(e,t){return t%2==0?Number(e)+1:"."}).join("")}function removeScrollListener(e){e&&e._onscroll&&(e.onscroll=null)}function restoreScrollListener(e){e&&e._onscroll&&(e.onscroll=e._onscroll)}function getRowkey(e){return e.rowOpts.keyField||e.rowId||"_X_ROW_KEY"}function getRowid(e,t){e=_xeUtils.default.get(t,getRowkey(e));return _xeUtils.default.eqNull(e)?"":encodeURIComponent(e)}function getPaddingLeftRightSize(e){if(e){e=getComputedStyle(e);return _xeUtils.default.toNumber(e.paddingLeft)+_xeUtils.default.toNumber(e.paddingRight)}return 0}function getElemenMarginWidth(e){if(e){var t=getComputedStyle(e),l=_xeUtils.default.toNumber(t.marginLeft),t=_xeUtils.default.toNumber(t.marginRight);return e.offsetWidth+l+t}return 0}function handleFieldOrColumn(e,t){return t?_xeUtils.default.isString(t)?e.getColumnByField(t):t:null}function queryCellElement(e,t){return e.querySelector(".vxe-cell"+t)}function toFilters(e){return e&&_xeUtils.default.isArray(e)?e.map(function(e){var t=e.label,l=e.value,r=e.data,o=e.resetValue,e=e.checked;return{label:t,value:l,data:r,resetValue:o,checked:!!e,_checked:!!e}}):e}function getColMinWidth(e){var t=e.$table,l=e.column,r=e.cell,o=t.showHeaderOverflow,n=t.resizableOpts.minWidth;if(n){var i=_xeUtils.default.isFunction(n)?n(e):n;if("auto"!==i)return Math.max(1,_xeUtils.default.toNumber(i))}var a=l.showHeaderOverflow,u=l.minWidth,e=_xeUtils.default.isUndefined(a)||_xeUtils.default.isNull(a)?o:a,n="title"===e||(!0===e||"tooltip"===e)||"ellipsis"===e,i=_xeUtils.default.floor(1.6*(_xeUtils.default.toNumber(getComputedStyle(r).fontSize)||14))+(getPaddingLeftRightSize(r)+getPaddingLeftRightSize(queryCellElement(r,"")));if(n&&(l=getPaddingLeftRightSize(queryCellElement(r,"--title>.vxe-cell--checkbox")),o=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--required-icon")),a=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--edit-icon")),e=getElemenMarginWidth(queryCellElement(r,">.vxe-cell-help-icon")),n=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--sort")),i+=l+o+a+e+getElemenMarginWidth(queryCellElement(r,">.vxe-cell--filter"))+n),u){t=t.$refs.tableBody,t=t?t.$el:null;if(t){if(_dom.default.isScale(u)){t=(t.clientWidth-1)/100;return Math.max(i,Math.floor(_xeUtils.default.toInteger(u)*t))}if(_dom.default.isPx(u))return Math.max(i,_xeUtils.default.toInteger(u))}}return i}function countTreeExpand(e,t){var l=1;if(!e)return l;var r=t.$table,o=e[r.treeOpts.children];if(r.isTreeExpandByRow(e))for(var n=0;n<o.length;n++)l+=countTreeExpand(o[n],t);return l}function getOffsetSize(e){return lineOffsetSizes[e.vSize]||0}function calcTreeLine(e,t,l){var r=e.$table,o=1;return l&&(o=countTreeExpand(t[l-1],e)),r.rowHeight*o-(l?1:12-getOffsetSize(r))}function mergeBodyMethod(e,t,l){for(var r=0;r<e.length;r++){var o=e[r],n=o.row,i=o.col,a=o.rowspan,o=o.colspan;if(-1<i&&-1<n&&a&&o){if(n===t&&i===l)return{rowspan:a,colspan:o};if(n<=t&&t<n+a&&i<=l&&l<i+o)return{rowspan:0,colspan:0}}}}function clearTableDefaultStatus(e){return e.initStatus=!1,e.clearSort(),e.clearCurrentRow(),e.clearCurrentColumn(),e.clearRadioRow(),e.clearRadioReserve(),e.clearCheckboxRow(),e.clearCheckboxReserve(),e.clearRowExpand(),e.clearTreeExpand(),e.clearTreeExpandReserve(),e.clearActived&&_vXETable.default._edit&&e.clearActived(),e.clearSelected&&(e.keyboardConfig||e.mouseConfig)&&e.clearSelected(),e.clearCellAreas&&e.mouseConfig&&(e.clearCellAreas(),e.clearCopyCellArea()),e.clearScroll()}function clearTableAllStatus(e){return e.clearFilter&&_vXETable.default._filter&&e.clearFilter(),clearTableDefaultStatus(e)}function isColumnInfo(e){return e instanceof _columnInfo.ColumnInfo}function getColumnConfig(e,t,l){return isColumnInfo(t)?t:new _columnInfo.ColumnInfo(e,t,l)}
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.calcTreeLine=calcTreeLine,exports.clearTableAllStatus=clearTableAllStatus,exports.clearTableDefaultStatus=clearTableDefaultStatus,exports.colToVisible=colToVisible,exports.getColMinWidth=getColMinWidth,exports.getColumnConfig=getColumnConfig,exports.getOffsetSize=getOffsetSize,exports.getRowid=getRowid,exports.getRowkey=getRowkey,exports.handleFieldOrColumn=handleFieldOrColumn,exports.isColumnInfo=isColumnInfo,exports.mergeBodyMethod=mergeBodyMethod,exports.removeScrollListener=removeScrollListener,exports.restoreScrollListener=restoreScrollListener,exports.restoreScrollLocation=restoreScrollLocation,exports.rowToVisible=rowToVisible,exports.toFilters=toFilters,exports.toTreePathSeq=toTreePathSeq;var _vXETable=_interopRequireDefault(require("../../v-x-e-table")),_xeUtils=_interopRequireDefault(require("xe-utils")),_columnInfo=require("./columnInfo"),_dom=_interopRequireDefault(require("../../tools/dom"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var lineOffsetSizes={mini:3,small:2,medium:1};function restoreScrollLocation(e,t,l){return e.clearScroll().then(function(){if(t||l)return e.lastScrollLeft=0,e.lastScrollTop=0,e.scrollTo(t,l)})}function toTreePathSeq(e){return e.map(function(e,t){return t%2==0?Number(e)+1:"."}).join("")}function removeScrollListener(e){e&&e._onscroll&&(e.onscroll=null)}function restoreScrollListener(e){e&&e._onscroll&&(e.onscroll=e._onscroll)}function getRowkey(e){return e.rowOpts.keyField||e.rowId||"_X_ROW_KEY"}function getRowid(e,t){e=_xeUtils.default.get(t,getRowkey(e));return _xeUtils.default.eqNull(e)?"":encodeURIComponent(e)}function getPaddingLeftRightSize(e){if(e){e=getComputedStyle(e);return _xeUtils.default.toNumber(e.paddingLeft)+_xeUtils.default.toNumber(e.paddingRight)}return 0}function getElemenMarginWidth(e){if(e){var t=getComputedStyle(e),l=_xeUtils.default.toNumber(t.marginLeft),t=_xeUtils.default.toNumber(t.marginRight);return e.offsetWidth+l+t}return 0}function handleFieldOrColumn(e,t){return t?_xeUtils.default.isString(t)?e.getColumnByField(t):t:null}function queryCellElement(e,t){return e.querySelector(".vxe-cell"+t)}function toFilters(e){return e&&_xeUtils.default.isArray(e)?e.map(function(e){var t=e.label,l=e.value,r=e.data,o=e.resetValue,e=e.checked;return{label:t,value:l,data:r,resetValue:o,checked:!!e,_checked:!!e}}):e}function getColMinWidth(e){var t=e.$table,l=e.column,r=e.cell,o=t.showHeaderOverflow,n=t.resizableOpts.minWidth;if(n){var i=_xeUtils.default.isFunction(n)?n(e):n;if("auto"!==i)return Math.max(1,_xeUtils.default.toNumber(i))}var a=l.showHeaderOverflow,u=l.minWidth,e=_xeUtils.default.isUndefined(a)||_xeUtils.default.isNull(a)?o:a,n="title"===e||(!0===e||"tooltip"===e)||"ellipsis"===e,i=_xeUtils.default.floor(1.6*(_xeUtils.default.toNumber(getComputedStyle(r).fontSize)||14))+(getPaddingLeftRightSize(r)+getPaddingLeftRightSize(queryCellElement(r,"")));if(n&&(l=getPaddingLeftRightSize(queryCellElement(r,"--title>.vxe-cell--checkbox")),o=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--required-icon")),a=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--edit-icon")),e=getElemenMarginWidth(queryCellElement(r,">.vxe-cell-help-icon")),n=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--sort")),i+=l+o+a+e+getElemenMarginWidth(queryCellElement(r,">.vxe-cell--filter"))+n),u){t=t.$refs.tableBody,t=t?t.$el:null;if(t){if(_dom.default.isScale(u)){t=(t.clientWidth-1)/100;return Math.max(i,Math.floor(_xeUtils.default.toInteger(u)*t))}if(_dom.default.isPx(u))return Math.max(i,_xeUtils.default.toInteger(u))}}return i}function countTreeExpand(e,t){var l=1;if(!e)return l;var r=t.$table,o=e[r.treeOpts.children];if(r.isTreeExpandByRow(e))for(var n=0;n<o.length;n++)l+=countTreeExpand(o[n],t);return l}function getOffsetSize(e){return lineOffsetSizes[e.vSize]||0}function calcTreeLine(e,t,l){var r=e.$table,o=1;return l&&(o=countTreeExpand(t[l-1],e)),r.rowHeight*o-(l?1:12-getOffsetSize(r))}function mergeBodyMethod(e,t,l){for(var r=0;r<e.length;r++){var o=e[r],n=o.row,i=o.col,a=o.rowspan,o=o.colspan;if(-1<i&&-1<n&&a&&o){if(n===t&&i===l)return{rowspan:a,colspan:o};if(n<=t&&t<n+a&&i<=l&&l<i+o)return{rowspan:0,colspan:0}}}}function clearTableDefaultStatus(e){return e.initStatus=!1,e.clearSort(),e.clearCurrentRow(),e.clearCurrentColumn(),e.clearRadioRow(),e.clearRadioReserve(),e.clearCheckboxRow(),e.clearCheckboxReserve(),e.clearRowExpand(),e.clearTreeExpand(),e.clearTreeExpandReserve(),e.clearActived&&_vXETable.default._edit&&e.clearActived(),e.clearSelected&&(e.keyboardConfig||e.mouseConfig)&&e.clearSelected(),e.clearCellAreas&&e.mouseConfig&&(e.clearCellAreas(),e.clearCopyCellArea()),e.clearScroll()}function clearTableAllStatus(e){return e.clearFilter&&_vXETable.default._filter&&e.clearFilter(),clearTableDefaultStatus(e)}function isColumnInfo(e){return e instanceof _columnInfo.ColumnInfo}function getColumnConfig(e,t,l){return isColumnInfo(t)?t:new _columnInfo.ColumnInfo(e,t,l)}function rowToVisible(e,t){var l=e.$refs.tableBody,r=l?l.$el:null;if(r){var o=r.querySelector('[rowid="'.concat(getRowid(e,t),'"]'));if(o){var n=r.clientHeight,l=r.scrollTop,r=o.offsetTop+(o.offsetParent?o.offsetParent.offsetTop:0),o=o.clientHeight;if(r<l||l+n<r)return e.scrollTo(null,r);if(n+l<=r+o)return e.scrollTo(null,l+o)}else if(e.scrollYLoad)return e.scrollTo(null,(e.afterFullData.indexOf(t)-1)*e.scrollYStore.rowHeight)}return Promise.resolve()}function colToVisible(e,t){var l=e.$refs.tableBody,r=l?l.$el:null;if(r){var o=r.querySelector(".".concat(t.id));if(o){var n=r.clientWidth,l=r.scrollLeft,r=o.offsetLeft+(o.offsetParent?o.offsetParent.offsetLeft:0),o=o.clientWidth;if(r<l||l+n<r)return e.scrollTo(r);if(n+l<=r+o)return e.scrollTo(l+o)}else if(e.scrollXLoad){for(var i=e.visibleColumn,a=0,u=0;u<i.length&&i[u]!==t;u++)a+=i[u].renderWidth;return e.scrollTo(a)}}return Promise.resolve()}

package/lib/tools/dom.js

@@ -11,12 +11,8 @@ exports.setScrollTop = setScrollTop;
 
 var _xeUtils = _interopRequireDefault(require("xe-utils"));
 
-var _utils = _interopRequireDefault(require("./utils"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var getRowid = _utils.default.getRowid;
-
 var browse = _xeUtils.default.browse();
 
 exports.browse = browse;
@@ -135,77 +131,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,
 
   /**

package/lib/tools/dom.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.browse=exports.DomTools=void 0,exports.getOffsetHeight=getOffsetHeight,exports.getPaddingTopBottomSize=getPaddingTopBottomSize,exports.setScrollLeft=setScrollLeft,exports.setScrollTop=setScrollTop;var _xeUtils=_interopRequireDefault(require("xe-utils")),_utils=_interopRequireDefault(require("./utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var getRowid=_utils.default.getRowid,browse=_xeUtils.default.browse();exports.browse=browse;var reClsMap={};function getClsRE(e){return reClsMap[e]||(reClsMap[e]=new RegExp("(?:^|\\s)".concat(e,"(?!\\S)"),"g")),reClsMap[e]}function getNodeOffset(e,t,o){if(e){var l=e.parentNode;if(o.top+=e.offsetTop,o.left+=e.offsetLeft,l&&l!==document.documentElement&&l!==document.body&&(o.top-=l.scrollTop,o.left-=l.scrollLeft),(!t||e!==t&&e.offsetParent!==t)&&e.offsetParent)return getNodeOffset(e.offsetParent,t,o)}return o}function isScale(e){return e&&/^\d+%$/.test(e)}function hasClass(e,t){return e&&e.className&&e.className.match&&e.className.match(getClsRE(t))}function removeClass(e,t){e&&hasClass(e,t)&&(e.className=e.className.replace(getClsRE(t),""))}function getDomNode(){var e=document.documentElement,t=document.body;return{scrollTop:e.scrollTop||t.scrollTop,scrollLeft:e.scrollLeft||t.scrollLeft,visibleHeight:e.clientHeight||t.clientHeight,visibleWidth:e.clientWidth||t.clientWidth}}function getOffsetHeight(e){return e?e.offsetHeight:0}function getPaddingTopBottomSize(e){if(e){e=getComputedStyle(e);return _xeUtils.default.toNumber(e.paddingTop)+_xeUtils.default.toNumber(e.paddingBottom)}return 0}function setScrollTop(e,t){e&&(e.scrollTop=t)}function setScrollLeft(e,t){e&&(e.scrollLeft=t)}function isNodeElement(e){return e&&1===e.nodeType}var DomTools={browse:browse,isPx:function(e){return e&&/^\d+(px)?$/.test(e)},isScale:isScale,hasClass:hasClass,removeClass:removeClass,addClass:function(e,t){e&&!hasClass(e,t)&&(removeClass(e,t),e.className="".concat(e.className," ").concat(t))},updateCellTitle:function(e,t){t="html"===t.type?e.innerText:e.textContent;e.getAttribute("title")!==t&&e.setAttribute("title",t)},rowToVisible:function(e,t){var o=e.$refs.tableBody,l=o?o.$el:null;if(l){var r=l.querySelector('[rowid="'.concat(getRowid(e,t),'"]'));if(r){var s=l.clientHeight,o=l.scrollTop,l=r.offsetTop+(r.offsetParent?r.offsetParent.offsetTop:0),r=r.clientHeight;if(l<o||o+s<l)return e.scrollTo(null,l);if(s+o<=l+r)return e.scrollTo(null,o+r)}else if(e.scrollYLoad)return e.scrollTo(null,(e.afterFullData.indexOf(t)-1)*e.scrollYStore.rowHeight)}return Promise.resolve()},colToVisible:function(e,t){var o=e.$refs.tableBody,l=o?o.$el:null;if(l){var r=l.querySelector(".".concat(t.id));if(r){var s=l.clientWidth,o=l.scrollLeft,l=r.offsetLeft+(r.offsetParent?r.offsetParent.offsetLeft:0),r=r.clientWidth;if(l<o||o+s<l)return e.scrollTo(l);if(s+o<=l+r)return e.scrollTo(o+r)}else if(e.scrollXLoad){for(var i=e.visibleColumn,n=0,f=0;f<i.length&&i[f]!==t;f++)n+=i[f].renderWidth;return e.scrollTo(n)}}return Promise.resolve()},getDomNode:getDomNode,getEventTargetNode:function(e,t,o,l){for(var r,s=e.target;s&&s.nodeType&&s!==document;){if(o&&hasClass(s,o)&&(!l||l(s)))r=s;else if(s===t)return{flag:!o||!!r,container:t,targetElem:r};s=s.parentNode}return{flag:!1}},getOffsetPos:function(e,t){return getNodeOffset(e,t,{left:0,top:0})},getAbsolutePos:function(e){var t=e.getBoundingClientRect(),o=t.top,e=t.left,t=getDomNode();return{boundingTop:o,top:t.scrollTop+o,boundingLeft:e,left:t.scrollLeft+e,visibleHeight:t.visibleHeight,visibleWidth:t.visibleWidth}},scrollToView:function(e){var t="scrollIntoViewIfNeeded",o="scrollIntoView";e&&(e[t]?e[t]():e[o]&&e[o]())},triggerEvent:function(e,t){e&&e.dispatchEvent(new Event(t))},calcHeight:function(e,t){var o=e[t],l=0;return l=o?"auto"===o?e.parentHeight:(t=e.getExcludeHeight(),l=isScale(o)?Math.floor((_xeUtils.default.toInteger(o)||1)/100*e.parentHeight):_xeUtils.default.toNumber(o),Math.max(40,l-t)):l},isNodeElement:isNodeElement},_default=exports.DomTools=DomTools;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.browse=exports.DomTools=void 0,exports.getOffsetHeight=getOffsetHeight,exports.getPaddingTopBottomSize=getPaddingTopBottomSize,exports.setScrollLeft=setScrollLeft,exports.setScrollTop=setScrollTop;var _xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var browse=_xeUtils.default.browse();exports.browse=browse;var reClsMap={};function getClsRE(e){return reClsMap[e]||(reClsMap[e]=new RegExp("(?:^|\\s)".concat(e,"(?!\\S)"),"g")),reClsMap[e]}function getNodeOffset(e,t,o){if(e){var s=e.parentNode;if(o.top+=e.offsetTop,o.left+=e.offsetLeft,s&&s!==document.documentElement&&s!==document.body&&(o.top-=s.scrollTop,o.left-=s.scrollLeft),(!t||e!==t&&e.offsetParent!==t)&&e.offsetParent)return getNodeOffset(e.offsetParent,t,o)}return o}function isScale(e){return e&&/^\d+%$/.test(e)}function hasClass(e,t){return e&&e.className&&e.className.match&&e.className.match(getClsRE(t))}function removeClass(e,t){e&&hasClass(e,t)&&(e.className=e.className.replace(getClsRE(t),""))}function getDomNode(){var e=document.documentElement,t=document.body;return{scrollTop:e.scrollTop||t.scrollTop,scrollLeft:e.scrollLeft||t.scrollLeft,visibleHeight:e.clientHeight||t.clientHeight,visibleWidth:e.clientWidth||t.clientWidth}}function getOffsetHeight(e){return e?e.offsetHeight:0}function getPaddingTopBottomSize(e){if(e){e=getComputedStyle(e);return _xeUtils.default.toNumber(e.paddingTop)+_xeUtils.default.toNumber(e.paddingBottom)}return 0}function setScrollTop(e,t){e&&(e.scrollTop=t)}function setScrollLeft(e,t){e&&(e.scrollLeft=t)}function isNodeElement(e){return e&&1===e.nodeType}var DomTools={browse:browse,isPx:function(e){return e&&/^\d+(px)?$/.test(e)},isScale:isScale,hasClass:hasClass,removeClass:removeClass,addClass:function(e,t){e&&!hasClass(e,t)&&(removeClass(e,t),e.className="".concat(e.className," ").concat(t))},updateCellTitle:function(e,t){t="html"===t.type?e.innerText:e.textContent;e.getAttribute("title")!==t&&e.setAttribute("title",t)},getDomNode:getDomNode,getEventTargetNode:function(e,t,o,s){for(var l,r=e.target;r&&r.nodeType&&r!==document;){if(o&&hasClass(r,o)&&(!s||s(r)))l=r;else if(r===t)return{flag:!o||!!l,container:t,targetElem:l};r=r.parentNode}return{flag:!1}},getOffsetPos:function(e,t){return getNodeOffset(e,t,{left:0,top:0})},getAbsolutePos:function(e){var t=e.getBoundingClientRect(),o=t.top,e=t.left,t=getDomNode();return{boundingTop:o,top:t.scrollTop+o,boundingLeft:e,left:t.scrollLeft+e,visibleHeight:t.visibleHeight,visibleWidth:t.visibleWidth}},scrollToView:function(e){var t="scrollIntoViewIfNeeded",o="scrollIntoView";e&&(e[t]?e[t]():e[o]&&e[o]())},triggerEvent:function(e,t){e&&e.dispatchEvent(new Event(t))},calcHeight:function(e,t){var o=e[t],s=0;return s=o?"auto"===o?e.parentHeight:(t=e.getExcludeHeight(),s=isScale(o)?Math.floor((_xeUtils.default.toInteger(o)||1)/100*e.parentHeight):_xeUtils.default.toNumber(o),Math.max(40,s-t)):s},isNodeElement:isNodeElement},_default=exports.DomTools=DomTools;exports.default=_default;

package/lib/tools/log.js

@@ -12,7 +12,7 @@ var _conf = _interopRequireDefault(require("../v-x-e-table/src/conf"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.5.0-beta.3", "] ", _conf.default.i18n(message, params));
+  return "[vxe-table v".concat("3.5.1", "] ", _conf.default.i18n(message, params));
 }
 
 function outLog(type) {

package/lib/tools/log.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.errLog=void 0,exports.getLog=getLog,exports.warnLog=void 0;var _conf=_interopRequireDefault(require("../v-x-e-table/src/conf"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getLog(e,r){return"[vxe-table v".concat("3.5.0-beta.3","] ",_conf.default.i18n(e,r))}function outLog(o){return function(e,r){r=getLog(e,r);return console[o](r),r}}var warnLog=outLog("warn");exports.warnLog=warnLog;var errLog=outLog("error");exports.errLog=errLog;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.errLog=void 0,exports.getLog=getLog,exports.warnLog=void 0;var _conf=_interopRequireDefault(require("../v-x-e-table/src/conf"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getLog(e,r){return"[vxe-table v".concat("3.5.1","] ",_conf.default.i18n(e,r))}function outLog(o){return function(e,r){r=getLog(e,r);return console[o](r),r}}var warnLog=outLog("warn");exports.warnLog=warnLog;var errLog=outLog("error");exports.errLog=errLog;

package/lib/v-x-e-table/index.js

@@ -221,7 +221,7 @@ var v = 'v3';
 exports.v = v;
 var VXETable = {
   v: v,
-  version: "3.5.0-beta.3",
+  version: "3.5.1",
   reg: reg,
   use: use,
   setup: _setup.setup,

package/lib/v-x-e-table/index.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,config:!0,t:!0,_t:!0,v:!0,VXETable:!0};exports.VXETable=void 0,exports._t=_t,exports.default=exports.config=void 0,exports.t=t,exports.use=use,exports.v=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../v-x-e-table/src/conf")),_interceptor=require("./src/interceptor");Object.keys(_interceptor).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_interceptor[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _interceptor[e]}}))});var _renderer=require("./src/renderer");Object.keys(_renderer).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_renderer[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _renderer[e]}}))});var _commands=require("./src/commands");Object.keys(_commands).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_commands[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _commands[e]}}))});var _menus=require("./src/menus");Object.keys(_menus).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_menus[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _menus[e]}}))});var _formats=require("./src/formats");Object.keys(_formats).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_formats[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _formats[e]}}))});var _setup=require("./src/setup");Object.keys(_setup).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_setup[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _setup[e]}}))});var _utils=require("../tools/utils"),_log=require("../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,t){for(var r=0;r<t.length;r++){var o=t[r];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}function _createClass(e,t,r){return t&&_defineProperties(e.prototype,t),r&&_defineProperties(e,r),e}var installedPlugins=[];function use(e,t){return e&&e.install&&-1===installedPlugins.indexOf(e)&&(e.install(VXETable,t),installedPlugins.push(e)),VXETable}function reg(e){"development"===process.env.NODE_ENV&&VXETable.Table&&(0,_log.errLog)("vxe.error.useErr",[e]),VXETable["_".concat(e)]=1}function getExportOrImpotType(e,r){var o=[];return _xeUtils.default.objectEach(e,function(e,t){0!==e&&e!==r||o.push(t)}),o}var VXETableConfig=function(){function e(){_classCallCheck(this,e)}return _createClass(e,[{key:"zIndex",get:function(){return _utils.UtilTools.getLastZIndex()}},{key:"nextZIndex",get:function(){return _utils.UtilTools.nextZIndex()}},{key:"exportTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,1)}},{key:"importTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,2)}}]),e}(),config=new VXETableConfig;function t(e,t){return _conf.default.i18n(e,t)}function _t(e,t){return e?_xeUtils.default.toValueString(_conf.default.translate?_conf.default.translate(e,t):e):""}exports.config=config;var v="v3",VXETable={v:exports.v=v,version:"3.5.0-beta.3",reg:reg,use:use,setup:_setup.setup,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,menus:_menus.menus,config:config,t:t,_t:_t},_default=exports.VXETable=VXETable;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,config:!0,t:!0,_t:!0,v:!0,VXETable:!0};exports.VXETable=void 0,exports._t=_t,exports.default=exports.config=void 0,exports.t=t,exports.use=use,exports.v=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../v-x-e-table/src/conf")),_interceptor=require("./src/interceptor");Object.keys(_interceptor).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_interceptor[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _interceptor[e]}}))});var _renderer=require("./src/renderer");Object.keys(_renderer).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_renderer[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _renderer[e]}}))});var _commands=require("./src/commands");Object.keys(_commands).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_commands[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _commands[e]}}))});var _menus=require("./src/menus");Object.keys(_menus).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_menus[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _menus[e]}}))});var _formats=require("./src/formats");Object.keys(_formats).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_formats[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _formats[e]}}))});var _setup=require("./src/setup");Object.keys(_setup).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_setup[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _setup[e]}}))});var _utils=require("../tools/utils"),_log=require("../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,t){for(var r=0;r<t.length;r++){var o=t[r];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}function _createClass(e,t,r){return t&&_defineProperties(e.prototype,t),r&&_defineProperties(e,r),e}var installedPlugins=[];function use(e,t){return e&&e.install&&-1===installedPlugins.indexOf(e)&&(e.install(VXETable,t),installedPlugins.push(e)),VXETable}function reg(e){"development"===process.env.NODE_ENV&&VXETable.Table&&(0,_log.errLog)("vxe.error.useErr",[e]),VXETable["_".concat(e)]=1}function getExportOrImpotType(e,r){var o=[];return _xeUtils.default.objectEach(e,function(e,t){0!==e&&e!==r||o.push(t)}),o}var VXETableConfig=function(){function e(){_classCallCheck(this,e)}return _createClass(e,[{key:"zIndex",get:function(){return _utils.UtilTools.getLastZIndex()}},{key:"nextZIndex",get:function(){return _utils.UtilTools.nextZIndex()}},{key:"exportTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,1)}},{key:"importTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,2)}}]),e}(),config=new VXETableConfig;function t(e,t){return _conf.default.i18n(e,t)}function _t(e,t){return e?_xeUtils.default.toValueString(_conf.default.translate?_conf.default.translate(e,t):e):""}exports.config=config;var v="v3",VXETable={v:exports.v=v,version:"3.5.1",reg:reg,use:use,setup:_setup.setup,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,menus:_menus.menus,config:config,t:t,_t:_t},_default=exports.VXETable=VXETable;exports.default=_default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.5.0-beta.3",
+  "version": "3.5.1",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、贼灵活的配置项、扩展接口等...",
   "scripts": {
     "serve": "vue-cli-service serve",

package/packages/export/src/mixin.js

@@ -896,7 +896,7 @@ function handleFileImport ($xetable, file, opts) {
           reader.onload = (e) => {
             handleImport($xetable, e.target.result, options)
           }
-          reader.readAsText(file, 'UTF-8')
+          reader.readAsText(file, options.encoding || 'UTF-8')
         })
       }
     } else {

package/packages/locale/lang/en-US.js

@@ -79,7 +79,8 @@ export default {
       area: {
         mergeErr: 'The operation cannot be performed on merged cells',
         multiErr: 'The operation cannot be performed on multiple selection areas',
-        extendErr: 'If the extended area contains merged cells, all merged cells need to be the same size'
+        extendErr: 'If the extended area contains merged cells, all merged cells need to be the same size',
+        pasteMultiErr: 'Cannot paste, copied area and pasted area of the same size are required to perform this operation'
       },
       fnr: {
         title: 'Find and replace',

package/packages/locale/lang/ja-JP.js

@@ -79,7 +79,8 @@ export default {
       area: {
         mergeErr: '无法对合并单元格进行该操作',
         multiErr: '无法对多重选择区域进行该操作',
-        extendErr: '如果延伸的区域包含被合并的单元格，所有合并的单元格需大小相同'
+        extendErr: '如果延伸的区域包含被合并的单元格，所有合并的单元格需大小相同',
+        pasteMultiErr: '无法粘贴，需要相同大小的复制的区域和粘贴的区域才能执行此操作'
       },
       fnr: {
         title: '查找和替换',

package/packages/locale/lang/zh-CN.js

@@ -79,7 +79,8 @@ export default {
       area: {
         mergeErr: '无法对合并单元格进行该操作',
         multiErr: '无法对多重选择区域进行该操作',
-        extendErr: '如果延伸的区域包含被合并的单元格，所有合并的单元格需大小相同'
+        extendErr: '如果延伸的区域包含被合并的单元格，所有合并的单元格需大小相同',
+        pasteMultiErr: '无法粘贴，需要相同大小的复制的区域和粘贴的区域才能执行此操作'
       },
       fnr: {
         title: '查找和替换',

package/packages/locale/lang/zh-TC.js

@@ -79,7 +79,8 @@ export default {
       area: {
         mergeErr: '無法對合併儲存格進行該操作',
         multiErr: '無法對多重選擇區域進行該操作',
-        extendErr: '如果延伸的區域包含被合併的儲存格，所有合併的儲存格需大小相同'
+        extendErr: '如果延伸的區域包含被合併的儲存格，所有合併的儲存格需大小相同',
+        pasteMultiErr: '无法粘贴，需要相同大小的复制的区域和粘贴的区域才能执行此操作'
       },
       fnr: {
         title: '查找和替換',

package/packages/table/src/methods.js

@@ -2,7 +2,7 @@ import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import Cell from './cell'
 import VXETable from '../../v-x-e-table'
-import { getRowid, getRowkey, clearTableAllStatus, handleFieldOrColumn, restoreScrollLocation, restoreScrollListener, toTreePathSeq } from './util'
+import { getRowid, getRowkey, clearTableAllStatus, handleFieldOrColumn, restoreScrollLocation, restoreScrollListener, toTreePathSeq, rowToVisible, colToVisible } from './util'
 import UtilTools, { eqEmptyValue, isEnableConf, getFuncText } from '../../tools/utils'
 import DomTools, { browse, getPaddingTopBottomSize, setScrollTop, setScrollLeft } from '../../tools/dom'
 import { formats } from '../../v-x-e-table/src/formats'
@@ -31,8 +31,7 @@ function eqCellValue (row1, row2, field) {
     return true
   }
   if (XEUtils.isString(val1) || XEUtils.isNumber(val1)) {
-    /* eslint-disable eqeqeq */
-    return val1 == val2
+    return ('' + val1) === ('' + val2)
   }
   return XEUtils.isEqual(val1, val2)
 }
@@ -1151,12 +1150,12 @@ const Methods = {
   updateAfterFullData () {
     const { tableFullColumn, tableFullData, filterOpts, sortOpts, treeConfig, treeOpts, tableFullTreeData } = this
     const { remote: allRemoteFilter, filterMethod: allFilterMethod } = filterOpts
-    const { remote: allRemoteSort, sortMethod: allSortMethod, multiple: sortMultiple } = sortOpts
+    const { remote: allRemoteSort, sortMethod: allSortMethod, multiple: sortMultiple, chronological } = sortOpts
     const { transform } = treeOpts
     let tableData = []
     let tableTree = []
     const filterColumns = []
-    const orderColumns = []
+    let orderColumns = []
     tableFullColumn.forEach(column => {
       const { property, sortable, order, filters } = column
       if (!allRemoteFilter && filters && filters.length) {
@@ -1173,9 +1172,12 @@ const Methods = {
         }
       }
       if (!allRemoteSort && sortable && order) {
-        orderColumns.push({ column, field: column.property, property, order })
+        orderColumns.push({ column, field: column.property, property, order, sortTime: column.sortTime })
       }
     })
+    if (sortMultiple && chronological && orderColumns.length > 1) {
+      orderColumns = XEUtils.orderBy(orderColumns, 'sortTime')
+    }
     if (filterColumns.length) {
       const handleFilter = (row) => {
         return filterColumns.every(({ column, valueList, itemList }) => {
@@ -3513,13 +3515,13 @@ const Methods = {
         defaultSort = [defaultSort]
       }
       if (defaultSort.length) {
-        (sortConfig.multiple ? defaultSort : defaultSort.slice(0, 1)).forEach((item) => {
+        (sortConfig.multiple ? defaultSort : defaultSort.slice(0, 1)).forEach((item, index) => {
           const { field, order } = item
           if (field && order) {
             const column = this.getColumnByField(field)
             if (column && column.sortable) {
               column.order = order
-              column.sortTime = Date.now()
+              column.sortTime = Date.now() + index
             }
           }
         })
@@ -3563,7 +3565,7 @@ const Methods = {
       if (!multiple) {
         clearAllSort(this)
       }
-      (multiple ? sortConfs : [sortConfs[0]]).forEach((confs) => {
+      (multiple ? sortConfs : [sortConfs[0]]).forEach((confs, index) => {
         let { field, order } = confs
         let column = field
         if (XEUtils.isString(field)) {
@@ -3579,6 +3581,7 @@ const Methods = {
           if (column.order !== order) {
             column.order = order
           }
+          column.sortTime = Date.now() + index
         }
       })
       // 如果是服务端排序，则跳过本地排序处理
@@ -3624,13 +3627,17 @@ const Methods = {
     return this.getSortColumns().length > 0
   },
   getSortColumns () {
+    const { multiple, chronological } = this.sortOpts
     const sortList = []
     this.tableFullColumn.forEach((column) => {
       const { property, order } = column
       if ((column.sortable || column.remoteSort) && order) {
-        sortList.push({ column, field: column.property, property, order })
+        sortList.push({ column, field: column.property, property, order, sortTime: column.sortTime })
       }
     })
+    if (multiple && chronological && sortList.length > 1) {
+      return XEUtils.orderBy(sortList, 'sortTime')
+    }
     return sortList
   },
   /**
@@ -4356,7 +4363,7 @@ const Methods = {
       if (this.treeConfig) {
         rest.push(this.scrollToTreeRow(row))
       } else {
-        rest.push(DomTools.rowToVisible(this, row))
+        rest.push(rowToVisible(this, row))
       }
     }
     if (fieldOrColumn) {
@@ -4371,7 +4378,7 @@ const Methods = {
   scrollToColumn (fieldOrColumn) {
     const column = handleFieldOrColumn(this, fieldOrColumn)
     if (column && this.fullColumnMap.has(column)) {
-      return DomTools.colToVisible(this, column)
+      return colToVisible(this, column)
     }
     return this.$nextTick()
   },
@@ -4394,7 +4401,7 @@ const Methods = {
         })
       }
     }
-    return Promise.all(rests).then(() => DomTools.rowToVisible(this, row))
+    return Promise.all(rests).then(() => rowToVisible(this, row))
   },
   /**
    * 手动清除滚动相关信息，还原到初始状态
@@ -4631,7 +4638,7 @@ const Methods = {
 }
 
 // Module methods
-const 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(',')
+const 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(name => {
   Methods[name] = function (...args) {

package/packages/table/src/util.js

@@ -216,3 +216,67 @@ export function isColumnInfo (column) {
 export function getColumnConfig ($xetable, _vm, options) {
   return isColumnInfo(_vm) ? _vm : new ColumnInfo($xetable, _vm, options)
 }
+
+export function rowToVisible ($xetable, row) {
+  const { tableBody } = $xetable.$refs
+  const bodyElem = tableBody ? tableBody.$el : null
+  if (bodyElem) {
+    const trElem = bodyElem.querySelector(`[rowid="${getRowid($xetable, row)}"]`)
+    if (trElem) {
+      const bodyHeight = bodyElem.clientHeight
+      const bodySrcollTop = bodyElem.scrollTop
+      const trOffsetTop = trElem.offsetTop + (trElem.offsetParent ? trElem.offsetParent.offsetTop : 0)
+      const 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()
+}
+
+export function colToVisible ($xetable, column) {
+  const { tableBody } = $xetable.$refs
+  const bodyElem = tableBody ? tableBody.$el : null
+  if (bodyElem) {
+    const tdElem = bodyElem.querySelector(`.${column.id}`)
+    if (tdElem) {
+      const bodyWidth = bodyElem.clientWidth
+      const bodySrcollLeft = bodyElem.scrollLeft
+      const tdOffsetLeft = tdElem.offsetLeft + (tdElem.offsetParent ? tdElem.offsetParent.offsetLeft : 0)
+      const 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) {
+        const visibleColumn = $xetable.visibleColumn
+        let scrollLeft = 0
+        for (let index = 0; index < visibleColumn.length; index++) {
+          if (visibleColumn[index] === column) {
+            break
+          }
+          scrollLeft += visibleColumn[index].renderWidth
+        }
+        return $xetable.scrollTo(scrollLeft)
+      }
+    }
+  }
+  return Promise.resolve()
+}

package/packages/tools/dom.js

@@ -1,7 +1,4 @@
 import XEUtils from 'xe-utils'
-import UtilTools from './utils'
-
-const { getRowid } = UtilTools
 
 export const browse = XEUtils.browse()
 const reClsMap = {}
@@ -111,68 +108,6 @@ export const DomTools = {
       overflowElem.setAttribute('title', content)
     }
   },
-  rowToVisible ($xetable, row) {
-    const { tableBody } = $xetable.$refs
-    const bodyElem = tableBody ? tableBody.$el : null
-    if (bodyElem) {
-      const trElem = bodyElem.querySelector(`[rowid="${getRowid($xetable, row)}"]`)
-      if (trElem) {
-        const bodyHeight = bodyElem.clientHeight
-        const bodySrcollTop = bodyElem.scrollTop
-        const trOffsetTop = trElem.offsetTop + (trElem.offsetParent ? trElem.offsetParent.offsetTop : 0)
-        const 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 ($xetable, column) {
-    const { tableBody } = $xetable.$refs
-    const bodyElem = tableBody ? tableBody.$el : null
-    if (bodyElem) {
-      const tdElem = bodyElem.querySelector(`.${column.id}`)
-      if (tdElem) {
-        const bodyWidth = bodyElem.clientWidth
-        const bodySrcollLeft = bodyElem.scrollLeft
-        const tdOffsetLeft = tdElem.offsetLeft + (tdElem.offsetParent ? tdElem.offsetParent.offsetLeft : 0)
-        const 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) {
-          const visibleColumn = $xetable.visibleColumn
-          let scrollLeft = 0
-          for (let index = 0; index < visibleColumn.length; index++) {
-            if (visibleColumn[index] === column) {
-              break
-            }
-            scrollLeft += visibleColumn[index].renderWidth
-          }
-          return $xetable.scrollTo(scrollLeft)
-        }
-      }
-    }
-    return Promise.resolve()
-  },
   getDomNode,
   /**
    * 检查触发源是否属于目标节点