vxe-table 4.22.4 → 4.23.0-beta.0

package/es/table/module/custom/panel.js

@@ -1,7 +1,7 @@
 import { h, inject, ref, provide, nextTick, TransitionGroup, reactive, onUnmounted } from 'vue';
 import { defineVxeComponent } from '../../../ui/src/comp';
 import { VxeUI } from '../../../ui';
-import { formatText } from '../../../ui/src/utils';
+import { formatText, hasEnableConf } from '../../../ui/src/utils';
 import { getTpImg, addClass, removeClass, hasControlKey } from '../../../ui/src/dom';
 import { createComponentLog } from '../../../ui/src/log';
 import XEUtils from 'xe-utils';
@@ -35,7 +35,7 @@ export default defineVxeComponent({
         const VxeUIRadioGroupComponent = VxeUI.getComponent('VxeRadioGroup');
         const $xeTable = inject('$xeTable', {});
         const { props: tableProps, reactData: tableReactData, internalData: tableInternalData } = $xeTable;
-        const { computeSize, computeCustomOpts, computeColumnDragOpts, computeColumnOpts, computeIsMaxFixedColumn, computeResizableOpts, computeAggregateOpts } = $xeTable.getComputeMaps();
+        const { computeSize, computeCustomOpts, computeMouseOpts, computeColumnDragOpts, computeColumnOpts, computeIsMaxFixedColumn, computeResizableOpts, computeAggregateOpts } = $xeTable.getComputeMaps();
         const refElem = ref();
         const refBodyWrapperElem = ref();
         const refCustomBodyElem = ref();
@@ -341,6 +341,7 @@ export default defineVxeComponent({
             const { customColumnList } = tableReactData;
             const { collectColumn } = tableInternalData;
             const customOpts = computeCustomOpts.value;
+            const mouseOpts = computeMouseOpts.value;
             const { immediate } = customOpts;
             const trEl = evnt.currentTarget;
             const columnDragOpts = computeColumnDragOpts.value;
@@ -484,7 +485,7 @@ export default defineVxeComponent({
                             nafIndex = XEUtils.findIndexOf(customColumnList, item => item.id === newColumn.id);
                             customColumnList.splice(nafIndex + dragOffsetIndex, 0, dragColumn);
                         }
-                        if (mouseConfig) {
+                        if (hasEnableConf(mouseConfig, mouseOpts)) {
                             if ($xeTable.clearSelected) {
                                 $xeTable.clearSelected();
                             }

package/es/table/module/edit/hook.js

@@ -1,7 +1,7 @@
 import { reactive, nextTick } from 'vue';
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../../ui';
-import { isEnableConf } from '../../../ui/src/utils';
+import { hasEnableConf, isEnableConf } from '../../../ui/src/utils';
 import { getCellValue, setCellValue, getRowid } from '../../src/util';
 import { removeClass, addClass } from '../../../ui/src/dom';
 import { createComponentLog } from '../../../ui/src/log';
@@ -391,6 +391,7 @@ hooks.add('tableEditModule', {
             const { editConfig, mouseConfig } = props;
             const { editStore, tableColumn } = reactData;
             const editOpts = computeEditOpts.value;
+            const mouseOpts = computeMouseOpts.value;
             const { mode } = editOpts;
             const { actived, focused } = editStore;
             const { row, column } = params;
@@ -406,7 +407,7 @@ hooks.add('tableEditModule', {
                         // 判断是否禁用编辑
                         let type = 'edit-disabled';
                         if (!beforeEditMethod || beforeEditMethod(Object.assign(Object.assign({}, editParams), { $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt }))) {
-                            if (mouseConfig) {
+                            if (hasEnableConf(mouseConfig, mouseOpts)) {
                                 $xeTable.clearSelected();
                                 if ($xeTable.clearCellAreas) {
                                     $xeTable.clearCellAreas();
@@ -464,7 +465,7 @@ hooks.add('tableEditModule', {
                     }
                     else {
                         const { column: oldColumn } = actived;
-                        if (mouseConfig) {
+                        if (hasEnableConf(mouseConfig, mouseOpts)) {
                             $xeTable.clearSelected();
                             if ($xeTable.clearCellAreas) {
                                 $xeTable.clearCellAreas();
@@ -1047,7 +1048,7 @@ hooks.add('tableEditModule', {
                 const editOpts = computeEditOpts.value;
                 const { actived, selected } = editStore;
                 const { row, column } = params;
-                const isMouseSelected = mouseConfig && mouseOpts.selected;
+                const isMouseSelected = hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.selected;
                 const selectMethod = () => {
                     if (isMouseSelected && (selected.row !== row || selected.column !== column)) {
                         if (actived.row !== row || (editOpts.mode === 'cell' ? actived.column !== column : false)) {

package/es/table/module/export/hook.js

@@ -2,7 +2,7 @@ import { nextTick } from 'vue';
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../../ui';
 import { isColumnInfo, getCellValue, createHandleGetRowId } from '../../src/util';
-import { parseFile, formatText, eqEmptyValue } from '../../../ui/src/utils';
+import { parseFile, formatText, eqEmptyValue, hasEnableConf } from '../../../ui/src/utils';
 import { hasClass, toCssUnit } from '../../../ui/src/dom';
 import { createHtmlPage, getExportBlobByContent } from './util';
 import { createComponentLog } from '../../../ui/src/log';
@@ -1921,7 +1921,7 @@ hooks.add('tableExportModule', {
                     }
                     return;
                 }
-                if (!importConfig) {
+                if (!hasEnableConf(importConfig, importOpts)) {
                     errLog('vxe.error.reqProp', ['import-config']);
                 }
                 // 处理类型
@@ -1959,23 +1959,25 @@ hooks.add('tableExportModule', {
             },
             closeExport: handleCloseExport,
             openExport(options) {
+                const { exportConfig } = props;
                 const exportOpts = computeExportOpts.value;
                 const defOpts = Object.assign({
                     message: true,
                     types: XEUtils.keys(exportOpts._typeMaps)
                 }, exportOpts, options);
-                if (!props.exportConfig) {
+                if (!hasEnableConf(exportConfig, exportOpts)) {
                     errLog('vxe.error.reqProp', ['export-config']);
                 }
                 return handleExportAndPrint(defOpts);
             },
             closePrint: handleCloseExport,
             openPrint(options) {
+                const { printConfig } = props;
                 const printOpts = computePrintOpts.value;
                 const defOpts = Object.assign({
                     message: true
                 }, printOpts, options);
-                if (!props.printConfig) {
+                if (!hasEnableConf(printConfig, printOpts)) {
                     errLog('vxe.error.reqProp', ['print-config']);
                 }
                 return handleExportAndPrint(defOpts, true);

package/es/table/module/filter/hook.js

@@ -3,7 +3,7 @@ import XEUtils from 'xe-utils';
 import { VxeUI } from '../../../ui';
 import { toFilters, handleFieldOrColumn, getRefElem } from '../../src/util';
 import { toCssUnit, triggerEvent, updatePanelPlacement } from '../../../ui/src/dom';
-import { isEnableConf } from '../../../ui/src/utils';
+import { hasEnableConf, isEnableConf } from '../../../ui/src/utils';
 const { renderer, hooks } = VxeUI;
 const tableFilterMethodKeys = ['openFilter', 'setFilter', 'clearFilter', 'saveFilter', 'saveFilterByEvent', 'saveFilterPanel', 'saveFilterPanelByEvent', 'resetFilter', 'resetFilterByEvent', 'resetFilterPanel', 'resetFilterPanelByEvent', 'getCheckedFilters', 'updateFilterOptionStatus'];
 const sourceType = 'table';
@@ -201,7 +201,7 @@ hooks.add('tableFilterModule', {
                     $xeTable.handleTableData(true);
                     $xeTable.checkSelectionStatus();
                 }
-                if (mouseConfig && mouseOpts.area && $xeTable.handleFilterEvent) {
+                if (hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area && $xeTable.handleFilterEvent) {
                     $xeTable.handleFilterEvent(evnt, params);
                 }
                 if (evnt) {

package/es/table/module/keyboard/hook.js

@@ -2,6 +2,7 @@ import XEUtils from 'xe-utils';
 import { VxeUI } from '../../../ui';
 import { getRefElem } from '../../src/util';
 import { getAbsolutePos, addClass, removeClass, hasControlKey } from '../../../ui/src/dom';
+import { hasEnableConf } from '../../../ui/src/utils';
 const { hooks } = VxeUI;
 hooks.add('tableKeyboardModule', {
     setupTable($xeTable) {
@@ -250,14 +251,14 @@ hooks.add('tableKeyboardModule', {
             const checkboxOpts = computeCheckboxOpts.value;
             const mouseOpts = computeMouseOpts.value;
             const editOpts = computeEditOpts.value;
-            if (mouseConfig && mouseOpts.area && $xeTable.triggerClAreaMnEvent) {
-                return $xeTable.triggerClAreaMnEvent(evnt, params);
+            if (hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area && $xeTable.triggerClAaMnEvent) {
+                return $xeTable.triggerClAaMnEvent(evnt, params);
             }
             else {
                 if (checkboxConfig && checkboxOpts.range) {
                     handleCheckboxRangeEvent(evnt, params);
                 }
-                if (mouseConfig && mouseOpts.selected) {
+                if (hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.selected) {
                     if (!editConfig || editOpts.mode === 'cell') {
                         $xeTable.handleSelected(params, evnt);
                     }

package/es/table/module/menu/hook.js

@@ -2,7 +2,7 @@ import { nextTick } from 'vue';
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../../ui';
 import { getDomNode, getAbsolutePos, getEventTargetNode, toCssUnit } from '../../../ui/src/dom';
-import { isEnableConf, hasChildrenList } from '../../../ui/src/utils';
+import { isEnableConf, hasChildrenList, hasEnableConf } from '../../../ui/src/utils';
 const { menus, hooks, globalEvents, GLOBAL_EVENT_KEYS } = VxeUI;
 const tableMenuMethodKeys = ['closeMenu'];
 hooks.add('tableMenuModule', {
@@ -183,7 +183,7 @@ hooks.add('tableMenuModule', {
                         const type = 'body';
                         const params = { source: 'table', type, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, keyboard: true, columns: visibleColumn.slice(0), $event: evnt };
                         // 如果开启单元格区域
-                        if (mouseConfig && mouseOpts.area) {
+                        if (hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area) {
                             const activeArea = $xeTable.getActiveCellArea();
                             if (activeArea && activeArea.row && activeArea.column) {
                                 params.row = activeArea.row;
@@ -192,7 +192,7 @@ hooks.add('tableMenuModule', {
                                 return;
                             }
                         }
-                        else if (mouseConfig && mouseOpts.selected) {
+                        else if (hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.selected) {
                             // 如果启用键盘导航且已选中单元格
                             if (selected.row && selected.column) {
                                 params.row = selected.row;

package/es/table/render/index.js

@@ -2,7 +2,7 @@ import { h, resolveComponent } from 'vue';
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../ui';
 import { getCellValue, setCellValue } from '../../table/src/util';
-import { getFuncText, formatText, isEmptyValue } from '../../ui/src/utils';
+import { getFuncText, formatText, isEmptyValue, hasEnableConf } from '../../ui/src/utils';
 import { getOnName, getModelEvent, getChangeEvent, hasInputType } from '../../ui/src/vn';
 import { createComponentLog } from '../../ui/src/log';
 const { errLog } = createComponentLog('table');
@@ -780,9 +780,11 @@ function getNativeInputRenderCellVNs(cellValue, labelVNs, renderOpts, renderPara
     const { name } = renderOpts;
     const tableProps = $table.props;
     const { editConfig, mouseConfig } = tableProps;
+    const { computeMouseOpts } = $table.getComputeMaps();
+    const mouseOpts = computeMouseOpts.value;
     let isColSelected = false;
     let isActiveCellArea = false;
-    if (editConfig && mouseConfig) {
+    if (editConfig && hasEnableConf(mouseConfig, mouseOpts)) {
         const tableReactData = $table.reactData;
         const { editStore } = tableReactData;
         const { selected } = editStore;
@@ -804,12 +806,13 @@ function getInputRenderCellVNs(cellValue, labelVNs, renderOpts, renderParams) {
     const { $table, row, column } = renderParams;
     const tableProps = $table.props;
     const { editConfig, mouseConfig } = tableProps;
+    const { computeEditOpts, computeMouseOpts } = $table.getComputeMaps();
+    const mouseOpts = computeMouseOpts.value;
     let isColSelected = false;
     let isActiveCellArea = false;
-    if (editConfig && mouseConfig) {
+    if (editConfig && hasEnableConf(mouseConfig, mouseOpts)) {
         const tableReactData = $table.reactData;
         const { editStore } = tableReactData;
-        const { computeEditOpts } = $table.getComputeMaps();
         const editOpts = computeEditOpts.value;
         if (editOpts.isReuseKeep) {
             const { selected } = editStore;

package/es/table/src/body.js

@@ -4,7 +4,7 @@ import XEUtils from 'xe-utils';
 import { VxeUI } from '../../ui';
 import { getRowid, createHandleGetRowId, getCellRestHeight } from './util';
 import { updateCellTitle, getPropClass } from '../../ui/src/dom';
-import { isEnableConf, getDefaultConfig } from '../../ui/src/utils';
+import { isEnableConf, getDefaultConfig, hasEnableConf } from '../../ui/src/utils';
 import { getSlotVNs } from '../../ui/src/vn';
 const { getI18n, renderer, renderEmptyElement } = VxeUI;
 const sourceType = 'table';
@@ -216,7 +216,7 @@ export default defineVxeComponent({
                 };
             }
             // 按下事件处理
-            if (isRowDragCell || checkboxOpts.range || mouseConfig) {
+            if (isRowDragCell || checkboxOpts.range || hasEnableConf(mouseConfig, mouseOpts)) {
                 tdOns.onMousedown = (evnt) => {
                     $xeTable.triggerCellMousedownEvent(evnt, cellParams);
                 };
@@ -395,7 +395,7 @@ export default defineVxeComponent({
                 }
             }
             let showAreaRowStatus = false;
-            if (mouseConfig && mouseOpts.area && !_columnIndex && selectCellToRow) {
+            if (hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area && !_columnIndex && selectCellToRow) {
                 showAreaRowStatus = true;
             }
             if (!fixedHiddenColumn && showResizable && isAllColumnDrag) {
@@ -829,7 +829,7 @@ export default defineVxeComponent({
                     h('div', {
                         class: 'vxe-table--checkbox-range'
                     }),
-                    mouseConfig && mouseOpts.area
+                    hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area
                         ? h('div', {
                             class: 'vxe-table--cell-area',
                             xid: xID

package/es/table/src/header.js

@@ -2,7 +2,7 @@ import { h, ref, inject, nextTick, watch, onMounted, onUnmounted } from 'vue';
 import { defineVxeComponent } from '../../ui/src/comp';
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../ui';
-import { getDefaultConfig, isEnableConf } from '../../ui/src/utils';
+import { getDefaultConfig, hasEnableConf, isEnableConf } from '../../ui/src/utils';
 import { getCalcHeight, convertHeaderColumnToRows, convertHeaderToGridRows } from './util';
 import { getSlotVNs } from '../../ui/src/vn';
 const { renderer, renderEmptyElement } = VxeUI;
@@ -63,6 +63,7 @@ export default defineVxeComponent({
             const defaultRowHeight = computeDefaultRowHeight.value;
             const headerCellOpts = computeHeaderCellOpts.value;
             const rendererOpts = computeRendererOpts.value;
+            const mouseOpts = computeMouseOpts.value;
             const currCellHeight = getCalcHeight(headerCellOpts.height) || defaultRowHeight;
             const { disabledMethod: dragDisabledMethod, isCrossDrag, isPeerDrag } = columnDragOpts;
             const isLastRow = _rowIndex === headerGroups.length - 1;
@@ -148,7 +149,7 @@ export default defineVxeComponent({
                     isDisabledDrag = !!(dragDisabledMethod && dragDisabledMethod(cellParams));
                 }
                 // 按下事件处理
-                if (mouseConfig || isColDragCell) {
+                if (hasEnableConf(mouseConfig, mouseOpts) || isColDragCell) {
                     thOns.onMousedown = (evnt) => $xeTable.triggerHeaderCellMousedownEvent(evnt, cellParams);
                 }
                 // 拖拽列事件
@@ -467,7 +468,7 @@ export default defineVxeComponent({
                             ref: refHeaderTHead
                         }, renderHeads(isGroup, isOptimizeMode, renderHeaderList, renderColumnList))
                     ]),
-                    mouseConfig && mouseOpts.area
+                    hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area
                         ? h('div', {
                             class: 'vxe-table--cell-area',
                             xid: xID