vxe-table 4.6.5 → 4.6.6

package/lib/table/src/columnInfo.js

@@ -128,12 +128,12 @@ class ColumnInfo {
       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}}class ColumnInfo{title;type;field;constructor(e,r,{renderHeader:t,renderCell:l,renderFooter:o,renderData:i}={}){var d,s=e.xegrid,n=r.formatter,a=!_xeUtils.default.isBoolean(r.visible)||r.visible;"development"===process.env.NODE_ENV&&(d=["seq","checkbox","radio","expand","html"],r.type&&-1===d.indexOf(r.type)&&(0,_log.warnLog)("vxe.error.errProp",["type="+r.type,d.join(", ")]),(_xeUtils.default.isBoolean(r.cellRender)||r.cellRender&&!_xeUtils.default.isObject(r.cellRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.cell-render="+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="+r.editRender,"column.edit-render={}"]),r.cellRender&&r.editRender&&(0,_log.warnLog)("vxe.error.errConflicts",["column.cell-render","column.edit-render"]),"expand"===r.type&&(d=e["props"],d=d["treeConfig"],e=e.getComputeMaps()["computeTreeOpts"],e=e.value,d)&&(e.showLine||e.line)&&(0,_log.errLog)("vxe.error.errConflicts",["tree-config.showLine","column.type=expand"]),n)&&(_xeUtils.default.isString(n)?(d=_formats.formats.get(n)||_xeUtils.default[n])&&_xeUtils.default.isFunction(d.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[n]):!_xeUtils.default.isArray(n)||(e=_formats.formats.get(n[0])||_xeUtils.default[n[0]])&&_xeUtils.default.isFunction(e.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[n[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:n,sortable:r.sortable,sortBy:r.sortBy,sortType:r.sortType,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:a,halfVisible:!1,defaultVisible:a,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:t||r.renderHeader,renderCell:l||r.renderCell,renderFooter:o||r.renderFooter,renderData:i,slots:r.slots}),s&&(d=s.getComputeMaps()["computeProxyOpts"],(e=d.value).beforeColumn)&&e.beforeColumn({$grid:s,column:this})}getTitle(){return(0,_utils.getFuncText)(this.title||("seq"===this.type?_conf.default.i18n("vxe.table.seqTitle"):""))}getKey(){return this.field||(this.type?"type="+this.type:null)}update(e,r){"filters"!==e&&("field"===e&&(this.property=r),this[e]=r)}}exports.ColumnInfo=ColumnInfo;
+"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}}class ColumnInfo{title;type;field;constructor(e,r,{renderHeader:t,renderCell:l,renderFooter:o,renderData:i}={}){var d,s=e.xegrid,n=r.formatter,a=!_xeUtils.default.isBoolean(r.visible)||r.visible;"development"===process.env.NODE_ENV&&(d=["seq","checkbox","radio","expand","html"],r.type&&-1===d.indexOf(r.type)&&(0,_log.warnLog)("vxe.error.errProp",["type="+r.type,d.join(", ")]),(_xeUtils.default.isBoolean(r.cellRender)||r.cellRender&&!_xeUtils.default.isObject(r.cellRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.cell-render="+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="+r.editRender,"column.edit-render={}"]),r.cellRender&&r.editRender&&(0,_log.warnLog)("vxe.error.errConflicts",["column.cell-render","column.edit-render"]),"expand"===r.type&&(d=e["props"],d=d["treeConfig"],e=e.getComputeMaps()["computeTreeOpts"],e=e.value,d)&&(e.showLine||e.line)&&(0,_log.errLog)("vxe.error.errConflicts",["tree-config.showLine","column.type=expand"]),n)&&(_xeUtils.default.isString(n)?(d=_formats.formats.get(n)||_xeUtils.default[n])&&_xeUtils.default.isFunction(d.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[n]):!_xeUtils.default.isArray(n)||(e=_formats.formats.get(n[0])||_xeUtils.default[n[0]])&&_xeUtils.default.isFunction(e.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[n[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:n,sortable:r.sortable,sortBy:r.sortBy,sortType:r.sortType,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:a,halfVisible:!1,defaultVisible:a,defaultFixed:r.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:t||r.renderHeader,renderCell:l||r.renderCell,renderFooter:o||r.renderFooter,renderData:i,slots:r.slots}),s&&(d=s.getComputeMaps()["computeProxyOpts"],(e=d.value).beforeColumn)&&e.beforeColumn({$grid:s,column:this})}getTitle(){return(0,_utils.getFuncText)(this.title||("seq"===this.type?_conf.default.i18n("vxe.table.seqTitle"):""))}getKey(){return this.field||(this.type?"type="+this.type:null)}update(e,r){"filters"!==e&&("field"===e&&(this.property=r),this[e]=r)}}exports.ColumnInfo=ColumnInfo;

package/lib/table/src/table.js

@@ -28,7 +28,7 @@ const isWebkit = _dom.browse['-webkit'] && !_dom.browse.edge;
 const resizableStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_WIDTH';
 const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
 const fixedStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_FIXED';
-const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
+const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
 var _default = exports.default = (0, _vue.defineComponent)({
   name: 'VxeTable',
   props: _props.default,
@@ -130,6 +130,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         visible: false,
         maxHeight: 0
       },
+      customColumnList: [],
       // 当前选中的筛选列
       filterStore: {
         isAllSelected: false,
@@ -491,10 +492,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
     });
     const computeFixedColumnSize = (0, _vue.computed)(() => {
       const {
-        tableFullColumn
+        collectColumn
       } = internalData;
       let fixedSize = 0;
-      tableFullColumn.forEach(column => {
+      // 只判断第一层
+      collectColumn.forEach(column => {
         if (column.fixed) {
           fixedSize++;
         }
@@ -901,11 +903,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
       const {
         storage
       } = customOpts;
-      const isCustomResizable = storage === true || storage && storage.resizable;
-      const isCustomVisible = storage === true || storage && storage.visible;
-      const isCustomFixed = storage === true || storage && storage.fixed;
-      const isCustomOrder = storage === true || storage && storage.order;
-      if (customConfig && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomOrder)) {
+      const isAllCustom = storage === true;
+      const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {});
+      const isCustomResizable = isAllCustom || storageOpts.resizable;
+      const isCustomVisible = isAllCustom || storageOpts.visible;
+      const isCustomFixed = isAllCustom || storageOpts.fixed;
+      const isCustomSort = isAllCustom || storageOpts.sort;
+      if (customConfig && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
         const customMap = {};
         if (!id) {
           (0, _log.errLog)('vxe.error.reqProp', ['id']);
@@ -940,18 +944,20 @@ var _default = exports.default = (0, _vue.defineComponent)({
           }
         }
         // 自定义顺序
-        if (isCustomOrder) {
-          const columnOrderStorage = getCustomStorageMap(orderStorageKey)[id];
-          if (columnOrderStorage) {
-            // const colOrderSeqs = columnOrderStorage.split(',')
-            // colOrderSeqs.forEach((orderConf: any) => {
-            //   const [colKey, order] = orderConf.split('|')
-            //   if (customMap[colKey]) {
-            //     customMap[colKey].order = order
-            //   } else {
-            //     customMap[colKey] = { order }
-            //   }
-            // })
+        if (isCustomSort) {
+          const columnSortStorage = getCustomStorageMap(sortStorageKey)[id];
+          if (columnSortStorage) {
+            const colOrderSeqs = columnSortStorage.split(',');
+            colOrderSeqs.forEach(orderConf => {
+              const [colKey, sortNumber] = orderConf.split('|');
+              if (customMap[colKey]) {
+                customMap[colKey].sortNumber = sortNumber;
+              } else {
+                customMap[colKey] = {
+                  sortNumber
+                };
+              }
+            });
           }
         }
         // 自定义隐藏列
@@ -992,7 +998,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           visible,
           resizeWidth,
           fixed,
-          order
+          sortNumber
         }, colKey) => {
           const column = keyMap[colKey];
           if (column) {
@@ -1005,8 +1011,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
             if (fixed) {
               column.fixed = fixed;
             }
-            if (order) {
-              column.customOrder = order;
+            if (sortNumber) {
+              column.renderSortNumber = Number(sortNumber);
             }
           }
         });
@@ -1016,7 +1022,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
      * 更新数据列的 Map
      * 牺牲数据组装的耗时，用来换取使用过程中的流畅
      */
-    const cacheColumnMap = () => {
+    const cacheColumnMap = isInit => {
       const {
         tableFullColumn,
         collectColumn
@@ -1105,6 +1111,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (fullColumnIdData[colid]) {
           (0, _log.errLog)('vxe.error.colRepet', ['colId', colid]);
         }
+        if (isInit) {
+          column.sortNumber = index;
+        }
         fullColumnIdData[colid] = rest;
       };
       if (isGroup) {
@@ -1480,7 +1489,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
               column,
               field,
               property: field,
-              order,
+              order: order,
               sortTime: column.sortTime
             });
           }
@@ -2867,7 +2876,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       internalData.collectColumn = collectColumn;
       const tableFullColumn = getColumnList(collectColumn);
       internalData.tableFullColumn = tableFullColumn;
-      cacheColumnMap();
+      cacheColumnMap(true);
       restoreCustomStorage();
       parseColumns().then(() => {
         if (reactData.scrollXLoad) {
@@ -3556,7 +3565,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
        */
       getColumnById(colid) {
         const fullColumnIdData = internalData.fullColumnIdData;
-        return fullColumnIdData[colid] ? fullColumnIdData[colid].column : null;
+        return colid && fullColumnIdData[colid] ? fullColumnIdData[colid].column : null;
       },
       /**
        * 根据列的字段名获取列
@@ -3564,7 +3573,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
        */
       getColumnByField(field) {
         const fullColumnFieldData = internalData.fullColumnFieldData;
-        return fullColumnFieldData[field] ? fullColumnFieldData[field].column : null;
+        return field && fullColumnFieldData[field] ? fullColumnFieldData[field].column : null;
       },
       /**
        * 获取当前表格的列
@@ -3664,7 +3673,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const {
           fullDataRowIdData
         } = internalData;
-        const rowid = _xeUtils.default.eqNull(cellValue) ? '' : encodeURIComponent(cellValue);
+        const rowid = _xeUtils.default.eqNull(cellValue) ? '' : encodeURIComponent(cellValue || '');
         return fullDataRowIdData[rowid] ? fullDataRowIdData[rowid].row : null;
       },
       /**
@@ -3801,7 +3810,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const opts = Object.assign({
           visible: true,
           resizable: options === true,
-          fixed: options === true
+          fixed: options === true,
+          sort: options === true
         }, options);
         _xeUtils.default.eachTree(collectColumn, column => {
           if (opts.resizable) {
@@ -3810,6 +3820,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
           if (opts.fixed) {
             column.fixed = column.defaultFixed;
           }
+          if (opts.sort) {
+            column.renderSortNumber = column.sortNumber;
+          }
           if (!checkMethod || checkMethod({
             column
           })) {
@@ -3827,8 +3840,16 @@ var _default = exports.default = (0, _vue.defineComponent)({
       /**
        * 刷新列信息
        * 将固定的列左边、右边分别靠边
+       * 如果传 true 则会检查列顺序并排序
        */
-      refreshColumn() {
+      refreshColumn(resiveOrder) {
+        if (resiveOrder) {
+          const columnList = _xeUtils.default.orderBy(internalData.collectColumn, 'renderSortNumber');
+          internalData.collectColumn = columnList;
+          const tableFullColumn = getColumnList(columnList);
+          internalData.tableFullColumn = tableFullColumn;
+          cacheColumnMap();
+        }
         return parseColumns().then(() => {
           return tableMethods.refreshScroll();
         }).then(() => {
@@ -4428,7 +4449,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
               column,
               field,
               property: field,
-              order,
+              order: order,
               sortTime: column.sortTime
             });
           }
@@ -6087,7 +6108,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const {
           storage
         } = customOpts;
-        const isCustomFixed = storage === true || storage && storage.fixed;
+        const isAllStorage = storage === true;
+        const storageOpts = isAllStorage ? {} : Object.assign({}, storage || {});
+        const isCustomFixed = isAllStorage || storageOpts.fixed;
         if (customConfig && isCustomFixed) {
           const columnFixedStorageMap = getCustomStorageMap(fixedStorageKey);
           const colFixeds = [];
@@ -6120,7 +6143,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
           checkMethod,
           storage
         } = customOpts;
-        const isCustomVisible = storage === true || storage && storage.visible;
+        const isAllStorage = storage === true;
+        const storageOpts = isAllStorage ? {} : Object.assign({}, storage || {});
+        const isCustomVisible = isAllStorage || storageOpts.visible;
         if (customConfig && isCustomVisible) {
           const columnVisibleStorageMap = getCustomStorageMap(visibleStorageKey);
           const colHides = [];
@@ -6153,7 +6178,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       handleCustom() {
         tablePrivateMethods.saveCustomVisible();
         tablePrivateMethods.analyColumnWidth();
-        return tableMethods.refreshColumn();
+        return tableMethods.refreshColumn(true);
       },
       handleUpdateDataQueue() {
         reactData.upDataFlag++;
@@ -7782,7 +7807,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         ref: refElem,
         class: ['vxe-table', 'vxe-table--render-default', `tid_${xID}`, `border--${tableBorder}`, {
           [`size--${vSize}`]: vSize,
-          [`vaild-msg--${validOpts.msgMode}`]: !!editRules,
+          [`valid-msg--${validOpts.msgMode}`]: !!editRules,
           'vxe-editable': !!editConfig,
           'old-cell-valid': editRules && _conf.default.cellVaildMode === 'obsolete',
           'cell--highlight': highlightCell,