vxe-table 4.6.5 → 4.6.6

package/es/table/src/columnInfo.js

@@ -111,12 +111,12 @@ export class ColumnInfo {
             rowSpan: 1,
             // 跨列
             colSpan: 1,
-            // 数据排序-自定义排序
+            // 数据排序
             order: null,
-            // 数据排序-用于多列的先后顺序
             sortTime: 0,
             // 列排序
-            customOrder: 0,
+            sortNumber: 0,
+            renderSortNumber: 0,
             renderWidth: 0,
             renderHeight: 0,
             resizeWidth: 0,

package/es/table/src/table.js

@@ -21,7 +21,7 @@ const isWebkit = browse['-webkit'] && !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';
 export default defineComponent({
     name: 'VxeTable',
     props: tableProps,
@@ -120,6 +120,7 @@ export default defineComponent({
                 visible: false,
                 maxHeight: 0
             },
+            customColumnList: [],
             // 当前选中的筛选列
             filterStore: {
                 isAllSelected: false,
@@ -472,9 +473,10 @@ export default defineComponent({
             return Object.assign({}, GlobalConfig.table.customConfig, props.customConfig);
         });
         const computeFixedColumnSize = computed(() => {
-            const { tableFullColumn } = internalData;
+            const { collectColumn } = internalData;
             let fixedSize = 0;
-            tableFullColumn.forEach((column) => {
+            // 只判断第一层
+            collectColumn.forEach((column) => {
                 if (column.fixed) {
                     fixedSize++;
                 }
@@ -814,11 +816,13 @@ export default defineComponent({
             const { collectColumn } = internalData;
             const customOpts = computeCustomOpts.value;
             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) {
                     errLog('vxe.error.reqProp', ['id']);
@@ -850,18 +854,19 @@ export default 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 };
+                            }
+                        });
                     }
                 }
                 // 自定义隐藏列
@@ -896,7 +901,7 @@ export default defineComponent({
                         keyMap[colKey] = column;
                     }
                 });
-                XEUtils.each(customMap, ({ visible, resizeWidth, fixed, order }, colKey) => {
+                XEUtils.each(customMap, ({ visible, resizeWidth, fixed, sortNumber }, colKey) => {
                     const column = keyMap[colKey];
                     if (column) {
                         if (XEUtils.isNumber(resizeWidth)) {
@@ -908,8 +913,8 @@ export default defineComponent({
                         if (fixed) {
                             column.fixed = fixed;
                         }
-                        if (order) {
-                            column.customOrder = order;
+                        if (sortNumber) {
+                            column.renderSortNumber = Number(sortNumber);
                         }
                     }
                 });
@@ -919,7 +924,7 @@ export default defineComponent({
          * 更新数据列的 Map
          * 牺牲数据组装的耗时，用来换取使用过程中的流畅
          */
-        const cacheColumnMap = () => {
+        const cacheColumnMap = (isInit) => {
             const { tableFullColumn, collectColumn } = internalData;
             const fullColumnIdData = internalData.fullColumnIdData = {};
             const fullColumnFieldData = internalData.fullColumnFieldData = {};
@@ -995,6 +1000,9 @@ export default defineComponent({
                 if (fullColumnIdData[colid]) {
                     errLog('vxe.error.colRepet', ['colId', colid]);
                 }
+                if (isInit) {
+                    column.sortNumber = index;
+                }
                 fullColumnIdData[colid] = rest;
             };
             if (isGroup) {
@@ -1297,7 +1305,7 @@ export default defineComponent({
                         }
                     }
                     if (!allRemoteSort && sortable && order) {
-                        orderColumns.push({ column, field, property: field, order, sortTime: column.sortTime });
+                        orderColumns.push({ column, field, property: field, order: order, sortTime: column.sortTime });
                     }
                 });
                 if (sortMultiple && chronological && orderColumns.length > 1) {
@@ -2451,7 +2459,7 @@ export default defineComponent({
             internalData.collectColumn = collectColumn;
             const tableFullColumn = getColumnList(collectColumn);
             internalData.tableFullColumn = tableFullColumn;
-            cacheColumnMap();
+            cacheColumnMap(true);
             restoreCustomStorage();
             parseColumns().then(() => {
                 if (reactData.scrollXLoad) {
@@ -3022,7 +3030,7 @@ export default defineComponent({
              */
             getColumnById(colid) {
                 const fullColumnIdData = internalData.fullColumnIdData;
-                return fullColumnIdData[colid] ? fullColumnIdData[colid].column : null;
+                return colid && fullColumnIdData[colid] ? fullColumnIdData[colid].column : null;
             },
             /**
              * 根据列的字段名获取列
@@ -3030,7 +3038,7 @@ export default defineComponent({
              */
             getColumnByField(field) {
                 const fullColumnFieldData = internalData.fullColumnFieldData;
-                return fullColumnFieldData[field] ? fullColumnFieldData[field].column : null;
+                return field && fullColumnFieldData[field] ? fullColumnFieldData[field].column : null;
             },
             /**
              * 获取当前表格的列
@@ -3109,7 +3117,7 @@ export default defineComponent({
              */
             getRowById(cellValue) {
                 const { fullDataRowIdData } = internalData;
-                const rowid = XEUtils.eqNull(cellValue) ? '' : encodeURIComponent(cellValue);
+                const rowid = XEUtils.eqNull(cellValue) ? '' : encodeURIComponent(cellValue || '');
                 return fullDataRowIdData[rowid] ? fullDataRowIdData[rowid].row : null;
             },
             /**
@@ -3233,7 +3241,8 @@ export default defineComponent({
                 const opts = Object.assign({
                     visible: true,
                     resizable: options === true,
-                    fixed: options === true
+                    fixed: options === true,
+                    sort: options === true
                 }, options);
                 XEUtils.eachTree(collectColumn, (column) => {
                     if (opts.resizable) {
@@ -3242,6 +3251,9 @@ export default defineComponent({
                     if (opts.fixed) {
                         column.fixed = column.defaultFixed;
                     }
+                    if (opts.sort) {
+                        column.renderSortNumber = column.sortNumber;
+                    }
                     if (!checkMethod || checkMethod({ column })) {
                         column.visible = column.defaultVisible;
                     }
@@ -3257,8 +3269,16 @@ export default defineComponent({
             /**
              * 刷新列信息
              * 将固定的列左边、右边分别靠边
+             * 如果传 true 则会检查列顺序并排序
              */
-            refreshColumn() {
+            refreshColumn(resiveOrder) {
+                if (resiveOrder) {
+                    const columnList = XEUtils.orderBy(internalData.collectColumn, 'renderSortNumber');
+                    internalData.collectColumn = columnList;
+                    const tableFullColumn = getColumnList(columnList);
+                    internalData.tableFullColumn = tableFullColumn;
+                    cacheColumnMap();
+                }
                 return parseColumns().then(() => {
                     return tableMethods.refreshScroll();
                 }).then(() => {
@@ -3786,7 +3806,7 @@ export default defineComponent({
                 tableFullColumn.forEach((column) => {
                     const { field, order } = column;
                     if (column.sortable && order) {
-                        sortList.push({ column, field, property: field, order, sortTime: column.sortTime });
+                        sortList.push({ column, field, property: field, order: order, sortTime: column.sortTime });
                     }
                 });
                 if (multiple && chronological && sortList.length > 1) {
@@ -5221,7 +5241,9 @@ export default defineComponent({
                 const { collectColumn } = internalData;
                 const customOpts = computeCustomOpts.value;
                 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 = [];
@@ -5246,7 +5268,9 @@ export default defineComponent({
                 const { collectColumn } = internalData;
                 const customOpts = computeCustomOpts.value;
                 const { 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 = [];
@@ -5278,7 +5302,7 @@ export default defineComponent({
             handleCustom() {
                 tablePrivateMethods.saveCustomVisible();
                 tablePrivateMethods.analyColumnWidth();
-                return tableMethods.refreshColumn();
+                return tableMethods.refreshColumn(true);
             },
             handleUpdateDataQueue() {
                 reactData.upDataFlag++;
@@ -6645,7 +6669,7 @@ export default 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 && GlobalConfig.cellVaildMode === 'obsolete',
                         'cell--highlight': highlightCell,

package/es/table/style.css

@@ -208,7 +208,7 @@
 .vxe-loading.is--visible {
   display: block;
 }
-.vxe-loading > .vxe-loading--chunk, .vxe-loading > .vxe-loading--warpper {
+.vxe-loading > .vxe-loading--chunk, .vxe-loading > .vxe-loading--wrapper {
   width: 100%;
   position: absolute;
   top: 50%;
@@ -1251,13 +1251,13 @@
 .vxe-table--render-default .vxe-body--column.col--valid-error .vxe-input > .vxe-input--inner {
   border-color: var(--vxe-table-validate-error-color);
 }
-.vxe-table--render-default.vaild-msg--single .vxe-body--row:last-child .vxe-cell--valid-error-hint {
+.vxe-table--render-default.valid-msg--single .vxe-body--row:last-child .vxe-cell--valid-error-hint {
   bottom: 100%;
 }
-.vxe-table--render-default.vaild-msg--single .vxe-body--row:last-child:first-child .vxe-cell--valid-error-hint {
+.vxe-table--render-default.valid-msg--single .vxe-body--row:last-child:first-child .vxe-cell--valid-error-hint {
   bottom: auto;
 }
-.vxe-table--render-default.vaild-msg--full .vxe-body--row:last-child .vxe-cell--valid-error-hint {
+.vxe-table--render-default.valid-msg--full .vxe-body--row:last-child .vxe-cell--valid-error-hint {
   top: calc(100% - 1.3em);
 }
 .vxe-table--render-default.old-cell-valid .vxe-body--column.col--valid-error .vxe-cell--valid-error-hint {

package/es/tools/log.js

@@ -1,6 +1,6 @@
 import GlobalConfig from '../v-x-e-table/src/conf';
 export function getLog(message, params) {
-    return `[vxe-table v${"4.6.5"}] ${GlobalConfig.i18n(message, params)}`;
+    return `[vxe-table v${"4.6.6"}] ${GlobalConfig.i18n(message, params)}`;
 }
 function outLog(type) {
     return function (message, params) {

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

@@ -71,7 +71,7 @@ export const setup = config;
 export const globalStore = {};
 export const VXETable = {
     v,
-    version: "4.6.5",
+    version: "4.6.6",
     config,
     globalStore,
     interceptor,

package/es/v-x-e-table/style.css

@@ -1372,7 +1372,7 @@
 .vxe-loading.is--visible {
   display: block;
 }
-.vxe-loading > .vxe-loading--chunk, .vxe-loading > .vxe-loading--warpper {
+.vxe-loading > .vxe-loading--chunk, .vxe-loading > .vxe-loading--wrapper {
   width: 100%;
   position: absolute;
   top: 50%;

package/es/vxe-button/style.css

@@ -381,13 +381,13 @@
   min-width: var(--vxe-font-size-mini);
 }
 
-.vxe-input + .vxe-button-warpper, .vxe-input + .vxe-button.type--button, .vxe-input + .vxe-button--dropdown,
-.vxe-button + .vxe-button-warpper,
+.vxe-input + .vxe-button-wrapper, .vxe-input + .vxe-button.type--button, .vxe-input + .vxe-button--dropdown,
+.vxe-button + .vxe-button-wrapper,
 .vxe-button + .vxe-button.type--button,
 .vxe-button + .vxe-button--dropdown,
-.vxe-button-warpper + .vxe-button-warpper,
-.vxe-button-warpper + .vxe-button.type--button,
-.vxe-button-warpper + .vxe-button--dropdown {
+.vxe-button-wrapper + .vxe-button-wrapper,
+.vxe-button-wrapper + .vxe-button.type--button,
+.vxe-button-wrapper + .vxe-button--dropdown {
   margin-left: 12px;
 }
 
@@ -408,7 +408,7 @@
 .vxe-button--dropdown {
   position: relative;
 }
-.vxe-button--dropdown + .vxe-button-warpper, .vxe-button--dropdown + .vxe-button.type--button, .vxe-button--dropdown + .vxe-button--dropdown {
+.vxe-button--dropdown + .vxe-button-wrapper, .vxe-button--dropdown + .vxe-button.type--button, .vxe-button--dropdown + .vxe-button--dropdown {
   margin-left: 12px;
 }
 .vxe-button--dropdown > .vxe-button.type--button.theme--primary {

package/es/vxe-input/style.css

@@ -383,7 +383,6 @@
 
 .vxe-input--date-picker-label,
 .vxe-input--date-picker-btn {
-  display: inline-block;
   display: flex;
   align-items: center;
   justify-content: center;

package/es/vxe-loading/style.css

@@ -41,7 +41,7 @@
 .vxe-loading.is--visible {
   display: block;
 }
-.vxe-loading > .vxe-loading--chunk, .vxe-loading > .vxe-loading--warpper {
+.vxe-loading > .vxe-loading--chunk, .vxe-loading > .vxe-loading--wrapper {
   width: 100%;
   position: absolute;
   top: 50%;

package/es/vxe-table/style.css

@@ -208,7 +208,7 @@
 .vxe-loading.is--visible {
   display: block;
 }
-.vxe-loading > .vxe-loading--chunk, .vxe-loading > .vxe-loading--warpper {
+.vxe-loading > .vxe-loading--chunk, .vxe-loading > .vxe-loading--wrapper {
   width: 100%;
   position: absolute;
   top: 50%;
@@ -1251,13 +1251,13 @@
 .vxe-table--render-default .vxe-body--column.col--valid-error .vxe-input > .vxe-input--inner {
   border-color: var(--vxe-table-validate-error-color);
 }
-.vxe-table--render-default.vaild-msg--single .vxe-body--row:last-child .vxe-cell--valid-error-hint {
+.vxe-table--render-default.valid-msg--single .vxe-body--row:last-child .vxe-cell--valid-error-hint {
   bottom: 100%;
 }
-.vxe-table--render-default.vaild-msg--single .vxe-body--row:last-child:first-child .vxe-cell--valid-error-hint {
+.vxe-table--render-default.valid-msg--single .vxe-body--row:last-child:first-child .vxe-cell--valid-error-hint {
   bottom: auto;
 }
-.vxe-table--render-default.vaild-msg--full .vxe-body--row:last-child .vxe-cell--valid-error-hint {
+.vxe-table--render-default.valid-msg--full .vxe-body--row:last-child .vxe-cell--valid-error-hint {
   top: calc(100% - 1.3em);
 }
 .vxe-table--render-default.old-cell-valid .vxe-body--column.col--valid-error .vxe-cell--valid-error-hint {