vxe-table 4.11.0-beta.2 → 4.11.0-beta.3

package/es/table/src/table.js

@@ -8926,7 +8926,7 @@ export default defineComponent({
             updateScrollYStatus,
             // 更新横向 X 可视渲染上下剩余空间大小
             updateScrollXSpace() {
-                const { isGroup, scrollXLoad } = reactData;
+                const { isGroup, scrollXLoad, overflowX } = reactData;
                 const { visibleColumn, scrollXStore, elemStore, tableWidth } = internalData;
                 const tableHeader = refTableHeader.value;
                 const tableBody = refTableBody.value;
@@ -8940,7 +8940,7 @@ export default defineComponent({
                     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) {
@@ -9806,6 +9806,12 @@ export default defineComponent({
         watch(() => props.showFooter, () => {
             reScrollFlag.value++;
         });
+        watch(() => reactData.overflowX, () => {
+            reScrollFlag.value++;
+        });
+        watch(() => reactData.overflowY, () => {
+            reScrollFlag.value++;
+        });
         watch(reScrollFlag, () => {
             nextTick(() => {
                 tableMethods.recalculate(true).then(() => tableMethods.refreshScroll());

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.11.0-beta.2";
+export const version = "4.11.0-beta.3";
 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${"4.11.0-beta.2"}`;
+const version = `table v${"4.11.0-beta.3"}`;
 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.11.0-beta.2";
+const version = "4.11.0-beta.3";
 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.11.0-beta.2"}`;
+const log_version = `table v${"4.11.0-beta.3"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -6882,6 +6882,7 @@ const renderType = 'body';
         tableData,
         isRowLoading,
         isColLoading,
+        overflowX,
         scrollXLoad,
         scrollYLoad,
         isAllOverflow,
@@ -6911,8 +6912,10 @@ const renderType = 'body';
           isOptimizeMode = true;
         }
       }
-      if (fixedType) {
+      if (fixedType || !overflowX) {
         renderColumnList = visibleColumn;
+      }
+      if (fixedType) {
         if (isOptimizeMode) {
           renderColumnList = fixedColumn || [];
         }
@@ -7346,6 +7349,7 @@ const header_renderType = 'header';
       } = tableProps;
       const {
         isGroup,
+        overflowX,
         scrollXLoad,
         scrollYLoad,
         dragCol
@@ -7369,8 +7373,10 @@ const header_renderType = 'header';
             isOptimizeMode = true;
           }
         }
-        if (fixedType) {
+        if (fixedType || !overflowX) {
           renderColumnList = visibleColumn;
+        }
+        if (fixedType) {
           // 如果是使用优化模式
           if (isOptimizeMode) {
             renderColumnList = fixedColumn || [];
@@ -7838,6 +7844,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
       } = tableInternalData;
       const {
         isGroup,
+        overflowX,
         scrollXLoad,
         scrollYLoad,
         dragCol
@@ -7852,8 +7859,10 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
           isOptimizeMode = true;
         }
       }
-      if (fixedType) {
+      if (fixedType || !overflowX) {
         renderColumnList = visibleColumn;
+      }
+      if (fixedType) {
         if (isOptimizeMode) {
           renderColumnList = fixedColumn || [];
         }
@@ -20688,7 +20697,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       updateScrollXSpace() {
         const {
           isGroup,
-          scrollXLoad
+          scrollXLoad,
+          overflowX
         } = reactData;
         const {
           visibleColumn,
@@ -20708,7 +20718,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           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) {
@@ -21582,6 +21592,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.showFooter, () => {
       reScrollFlag.value++;
     });
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => reactData.overflowX, () => {
+      reScrollFlag.value++;
+    });
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => reactData.overflowY, () => {
+      reScrollFlag.value++;
+    });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(reScrollFlag, () => {
       (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
         tableMethods.recalculate(true).then(() => tableMethods.refreshScroll());