vxe-table 3.24.4 → 3.25.0-beta.1

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

@@ -1,6 +1,6 @@
 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';
@@ -415,6 +415,7 @@ export default {
             const { customColumnList } = tableReactData;
             const { collectColumn } = tableInternalData;
             const customOpts = $xeTable.computeCustomOpts;
+            const mouseOpts = $xeTable.computeMouseOpts;
             const { immediate } = customOpts;
             const trEl = evnt.currentTarget;
             const columnDragOpts = $xeTable.computeColumnDragOpts;
@@ -558,7 +559,7 @@ export default {
                             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/mixin.js

@@ -1,6 +1,6 @@
 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 @@ function handleEditActive($xeTable, params, evnt, options) {
     const { editConfig, mouseConfig } = props;
     const { editStore, tableColumn } = reactData;
     const editOpts = $xeTable.computeEditOpts;
+    const mouseOpts = $xeTable.computeMouseOpts;
     const { mode } = editOpts;
     const { actived, focused } = editStore;
     const { row, column } = params;
@@ -406,7 +407,7 @@ function handleEditActive($xeTable, params, evnt, options) {
                 // 判断是否禁用编辑
                 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 @@ function handleEditActive($xeTable, params, evnt, options) {
             }
             else {
                 const { column: oldColumn } = actived;
-                if (mouseConfig) {
+                if (hasEnableConf(mouseConfig, mouseOpts)) {
                     $xeTable.clearSelected();
                     if ($xeTable.clearCellAreas) {
                         $xeTable.clearCellAreas();
@@ -1081,7 +1082,7 @@ export default {
             const editOpts = $xeTable.computeEditOpts;
             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/mixin.js

@@ -1,7 +1,7 @@
 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';
@@ -1945,7 +1945,7 @@ export default {
                 }
                 return;
             }
-            if (!importConfig) {
+            if (!hasEnableConf(importConfig, importOpts)) {
                 errLog('vxe.error.reqProp', ['import-config']);
             }
             // 处理类型
@@ -1985,12 +1985,13 @@ export default {
         _openExport(options) {
             const $xeTable = this;
             const props = $xeTable;
+            const { exportConfig } = props;
             const exportOpts = $xeTable.computeExportOpts;
             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($xeTable, defOpts);
@@ -1999,11 +2000,12 @@ export default {
         _openPrint(options) {
             const $xeTable = this;
             const props = $xeTable;
+            const { printConfig } = props;
             const printOpts = $xeTable.computePrintOpts;
             const defOpts = Object.assign({
                 message: true
             }, printOpts, options);
-            if (!props.printConfig) {
+            if (!hasEnableConf(printConfig, printOpts)) {
                 errLog('vxe.error.reqProp', ['print-config']);
             }
             return handleExportAndPrint($xeTable, defOpts, true);

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

@@ -2,7 +2,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 } = VxeUI;
 const sourceType = 'table';
 function updatePopupStyle($xeTable) {
@@ -405,7 +405,7 @@ export default {
                 $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/mixin.js

@@ -1,6 +1,7 @@
 import XEUtils from 'xe-utils';
 import { getRefElem } from '../../src/util';
 import { getAbsolutePos, addClass, removeClass, hasControlKey } from '../../../ui/src/dom';
+import { hasEnableConf } from '../../../ui/src/utils';
 function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offsetClientTop, moveRange) {
     const props = $xeTable;
     const reactData = $xeTable;
@@ -508,14 +509,14 @@ export default {
             const checkboxOpts = $xeTable.computeCheckboxOpts;
             const mouseOpts = $xeTable.computeMouseOpts;
             const editOpts = $xeTable.computeEditOpts;
-            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($xeTable, 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/mixin.js

@@ -1,7 +1,7 @@
 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';
 import { createComponentLog } from '../../../ui/src/log';
 const { warnLog } = createComponentLog('table');
 const { menus, globalEvents, GLOBAL_EVENT_KEYS } = VxeUI;
@@ -87,7 +87,7 @@ export default {
                     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;
@@ -96,7 +96,7 @@ export default {
                             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

@@ -1,7 +1,7 @@
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../ui';
 import { getCellValue, setCellValue } from '../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');
@@ -847,9 +847,10 @@ function getNativeInputRenderCellVNs(h, cellValue, labelVNs, renderOpts, renderP
     const { name } = renderOpts;
     const tableProps = $table;
     const { editConfig, mouseConfig } = tableProps;
+    const mouseOpts = $table.computeMouseOpts;
     let isColSelected = false;
     let isActiveCellArea = false;
-    if (editConfig && mouseConfig) {
+    if (editConfig && hasEnableConf(mouseConfig, mouseOpts)) {
         const tableReactData = $table;
         const { editStore } = tableReactData;
         const { selected } = editStore;
@@ -879,9 +880,10 @@ function getInputRenderCellVNs(h, cellValue, labelVNs, renderOpts, renderParams)
     const { $table, row, column } = renderParams;
     const tableProps = $table;
     const { editConfig, mouseConfig } = tableProps;
+    const mouseOpts = $table.computeMouseOpts;
     let isColSelected = false;
     let isActiveCellArea = false;
-    if (editConfig && mouseConfig) {
+    if (editConfig && hasEnableConf(mouseConfig, mouseOpts)) {
         const tableReactData = $table;
         const { editStore } = tableReactData;
         const editOpts = $table.computeEditOpts;

package/es/table/src/body.js

@@ -1,7 +1,7 @@
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../ui';
 import { defineVxeComponent } from '../../ui/src/comp';
-import { isEnableConf, getClass, getDefaultConfig } from '../../ui/src/utils';
+import { isEnableConf, getClass, getDefaultConfig, hasEnableConf } from '../../ui/src/utils';
 import { getRowid, createHandleGetRowId, getCellRestHeight } from './util';
 import { updateCellTitle } from '../../ui/src/dom';
 import { getSlotVNs } from '../../ui/src/vn';
@@ -199,7 +199,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
         };
     }
     // 按下事件处理
-    if (isRowDragCell || checkboxOpts.range || mouseConfig) {
+    if (isRowDragCell || checkboxOpts.range || hasEnableConf(mouseConfig, mouseOpts)) {
         tdOns.mousedown = (evnt) => {
             $xeTable.triggerCellMousedownEvent(evnt, cellParams);
         };
@@ -382,7 +382,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
         }
     }
     let showAreaRowStatus = false;
-    if (mouseConfig && mouseOpts.area && !_columnIndex && selectCellToRow) {
+    if (hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area && !_columnIndex && selectCellToRow) {
         showAreaRowStatus = true;
     }
     if (!fixedHiddenColumn && showResizable && isAllColumnDrag) {
@@ -875,7 +875,7 @@ export default {
                 h('div', {
                     class: 'vxe-table--checkbox-range'
                 }),
-                mouseConfig && mouseOpts.area
+                hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area
                     ? h('div', {
                         class: 'vxe-table--cell-area',
                         attrs: {

package/es/table/src/header.js

@@ -1,7 +1,7 @@
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../ui';
 import { defineVxeComponent } from '../../ui/src/comp';
-import { isEnableConf, getClass, getDefaultConfig } from '../../ui/src/utils';
+import { isEnableConf, getClass, getDefaultConfig, hasEnableConf } from '../../ui/src/utils';
 import { getCalcHeight, convertHeaderColumnToRows, convertHeaderToGridRows } from './util';
 import { getSlotVNs } from '../../ui/src/vn';
 const { renderer, renderEmptyElement } = VxeUI;
@@ -27,6 +27,7 @@ function renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, _rowIndex, co
     const defaultRowHeight = $xeTable.computeDefaultRowHeight;
     const headerCellOpts = $xeTable.computeHeaderCellOpts;
     const rendererOpts = $xeTable.computeRendererOpts;
+    const mouseOpts = $xeTable.computeMouseOpts;
     const currCellHeight = getCalcHeight(headerCellOpts.height) || defaultRowHeight;
     const { disabledMethod: dragDisabledMethod, isCrossDrag, isPeerDrag } = columnDragOpts;
     const isLastRow = _rowIndex === headerGroups.length - 1;
@@ -113,7 +114,7 @@ function renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, _rowIndex, co
             isDisabledDrag = !!(dragDisabledMethod && dragDisabledMethod(cellParams));
         }
         // 按下事件处理
-        if (mouseConfig || isColDragCell) {
+        if (hasEnableConf(mouseConfig, mouseOpts) || isColDragCell) {
             thOns.mousedown = (evnt) => $xeTable.triggerHeaderCellMousedownEvent(evnt, cellParams);
         }
         // 拖拽列事件
@@ -529,7 +530,7 @@ export default {
                         ref: 'refHeaderTHead'
                     }, renderHeads(h, _vm, isGroup, isOptimizeMode, renderHeaderList, renderColumnList))
                 ]),
-                mouseConfig && mouseOpts.area
+                hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area
                     ? h('div', {
                         class: 'vxe-table--cell-area',
                         attrs: {