vxe-table 4.2.0 → 4.2.2-beta.1

package/lib/header/src/header.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_util=require("./util"),_util2=require("../../table/src/util"),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var l,t=1,n=arguments.length;t<n;t++)for(var r in l=arguments[t])Object.prototype.hasOwnProperty.call(l,r)&&(e[r]=l[r]);return e}).apply(this,arguments)},renderType="header",_default=(0,_vue.defineComponent)({name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,fixedType:{type:String,default:null}},setup:function(W){function t(){var e=s.isGroup;c.value=e?(0,_util.convertToRows)(W.tableGroupColumn):[]}var k=(0,_vue.inject)("$xetable",{}),o=k.xID,u=k.props,s=k.reactData,I=k.internalData,e=k.getRefMaps(),$=e.refElem,H=e.refTableBody,O=e.refLeftContainer,q=e.refRightContainer,A=e.refCellResizeBar,d=k.getComputeMaps().computeColumnOpts,c=(0,_vue.ref)([]),E=(0,_vue.ref)(),f=(0,_vue.ref)(),p=(0,_vue.ref)(),v=(0,_vue.ref)(),m=(0,_vue.ref)(),h=(0,_vue.ref)();(0,_vue.watch)(function(){return W.tableColumn},t),(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){var e=W.fixedType,l=k.internalData.elemStore,e=(e||"main")+"-header-";l[e+"wrapper"]=E.value,l[e+"table"]=f.value,l[e+"colgroup"]=p.value,l[e+"list"]=v.value,l[e+"xSpace"]=m.value,l[e+"repair"]=h.value,t()})}),(0,_vue.onUnmounted)(function(){var e=W.fixedType,l=k.internalData.elemStore,e=(e||"main")+"-header-";l[e+"wrapper"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null,l[e+"repair"]=null});return function(){var _=W.fixedType,e=W.fixedColumn,l=W.tableColumn,x=u.resizable,g=u.border,b=u.columnKey,t=u.headerRowClassName,y=u.headerCellClassName,n=u.headerRowStyle,C=u.headerCellStyle,w=u.showHeaderOverflow,M=u.headerAlign,T=u.align,z=u.mouseConfig,r=s.isGroup,S=s.currentColumn,D=s.scrollYLoad,R=s.overflowX,a=s.scrollbarWidth,U=d.value,i=c.value;return r||(i=[l=_&&(D||w)?e:l]),(0,_vue.h)("div",{ref:E,class:["vxe-table--header-wrapper",_?"fixed-"+_+"--wrapper":"body--wrapper"],xid:o},[_?(0,_vue.createCommentVNode)():(0,_vue.h)("div",{ref:m,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:f,class:"vxe-table--header",xid:o,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:p},l.map(function(e,l){return(0,_vue.h)("col",{name:e.id,key:l})}).concat(a?[(0,_vue.h)("col",{name:"col_gutter"})]:[])),(0,_vue.h)("thead",{ref:v},i.map(function(m,h){return(0,_vue.h)("tr",{class:["vxe-header--row",t?_xeUtils.default.isFunction(t)?t({$table:k,$rowIndex:h,fixed:_,type:renderType}):t:""],style:n?_xeUtils.default.isFunction(n)?n({$table:k,$rowIndex:h,fixed:_,type:renderType}):n:null},m.map(function(e,l){var t=e.type,n=e.showHeaderOverflow,r=e.headerAlign,a=e.align,i=e.headerClassName,o=e.children&&e.children.length,u=_?e.fixed!==_&&!o:!!e.fixed&&R,s=_xeUtils.default.isUndefined(n)||_xeUtils.default.isNull(n)?w:n,d=r||a||M||T,c="ellipsis"===s,f="title"===s,p=!0===s||"tooltip"===s,n=f||p||c,r=e.filters&&e.filters.some(function(e){return e.checked}),a=k.getColumnIndex(e),s=k.getVTColumnIndex(e),v={$table:k,$rowIndex:h,column:e,columnIndex:a,$columnIndex:l,_columnIndex:s,fixed:_,type:renderType,isHidden:u,hasFilter:r},a={onClick:function(e){return k.triggerHeaderCellClickEvent(e,v)},onDblclick:function(e){return k.triggerHeaderCellDblclickEvent(e,v)}};return D&&!n&&(c=n=!0),z&&(a.onMousedown=function(e){return k.triggerHeaderCellMousedownEvent(e,v)}),(0,_vue.h)("th",__assign(__assign({class:["vxe-header--column",e.id,((s={})["col--"+d]=d,s["col--"+t]=t,s["col--last"]=l===m.length-1,s["col--fixed"]=e.fixed,s["col--group"]=o,s["col--ellipsis"]=n,s["fixed--hidden"]=u,s["is--sortable"]=e.sortable,s["col--filter"]=!!e.filters,s["is--filter-active"]=r,s["col--current"]=S===e,s),i?_xeUtils.default.isFunction(i)?i(v):i:"",y?_xeUtils.default.isFunction(y)?y(v):y:""],colid:e.id,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null,style:C?_xeUtils.default.isFunction(C)?C(v):C:null},a),{key:b||U.useKey||o?e.id:l}),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":f,"c--tooltip":p,"c--ellipsis":c}]},e.renderHeader(v)),u||o||!(_xeUtils.default.isBoolean(e.resizable)?e.resizable:U.resizable||x)?null:(0,_vue.h)("div",{class:["vxe-resizable",{"is--line":!g||"none"===g}],onMousedown:function(e){return function(e,l){var t=l.column,n=W.fixedType,r=H.value,a=O.value,i=q.value,o=A.value,u=e.clientX,s=E.value,d=e.target,c=l.cell=d.parentNode,f=0,p=r.$el,r=(0,_dom.getOffsetPos)(d,s),s=d.clientWidth,d=Math.floor(s/2),v=(0,_util2.getColMinWidth)(l)-d,m=r.left-c.clientWidth+s+v,h=r.left+d,_=document.onmousemove,x=document.onmouseup,g="left"===n,b="right"===n,y=$.value,C=0;if(g||b){for(var w=g?"nextElementSibling":"previousElementSibling",M=c[w];M&&!(0,_dom.hasClass)(M,"fixed--hidden");)(0,_dom.hasClass)(M,"col--group")||(C+=M.offsetWidth),M=M[w];b&&i&&(h=i.offsetLeft+C)}d=function(e){e.stopPropagation(),e.preventDefault();var l=e.clientX-u,e=h+l,l=n?0:p.scrollLeft;g?e=Math.min(e,(i?i.offsetLeft:p.clientWidth)-C-v):b?(m=(a?a.clientWidth:0)+C+v,e=Math.min(e,h+c.clientWidth-v)):m=Math.max(p.scrollLeft,m),f=Math.max(e,m),o.style.left=f-l+"px"};I._isResize=!0,(0,_dom.addClass)(y,"drag--resize"),o.style.display="block",document.onmousemove=d,document.onmouseup=function(e){document.onmousemove=_,document.onmouseup=x,t.resizeWidth=t.renderWidth+(b?h-f:f-h),o.style.display="none",I._isResize=!1,I._lastResizeTime=Date.now(),k.analyColumnWidth(),k.recalculate(!0).then(function(){k.saveCustomResizable(),k.updateCellAreas(),k.dispatchEvent("resizable-change",l,e)}),(0,_dom.removeClass)(y,"drag--resize")},d(e),k.closeMenu&&k.closeMenu()}(e,v)}})])}).concat(a?[(0,_vue.h)("th",{class:"vxe-header--gutter col--gutter"})]:[]))}))]),(0,_vue.h)("div",{ref:h,class:"vxe-table--header-border-line"})])}}});exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_util=require("./util"),_util2=require("../../table/src/util"),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var l,t=1,n=arguments.length;t<n;t++)for(var r in l=arguments[t])Object.prototype.hasOwnProperty.call(l,r)&&(e[r]=l[r]);return e}).apply(this,arguments)},renderType="header",_default=(0,_vue.defineComponent)({name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,fixedType:{type:String,default:null}},setup:function(W){function t(){var e=s.isGroup;c.value=e?(0,_util.convertToRows)(W.tableGroupColumn):[]}var k=(0,_vue.inject)("$xetable",{}),o=k.xID,u=k.props,s=k.reactData,I=k.internalData,e=k.getRefMaps(),$=e.refElem,H=e.refTableBody,O=e.refLeftContainer,q=e.refRightContainer,A=e.refCellResizeBar,d=k.getComputeMaps().computeColumnOpts,c=(0,_vue.ref)([]),E=(0,_vue.ref)(),f=(0,_vue.ref)(),p=(0,_vue.ref)(),v=(0,_vue.ref)(),m=(0,_vue.ref)(),h=(0,_vue.ref)();(0,_vue.watch)(function(){return W.tableColumn},t),(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){var e=W.fixedType,l=k.internalData.elemStore,e=(e||"main")+"-header-";l[e+"wrapper"]=E.value,l[e+"table"]=f.value,l[e+"colgroup"]=p.value,l[e+"list"]=v.value,l[e+"xSpace"]=m.value,l[e+"repair"]=h.value,t()})}),(0,_vue.onUnmounted)(function(){var e=W.fixedType,l=k.internalData.elemStore,e=(e||"main")+"-header-";l[e+"wrapper"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null,l[e+"repair"]=null});return function(){var _=W.fixedType,e=W.fixedColumn,l=W.tableColumn,x=u.resizable,g=u.border,b=u.columnKey,t=u.headerRowClassName,y=u.headerCellClassName,n=u.headerRowStyle,C=u.headerCellStyle,w=u.showHeaderOverflow,M=u.headerAlign,T=u.align,z=u.mouseConfig,r=s.isGroup,S=s.currentColumn,D=s.scrollXLoad,R=s.overflowX,a=s.scrollbarWidth,U=d.value,i=c.value;return r||(i=[l=_&&(D||w)?e:l]),(0,_vue.h)("div",{ref:E,class:["vxe-table--header-wrapper",_?"fixed-"+_+"--wrapper":"body--wrapper"],xid:o},[_?(0,_vue.createCommentVNode)():(0,_vue.h)("div",{ref:m,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:f,class:"vxe-table--header",xid:o,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:p},l.map(function(e,l){return(0,_vue.h)("col",{name:e.id,key:l})}).concat(a?[(0,_vue.h)("col",{name:"col_gutter"})]:[])),(0,_vue.h)("thead",{ref:v},i.map(function(m,h){return(0,_vue.h)("tr",{class:["vxe-header--row",t?_xeUtils.default.isFunction(t)?t({$table:k,$rowIndex:h,fixed:_,type:renderType}):t:""],style:n?_xeUtils.default.isFunction(n)?n({$table:k,$rowIndex:h,fixed:_,type:renderType}):n:null},m.map(function(e,l){var t=e.type,n=e.showHeaderOverflow,r=e.headerAlign,a=e.align,i=e.headerClassName,o=e.children&&e.children.length,u=_?e.fixed!==_&&!o:!!e.fixed&&R,s=_xeUtils.default.isUndefined(n)||_xeUtils.default.isNull(n)?w:n,d=r||a||M||T,c="ellipsis"===s,f="title"===s,p=!0===s||"tooltip"===s,n=f||p||c,r=e.filters&&e.filters.some(function(e){return e.checked}),a=k.getColumnIndex(e),s=k.getVTColumnIndex(e),v={$table:k,$rowIndex:h,column:e,columnIndex:a,$columnIndex:l,_columnIndex:s,fixed:_,type:renderType,isHidden:u,hasFilter:r},a={onClick:function(e){return k.triggerHeaderCellClickEvent(e,v)},onDblclick:function(e){return k.triggerHeaderCellDblclickEvent(e,v)}};return D&&!n&&(c=n=!0),z&&(a.onMousedown=function(e){return k.triggerHeaderCellMousedownEvent(e,v)}),(0,_vue.h)("th",__assign(__assign({class:["vxe-header--column",e.id,((s={})["col--"+d]=d,s["col--"+t]=t,s["col--last"]=l===m.length-1,s["col--fixed"]=e.fixed,s["col--group"]=o,s["col--ellipsis"]=n,s["fixed--hidden"]=u,s["is--sortable"]=e.sortable,s["col--filter"]=!!e.filters,s["is--filter-active"]=r,s["col--current"]=S===e,s),i?_xeUtils.default.isFunction(i)?i(v):i:"",y?_xeUtils.default.isFunction(y)?y(v):y:""],colid:e.id,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null,style:C?_xeUtils.default.isFunction(C)?C(v):C:null},a),{key:b||U.useKey||o?e.id:l}),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":f,"c--tooltip":p,"c--ellipsis":c}]},e.renderHeader(v)),u||o||!(_xeUtils.default.isBoolean(e.resizable)?e.resizable:U.resizable||x)?null:(0,_vue.h)("div",{class:["vxe-resizable",{"is--line":!g||"none"===g}],onMousedown:function(e){return function(e,l){var t=l.column,n=W.fixedType,r=H.value,a=O.value,i=q.value,o=A.value,u=e.clientX,s=E.value,d=e.target,c=l.cell=d.parentNode,f=0,p=r.$el,r=(0,_dom.getOffsetPos)(d,s),s=d.clientWidth,d=Math.floor(s/2),v=(0,_util2.getColMinWidth)(l)-d,m=r.left-c.clientWidth+s+v,h=r.left+d,_=document.onmousemove,x=document.onmouseup,g="left"===n,b="right"===n,y=$.value,C=0;if(g||b){for(var w=g?"nextElementSibling":"previousElementSibling",M=c[w];M&&!(0,_dom.hasClass)(M,"fixed--hidden");)(0,_dom.hasClass)(M,"col--group")||(C+=M.offsetWidth),M=M[w];b&&i&&(h=i.offsetLeft+C)}d=function(e){e.stopPropagation(),e.preventDefault();var l=e.clientX-u,e=h+l,l=n?0:p.scrollLeft;g?e=Math.min(e,(i?i.offsetLeft:p.clientWidth)-C-v):b?(m=(a?a.clientWidth:0)+C+v,e=Math.min(e,h+c.clientWidth-v)):m=Math.max(p.scrollLeft,m),f=Math.max(e,m),o.style.left=f-l+"px"};I._isResize=!0,(0,_dom.addClass)(y,"drag--resize"),o.style.display="block",document.onmousemove=d,document.onmouseup=function(e){document.onmousemove=_,document.onmouseup=x,t.resizeWidth=t.renderWidth+(b?h-f:f-h),o.style.display="none",I._isResize=!1,I._lastResizeTime=Date.now(),k.analyColumnWidth(),k.recalculate(!0).then(function(){k.saveCustomResizable(),k.updateCellAreas(),k.dispatchEvent("resizable-change",l,e)}),(0,_dom.removeClass)(y,"drag--resize")},d(e),k.closeMenu&&k.closeMenu()}(e,v)}})])}).concat(a?[(0,_vue.h)("th",{class:"vxe-header--gutter col--gutter"})]:[]))}))]),(0,_vue.h)("div",{ref:h,class:"vxe-table--header-border-line"})])}}});exports.default=_default;

