vxe-table 4.10.6-beta.30 → 4.10.6-beta.32

package/es/table/src/cell.js

@@ -805,7 +805,7 @@ export const Cell = {
         const { $table, column } = params;
         const { computeSortOpts } = $table.getComputeMaps();
         const sortOpts = computeSortOpts.value;
-        const { showIcon, iconLayout, iconAsc, iconDesc, iconVisibleMethod } = sortOpts;
+        const { showIcon, allowBtn, iconLayout, iconAsc, iconDesc, iconVisibleMethod } = sortOpts;
         const { order } = column;
         if (showIcon && (!iconVisibleMethod || iconVisibleMethod(params))) {
             return [
@@ -817,20 +817,24 @@ export const Cell = {
                                 'sort--active': order === 'asc'
                             }],
                         title: getI18n('vxe.table.sortAsc'),
-                        onClick(evnt) {
-                            evnt.stopPropagation();
-                            $table.triggerSortEvent(evnt, column, 'asc');
-                        }
+                        onClick: allowBtn
+                            ? (evnt) => {
+                                evnt.stopPropagation();
+                                $table.triggerSortEvent(evnt, column, 'asc');
+                            }
+                            : undefined
                     }),
                     h('i', {
                         class: ['vxe-sort--desc-btn', iconDesc || getIcon().TABLE_SORT_DESC, {
                                 'sort--active': order === 'desc'
                             }],
                         title: getI18n('vxe.table.sortDesc'),
-                        onClick(evnt) {
-                            evnt.stopPropagation();
-                            $table.triggerSortEvent(evnt, column, 'desc');
-                        }
+                        onClick: allowBtn
+                            ? (evnt) => {
+                                evnt.stopPropagation();
+                                $table.triggerSortEvent(evnt, column, 'desc');
+                            }
+                            : undefined
                     })
                 ])
             ];

package/es/table/src/footer.js

