vxe-table 3.24.3 → 3.25.0-beta.0

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 } 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';
@@ -1255,7 +1255,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) {
@@ -3455,12 +3455,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 +3551,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 +4679,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 +4709,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 +6468,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 +7531,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 +7627,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 +7704,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 +7712,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 +7796,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 +7805,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 +7817,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 +7844,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 +7852,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 +7970,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 +7988,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 +8038,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 +8069,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 +8102,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 +8120,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 +8132,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 +8188,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 +8208,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 +8228,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 +9672,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 +9886,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 +9968,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 +10750,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 +10913,7 @@ const tableMethods = {
                     }
                 });
                 $xeTable.handleClearStack();
-                if (mouseConfig) {
+                if (hasEnableConf(mouseConfig, mouseOpts)) {
                     if ($xeTable.clearSelected) {
                         $xeTable.clearSelected();
                     }
@@ -13100,7 +13128,7 @@ const tableMethods = {
      */
     scrollToColumn(fieldOrColumn, options) {
         const $xeTable = this;
-        return handleScrollToRowColumn($xeTable, null, fieldOrColumn, options);
+        return handleScrollToRowColumn($xeTable, fieldOrColumn, null, options);
     },
     /**
      * 如果有滚动条，则滚动到第一列
@@ -13490,7 +13518,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/table.js

@@ -1,5 +1,5 @@
 import XEUtils from 'xe-utils';
-import { getFuncText, isEnableConf } from '../../ui/src/utils';
+import { getFuncText, hasEnableConf, isEnableConf } from '../../ui/src/utils';
 import { initTpImg, toCssUnit } from '../../ui/src/dom';
 import { createReactData, createInternalData, createHandleGetRowId, getCalcHeight, hasDeepKey } from './util';
 import { VxeUI } from '../../ui';
@@ -1600,7 +1600,7 @@ export default {
         const internalData = $xeTable;
         XEUtils.assign(internalData, createInternalData());
         handleKeyField($xeTable);
-        const { editConfig, exportConfig, importConfig, treeConfig, minHeight, keepSource } = props;
+        const { editConfig, exportConfig, importConfig, treeConfig, minHeight, keepSource, areaConfig } = props;
         const { scrollXStore, scrollYStore } = internalData;
         const columnOpts = $xeTable.computeColumnOpts;
         const columnDragOpts = $xeTable.computeColumnDragOpts;
@@ -1699,13 +1699,13 @@ export default {
         //   warnLog('vxe.error.delProp', ['scroll-x', 'virtual-x-config'])
         // }
         // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
-        if (importConfig && importOpts.types && !importOpts.importMethod && !XEUtils.includeArrays(XEUtils.keys(importOpts._typeMaps), importOpts.types)) {
+        if (hasEnableConf(importConfig, importOpts) && importOpts.types && !importOpts.importMethod && !XEUtils.includeArrays(XEUtils.keys(importOpts._typeMaps), importOpts.types)) {
             warnLog('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter((type) => XEUtils.includes(XEUtils.keys(importOpts._typeMaps), type)).join(',') || XEUtils.keys(importOpts._typeMaps).join(',')]);
         }
-        if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !XEUtils.includeArrays(XEUtils.keys(exportOpts._typeMaps), exportOpts.types)) {
+        if (hasEnableConf(exportConfig, exportOpts) && exportOpts.types && !exportOpts.exportMethod && !XEUtils.includeArrays(XEUtils.keys(exportOpts._typeMaps), exportOpts.types)) {
             warnLog('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter((type) => XEUtils.includes(XEUtils.keys(exportOpts._typeMaps), type)).join(',') || XEUtils.keys(exportOpts._typeMaps).join(',')]);
         }
-        if (exportConfig && XEUtils.isBoolean(exportOpts.isAllExpand)) {
+        if (hasEnableConf(exportConfig, exportOpts) && XEUtils.isBoolean(exportOpts.isAllExpand)) {
             warnLog('vxe.error.delProp', ['isAllExpand', 'isTreeAllExpanded']);
         }
         if (!props.id) {
@@ -1719,8 +1719,8 @@ export default {
         if (rowOpts.height && !this.showOverflow) {
             warnLog('vxe.error.notProp', ['table.show-overflow']);
         }
-        if (!$xeTable.triggerClAreaMnEvent) {
-            if (props.areaConfig) {
+        if (!$xeTable.triggerClAaMnEvent) {
+            if (hasEnableConf(areaConfig, areaOpts)) {
                 warnLog('vxe.error.notProp', ['area-config']);
             }
             if (props.clipConfig) {
@@ -1837,10 +1837,10 @@ export default {
         if (columnOpts.currentMethod) {
             warnLog('vxe.error.delProp', ['row-config.currentMethod', 'current-column-config.beforeSelectMethod']);
         }
-        // if ((rowOpts.isCurrent || highlightCurrentRow) && props.keyboardConfig && keyboardOpts.isArrow && !XEUtils.isBoolean(currentRowOpts.isFollowSelected)) {
+        // if ((rowOpts.isCurrent || highlightCurrentRow) && hasEnableConf(keyboardConfig, keyboardOpts) && keyboardOpts.isArrow && !XEUtils.isBoolean(currentRowOpts.isFollowSelected)) {
         //   warnLog('vxe.error.notConflictProp', ['row-config.isCurrent & keyboard-config.isArrow', 'current-row-config.isFollowSelected'])
         // }
-        // if ((columnOpts.isCurrent || highlightCurrentColumn) && props.keyboardConfig && keyboardOpts.isArrow && !XEUtils.isBoolean(currentColumnOpts.isFollowSelected)) {
+        // if ((columnOpts.isCurrent || highlightCurrentColumn) && hasEnableConf(keyboardConfig, keyboardOpts) && keyboardOpts.isArrow && !XEUtils.isBoolean(currentColumnOpts.isFollowSelected)) {
         //   warnLog('vxe.error.notConflictProp', ['column-config.isCurrent & keyboard-config.isArrow', 'current-column-config.isFollowSelected'])
         // }
         // 如果不支持虚拟滚动
@@ -1858,18 +1858,18 @@ export default {
         //   }
         // }
         // 检查是否有安装需要的模块
-        if (props.editConfig && !$xeTable.insert) {
-            errLog('vxe.error.reqModule', ['Edit']);
-        }
-        if (props.editRules && !$xeTable.validate) {
-            errLog('vxe.error.reqModule', ['Validator']);
-        }
-        if ((checkboxOpts.range || props.keyboardConfig || props.mouseConfig) && !$xeTable.handleCellMousedownEvent) {
-            errLog('vxe.error.reqModule', ['Keyboard']);
-        }
-        if ((props.printConfig || props.importConfig || props.exportConfig) && !$xeTable.exportData) {
-            errLog('vxe.error.reqModule', ['Export']);
-        }
+        // if (props.editConfig && !$xeTable.insert) {
+        //   errLog('vxe.error.reqModule', ['Edit'])
+        // }
+        // if (props.editRules && !$xeTable.validate) {
+        //   errLog('vxe.error.reqModule', ['Validator'])
+        // }
+        // if ((checkboxOpts.range || hasEnableConf(keyboardConfig, keyboardOpts) || hasEnableConf(mouseConfig, mouseOpts)) && !$xeTable.handleCellMousedownEvent) {
+        //   errLog('vxe.error.reqModule', ['Keyboard'])
+        // }
+        // if ((hasEnableConf(printConfig, printOpts) || hasEnableConf(importConfig, importOpts) || hasEnableConf(exportConfig, exportOpts)) && !$xeTable.exportData) {
+        //   errLog('vxe.error.reqModule', ['Export'])
+        // }
         Object.assign(scrollYStore, {
             startIndex: 0,
             endIndex: 1,
@@ -1982,7 +1982,7 @@ export default {
             if (this.autoResize) {
                 const resizeObserver = globalResize.create(() => {
                     if (this.autoResize) {
-                        this.handleResizeEvent();
+                        this.layoutReFlag++;
                     }
                 });
                 resizeObserver.observe(this.$el);
@@ -2073,7 +2073,7 @@ export default {
         const slots = $xeTable.$scopedSlots;
         const reactData = $xeTable;
         const { xID } = $xeTable;
-        const { loading, stripe, showHeader, height, treeConfig, mouseConfig, showFooter, highlightCell, highlightHoverRow, highlightHoverColumn, editConfig, editRules } = props;
+        const { loading, stripe, showHeader, height, treeConfig, mouseConfig, showFooter, highlightCell, highlightHoverRow, highlightHoverColumn, editConfig, editRules, importConfig, exportConfig, printConfig } = props;
         const { isGroup, overflowX, overflowY, scrollXLoad, scrollYLoad, tableData, initStore, isRowGroupStatus, columnStore, filterStore, customStore, tooltipStore } = reactData;
         const { leftList, rightList } = columnStore;
         const loadingSlot = slots.loading;
@@ -2100,10 +2100,13 @@ export default {
         const isContentMenu = $xeTable.computeIsContentMenu;
         const currLoading = reactData.isColLoading || reactData.isRowLoading || loading;
         const resizableOpts = $xeTable.computeResizableOpts;
-        const isArea = mouseConfig && mouseOpts.area;
+        const isArea = hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area;
         const columnDragOpts = $xeTable.computeColumnDragOpts;
         const scrollbarXToTop = $xeTable.computeScrollbarXToTop;
         const scrollbarYToLeft = $xeTable.computeScrollbarYToLeft;
+        const exportOpts = $xeTable.computeExportOpts;
+        const importOpts = $xeTable.computeImportOpts;
+        const printOpts = $xeTable.computePrintOpts;
         const { isCrossTableDrag } = rowDragOpts;
         const tbOns = {
             contextmenu: this.contextMenuEvent,
@@ -2120,7 +2123,7 @@ export default {
                     'vxe-editable': !!editConfig,
                     'old-cell-valid': editRules && getConfig().cellVaildMode === 'obsolete',
                     'cell--highlight': highlightCell,
-                    'cell--selected': mouseConfig && mouseOpts.selected,
+                    'cell--selected': hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.selected,
                     'cell--area': isArea,
                     'header-cell--area': isArea && areaOpts.selectCellByHeader,
                     'body-cell--area': isArea && areaOpts.selectCellByBody,
@@ -2336,7 +2339,7 @@ export default {
             /**
              * 导入
              */
-            initStore.import && this.importConfig
+            initStore.import && hasEnableConf(importConfig, importOpts)
                 ? h(TableImportPanelComponent, {
                     key: 'it',
                     props: {
@@ -2348,7 +2351,7 @@ export default {
             /**
              * 导出
              */
-            initStore.export && (this.exportConfig || this.printConfig)
+            initStore.export && (hasEnableConf(exportConfig, exportOpts) || hasEnableConf(printConfig, printOpts))
                 ? h(TableExportPanelComponent, {
                     key: 'et',
                     props: {

package/es/table/src/util.js

@@ -2,7 +2,7 @@ import XEUtils from 'xe-utils';
 import { ColumnInfo } from './columnInfo';
 import { isScale, isPx, queryElement } from '../../ui/src/dom';
 import { createComponentLog } from '../../ui/src/log';
-import { eqEmptyValue } from '../../ui/src/utils';
+import { eqEmptyValue, hasEnableConf } from '../../ui/src/utils';
 const { warnLog, errLog } = createComponentLog('table');
 export function createInternalData() {
     return {
@@ -872,6 +872,9 @@ export function getRefElem(refEl) {
 export function clearTableDefaultStatus($xeTable) {
     const props = $xeTable;
     const internalData = $xeTable;
+    const { keyboardConfig, mouseConfig } = props;
+    const mouseOpts = $xeTable.computeMouseOpts;
+    const keyboardOpts = $xeTable.computeKeyboardOpts;
     internalData.initStatus = false;
     const actionList = [
         $xeTable.clearSort(),
@@ -889,10 +892,10 @@ export function clearTableDefaultStatus($xeTable) {
     if ($xeTable.clearFilter) {
         actionList.push($xeTable.clearFilter());
     }
-    if ($xeTable.clearSelected && (props.keyboardConfig || props.mouseConfig)) {
+    if ($xeTable.clearSelected && (hasEnableConf(keyboardConfig, keyboardOpts) || hasEnableConf(mouseConfig, mouseOpts))) {
         actionList.push($xeTable.clearSelected());
     }
-    if ($xeTable.clearCellAreas && props.mouseConfig) {
+    if ($xeTable.clearCellAreas && hasEnableConf(mouseConfig, mouseOpts)) {
         actionList.push($xeTable.clearCellAreas(), $xeTable.clearCopyCellArea());
     }
     return Promise.all(actionList).then(() => {

package/es/ui/index.js

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

package/es/ui/src/log.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const tableVersion = `table v${"3.24.3"}`;
+const tableVersion = `table v${"3.25.0-beta.0"}`;
 export function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';

package/es/ui/src/utils.js

@@ -5,6 +5,15 @@ const { getConfig } = VxeUI;
 export function isEnableConf(conf) {
     return conf && conf.enabled !== false;
 }
+/**
+ * 用于开关类型的配置项
+ * 局部启用规则：conf={}
+ * 局部禁用规则：conf={enabled:false}
+ * 全局默认启用规则：conf.enabled=true
+ */
+export function hasEnableConf(conf, opts) {
+    return opts && (conf ? opts.enabled !== false : opts.enabled);
+}
 export function isEmptyValue(cellValue) {
     return cellValue === null || cellValue === undefined || cellValue === '';
 }