vxe-table 3.24.4 → 3.25.0-beta.1

package/es/table/src/methods.js

@@ -1,6 +1,6 @@
 import XEUtils from 'xe-utils';
 import { getTpImg, isPx, isScale, hasClass, addClass, removeClass, wheelScrollLeftTo, wheelScrollTopTo, getEventTargetNode, getPaddingTopBottomSize, setScrollTop, setScrollLeft, toCssUnit, hasControlKey, checkTargetElement, hasAxternalInputTarget } from '../../ui/src/dom';
-import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils';
+import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue, hasEnableConf, getDefaultConfig } from '../../ui/src/utils';
 import { VxeUI } from '../../ui';
 import Cell from './cell';
 import { getRowUniqueId, createRowId, clearTableAllStatus, getColumnList, toFilters, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, getColReMaxWidth, createHandleUpdateRowId, createHandleGetRowId, getRefElem, getCellRestHeight, getLastChildColumn, getRowMaxHeight, handleCustomStoreConfig, encodeRowid } from './util';
@@ -996,7 +996,6 @@ function updateStyle($xeTable) {
     const isHeaderRenderOptimize = $xeTable.computeIsHeaderRenderOptimize;
     const isBodyRenderOptimize = $xeTable.computeIsBodyRenderOptimize;
     const isFooterRenderOptimize = $xeTable.computeIsFooterRenderOptimize;
-    const scrollbarOpts = $xeTable.computeScrollbarOpts;
     const mouseOpts = $xeTable.computeMouseOpts;
     const bodyWrapperElem = getRefElem(elemStore['main-body-wrapper']);
     const bodyTableElem = getRefElem(elemStore['main-body-table']);
@@ -1004,24 +1003,26 @@ function updateStyle($xeTable) {
         emptyPlaceholderElem.style.top = `${tHeaderHeight}px`;
         emptyPlaceholderElem.style.height = bodyWrapperElem ? `${bodyWrapperElem.offsetHeight - osbHeight}px` : '';
     }
-    const scrollbarXConf = scrollbarOpts.x || {};
-    const scrollbarYConf = scrollbarOpts.y || {};
+    const scrollbarXOpts = $xeTable.computeScrollbarXOpts;
+    const scrollbarYOpts = $xeTable.computeScrollbarYOpts;
     const scrollbarYToLeft = $xeTable.computeScrollbarYToLeft;
     let xScrollbarVisible = overflowX ? 'visible' : 'hidden';
-    if (scrollbarXConf.visible === 'visible' || $xeGanttView) {
+    const hideXScroll = scrollbarXOpts.visible === false || scrollbarXOpts.visible === 'hidden';
+    if (!hideXScroll || $xeGanttView) {
         osbHeight = scrollbarHeight;
         xScrollbarVisible = 'visible';
     }
-    else if (scrollbarXConf.visible === 'hidden' || scrollbarXConf.visible === false) {
+    else if (hideXScroll) {
         osbHeight = 0;
         xScrollbarVisible = 'hidden';
     }
     let yScrollbarVisible = overflowY ? 'visible' : 'hidden';
-    if ((scrollbarYConf.visible === 'hidden' || scrollbarYConf.visible === false) || (($xeGantt && $xeGanttView && $xeGantt.reactData.showRightView) && !scrollbarYToLeft)) {
+    const showYScroll = !(scrollbarYOpts.visible === false || scrollbarYOpts.visible === 'hidden');
+    if (!showYScroll || (($xeGantt && $xeGanttView && $xeGantt.reactData.showRightView) && !scrollbarYToLeft)) {
         osbWidth = 0;
         yScrollbarVisible = 'hidden';
     }
-    else if (scrollbarYConf.visible === 'visible') {
+    else if (showYScroll) {
         osbWidth = scrollbarWidth;
         yScrollbarVisible = 'visible';
     }
@@ -1255,7 +1256,7 @@ function updateStyle($xeTable) {
     if (currentRow) {
         $xeTable.setCurrentRow(currentRow);
     }
-    if (mouseConfig && mouseOpts.selected && editStore.selected.row && editStore.selected.column) {
+    if (hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.selected && editStore.selected.row && editStore.selected.column) {
         $xeTable.addCellSelectedClass();
     }
     if ($xeGanttView && $xeGanttView.handleUpdateStyle) {
@@ -3027,6 +3028,7 @@ function computeScrollLoad($xeTable) {
     });
 }
 function calcScrollbar($xeTable) {
+    const scrollDefaultConf = $xeTable.scrollDefaultConf;
     const reactData = $xeTable;
     const internalData = $xeTable;
     const { scrollXWidth, scrollYHeight } = reactData;
@@ -3044,14 +3046,18 @@ function calcScrollbar($xeTable) {
     let overflowY = false;
     let overflowX = false;
     if (bodyWrapperElem) {
+        const scrollbarXOpts = $xeTable.computeScrollbarXOpts;
+        const scrollbarYOpts = $xeTable.computeScrollbarYOpts;
+        const barWidth = XEUtils.toNumber(getDefaultConfig(getDefaultConfig(scrollbarYOpts.width, scrollbarOpts.width), scrollDefaultConf.width));
+        const barHeight = XEUtils.toNumber(getDefaultConfig(getDefaultConfig(scrollbarXOpts.height, scrollbarOpts.height), scrollDefaultConf.height));
         overflowY = scrollYHeight > bodyWrapperElem.clientHeight;
         if (yHandleEl) {
-            reactData.scrollbarWidth = scrollbarOpts.width || (yHandleEl.offsetWidth - yHandleEl.clientWidth) || 14;
+            reactData.scrollbarWidth = (barWidth || barHeight) || (yHandleEl.offsetWidth - yHandleEl.clientWidth) || 14;
         }
         reactData.overflowY = overflowY;
         overflowX = scrollXWidth > bodyWrapperElem.clientWidth;
         if (xHandleEl) {
-            reactData.scrollbarHeight = scrollbarOpts.height || (xHandleEl.offsetHeight - xHandleEl.clientHeight) || 14;
+            reactData.scrollbarHeight = (barHeight || barWidth) || (xHandleEl.offsetHeight - xHandleEl.clientHeight) || 14;
         }
         reactData.overflowX = overflowX;
         const hHeight = headerTableElem ? headerTableElem.clientHeight : 0;
@@ -3455,12 +3461,13 @@ function loadTableData($xeTable, datas, isReload, isReset) {
     const props = $xeTable;
     const reactData = $xeTable;
     const internalData = $xeTable;
-    const { keepSource, treeConfig, aggregateConfig, rowGroupConfig } = props;
+    const { keepSource, treeConfig, rowGroupConfig, aggregateConfig, mouseConfig } = props;
     const { rowGroupList, scrollYLoad: oldScrollYLoad } = reactData;
     const { initStatus, scrollYStore, scrollXStore, lastScrollLeft, lastScrollTop } = internalData;
     const rowOpts = $xeTable.computeRowOpts;
     const treeOpts = $xeTable.computeTreeOpts;
     const expandOpts = $xeTable.computeExpandOpts;
+    const mouseOpts = $xeTable.computeMouseOpts;
     const { transform } = treeOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
     let treeData = [];
@@ -3550,7 +3557,7 @@ function loadTableData($xeTable, datas, isReload, isReset) {
     if (keepSource) {
         $xeTable.cacheSourceMap(fullData);
     }
-    if ($xeTable.clearCellAreas && props.mouseConfig) {
+    if ($xeTable.clearCellAreas && hasEnableConf(mouseConfig, mouseOpts)) {
         $xeTable.clearCellAreas();
         $xeTable.clearCopyCellArea();
     }
@@ -4678,9 +4685,25 @@ const tableMethods = {
         const $xeTable = this;
         const $xeGrid = $xeTable.$xeGrid;
         const $xeGantt = $xeTable.$xeGantt;
-        const $xeGGWrapper = $xeGrid || $xeGantt;
-        const { $el } = this;
-        return $xeGGWrapper ? $xeGGWrapper.$el.parentNode : $el.parentNode;
+        const el = $xeTable.$refs.refElem;
+        if (!el) {
+            return null;
+        }
+        const parentEl = el.parentElement;
+        if (!parentEl) {
+            return null;
+        }
+        if ($xeGantt && hasClass(parentEl, 'vxe-gantt--table-wrapper')) {
+            return $xeGantt.getParentElem();
+        }
+        else if ($xeGrid && hasClass(parentEl, 'vxe-grid--table-wrapper')) {
+            return $xeGrid.getParentElem();
+        }
+        // 如果是虚拟滚动条
+        if (parentEl && hasClass(parentEl, 'vxe-scrollbar--view-inner')) {
+            return parentEl.parentElement;
+        }
+        return parentEl;
     },
     /**
      * 获取父容器的高度
@@ -4692,24 +4715,32 @@ const tableMethods = {
         const props = $xeTable;
         const { height } = props;
         const el = $xeTable.$refs.refElem;
-        if (el) {
-            const parentElem = el.parentNode;
-            const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
-            let parentWrapperHeight = 0;
-            if (parentElem) {
-                if ($xeGantt && hasClass(parentElem, 'vxe-gantt--table-wrapper')) {
-                    parentWrapperHeight = $xeGantt.getParentHeight();
-                }
-                else if ($xeGrid && hasClass(parentElem, 'vxe-grid--table-wrapper')) {
-                    parentWrapperHeight = $xeGrid.getParentHeight();
-                }
-                else {
-                    parentWrapperHeight = parentElem.clientHeight;
-                }
+        if (!el) {
+            return 0;
+        }
+        let parentEl = el.parentElement;
+        let parentPaddingSize = 0;
+        let parentWrapperHeight = 0;
+        if (!parentEl) {
+            return 0;
+        }
+        if ($xeGantt && hasClass(parentEl, 'vxe-gantt--table-wrapper')) {
+            parentWrapperHeight = $xeGantt.getParentHeight();
+        }
+        else if ($xeGrid && hasClass(parentEl, 'vxe-grid--table-wrapper')) {
+            parentWrapperHeight = $xeGrid.getParentHeight();
+        }
+        else {
+            // 如果是虚拟滚动条
+            if (parentEl && hasClass(parentEl, 'vxe-scrollbar--view-inner')) {
+                parentEl = parentEl.parentElement;
+            }
+            if (parentEl) {
+                parentWrapperHeight = parentEl.clientHeight;
+                parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentEl) : 0;
             }
-            return Math.floor(parentWrapperHeight - parentPaddingSize);
         }
-        return 0;
+        return Math.floor(parentWrapperHeight - parentPaddingSize);
     },
     /**
      * 获取需要排除的高度
@@ -6443,7 +6474,8 @@ const tableMethods = {
         const $xeTable = this;
         const props = $xeTable;
         const { mouseConfig } = props;
-        if (mouseConfig) {
+        const mouseOpts = $xeTable.computeMouseOpts;
+        if (hasEnableConf(mouseConfig, mouseOpts)) {
             if ($xeTable.clearSelected) {
                 $xeTable.clearSelected();
             }
@@ -7505,6 +7537,7 @@ const tableMethods = {
         const editOpts = $xeTable.computeEditOpts;
         const validOpts = $xeTable.computeValidOpts;
         const areaOpts = $xeTable.computeAreaOpts;
+        const mouseOpts = $xeTable.computeMouseOpts;
         const { actived } = editStore;
         const tableFilter = $xeTable.$refs.refTableFilter;
         const tableMenu = $xeTable.$refs.refTableMenu;
@@ -7600,7 +7633,7 @@ const tableMethods = {
                 }
             }
         }
-        else if (mouseConfig) {
+        else if (hasEnableConf(mouseConfig, mouseOpts)) {
             if (!getEventTargetNode(evnt, el).flag && !($xeGGWrapper && getEventTargetNode(evnt, $xeGGWrapper.$el).flag) && !(tableMenu && getEventTargetNode(evnt, tableMenu.$el).flag) && !(this.$toolbar && getEventTargetNode(evnt, this.$toolbar.$el).flag)) {
                 if ($xeTable.clearSelected) {
                     $xeTable.clearSelected();
@@ -7677,7 +7710,7 @@ const tableMethods = {
         if (isEsc) {
             $xeTable.preventEvent(evnt, 'event.keydown', null, () => {
                 $xeTable.dispatchEvent('keydown-start', {}, evnt);
-                if (keyboardConfig && mouseConfig && mouseOpts.area && $xeTable.handleKdClAreaEvent) {
+                if (hasEnableConf(keyboardConfig, keyboardOpts) && hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area && $xeTable.handleKdClAreaEvent) {
                     $xeTable.handleKdClAreaEvent(evnt);
                 }
                 else if (actived.row || filterStore.visible || ctxMenuStore.visible) {
@@ -7685,13 +7718,13 @@ const tableMethods = {
                     // 如果按下了 Esc 键，关闭快捷菜单、筛选
                     $xeTable.closeFilter();
                     $xeTable.closeMenu();
-                    if (keyboardConfig && keyboardOpts.isEsc) {
+                    if (hasEnableConf(keyboardConfig, keyboardOpts) && keyboardOpts.isEsc) {
                         // 如果是激活编辑状态，则取消编辑
                         if (actived.row) {
                             const params = actived.args;
                             $xeTable.handleClearEdit(evnt);
                             // 如果配置了选中功能，则为选中状态
-                            if (mouseConfig && mouseOpts.selected) {
+                            if (hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.selected) {
                                 $xeTable.$nextTick(() => $xeTable.handleSelected(params, evnt));
                             }
                         }
@@ -7769,7 +7802,7 @@ const tableMethods = {
                         $xeTable.moveCtxMenu(evnt, ctxMenuStore, 'selected', isRightArrow, true, menuList);
                     }
                 }
-                else if (keyboardConfig && mouseConfig && mouseOpts.area && $xeTable.handleKdClAreaEvent) {
+                else if (hasEnableConf(keyboardConfig, keyboardOpts) && hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area && $xeTable.handleKdClAreaEvent) {
                     $xeTable.handleKdClAreaEvent(evnt);
                 }
                 else if (isEsc) {
@@ -7778,7 +7811,7 @@ const tableMethods = {
                         $xeTable.closeMenu();
                     }
                     $xeTable.closeFilter();
-                    if (keyboardConfig && keyboardOpts.isEsc) {
+                    if (hasEnableConf(keyboardConfig, keyboardOpts) && keyboardOpts.isEsc) {
                         // 如果是激活编辑状态，则取消编辑
                         if (actived.row) {
                             const params = actived.args;
@@ -7790,7 +7823,7 @@ const tableMethods = {
                         }
                     }
                 }
-                else if (keyboardConfig && isSpacebar && keyboardOpts.isChecked && selectRow && selectColumn && (selectColumn.type === 'checkbox' || selectColumn.type === 'radio')) {
+                else if (hasEnableConf(keyboardConfig, keyboardOpts) && isSpacebar && keyboardOpts.isChecked && selectRow && selectColumn && (selectColumn.type === 'checkbox' || selectColumn.type === 'radio')) {
                     // 空格键支持选中复选框
                     evnt.preventDefault();
                     if (selectColumn.type === 'checkbox') {
@@ -7817,7 +7850,7 @@ const tableMethods = {
                         internalData._keyCtx = false;
                     }, 1000);
                 }
-                else if (isEnter && !hasAltKey && keyboardConfig && keyboardOpts.isEnter && (selectRow || actived.row || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow))) {
+                else if (isEnter && !hasAltKey && hasEnableConf(keyboardConfig, keyboardOpts) && keyboardOpts.isEnter && (selectRow || actived.row || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow))) {
                     // 退出选中
                     if (isControlKey) {
                         // 如果是激活编辑状态，则取消编辑
@@ -7825,7 +7858,7 @@ const tableMethods = {
                             const params = actived.args;
                             $xeTable.handleClearEdit(evnt);
                             // 如果配置了选中功能，则为选中状态
-                            if (mouseConfig && mouseOpts.selected) {
+                            if (hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.selected) {
                                 $xeTable.$nextTick(() => $xeTable.handleSelected(params, evnt));
                             }
                         }
@@ -7943,7 +7976,7 @@ const tableMethods = {
                         }
                     }
                 }
-                else if (operArrow && keyboardConfig && keyboardOpts.isArrow) {
+                else if (operArrow && hasEnableConf(keyboardConfig, keyboardOpts) && keyboardOpts.isArrow) {
                     if (!isEditStatus) {
                         // 如果按下了方向键
                         if (mouseOpts.selected && selectRow && selectColumn) {
@@ -7961,7 +7994,7 @@ const tableMethods = {
                         }
                     }
                 }
-                else if (isTab && keyboardConfig && keyboardOpts.isTab) {
+                else if (isTab && hasEnableConf(keyboardConfig, keyboardOpts) && keyboardOpts.isTab) {
                     // 如果按下了 Tab 键切换
                     if (selectRow || actived.row) {
                         const activeRow = selectRow || actived.row;
@@ -8011,7 +8044,7 @@ const tableMethods = {
                         }
                     }
                 }
-                else if (keyboardConfig && keyboardOpts.isDel && hasDeleteKey && isEnableConf(editConfig) && (selectRow || selectColumn)) {
+                else if (hasEnableConf(keyboardConfig, keyboardOpts) && keyboardOpts.isDel && hasDeleteKey && isEnableConf(editConfig) && (selectRow || selectColumn)) {
                     // 如果是删除键
                     if (!isEditStatus) {
                         const { delMethod } = keyboardOpts;
@@ -8042,7 +8075,7 @@ const tableMethods = {
                         }
                     }
                 }
-                else if (hasBackspaceKey && keyboardConfig && keyboardOpts.isBack && isEnableConf(editConfig) && (selectRow || selectColumn)) {
+                else if (hasBackspaceKey && hasEnableConf(keyboardConfig, keyboardOpts) && keyboardOpts.isBack && isEnableConf(editConfig) && (selectRow || selectColumn)) {
                     if (!isEditStatus) {
                         const { backMethod } = keyboardOpts;
                         // 如果是删除键
@@ -8075,7 +8108,7 @@ const tableMethods = {
                         }
                     }
                 }
-                else if (hasBackspaceKey && keyboardConfig && treeConfig && keyboardOpts.isBack && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
+                else if (hasBackspaceKey && hasEnableConf(keyboardConfig, keyboardOpts) && treeConfig && keyboardOpts.isBack && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
                     // 如果树形表格回退键关闭当前行返回父节点
                     const { parent: parentRow } = XEUtils.findTree(internalData.afterTreeFullData, item => item === currentRow, { children: childrenField });
                     if (parentRow) {
@@ -8093,7 +8126,7 @@ const tableMethods = {
                             .then(() => $xeTable.triggerCurrentRowEvent(evnt, params));
                     }
                 }
-                else if (keyboardConfig && keyboardOpts.isUndoRedo && isControlKey && (isZ || isY) && !hasAxternalInputTarget(evnt.target)) {
+                else if (hasEnableConf(keyboardConfig, keyboardOpts) && keyboardOpts.isUndoRedo && isControlKey && (isZ || isY) && !hasAxternalInputTarget(evnt.target)) {
                     if (isY || (hasShiftKey && isZ)) {
                         // 恢复被撤销的操作：Ctrl + Y 或 Ctrl + Shift + Z
                         evnt.preventDefault();
@@ -8105,7 +8138,7 @@ const tableMethods = {
                         $xeTable.handleUndoStackEvent(evnt);
                     }
                 }
-                else if (keyboardConfig && keyboardOpts.isEdit && !isControlKey && (isSpacebar || isProcess || (keyCode >= 48 && keyCode <= 57) || (keyCode >= 65 && keyCode <= 90) || (keyCode >= 96 && keyCode <= 111) || (keyCode >= 186 && keyCode <= 192) || (keyCode >= 219 && keyCode <= 222))) {
+                else if (hasEnableConf(keyboardConfig, keyboardOpts) && keyboardOpts.isEdit && !isControlKey && (isSpacebar || isProcess || (keyCode >= 48 && keyCode <= 57) || (keyCode >= 65 && keyCode <= 90) || (keyCode >= 96 && keyCode <= 111) || (keyCode >= 186 && keyCode <= 192) || (keyCode >= 219 && keyCode <= 222))) {
                     const { editMode, editMethod } = keyboardOpts;
                     // 启用编辑后，空格键功能将失效
                     // if (isSpacebar) {
@@ -8161,7 +8194,7 @@ const tableMethods = {
         const { actived } = editStore;
         if (isActivated && !filterStore.visible) {
             if (!(actived.row || actived.column)) {
-                if (keyboardConfig && keyboardOpts.isClip && mouseConfig && mouseOpts.area && $xeTable.handlePeClAreaEvent) {
+                if (hasEnableConf(keyboardConfig, keyboardOpts) && keyboardOpts.isClip && hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area && $xeTable.handlePeClAreaEvent) {
                     $xeTable.handlePeClAreaEvent(evnt);
                 }
             }
@@ -8181,7 +8214,7 @@ const tableMethods = {
         const { actived } = editStore;
         if (isActivated && !filterStore.visible) {
             if (!(actived.row || actived.column)) {
-                if (keyboardConfig && keyboardOpts.isClip && mouseConfig && mouseOpts.area && $xeTable.handleCyClAreaEvent) {
+                if (hasEnableConf(keyboardConfig, keyboardOpts) && keyboardOpts.isClip && hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area && $xeTable.handleCyClAreaEvent) {
                     $xeTable.handleCyClAreaEvent(evnt);
                 }
             }
@@ -8201,7 +8234,7 @@ const tableMethods = {
         const { actived } = editStore;
         if (isActivated && !filterStore.visible) {
             if (!(actived.row || actived.column)) {
-                if (keyboardConfig && keyboardOpts.isClip && mouseConfig && mouseOpts.area && $xeTable.handleCutCellAreaEvent) {
+                if (hasEnableConf(keyboardConfig, keyboardOpts) && keyboardOpts.isClip && hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area && $xeTable.handleCutCellAreaEvent) {
                     $xeTable.handleCutCellAreaEvent(evnt);
                 }
             }
@@ -9645,7 +9678,7 @@ const tableMethods = {
         const internalData = $xeTable;
         const { mouseConfig } = props;
         const mouseOpts = $xeTable.computeMouseOpts;
-        const isMouseSelected = mouseConfig && mouseOpts.selected;
+        const isMouseSelected = hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.selected;
         const column = handleFieldOrColumn($xeTable, fieldOrColumn);
         if (column) {
             $xeTable.clearCurrentColumn();
@@ -9859,7 +9892,7 @@ const tableMethods = {
         const { field, sortable, order } = column;
         if (sortable) {
             const params = { $table: $xeTable, $event: evnt, column, field, property: field, order, sortList: $xeTable.getSortColumns(), sortTime: column.sortTime };
-            if (mouseConfig && mouseOpts.area && $xeTable.handleSortEvent) {
+            if (hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area && $xeTable.handleSortEvent) {
                 $xeTable.handleSortEvent(evnt, params);
             }
             if (!order) {
@@ -9941,7 +9974,7 @@ const tableMethods = {
                 $xeTable.handleHeaderCellDragMousedownEvent(evnt, params);
             }
         }
-        if (!triggerDrag && mouseConfig && mouseOpts.area && $xeTable.handleHeaderCellAreaMouseDnEvent) {
+        if (!triggerDrag && hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area && $xeTable.handleHeaderCellAreaMouseDnEvent) {
             $xeTable.handleHeaderCellAreaMouseDnEvent(evnt, Object.assign({ cell, triggerSort, triggerFilter }, params));
         }
         $xeTable.focus();
@@ -10723,6 +10756,7 @@ const tableMethods = {
         const internalData = $xeTable;
         const { mouseConfig } = props;
         const columnDragOpts = $xeTable.computeColumnDragOpts;
+        const mouseOpts = $xeTable.computeMouseOpts;
         const { animation, isPeerDrag, isCrossDrag, isSelfToChildDrag, isToChildDrag, dragEndMethod, dragToChildMethod } = columnDragOpts;
         const { collectColumn, fullColumnIdData } = internalData;
         const el = $xeTable.$refs.refElem;
@@ -10885,7 +10919,7 @@ const tableMethods = {
                     }
                 });
                 $xeTable.handleClearStack();
-                if (mouseConfig) {
+                if (hasEnableConf(mouseConfig, mouseOpts)) {
                     if ($xeTable.clearSelected) {
                         $xeTable.clearSelected();
                     }
@@ -12551,14 +12585,14 @@ const tableMethods = {
         const isRollY = overflowY && scrollTop !== lastScrollTop;
         if (isRollX) {
             // 如果禁用滚动
-            if (scrollbarXOpts.visible === 'hidden') {
+            if (scrollbarXOpts.visible === false || scrollbarXOpts.visible === 'hidden') {
                 evnt.preventDefault();
                 return;
             }
         }
         if (isRollY) {
             // 如果禁用滚动
-            if (scrollbarYOpts.visible === 'hidden') {
+            if (scrollbarYOpts.visible === false || scrollbarYOpts.visible === 'hidden') {
                 evnt.preventDefault();
                 return;
             }
@@ -13490,7 +13524,7 @@ const tableMethods = {
         const props = $xeTable;
         const { mouseConfig } = props;
         const mouseOpts = $xeTable.computeMouseOpts;
-        if (mouseConfig && mouseOpts.area && $xeTable.handleRecalculateCellAreaEvent) {
+        if (hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area && $xeTable.handleRecalculateCellAreaEvent) {
             return $xeTable.handleRecalculateCellAreaEvent();
         }
         return $xeTable.$nextTick();

package/es/table/src/props.js

@@ -292,6 +292,10 @@ export const tableProps = {
     virtualXConfig: Object,
     // 纵向虚拟滚动配置项
     virtualYConfig: Object,
+    useScrollbar: {
+        type: Boolean,
+        default: () => getConfig().table.useScrollbar
+    },
     // 滚动条配置项
     scrollbarConfig: Object,
     // 撤销/恢复历史配置项