package/lib/index.umd.js

@@ -8754,7 +8754,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("4.2.0", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("4.2.2-beta.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",
+  version: "4.2.2-beta.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 {
@@ -22514,7 +22518,7 @@ var renderType = 'header';
           mouseConfig = tableProps.mouseConfig;
       var isGroup = tableReactData.isGroup,
           currentColumn = tableReactData.currentColumn,
-          scrollYLoad = tableReactData.scrollYLoad,
+          scrollXLoad = tableReactData.scrollXLoad,
           overflowX = tableReactData.overflowX,
           scrollbarWidth = tableReactData.scrollbarWidth;
       var columnOpts = computeColumnOpts.value;
@@ -22522,7 +22526,7 @@ var renderType = 'header';
 
       if (!isGroup) {
         if (fixedType) {
-          if (scrollYLoad || allColumnHeaderOverflow) {
+          if (scrollXLoad || allColumnHeaderOverflow) {
             tableColumn = fixedColumn;
           }
         }
@@ -22619,9 +22623,9 @@ var renderType = 'header';
             onDblclick: function onDblclick(evnt) {
               return $xetable.triggerHeaderCellDblclickEvent(evnt, params);
             }
-          }; // 纵向虚拟滚动不支持动态行高
+          }; // 横向虚拟滚动不支持动态行高
 
-          if (scrollYLoad && !hasEllipsis) {
+          if (scrollXLoad && !hasEllipsis) {
             showEllipsis = hasEllipsis = true;
           } // 按下事件处理
 
@@ -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
 
 
@@ -29267,15 +29271,17 @@ function getResetValue(value, resetValue) {
 
       if (!props.preventSubmit) {
         clearValidate();
-        beginValidate(getItems()).then(function () {
-          formMethods.dispatchEvent('submit', {
-            data: props.data
-          }, evnt);
-        }).catch(function (errMap) {
-          formMethods.dispatchEvent('submit-invalid', {
-            data: props.data,
-            errMap: errMap
-          }, evnt);
+        beginValidate(getItems()).then(function (errMap) {
+          if (errMap) {
+            formMethods.dispatchEvent('submit-invalid', {
+              data: props.data,
+              errMap: errMap
+            }, evnt);
+          } else {
+            formMethods.dispatchEvent('submit', {
+              data: props.data
+            }, evnt);
+          }
         });
       }
     };
@@ -32691,8 +32697,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 +33491,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 +33530,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) {
@@ -33759,11 +33772,9 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
               tableColumn = fixedColumn;
             }
 
-            if (isOptimize || scrollXLoad) {
-              tWidth = tableColumn.reduce(function (previous, column) {
-                return previous + column.renderWidth;
-              }, 0);
-            }
+            tWidth = tableColumn.reduce(function (previous, column) {
+              return previous + column.renderWidth;
+            }, 0);
 
             if (tableElem) {
               tableElem.style.width = tWidth ? "".concat(tWidth + scrollbarWidth, "px") : ''; // 修复 IE 中高度无法自适应问题
@@ -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;
       },
 
@@ -39812,7 +39833,8 @@ dynamicApp.component(table.name, table);
       area: {
         mergeErr: '无法对合并单元格进行该操作',
         multiErr: '无法对多重选择区域进行该操作',
-        extendErr: '如果延伸的区域包含被合并的单元格，所有合并的单元格需大小相同'
+        extendErr: '如果延伸的区域包含被合并的单元格，所有合并的单元格需大小相同',
+        pasteMultiErr: '无法粘贴，需要相同大小的复制的区域和粘贴的区域才能执行此操作'
       },
       fnr: {
         title: '查找和替换',