vxe-table 3.8.2 → 3.8.3-beta.0

package/lib/table/src/columnInfo.js

@@ -128,9 +128,18 @@ var ColumnInfo = exports.ColumnInfo = /*#__PURE__*/function () {
       level: 1,
       rowSpan: 1,
       colSpan: 1,
+      // 数据排序
       order: null,
+      // 用于记录排序类型，升序和倒序
       sortTime: 0,
-      customOrder: 0,
+      // 用于多列的先后顺序
+
+      // 列排序
+      sortNumber: 0,
+      // 用于记录自定义列顺序
+      renderSortNumber: 0,
+      // 用于记录自定义列顺序
+
       renderWidth: 0,
       renderHeight: 0,
       resizeWidth: 0,

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.ColumnInfo=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_formats=require("../../v-x-e-table/src/formats"),_util=require("./util"),_utils=require("../../tools/utils"),_log=require("../../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(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,_toPropertyKey(o.key),o)}}function _createClass(e,t,r){return t&&_defineProperties(e.prototype,t),r&&_defineProperties(e,r),Object.defineProperty(e,"prototype",{writable:!1}),e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var r=e[Symbol.toPrimitive];if(void 0===r)return("string"===t?String:Number)(e);r=r.call(e,t||"default");if("object"!=_typeof(r))return r;throw new TypeError("@@toPrimitive must return a primitive value.")}var ColumnInfo=exports.ColumnInfo=function(){return _createClass(function e(t,r){var o,l=2<arguments.length&&void 0!==arguments[2]?arguments[2]:{},i=l.renderHeader,n=l.renderCell,d=l.renderFooter,l=l.renderData,s=(_classCallCheck(this,e),t.$xegrid),a=s?s.proxyOpts:null,f=r.formatter,u=!_xeUtils.default.isBoolean(r.visible)||r.visible;"development"===process.env.NODE_ENV&&(o=["seq","checkbox","radio","expand","html"],r.type&&-1===o.indexOf(r.type)&&(0,_log.warnLog)("vxe.error.errProp",["type=".concat(r.type),o.join(", ")]),(_xeUtils.default.isBoolean(r.cellRender)||r.cellRender&&!_xeUtils.default.isObject(r.cellRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.cell-render=".concat(r.cellRender),"column.cell-render={}"]),(_xeUtils.default.isBoolean(r.editRender)||r.editRender&&!_xeUtils.default.isObject(r.editRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.edit-render=".concat(r.editRender),"column.edit-render={}"]),r.cellRender&&r.editRender&&(0,_log.warnLog)("vxe.error.errConflicts",["column.cell-render","column.edit-render"]),"expand"===r.type&&t.treeConfig&&(t.treeOpts.showLine||t.treeOpts.line)&&(0,_log.errLog)("vxe.error.errConflicts",["tree-config.line","column.type=expand"]),r.remoteSort&&(0,_log.warnLog)("vxe.error.delProp",["column.remote-sort","sort-config.remote"]),r.sortMethod&&(0,_log.warnLog)("vxe.error.delProp",["column.sort-method","sort-config.sortMethod"]),f)&&(_xeUtils.default.isString(f)?(o=_formats.formats.get(f)||_xeUtils.default[f])&&_xeUtils.default.isFunction(o.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[f]):!_xeUtils.default.isArray(f)||(t=_formats.formats.get(f[0])||_xeUtils.default[f[0]])&&_xeUtils.default.isFunction(t.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[f[0]])),Object.assign(this,{type:r.type,property:r.field,field:r.field,title:r.title,width:r.width,minWidth:r.minWidth,maxWidth:r.maxWidth,resizable:r.resizable,fixed:r.fixed,align:r.align,headerAlign:r.headerAlign,footerAlign:r.footerAlign,showOverflow:r.showOverflow,showHeaderOverflow:r.showHeaderOverflow,showFooterOverflow:r.showFooterOverflow,className:r.className,headerClassName:r.headerClassName,footerClassName:r.footerClassName,formatter:f,sortable:r.sortable,sortBy:r.sortBy,sortType:r.sortType,sortMethod:r.sortMethod,remoteSort:r.remoteSort,filters:(0,_util.toFilters)(r.filters),filterMultiple:!_xeUtils.default.isBoolean(r.filterMultiple)||r.filterMultiple,filterMethod:r.filterMethod,filterResetMethod:r.filterResetMethod,filterRecoverMethod:r.filterRecoverMethod,filterRender:r.filterRender,treeNode:r.treeNode,cellType:r.cellType,cellRender:r.cellRender,editRender:r.editRender,contentRender:r.contentRender,headerExportMethod:r.headerExportMethod,exportMethod:r.exportMethod,footerExportMethod:r.footerExportMethod,titleHelp:r.titleHelp,titlePrefix:r.titlePrefix,titleSuffix:r.titleSuffix,params:r.params,id:r.colId||_xeUtils.default.uniqueId("col_"),parentId:null,visible:u,halfVisible:!1,defaultVisible:u,defaultFixed:r.fixed,checked:!1,halfChecked:!1,disabled:!1,level:1,rowSpan:1,colSpan:1,order:null,sortTime:0,customOrder:0,renderWidth:0,renderHeight:0,resizeWidth:0,renderLeft:0,renderArgs:[],model:{},renderHeader:i||r.renderHeader,renderCell:n||r.renderCell,renderFooter:d||r.renderFooter,renderData:l,slots:r.slots}),a&&a.beforeColumn&&a.beforeColumn({$grid:s,column:this})},[{key:"getTitle",value:function(){return(0,_utils.getFuncText)(this.title||("seq"===this.type?_conf.default.i18n("vxe.table.seqTitle"):""))}},{key:"getKey",value:function(){return this.field||(this.type?"type=".concat(this.type):null)}},{key:"update",value:function(e,t){"filters"!==e&&("field"===e&&(this.property=t),this[e]=t)}}])}();
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.ColumnInfo=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_formats=require("../../v-x-e-table/src/formats"),_util=require("./util"),_utils=require("../../tools/utils"),_log=require("../../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function _classCallCheck(e,r){if(!(e instanceof r))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,r){for(var t=0;t<r.length;t++){var o=r[t];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,_toPropertyKey(o.key),o)}}function _createClass(e,r,t){return r&&_defineProperties(e.prototype,r),t&&_defineProperties(e,t),Object.defineProperty(e,"prototype",{writable:!1}),e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,r){if("object"!=_typeof(e)||!e)return e;var t=e[Symbol.toPrimitive];if(void 0===t)return("string"===r?String:Number)(e);t=t.call(e,r||"default");if("object"!=_typeof(t))return t;throw new TypeError("@@toPrimitive must return a primitive value.")}var ColumnInfo=exports.ColumnInfo=function(){return _createClass(function e(r,t){var o,l=2<arguments.length&&void 0!==arguments[2]?arguments[2]:{},i=l.renderHeader,n=l.renderCell,d=l.renderFooter,l=l.renderData,s=(_classCallCheck(this,e),r.$xegrid),a=s?s.proxyOpts:null,f=t.formatter,u=!_xeUtils.default.isBoolean(t.visible)||t.visible;"development"===process.env.NODE_ENV&&(o=["seq","checkbox","radio","expand","html"],t.type&&-1===o.indexOf(t.type)&&(0,_log.warnLog)("vxe.error.errProp",["type=".concat(t.type),o.join(", ")]),(_xeUtils.default.isBoolean(t.cellRender)||t.cellRender&&!_xeUtils.default.isObject(t.cellRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.cell-render=".concat(t.cellRender),"column.cell-render={}"]),(_xeUtils.default.isBoolean(t.editRender)||t.editRender&&!_xeUtils.default.isObject(t.editRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.edit-render=".concat(t.editRender),"column.edit-render={}"]),t.cellRender&&t.editRender&&(0,_log.warnLog)("vxe.error.errConflicts",["column.cell-render","column.edit-render"]),"expand"===t.type&&r.treeConfig&&(r.treeOpts.showLine||r.treeOpts.line)&&(0,_log.errLog)("vxe.error.errConflicts",["tree-config.line","column.type=expand"]),t.remoteSort&&(0,_log.warnLog)("vxe.error.delProp",["column.remote-sort","sort-config.remote"]),t.sortMethod&&(0,_log.warnLog)("vxe.error.delProp",["column.sort-method","sort-config.sortMethod"]),f)&&(_xeUtils.default.isString(f)?(o=_formats.formats.get(f)||_xeUtils.default[f])&&_xeUtils.default.isFunction(o.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[f]):!_xeUtils.default.isArray(f)||(r=_formats.formats.get(f[0])||_xeUtils.default[f[0]])&&_xeUtils.default.isFunction(r.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[f[0]])),Object.assign(this,{type:t.type,property:t.field,field:t.field,title:t.title,width:t.width,minWidth:t.minWidth,maxWidth:t.maxWidth,resizable:t.resizable,fixed:t.fixed,align:t.align,headerAlign:t.headerAlign,footerAlign:t.footerAlign,showOverflow:t.showOverflow,showHeaderOverflow:t.showHeaderOverflow,showFooterOverflow:t.showFooterOverflow,className:t.className,headerClassName:t.headerClassName,footerClassName:t.footerClassName,formatter:f,sortable:t.sortable,sortBy:t.sortBy,sortType:t.sortType,sortMethod:t.sortMethod,remoteSort:t.remoteSort,filters:(0,_util.toFilters)(t.filters),filterMultiple:!_xeUtils.default.isBoolean(t.filterMultiple)||t.filterMultiple,filterMethod:t.filterMethod,filterResetMethod:t.filterResetMethod,filterRecoverMethod:t.filterRecoverMethod,filterRender:t.filterRender,treeNode:t.treeNode,cellType:t.cellType,cellRender:t.cellRender,editRender:t.editRender,contentRender:t.contentRender,headerExportMethod:t.headerExportMethod,exportMethod:t.exportMethod,footerExportMethod:t.footerExportMethod,titleHelp:t.titleHelp,titlePrefix:t.titlePrefix,titleSuffix:t.titleSuffix,params:t.params,id:t.colId||_xeUtils.default.uniqueId("col_"),parentId:null,visible:u,halfVisible:!1,defaultVisible:u,defaultFixed:t.fixed,checked:!1,halfChecked:!1,disabled:!1,level:1,rowSpan:1,colSpan:1,order:null,sortTime:0,sortNumber:0,renderSortNumber:0,renderWidth:0,renderHeight:0,resizeWidth:0,renderLeft:0,renderArgs:[],model:{},renderHeader:i||t.renderHeader,renderCell:n||t.renderCell,renderFooter:d||t.renderFooter,renderData:l,slots:t.slots}),a&&a.beforeColumn&&a.beforeColumn({$grid:s,column:this})},[{key:"getTitle",value:function(){return(0,_utils.getFuncText)(this.title||("seq"===this.type?_conf.default.i18n("vxe.table.seqTitle"):""))}},{key:"getKey",value:function(){return this.field||(this.type?"type=".concat(this.type):null)}},{key:"update",value:function(e,r){"filters"!==e&&("field"===e&&(this.property=r),this[e]=r)}}])}();

package/lib/table/src/methods.js

@@ -47,7 +47,7 @@ var debounceScrollYDuration = _dom.browse.msie ? 80 : 20;
 var resizableStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_WIDTH';
 var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
 var fixedStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_FIXED';
-var orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
+var sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
 
 /**
  * 生成行的唯一主键
@@ -660,7 +660,7 @@ var Methods = {
     this.collectColumn = collectColumn;
     var tableFullColumn = getColumnList(collectColumn);
     this.tableFullColumn = tableFullColumn;
-    this.cacheColumnMap();
+    this.cacheColumnMap(true);
     this.restoreCustomStorage();
     this.parseColumns().then(function () {
       if (_this9.scrollXLoad) {
@@ -840,7 +840,7 @@ var Methods = {
    * 更新数据列的 Map
    * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
-  cacheColumnMap: function cacheColumnMap() {
+  cacheColumnMap: function cacheColumnMap(isInit) {
     var _this13 = this;
     var tableFullColumn = this.tableFullColumn,
       collectColumn = this.collectColumn,
@@ -948,6 +948,9 @@ var Methods = {
       if (fullColumnIdData[colid]) {
         (0, _log.errLog)('vxe.error.colRepet', ['colId', colid]);
       }
+      if (isInit) {
+        column.sortNumber = index;
+      }
       fullColumnIdData[colid] = rest;
       fullColumnMap.set(column, rest);
     };
@@ -1892,7 +1895,8 @@ var Methods = {
     var opts = Object.assign({
       visible: true,
       resizable: options === true,
-      fixed: options === true
+      fixed: options === true,
+      sort: options === true
     }, options);
     _xeUtils.default.eachTree(collectColumn, function (column) {
       if (opts.resizable) {
@@ -1901,6 +1905,9 @@ var Methods = {
       if (opts.fixed) {
         column.fixed = column.defaultFixed;
       }
+      if (opts.sort) {
+        column.renderSortNumber = column.sortNumber;
+      }
       if (!checkMethod || checkMethod({
         column: column
       })) {
@@ -1918,7 +1925,7 @@ var Methods = {
   handleCustom: function handleCustom() {
     this.saveCustomVisible();
     this.analyColumnWidth();
-    return this.refreshColumn();
+    return this.refreshColumn(true);
   },
   /**
    * 还原自定义列操作状态
@@ -1929,12 +1936,13 @@ var Methods = {
       customConfig = this.customConfig,
       customOpts = this.customOpts;
     var storage = customOpts.storage;
-    var isAllStorage = customOpts.storage === true;
-    var isCustomResizable = isAllStorage || storage && storage.resizable;
-    var isCustomVisible = isAllStorage || storage && storage.visible;
-    var isCustomFixed = storage === true || storage && storage.fixed;
-    var isCustomOrder = storage === true || storage && storage.order;
-    if (customConfig && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomOrder)) {
+    var isAllStorage = storage === true;
+    var storageOpts = isAllStorage ? {} : Object.assign({}, storage || {});
+    var isCustomResizable = isAllStorage || storageOpts.resizable;
+    var isCustomVisible = isAllStorage || storageOpts.visible;
+    var isCustomFixed = isAllStorage || storageOpts.fixed;
+    var isCustomSort = isAllStorage || storageOpts.sort;
+    if (customConfig && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
       var customMap = {};
       if (!id) {
         (0, _log.errLog)('vxe.error.reqProp', ['id']);
@@ -1973,18 +1981,23 @@ var Methods = {
         }
       }
       // 自定义顺序
-      if (isCustomOrder) {
-        var columnOrderStorage = getCustomStorageMap(orderStorageKey)[id];
-        if (columnOrderStorage) {
-          // const colOrderSeqs = columnOrderStorage.split(',')
-          // colOrderSeqs.forEach((orderConf) => {
-          //   const [colKey, order] = orderConf.split('|')
-          //   if (customMap[colKey]) {
-          //     customMap[colKey].order = order
-          //   } else {
-          //     customMap[colKey] = { order }
-          //   }
-          // })
+      if (isCustomSort) {
+        var columnSortStorage = getCustomStorageMap(sortStorageKey)[id];
+        if (columnSortStorage) {
+          var colOrderSeqs = columnSortStorage.split(',');
+          colOrderSeqs.forEach(function (orderConf) {
+            var _orderConf$split = orderConf.split('|'),
+              _orderConf$split2 = _slicedToArray(_orderConf$split, 2),
+              colKey = _orderConf$split2[0],
+              sortNumber = _orderConf$split2[1];
+            if (customMap[colKey]) {
+              customMap[colKey].sortNumber = sortNumber;
+            } else {
+              customMap[colKey] = {
+                sortNumber: sortNumber
+              };
+            }
+          });
         }
       }
       if (isCustomVisible) {
@@ -2026,7 +2039,7 @@ var Methods = {
         var visible = _ref5.visible,
           resizeWidth = _ref5.resizeWidth,
           fixed = _ref5.fixed,
-          order = _ref5.order;
+          sortNumber = _ref5.sortNumber;
         var column = keyMap[field];
         if (column) {
           if (_xeUtils.default.isNumber(resizeWidth)) {
@@ -2038,8 +2051,8 @@ var Methods = {
           if (fixed) {
             column.fixed = fixed;
           }
-          if (order) {
-            column.colSeq = order;
+          if (sortNumber) {
+            column.colSeq = Number(sortNumber);
           }
         }
       });
@@ -2051,8 +2064,9 @@ var Methods = {
       customConfig = this.customConfig,
       customOpts = this.customOpts;
     var storage = customOpts.storage;
-    var isAllStorage = customOpts.storage === true;
-    var isCustomFixed = isAllStorage || storage && storage.fixed;
+    var isAllStorage = storage === true;
+    var storageOpts = isAllStorage ? {} : Object.assign({}, storage || {});
+    var isCustomFixed = isAllStorage || storageOpts.fixed;
     if (customConfig && isCustomFixed) {
       var columnFixedStorageMap = getCustomStorageMap(fixedStorageKey);
       var colFixeds = [];
@@ -2079,8 +2093,9 @@ var Methods = {
       customOpts = this.customOpts;
     var checkMethod = customOpts.checkMethod,
       storage = customOpts.storage;
-    var isAllStorage = customOpts.storage === true;
-    var isCustomVisible = isAllStorage || storage && storage.visible;
+    var isAllStorage = storage === true;
+    var storageOpts = isAllStorage ? {} : Object.assign({}, storage || {});
+    var isCustomVisible = isAllStorage || storageOpts.visible;
     if (customConfig && isCustomVisible) {
       var columnVisibleStorageMap = getCustomStorageMap(visibleStorageKey);
       var colHides = [];
@@ -2116,8 +2131,9 @@ var Methods = {
       customConfig = this.customConfig,
       customOpts = this.customOpts;
     var storage = customOpts.storage;
-    var isAllStorage = customOpts.storage === true;
-    var isResizable = isAllStorage || storage && storage.resizable;
+    var isAllStorage = storage === true;
+    var storageOpts = isAllStorage ? {} : Object.assign({}, storage || {});
+    var isResizable = isAllStorage || storageOpts.resizable;
     if (customConfig && isResizable) {
       var columnWidthStorageMap = getCustomStorageMap(resizableStorageKey);
       var columnWidthStorage;
@@ -2149,8 +2165,15 @@ var Methods = {
   /**
    * 刷新列配置
    */
-  refreshColumn: function refreshColumn() {
+  refreshColumn: function refreshColumn(resiveOrder) {
     var _this21 = this;
+    if (resiveOrder) {
+      var columnList = _xeUtils.default.orderBy(this.collectColumn, 'renderSortNumber');
+      this.collectColumn = columnList;
+      var tableFullColumn = getColumnList(columnList);
+      this.tableFullColumn = tableFullColumn;
+      this.cacheColumnMap();
+    }
     return this.parseColumns().then(function () {
       return _this21.refreshScroll();
     }).then(function () {