@@ -196,13 +196,13 @@ export default defineComponent({
         const renderHeads = (renderColumnList) => {
             const { fixedType, footerTableData } = props;
             const { footerRowClassName, footerRowStyle } = tableProps;
-            const { isDragColMove } = tableReactData;
+            const { isColLoading, isDragColMove } = tableReactData;
             const columnOpts = computeColumnOpts.value;
             const columnDragOpts = computeColumnDragOpts.value;
             return footerTableData.map((row, $rowIndex) => {
                 const _rowIndex = $rowIndex;
                 const rowParams = { $table: $xeTable, row, _rowIndex, $rowIndex, fixed: fixedType, type: renderType };
-                if (columnOpts.drag && columnDragOpts.animation) {
+                if (!isColLoading && columnOpts.drag && columnDragOpts.animation) {
                     return h(TransitionGroup, {
                         key: $rowIndex,
                         name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`,

package/es/table/src/header.js

@@ -165,12 +165,12 @@ export default defineComponent({
         const renderHeads = (isGroup, isOptimizeMode, headerGroups) => {
             const { fixedType } = props;
             const { headerRowClassName, headerRowStyle } = tableProps;
-            const { isDragColMove } = tableReactData;
+            const { isColLoading, isDragColMove } = tableReactData;
             const columnOpts = computeColumnOpts.value;
             const columnDragOpts = computeColumnDragOpts.value;
             return headerGroups.map((cols, $rowIndex) => {
                 const params = { $table: $xeTable, $rowIndex, fixed: fixedType, type: renderType };
-                if (columnOpts.drag && columnDragOpts.animation) {
+                if (!isColLoading && columnOpts.drag && columnDragOpts.animation) {
                     return h(TransitionGroup, {
                         key: $rowIndex,
                         name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`,

package/es/table/src/props.js

@@ -81,12 +81,18 @@ export default {
         type: Boolean,
         default: () => getConfig().table.highlightHoverRow
     },
-    // （即将废弃）是否要高亮当前选中列
+    /**
+     * （即将废弃）是否要高亮当前选中列
+     * @deprecated
+     */
     highlightCurrentColumn: {
         type: Boolean,
         default: () => getConfig().table.highlightCurrentColumn
     },
-    // （即将废弃）鼠标移到列是否要高亮显示
+    /**
+     * （即将废弃）鼠标移到列是否要高亮显示
+     * @deprecated
+     */
     highlightHoverColumn: {
         type: Boolean,
         default: () => getConfig().table.highlightHoverColumn

package/es/table/src/table.js

@@ -253,7 +253,8 @@ export default defineComponent({
             dragCol: null,
             dragTipText: '',
             isDragResize: false,
-            isLoading: false
+            isRowLoading: false,
+            isColLoading: false
         });
         const internalData = {
             tZindex: 0,
@@ -2580,16 +2581,18 @@ export default defineComponent({
             scrollYStore.endIndex = 1;
             scrollXStore.startIndex = 0;
             scrollXStore.endIndex = 1;
+            reactData.isRowLoading = true;
             reactData.scrollVMLoading = false;
             editStore.insertMaps = {};
             editStore.removeMaps = {};
             const sYLoad = updateScrollYStatus(fullData);
+            reactData.isDragColMove = false;
             reactData.isDragRowMove = false;
             // 全量数据
             internalData.tableFullData = fullData;
             internalData.tableFullTreeData = treeData;
             // 缓存数据
-            tablePrivateMethods.cacheRowMap(true, isReset);
+            $xeTable.cacheRowMap(true, isReset);
             // 原始数据
             internalData.tableSynchData = datas;
             if (isReset) {
@@ -2601,7 +2604,7 @@ export default defineComponent({
             }
             // 克隆原数据，用于显示编辑状态，与编辑值做对比
             if (keepSource) {
-                tablePrivateMethods.cacheSourceMap(fullData);
+                $xeTable.cacheSourceMap(fullData);
             }
             if ($xeTable.clearCellAreas && props.mouseConfig) {
                 $xeTable.clearCellAreas();
@@ -2659,6 +2662,7 @@ export default defineComponent({
                         if (sYOpts.scrollToTopOnChange) {
                             targetScrollTop = 0;
                         }
+                        reactData.isRowLoading = false;
                         calcCellHeight();
                         // 是否变更虚拟滚动
                         if (oldScrollYLoad === sYLoad) {
@@ -2893,11 +2897,10 @@ export default defineComponent({
             internalData.collectColumn = collectColumn;
             const tableFullColumn = getColumnList(collectColumn);
             internalData.tableFullColumn = tableFullColumn;
-            reactData.isLoading = true;
+            reactData.isColLoading = true;
             reactData.isDragColMove = false;
             initColumnSort();
             return Promise.resolve(restoreCustomStorage()).then(() => {
-                reactData.isLoading = false;
                 cacheColumnMap();
                 parseColumns(true).then(() => {
                     if (reactData.scrollXLoad) {
@@ -2922,6 +2925,7 @@ export default defineComponent({
                     if ($xeTable.handleUpdateCustomColumn) {
                         $xeTable.handleUpdateCustomColumn();
                     }
+                    reactData.isColLoading = false;
                     return $xeTable.recalculate();
                 });
             });
@@ -7721,10 +7725,13 @@ export default defineComponent({
              */
             triggerSortEvent(evnt, column, order) {
                 const sortOpts = computeSortOpts.value;
+                const { multiple, allowClear } = sortOpts;
                 const { field, sortable } = column;
                 if (sortable) {
                     if (!order || column.order === order) {
-                        tableMethods.clearSort(sortOpts.multiple ? column : null);
+                        if (allowClear) {
+                            tableMethods.clearSort(multiple ? column : null);
+                        }
                     }
                     else {
                         tableMethods.sort({ field, order });
@@ -9269,7 +9276,7 @@ export default defineComponent({
             const areaOpts = computeAreaOpts.value;
             const loadingOpts = computeLoadingOpts.value;
             const isMenu = computeIsMenu.value;
-            const currLoading = reactData.isLoading || loading;
+            const currLoading = reactData.isColLoading || reactData.isRowLoading || loading;
             const resizableOpts = computeResizableOpts.value;
             const isArea = mouseConfig && mouseOpts.area;
             const columnDragOpts = computeColumnDragOpts.value;

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.10.6-beta.30";
+export const version = "4.10.6-beta.32";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -113,6 +113,8 @@ VxeUI.setConfig({
             // orders: ['asc', 'desc', null],
             // sortMethod: null,
             showIcon: true,
+            allowClear: true,
+            allowBtn: true,
             iconLayout: 'vertical'
         },
         filterConfig: {

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"4.10.6-beta.30"}`;
+const version = `table v${"4.10.6-beta.32"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.10.6-beta.29";
+const version = "4.10.6-beta.32";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3251,6 +3251,8 @@ core_.VxeUI.setConfig({
       // orders: ['asc', 'desc', null],
       // sortMethod: null,
       showIcon: true,
+      allowClear: true,
+      allowBtn: true,
       iconLayout: 'vertical'
     },
     filterConfig: {
@@ -3581,7 +3583,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.10.6-beta.29"}`;
+const log_version = `table v${"4.10.6-beta.32"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -5686,6 +5688,7 @@ const Cell = {
     const sortOpts = computeSortOpts.value;
     const {
       showIcon,
+      allowBtn,
       iconLayout,
       iconAsc,
       iconDesc,
@@ -5702,19 +5705,19 @@ const Cell = {
           'sort--active': order === 'asc'
         }],
         title: cell_getI18n('vxe.table.sortAsc'),
-        onClick(evnt) {
+        onClick: allowBtn ? evnt => {
           evnt.stopPropagation();
           $table.triggerSortEvent(evnt, column, 'asc');
-        }
+        } : undefined
       }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
         class: ['vxe-sort--desc-btn', iconDesc || cell_getIcon().TABLE_SORT_DESC, {
           'sort--active': order === 'desc'
         }],
         title: cell_getI18n('vxe.table.sortDesc'),
-        onClick(evnt) {
+        onClick: allowBtn ? evnt => {
           evnt.stopPropagation();
           $table.triggerSortEvent(evnt, column, 'desc');
-        }
+        } : undefined
       })])];
     }
     return [];
@@ -6619,6 +6622,7 @@ const renderType = 'body';
       const {
         hasFixedColumn,
         treeExpandedMaps,
+        isColLoading,
         scrollXLoad,
         scrollYLoad,
         isAllOverflow,
@@ -6725,7 +6729,7 @@ const renderType = 'body';
         const tdVNs = tableColumn.map((column, $columnIndex) => {
           return renderTdColumn(seq, rowid, fixedType, isOptimizeMode, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData);
         });
-        rows.push(columnOpts.drag && columnDragOpts.animation ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
+        rows.push(!isColLoading && columnOpts.drag && columnDragOpts.animation ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
           name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`,
           tag: 'tr',
           class: trClass,
@@ -6854,6 +6858,8 @@ const renderType = 'body';
       const {
         isGroup,
         tableData,
+        isRowLoading,
+        isColLoading,
         scrollXLoad,
         scrollYLoad,
         isAllOverflow,
@@ -6996,9 +7002,9 @@ const renderType = 'body';
         });
       })),
       /**
-      * 内容
-      */
-      rowOpts.drag && rowDragOpts.animation ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
+       * 内容
+       */
+      !(isRowLoading || isColLoading) && rowOpts.drag && rowDragOpts.animation ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
         ref: refBodyTBody,
         name: `vxe-body--row-list${isDragRowMove ? '' : '-disabled'}`,
         tag: 'tbody'
@@ -7276,6 +7282,7 @@ const header_renderType = 'header';
         headerRowStyle
       } = tableProps;
       const {
+        isColLoading,
         isDragColMove
       } = tableReactData;
       const columnOpts = computeColumnOpts.value;
@@ -7287,7 +7294,7 @@ const header_renderType = 'header';
           fixed: fixedType,
           type: header_renderType
         };
-        if (columnOpts.drag && columnDragOpts.animation) {
+        if (!isColLoading && columnOpts.drag && columnDragOpts.animation) {
           return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
             key: $rowIndex,
             name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`,
@@ -7743,6 +7750,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
         footerRowStyle
       } = tableProps;
       const {
+        isColLoading,
         isDragColMove
       } = tableReactData;
       const columnOpts = computeColumnOpts.value;
@@ -7757,7 +7765,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
           fixed: fixedType,
           type: footer_renderType
         };
-        if (columnOpts.drag && columnDragOpts.animation) {
+        if (!isColLoading && columnOpts.drag && columnDragOpts.animation) {
           return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
             key: $rowIndex,
             name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`,
@@ -7996,12 +8004,18 @@ const {
     type: Boolean,
     default: () => props_getConfig().table.highlightHoverRow
   },
-  // （即将废弃）是否要高亮当前选中列
+  /**
+   * （即将废弃）是否要高亮当前选中列
+   * @deprecated
+   */
   highlightCurrentColumn: {
     type: Boolean,
     default: () => props_getConfig().table.highlightCurrentColumn
   },
-  // （即将废弃）鼠标移到列是否要高亮显示
+  /**
+   * （即将废弃）鼠标移到列是否要高亮显示
+   * @deprecated
+   */
   highlightHoverColumn: {
     type: Boolean,
     default: () => props_getConfig().table.highlightHoverColumn
@@ -10509,7 +10523,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       dragCol: null,
       dragTipText: '',
       isDragResize: false,
-      isLoading: false
+      isRowLoading: false,
+      isColLoading: false
     });
     const internalData = {
       tZindex: 0,
@@ -13275,16 +13290,18 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       scrollYStore.endIndex = 1;
       scrollXStore.startIndex = 0;
       scrollXStore.endIndex = 1;
+      reactData.isRowLoading = true;
       reactData.scrollVMLoading = false;
       editStore.insertMaps = {};
       editStore.removeMaps = {};
       const sYLoad = updateScrollYStatus(fullData);
+      reactData.isDragColMove = false;
       reactData.isDragRowMove = false;
       // 全量数据
       internalData.tableFullData = fullData;
       internalData.tableFullTreeData = treeData;
       // 缓存数据
-      tablePrivateMethods.cacheRowMap(true, isReset);
+      $xeTable.cacheRowMap(true, isReset);
       // 原始数据
       internalData.tableSynchData = datas;
       if (isReset) {
@@ -13296,7 +13313,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       }
       // 克隆原数据，用于显示编辑状态，与编辑值做对比
       if (keepSource) {
-        tablePrivateMethods.cacheSourceMap(fullData);
+        $xeTable.cacheSourceMap(fullData);
       }
       if ($xeTable.clearCellAreas && props.mouseConfig) {
         $xeTable.clearCellAreas();
@@ -13352,6 +13369,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             if (sYOpts.scrollToTopOnChange) {
               targetScrollTop = 0;
             }
+            reactData.isRowLoading = false;
             calcCellHeight();
             // 是否变更虚拟滚动
             if (oldScrollYLoad === sYLoad) {
@@ -13615,11 +13633,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       internalData.collectColumn = collectColumn;
       const tableFullColumn = getColumnList(collectColumn);
       internalData.tableFullColumn = tableFullColumn;
-      reactData.isLoading = true;
+      reactData.isColLoading = true;
       reactData.isDragColMove = false;
       initColumnSort();
       return Promise.resolve(restoreCustomStorage()).then(() => {
-        reactData.isLoading = false;
         cacheColumnMap();
         parseColumns(true).then(() => {
           if (reactData.scrollXLoad) {
@@ -13644,6 +13661,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           if ($xeTable.handleUpdateCustomColumn) {
             $xeTable.handleUpdateCustomColumn();
           }
+          reactData.isColLoading = false;
           return $xeTable.recalculate();
         });
       });
@@ -19212,13 +19230,19 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
        */
       triggerSortEvent(evnt, column, order) {
         const sortOpts = computeSortOpts.value;
+        const {
+          multiple,
+          allowClear
+        } = sortOpts;
         const {
           field,
           sortable
         } = column;
         if (sortable) {
           if (!order || column.order === order) {
-            tableMethods.clearSort(sortOpts.multiple ? column : null);
+            if (allowClear) {
+              tableMethods.clearSort(multiple ? column : null);
+            }
           } else {
             tableMethods.sort({
               field,
@@ -20955,7 +20979,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       const areaOpts = computeAreaOpts.value;
       const loadingOpts = computeLoadingOpts.value;
       const isMenu = computeIsMenu.value;
-      const currLoading = reactData.isLoading || loading;
+      const currLoading = reactData.isColLoading || reactData.isRowLoading || loading;
       const resizableOpts = computeResizableOpts.value;
       const isArea = mouseConfig && mouseOpts.area;
       const columnDragOpts = computeColumnDragOpts.value;