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

package/es/table/src/table.js

@@ -7721,10 +7721,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 });

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.31";
 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.31"}`;
 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.31";
 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.31"}`;
 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 [];
@@ -7996,12 +7999,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
@@ -19212,13 +19221,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,