vxe-table 4.17.0-beta.9 → 4.17.1

package/es/table/src/body.js

@@ -7,6 +7,7 @@ import { updateCellTitle, getPropClass } from '../../ui/src/dom';
 import { isEnableConf } from '../../ui/src/utils';
 import { getSlotVNs } from '../../ui/src/vn';
 const { getI18n, renderer, renderEmptyElement } = VxeUI;
+const sourceType = 'table';
 const renderType = 'body';
 export default defineVxeComponent({
     name: 'VxeTableBody',
@@ -149,6 +150,7 @@ export default defineVxeComponent({
                 $columnIndex,
                 _columnIndex,
                 fixed: fixedType,
+                source: sourceType,
                 type: renderType,
                 isHidden: !!fixedHiddenColumn,
                 level: rowLevel,
@@ -569,6 +571,7 @@ export default defineVxeComponent({
                             $columnIndex,
                             _columnIndex,
                             fixed: fixedType,
+                            source: sourceType,
                             type: renderType,
                             level: rowLevel,
                             row,

package/es/table/src/footer.js

@@ -5,6 +5,7 @@ import { VxeUI } from '../../ui';
 import { updateCellTitle, getPropClass } from '../../ui/src/dom';
 import { getCalcHeight } from './util';
 const { renderer, renderEmptyElement } = VxeUI;
+const sourceType = 'table';
 const renderType = 'footer';
 export default defineVxeComponent({
     name: 'VxeTableFooter',
@@ -88,6 +89,7 @@ export default defineVxeComponent({
                     itemIndex,
                     items: row,
                     fixed: fixedType,
+                    source: sourceType,
                     type: renderType,
                     data: footerTableData
                 };

package/es/table/src/header.js

@@ -6,6 +6,7 @@ import { isEnableConf } from '../../ui/src/utils';
 import { getCalcHeight, convertHeaderColumnToRows, convertHeaderToGridRows } from './util';
 import { getSlotVNs } from '../../ui/src/vn';
 const { renderer, renderEmptyElement } = VxeUI;
+const sourceType = 'table';
 const renderType = 'header';
 function getColumnFirstChild(column) {
     const { children } = column;
@@ -109,6 +110,7 @@ export default defineVxeComponent({
                     _columnIndex,
                     firstFilterOption: firstFilterOption,
                     fixed: fixedType,
+                    source: sourceType,
                     type: renderType,
                     isHidden: fixedHiddenColumn,
                     hasFilter
@@ -286,6 +288,7 @@ export default defineVxeComponent({
                     _columnIndex,
                     option: firstFilterOption,
                     fixed: fixedType,
+                    source: sourceType,
                     type: renderType,
                     isHidden: fixedHiddenColumn,
                     hasFilter

package/es/table/src/table.js

@@ -413,13 +413,23 @@ export default defineVxeComponent({
         const computeScrollbarOpts = computed(() => {
             return Object.assign({}, getConfig().table.scrollbarConfig, props.scrollbarConfig);
         });
-        const computeScrollbarXToTop = computed(() => {
+        const computeScrollbarXOpts = computed(() => {
+            var _a;
             const scrollbarOpts = computeScrollbarOpts.value;
-            return !!(scrollbarOpts.x && scrollbarOpts.x.position === 'top');
+            return Object.assign({}, scrollbarOpts.x, ((_a = props.scrollbarConfig) === null || _a === void 0 ? void 0 : _a.x) || {});
         });
-        const computeScrollbarYToLeft = computed(() => {
+        const computeScrollbarYOpts = computed(() => {
+            var _a;
             const scrollbarOpts = computeScrollbarOpts.value;
-            return !!(scrollbarOpts.y && scrollbarOpts.y.position === 'left');
+            return Object.assign({}, scrollbarOpts.y, ((_a = props.scrollbarConfig) === null || _a === void 0 ? void 0 : _a.y) || {});
+        });
+        const computeScrollbarXToTop = computed(() => {
+            const scrollbarXOpts = computeScrollbarXOpts.value;
+            return scrollbarXOpts.position === 'top';
+        });
+        const computeScrollbarYToLeft = computed(() => {
+            const scrollbarYOpts = computeScrollbarYOpts.value;
+            return scrollbarYOpts.position === 'left';
         });
         const computeScrollYThreshold = computed(() => {
             const virtualYOpts = computeVirtualYOpts.value;
@@ -770,6 +780,8 @@ export default defineVxeComponent({
             computeVirtualXOpts,
             computeVirtualYOpts,
             computeScrollbarOpts,
+            computeScrollbarXOpts,
+            computeScrollbarYOpts,
             computeScrollbarXToTop,
             computeScrollbarYToLeft,
             computeColumnOpts,
@@ -1457,7 +1469,7 @@ export default defineVxeComponent({
             });
         };
         const calcTableHeight = (key) => {
-            const { editConfig } = props;
+            const { editConfig, editRules } = props;
             const { parentHeight } = reactData;
             let val = props[key];
             if (key === 'minHeight') {
@@ -1465,7 +1477,7 @@ export default defineVxeComponent({
                 if (XEUtils.eqNull(val)) {
                     if (eqEmptyValue(defMinHeight)) {
                         // 编辑模式默认最小高度
-                        if (isEnableConf(editConfig)) {
+                        if (editRules && isEnableConf(editConfig)) {
                             val = 144;
                         }
                     }
@@ -2316,7 +2328,7 @@ export default defineVxeComponent({
             const { visibleColumn, tableHeight, elemStore, customHeight, customMinHeight, customMaxHeight, tHeaderHeight, tFooterHeight } = internalData;
             const $xeGanttView = internalData.xeGanttView;
             const el = refElem.value;
-            if (!el || !el.clientHeight) {
+            if (!el || (internalData.tBodyHeight && !el.clientHeight)) {
                 return;
             }
             const containerList = ['main', 'left', 'right'];
@@ -2333,7 +2345,6 @@ export default defineVxeComponent({
                 emptyPlaceholderElem.style.height = bodyWrapperElem ? `${bodyWrapperElem.offsetHeight - osbHeight}px` : '';
             }
             const scrollbarXConf = scrollbarOpts.x || {};
-            const scrollbarXToTop = computeScrollbarXToTop.value;
             const scrollbarYConf = scrollbarOpts.y || {};
             const scrollbarYToLeft = computeScrollbarYToLeft.value;
             let xScrollbarVisible = overflowX ? 'visible' : 'hidden';
@@ -2383,16 +2394,31 @@ export default defineVxeComponent({
             }
             const xWrapperEl = refScrollXWrapperElem.value;
             if (xWrapperEl) {
-                xWrapperEl.style.left = scrollbarXToTop ? `${osbWidth}px` : '';
                 xWrapperEl.style.width = `${el.clientWidth - osbWidth}px`;
+                if (scrollbarYToLeft) {
+                    xWrapperEl.style.left = `${osbWidth}px`;
+                }
+                else {
+                    xWrapperEl.style.left = '';
+                }
             }
             if (xLeftCornerEl) {
-                xLeftCornerEl.style.width = scrollbarXToTop ? `${osbWidth}px` : '';
-                xLeftCornerEl.style.display = scrollbarXToTop ? (overflowX && osbHeight ? 'block' : '') : '';
+                if (scrollbarYToLeft) {
+                    xLeftCornerEl.style.width = `${osbWidth}px`;
+                    xLeftCornerEl.style.display = overflowY && osbWidth ? 'block' : '';
+                }
+                else {
+                    xLeftCornerEl.style.display = '';
+                }
             }
             if (xRightCornerEl) {
-                xRightCornerEl.style.width = scrollbarXToTop ? '' : `${osbWidth}px`;
-                xRightCornerEl.style.display = scrollbarXToTop ? '' : (xScrollbarVisible === 'visible' ? 'block' : '');
+                if (scrollbarYToLeft) {
+                    xRightCornerEl.style.display = '';
+                }
+                else {
+                    xRightCornerEl.style.width = `${osbWidth}px`;
+                    xRightCornerEl.style.display = xScrollbarVisible === 'visible' ? 'block' : '';
+                }
             }
             const scrollYVirtualEl = refScrollYVirtualElem.value;
             if (scrollYVirtualEl) {
@@ -3970,8 +3996,10 @@ export default defineVxeComponent({
                 updateAfterDataIndex();
                 return nextTick();
             }).then(() => {
+                updateTreeLineStyle();
                 return handleLazyRecalculate(true, true, true);
             }).then(() => {
+                updateTreeLineStyle();
                 setTimeout(() => {
                     $xeTable.updateCellAreas();
                 }, 30);
@@ -4329,6 +4357,9 @@ export default defineVxeComponent({
                 }
             }
         };
+        /**
+         * 更新展开行样式
+         */
         const updateRowExpandStyle = () => {
             const { expandColumn, scrollYLoad, scrollYTop, isScrollYBig } = reactData;
             const expandOpts = computeExpandOpts.value;
@@ -4384,6 +4415,12 @@ export default defineVxeComponent({
                 }
             }
         };
+        /**
+         * 更新树连接线样式
+         */
+        const updateTreeLineStyle = () => {
+            // 待优化
+        };
         const handleRowExpandScroll = () => {
             const { elemStore } = internalData;
             const rowExpandEl = refRowExpandElem.value;
@@ -6817,14 +6854,40 @@ export default defineVxeComponent({
              * 获取表格的滚动状态
              */
             getScroll() {
-                const { scrollXLoad, scrollYLoad } = reactData;
+                return $xeTable.getScrollData();
+            },
+            /**
+             * 获取表格的滚动数据
+             */
+            getScrollData() {
+                const { scrollXLoad, scrollYLoad, scrollbarHeight, scrollbarWidth } = reactData;
                 const { elemStore } = internalData;
                 const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+                const scrollTop = bodyScrollElem ? bodyScrollElem.scrollTop : 0;
+                const scrollLeft = bodyScrollElem ? bodyScrollElem.scrollLeft : 0;
+                const clientHeight = bodyScrollElem ? bodyScrollElem.clientHeight : 0;
+                const clientWidth = bodyScrollElem ? bodyScrollElem.clientWidth : 0;
+                const scrollHeight = bodyScrollElem ? bodyScrollElem.scrollHeight : 0;
+                const scrollWidth = bodyScrollElem ? bodyScrollElem.scrollWidth : 0;
+                const isTop = scrollTop <= 0;
+                const isBottom = scrollTop + clientHeight >= scrollHeight;
+                const isLeft = scrollLeft <= 0;
+                const isRight = scrollLeft + clientWidth >= scrollWidth;
                 return {
                     virtualX: scrollXLoad,
                     virtualY: scrollYLoad,
-                    scrollTop: bodyScrollElem ? bodyScrollElem.scrollTop : 0,
-                    scrollLeft: bodyScrollElem ? bodyScrollElem.scrollLeft : 0
+                    isTop,
+                    isBottom,
+                    isLeft,
+                    isRight,
+                    scrollbarHeight,
+                    scrollbarWidth,
+                    scrollTop,
+                    scrollLeft,
+                    scrollHeight,
+                    scrollWidth,
+                    clientHeight,
+                    clientWidth
                 };
             },
             /**
@@ -6944,6 +7007,8 @@ export default defineVxeComponent({
                 scrollYStore.endIndex = scrollYStore.visibleSize;
                 scrollYStore.visibleEndIndex = scrollYStore.visibleSize;
                 return nextTick().then(() => {
+                    internalData.lastScrollLeft = 0;
+                    internalData.lastScrollTop = 0;
                     internalData.intoRunScroll = false;
                 });
             },
@@ -8165,7 +8230,7 @@ export default defineVxeComponent({
                 const el = refElem.value;
                 if (el) {
                     const parentElem = el.parentNode;
-                    const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
+                    let parentPaddingSize = 0;
                     let parentWrapperHeight = 0;
                     if (parentElem) {
                         if ($xeGantt && hasClass(parentElem, 'vxe-gantt--table-wrapper')) {
@@ -8176,6 +8241,7 @@ export default defineVxeComponent({
                         }
                         else {
                             parentWrapperHeight = parentElem.clientHeight;
+                            parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
                         }
                     }
                     return Math.floor(parentWrapperHeight - parentPaddingSize);
@@ -11205,11 +11271,10 @@ export default defineVxeComponent({
                 const { scrollXLoad, scrollYLoad, expandColumn } = reactData;
                 const leftFixedWidth = computeLeftFixedWidth.value;
                 const rightFixedWidth = computeRightFixedWidth.value;
-                if (!(leftFixedWidth || rightFixedWidth || expandColumn)) {
-                    return;
-                }
                 const { elemStore, lastScrollTop, lastScrollLeft } = internalData;
                 const rowOpts = computeRowOpts.value;
+                const scrollbarXOpts = computeScrollbarXOpts.value;
+                const scrollbarYOpts = computeScrollbarYOpts.value;
                 const xHandleEl = refScrollXHandleElem.value;
                 const yHandleEl = refScrollYHandleElem.value;
                 const leftScrollElem = getRefElem(elemStore['left-body-scroll']);
@@ -11218,12 +11283,6 @@ export default defineVxeComponent({
                 const footerScrollElem = getRefElem(elemStore['main-footer-scroll']);
                 const rightScrollElem = getRefElem(elemStore['right-body-scroll']);
                 const rowExpandEl = refRowExpandElem.value;
-                if (!xHandleEl) {
-                    return;
-                }
-                if (!yHandleEl) {
-                    return;
-                }
                 if (!bodyScrollElem) {
                     return;
                 }
@@ -11236,13 +11295,28 @@ export default defineVxeComponent({
                 const scrollLeft = currScrollLeft + deltaLeft;
                 const isRollX = scrollLeft !== lastScrollLeft;
                 const isRollY = scrollTop !== lastScrollTop;
+                if (isRollX) {
+                    // 如果禁用滚动
+                    if (scrollbarXOpts.visible === 'hidden') {
+                        evnt.preventDefault();
+                        return;
+                    }
+                }
                 if (isRollY) {
+                    // 如果禁用滚动
+                    if (scrollbarYOpts.visible === 'hidden') {
+                        evnt.preventDefault();
+                        return;
+                    }
                     const isTopWheel = deltaTop < 0;
                     // 如果滚动位置已经是顶部或底部，则不需要触发
                     if (isTopWheel ? currScrollTop <= 0 : currScrollTop >= bodyScrollElem.scrollHeight - bodyScrollElem.clientHeight) {
                         return;
                     }
                 }
+                if (!(leftFixedWidth || rightFixedWidth || expandColumn)) {
+                    return;
+                }
                 if (rowOpts.isHover || highlightHoverRow) {
                     $xeTable.clearHoverRow();
                 }
@@ -11745,14 +11819,24 @@ export default defineVxeComponent({
          * 如果宽度足够情况下，则不需要渲染固定列
          * @param {String} fixedType 固定列类型
          */
-        const renderFixed = (fixedType) => {
+        const renderViewFixed = (fixedType) => {
             const { showHeader, showFooter } = props;
             const { tableData, tableColumn, tableGroupColumn, columnStore, footerTableData } = reactData;
+            const scrollbarOpts = computeScrollbarOpts.value;
+            const scrollbarXOpts = computeScrollbarXOpts.value;
+            const scrollbarYOpts = computeScrollbarYOpts.value;
+            const { overscrollBehavior: overscrollXBehavior } = scrollbarXOpts;
+            const { overscrollBehavior: overscrollYBehavior } = scrollbarYOpts;
             const isFixedLeft = fixedType === 'left';
             const fixedColumn = isFixedLeft ? columnStore.leftList : columnStore.rightList;
+            const osXBehavior = XEUtils.eqNull(overscrollXBehavior) ? scrollbarOpts.overscrollBehavior : overscrollXBehavior;
+            const osYBehavior = XEUtils.eqNull(overscrollYBehavior) ? scrollbarOpts.overscrollBehavior : overscrollYBehavior;
             return h('div', {
                 ref: isFixedLeft ? refLeftContainer : refRightContainer,
-                class: `vxe-table--fixed-${fixedType}-wrapper`
+                class: [`vxe-table--fixed-${fixedType}-wrapper`, `sx--${scrollbarXOpts.visible}`, `sy--${scrollbarYOpts.visible}`, {
+                        [`x-ob--${osXBehavior}`]: osXBehavior,
+                        [`y-ob--${osYBehavior}`]: osYBehavior
+                    }]
             }, [
                 showHeader
                     ? h(TableHeaderComponent, {
@@ -11940,6 +12024,7 @@ export default defineVxeComponent({
                         $columnIndex,
                         _columnIndex,
                         fixed: '',
+                        source: 'table',
                         type: 'body',
                         level: rowLevel,
                         rowid,
@@ -12039,13 +12124,23 @@ export default defineVxeComponent({
         const renderViewport = () => {
             const { showHeader, showFooter } = props;
             const { overflowX, tableData, tableColumn, tableGroupColumn, footerTableData, columnStore } = reactData;
+            const scrollbarOpts = computeScrollbarOpts.value;
+            const scrollbarXOpts = computeScrollbarXOpts.value;
+            const scrollbarYOpts = computeScrollbarYOpts.value;
+            const { overscrollBehavior: overscrollXBehavior } = scrollbarXOpts;
+            const { overscrollBehavior: overscrollYBehavior } = scrollbarYOpts;
             const { leftList, rightList } = columnStore;
+            const osXBehavior = XEUtils.eqNull(overscrollXBehavior) ? scrollbarOpts.overscrollBehavior : overscrollXBehavior;
+            const osYBehavior = XEUtils.eqNull(overscrollYBehavior) ? scrollbarOpts.overscrollBehavior : overscrollYBehavior;
             return h('div', {
                 ref: refTableViewportElem,
-                class: 'vxe-table--viewport-wrapper'
+                class: ['vxe-table--viewport-wrapper', {
+                        [`x-ob--${osXBehavior}`]: osXBehavior,
+                        [`y-ob--${osYBehavior}`]: osYBehavior
+                    }]
             }, [
                 h('div', {
-                    class: 'vxe-table--main-wrapper'
+                    class: ['vxe-table--main-wrapper', `sx--${scrollbarXOpts.visible}`, `sy--${scrollbarYOpts.visible}`]
                 }, [
                     /**
                      * 表头
@@ -12080,8 +12175,8 @@ export default defineVxeComponent({
                 h('div', {
                     class: 'vxe-table--fixed-wrapper'
                 }, [
-                    leftList && leftList.length && overflowX ? renderFixed('left') : renderEmptyElement($xeTable),
-                    rightList && rightList.length && overflowX ? renderFixed('right') : renderEmptyElement($xeTable)
+                    leftList && leftList.length && overflowX ? renderViewFixed('left') : renderEmptyElement($xeTable),
+                    rightList && rightList.length && overflowX ? renderViewFixed('right') : renderEmptyElement($xeTable)
                 ]),
                 renderRowExpandedVNs()
             ]);
@@ -12211,11 +12306,15 @@ export default defineVxeComponent({
                 h('div', {
                     key: 'tn',
                     ref: refEmptyPlaceholder,
-                    class: 'vxe-table--empty-placeholder'
+                    class: 'vxe-table--empty-place-wrapper'
                 }, [
                     h('div', {
-                        class: 'vxe-table--empty-content'
-                    }, renderEmptyBody())
+                        class: 'vxe-table--empty-placeholder'
+                    }, [
+                        h('div', {
+                            class: 'vxe-table--empty-content'
+                        }, renderEmptyBody())
+                    ])
                 ]),
                 /**
                  * 边框线
@@ -12522,6 +12621,18 @@ export default defineVxeComponent({
         watch(() => VxeUI.getLanguage(), () => {
             reLayoutFlag.value++;
         });
+        watch(() => {
+            const scrollbarXOpts = computeScrollbarXOpts.value;
+            return scrollbarXOpts.visible;
+        }, () => {
+            reLayoutFlag.value++;
+        });
+        watch(() => {
+            const scrollbarYOpts = computeScrollbarYOpts.value;
+            return scrollbarYOpts.visible;
+        }, () => {
+            reLayoutFlag.value++;
+        });
         watch(reLayoutFlag, () => {
             $xeTable.recalculate(true);
         });

package/es/table/src/util.js

@@ -566,7 +566,7 @@ const lineOffsetSizes = {
     medium: 1,
     large: 0
 };
-function countTreeExpand(prevRow, params) {
+function countTreeExpandSize(prevRow, params) {
     let count = 1;
     if (!prevRow) {
         return count;
@@ -583,7 +583,7 @@ function countTreeExpand(prevRow, params) {
     const rowChildren = prevRow[transform ? mapChildrenField : childrenField];
     if (rowChildren && treeExpandedFlag && treeExpandedMaps[getRowid($table, prevRow)]) {
         for (let index = 0; index < rowChildren.length; index++) {
-            count += countTreeExpand(rowChildren[index], params);
+            count += countTreeExpandSize(rowChildren[index], params);
         }
     }
     return count;
@@ -613,7 +613,7 @@ export function calcTreeLine(params, prevRow) {
     const currCellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
     let expandSize = 1;
     if (prevRow) {
-        expandSize = countTreeExpand(prevRow, params);
+        expandSize = countTreeExpandSize(prevRow, params);
     }
     let cellHeight = currCellHeight;
     const vnHeight = rowRest.height;
@@ -627,28 +627,31 @@ export function calcTreeLine(params, prevRow) {
 export function clearTableDefaultStatus($xeTable) {
     const { props, internalData } = $xeTable;
     internalData.initStatus = false;
-    $xeTable.clearSort();
-    $xeTable.clearCurrentRow();
-    $xeTable.clearCurrentColumn();
-    $xeTable.clearRadioRow();
-    $xeTable.clearRadioReserve();
-    $xeTable.clearCheckboxRow();
-    $xeTable.clearCheckboxReserve();
-    $xeTable.clearRowExpand();
-    $xeTable.clearTreeExpand();
-    $xeTable.clearTreeExpandReserve();
-    $xeTable.clearPendingRow();
+    const actionList = [
+        $xeTable.clearSort(),
+        $xeTable.clearCurrentRow(),
+        $xeTable.clearCurrentColumn(),
+        $xeTable.clearRadioRow(),
+        $xeTable.clearRadioReserve(),
+        $xeTable.clearCheckboxRow(),
+        $xeTable.clearCheckboxReserve(),
+        $xeTable.clearRowExpand(),
+        $xeTable.clearTreeExpand(),
+        $xeTable.clearTreeExpandReserve(),
+        $xeTable.clearPendingRow()
+    ];
     if ($xeTable.clearFilter) {
-        $xeTable.clearFilter();
+        actionList.push($xeTable.clearFilter());
     }
     if ($xeTable.clearSelected && (props.keyboardConfig || props.mouseConfig)) {
-        $xeTable.clearSelected();
+        actionList.push($xeTable.clearSelected());
     }
     if ($xeTable.clearCellAreas && props.mouseConfig) {
-        $xeTable.clearCellAreas();
-        $xeTable.clearCopyCellArea();
+        actionList.push($xeTable.clearCellAreas(), $xeTable.clearCopyCellArea());
     }
-    return $xeTable.clearScroll();
+    return Promise.all(actionList).then(() => {
+        return $xeTable.clearScroll();
+    });
 }
 export function clearTableAllStatus($xeTable) {
     if ($xeTable.clearFilter) {

package/es/table/style.css

@@ -1788,6 +1788,18 @@
   overflow: hidden;
   flex-grow: 1;
 }
+.vxe-table--viewport-wrapper.x-ob--contain > .vxe-table--main-wrapper > .vxe-table--header-wrapper > .vxe-table--header-inner-wrapper {
+  overscroll-behavior-x: contain;
+}
+.vxe-table--viewport-wrapper.x-ob--contain > .vxe-table--main-wrapper > .vxe-table--body-wrapper > .vxe-table--body-inner-wrapper {
+  overscroll-behavior-x: contain;
+}
+.vxe-table--viewport-wrapper.x-ob--contain > .vxe-table--main-wrapper > .vxe-table--footer-wrapper > .vxe-table--footer-inner-wrapper {
+  overscroll-behavior-x: contain;
+}
+.vxe-table--viewport-wrapper.y-ob--contain > .vxe-table--main-wrapper > .vxe-table--body-wrapper > .vxe-table--body-inner-wrapper {
+  overscroll-behavior-y: contain;
+}
 
 .vxe-table--header-wrapper,
 .vxe-table--body-wrapper,
@@ -1827,6 +1839,28 @@
   overflow-x: scroll;
 }
 
+.vxe-table--main-wrapper.sx--hidden > .vxe-table--header-wrapper > .vxe-table--header-inner-wrapper {
+  overflow-x: hidden;
+}
+.vxe-table--main-wrapper.sx--hidden > .vxe-table--body-wrapper > .vxe-table--body-inner-wrapper {
+  overflow-x: hidden;
+}
+.vxe-table--main-wrapper.sx--hidden > .vxe-table--footer-wrapper > .vxe-table--footer-inner-wrapper {
+  overflow-x: hidden;
+}
+.vxe-table--main-wrapper.sy--hidden > .vxe-table--body-wrapper > .vxe-table--body-inner-wrapper {
+  overflow-y: hidden;
+}
+
+.vxe-table--fixed-left-wrapper.sx--hidden > .vxe-table--body-wrapper > .vxe-table--body-inner-wrapper,
+.vxe-table--fixed-right-wrapper.sx--hidden > .vxe-table--body-wrapper > .vxe-table--body-inner-wrapper {
+  overflow-x: hidden;
+}
+.vxe-table--fixed-left-wrapper.sy--hidden > .vxe-table--body-wrapper > .vxe-table--body-inner-wrapper,
+.vxe-table--fixed-right-wrapper.sy--hidden > .vxe-table--body-wrapper > .vxe-table--body-inner-wrapper {
+  overflow-y: hidden;
+}
+
 .vxe-loading--custom-wrapper {
   display: none;
   position: absolute;
@@ -2212,6 +2246,9 @@
   left: 0;
   bottom: 0;
 }
+.vxe-table .vxe-table--scroll-x-wrapper {
+  height: 100%;
+}
 .vxe-table .vxe-table--scroll-x-handle {
   overflow-y: hidden;
   overflow-x: scroll;
@@ -3151,6 +3188,10 @@
   outline: 0;
   background-color: var(--vxe-ui-layout-background-color);
 }
+.vxe-table--render-default .vxe-table--fixed-left-wrapper.y-ob--contain > .vxe-table--body-wrapper > .vxe-table--body-inner-wrapper,
+.vxe-table--render-default .vxe-table--fixed-right-wrapper.y-ob--contain > .vxe-table--body-wrapper > .vxe-table--body-inner-wrapper {
+  overscroll-behavior-y: contain;
+}
 .vxe-table--render-default .vxe-table--fixed-left-wrapper .vxe-table--body-wrapper,
 .vxe-table--render-default .vxe-table--fixed-right-wrapper .vxe-table--body-wrapper {
   outline: 0;
@@ -3477,11 +3518,16 @@
   display: none;
   visibility: hidden;
 }
-.vxe-table--render-default .vxe-table--empty-placeholder {
+.vxe-table--render-default .vxe-table--empty-place-wrapper {
   display: none;
   position: absolute;
+  width: 100%;
   top: 0;
   z-index: 5;
+  overflow: hidden;
+}
+.vxe-table--render-default .vxe-table--empty-placeholder {
+  display: flex;
 }
 .vxe-table--render-default .vxe-table--empty-content {
   display: block;
@@ -3489,7 +3535,7 @@
   pointer-events: auto;
 }
 .vxe-table--render-default.is--empty .vxe-table--empty-block,
-.vxe-table--render-default.is--empty .vxe-table--empty-placeholder {
+.vxe-table--render-default.is--empty .vxe-table--empty-place-wrapper {
   display: flex;
 }
 .vxe-table--render-default .vxe-body--column.col--selected {