vxe-table 3.13.26 → 3.13.28

package/es/table/src/methods.js

@@ -8551,7 +8551,7 @@ const Methods = {
         const $xeTable = this;
         const reactData = $xeTable;
         const internalData = $xeTable;
-        const { isGroup, scrollXLoad } = reactData;
+        const { isGroup, scrollXLoad, overflowX } = reactData;
         const { visibleColumn, scrollXStore, elemStore, tableWidth } = internalData;
         const tableHeader = $xeTable.$refs.refTableHeader;
         const tableBody = $xeTable.$refs.refTableBody;
@@ -8565,7 +8565,7 @@ const Methods = {
             const footerElem = tableFooterElem ? tableFooterElem.querySelector('.vxe-table--footer') : null;
             const leftSpaceWidth = visibleColumn.slice(0, scrollXStore.startIndex).reduce((previous, column) => previous + column.renderWidth, 0);
             let marginLeft = '';
-            if (scrollXLoad) {
+            if (scrollXLoad && overflowX) {
                 marginLeft = `${leftSpaceWidth}px`;
             }
             if (headerElem) {

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.13.26";
+export const version = "3.13.28";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

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

package/lib/index.umd.js

@@ -3201,7 +3201,7 @@ function getClass(property, params) {
 ;// ./packages/ui/index.ts
 
 
-const version = "3.13.26";
+const version = "3.13.28";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3828,7 +3828,7 @@ var es_iterator_map = __webpack_require__(1701);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.13.26"}`;
+const log_version = `table v${"3.13.28"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -16140,7 +16140,8 @@ const Methods = {
     const internalData = $xeTable;
     const {
       isGroup,
-      scrollXLoad
+      scrollXLoad,
+      overflowX
     } = reactData;
     const {
       visibleColumn,
@@ -16160,7 +16161,7 @@ const Methods = {
       const footerElem = tableFooterElem ? tableFooterElem.querySelector('.vxe-table--footer') : null;
       const leftSpaceWidth = visibleColumn.slice(0, scrollXStore.startIndex).reduce((previous, column) => previous + column.renderWidth, 0);
       let marginLeft = '';
-      if (scrollXLoad) {
+      if (scrollXLoad && overflowX) {
         marginLeft = `${leftSpaceWidth}px`;
       }
       if (headerElem) {
@@ -17472,7 +17473,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
         isOptimizeMode = true;
       }
     }
-    if (fixedType || !overflowX) {
+    if (!isColLoading && (fixedType || !overflowX)) {
       renderColumnList = visibleColumn;
     }
     if (fixedType) {
@@ -17962,6 +17963,7 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
     } = tableProps;
     const {
       isGroup,
+      isColLoading,
       overflowX,
       scrollXLoad,
       scrollYLoad,
@@ -17986,7 +17988,7 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
           isOptimizeMode = true;
         }
       }
-      if (fixedType || !overflowX) {
+      if (!isColLoading && (fixedType || !overflowX)) {
         renderColumnList = visibleColumn;
       }
       if (fixedType) {
@@ -18469,6 +18471,7 @@ function footer_renderHeads(h, _vm, renderColumnList) {
     } = tableInternalData;
     const {
       isGroup,
+      isColLoading,
       overflowX,
       scrollXLoad,
       scrollYLoad,
@@ -18484,7 +18487,7 @@ function footer_renderHeads(h, _vm, renderColumnList) {
         isOptimizeMode = true;
       }
     }
-    if (fixedType || !overflowX) {
+    if (!isColLoading && (fixedType || !overflowX)) {
       renderColumnList = visibleColumn;
     }
     if (fixedType) {