vxe-table 4.12.0-beta.15 → 4.12.0-beta.17

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"4.12.0-beta.15"}`;
+const version = `table v${"4.12.0-beta.17"}`;
 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.12.0-beta.15";
+const version = "4.12.0-beta.17";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3586,7 +3586,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.12.0-beta.15"}`;
+const log_version = `table v${"4.12.0-beta.17"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -6953,7 +6953,7 @@ const renderType = 'body';
           isOptimizeMode = true;
         }
       }
-      if (fixedType || !overflowX) {
+      if (!isColLoading && (fixedType || !overflowX)) {
         renderColumnList = visibleColumn;
       }
       if (fixedType) {
@@ -7390,6 +7390,7 @@ const header_renderType = 'header';
       } = tableProps;
       const {
         isGroup,
+        isColLoading,
         overflowX,
         scrollXLoad,
         scrollYLoad,
@@ -7414,7 +7415,7 @@ const header_renderType = 'header';
             isOptimizeMode = true;
           }
         }
-        if (fixedType || !overflowX) {
+        if (!isColLoading && (fixedType || !overflowX)) {
           renderColumnList = visibleColumn;
         }
         if (fixedType) {
@@ -7890,6 +7891,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
       } = tableInternalData;
       const {
         isGroup,
+        isColLoading,
         overflowX,
         scrollXLoad,
         scrollYLoad,
@@ -7905,7 +7907,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
           isOptimizeMode = true;
         }
       }
-      if (fixedType || !overflowX) {
+      if (!isColLoading && (fixedType || !overflowX)) {
         renderColumnList = visibleColumn;
       }
       if (fixedType) {
@@ -20829,6 +20831,7 @@ const Grid = VxeGrid;
       },
       combination: {
         menus: {
+          sort: '排序',
           clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',