vxe-table 3.13.14 → 3.13.16

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

@@ -1067,12 +1067,13 @@ export default {
             if (prevDragCol && dragCol) {
                 // 判断是否有拖动
                 if (prevDragCol !== dragCol) {
-                    const oldColumn = dragCol;
+                    const dragColumn = dragCol;
                     const newColumn = prevDragCol;
                     Promise.resolve(dragEndMethod
                         ? dragEndMethod({
-                            oldColumn,
+                            oldColumn: dragColumn,
                             newColumn,
+                            dragColumn,
                             dragPos: prevDragPos,
                             dragToChild: !!prevDragToChild,
                             offsetIndex: dragOffsetIndex
@@ -1084,13 +1085,13 @@ export default {
                         let oafIndex = -1;
                         let nafIndex = -1;
                         const oldAllMaps = {};
-                        XEUtils.eachTree([oldColumn], column => {
+                        XEUtils.eachTree([dragColumn], column => {
                             oldAllMaps[column.id] = column;
                         });
                         let isSelfToChildStatus = false;
                         // 只有实时拖拽支持跨层级
                         if (immediate) {
-                            if (oldColumn.parentId && newColumn.parentId) {
+                            if (dragColumn.parentId && newColumn.parentId) {
                                 // 子到子
                                 if (!isCrossDrag) {
                                     return;
@@ -1108,7 +1109,7 @@ export default {
                                     }
                                 }
                             }
-                            else if (oldColumn.parentId) {
+                            else if (dragColumn.parentId) {
                                 // 子到根
                                 if (!isCrossDrag) {
                                     return;
@@ -1135,17 +1136,17 @@ export default {
                             else {
                                 // 根到根
                             }
-                            const oldewMatchRest = XEUtils.findTree(collectColumn, item => item.id === oldColumn.id);
+                            const oldewMatchRest = XEUtils.findTree(collectColumn, item => item.id === dragColumn.id);
                             // 改变层级
                             if (isSelfToChildStatus && (isCrossDrag && isSelfToChildDrag)) {
                                 if (oldewMatchRest) {
                                     const { items: oCols, index: oIndex } = oldewMatchRest;
-                                    const childList = oldColumn.children || [];
+                                    const childList = dragColumn.children || [];
                                     childList.forEach(column => {
-                                        column.parentId = oldColumn.parentId;
+                                        column.parentId = dragColumn.parentId;
                                     });
                                     oCols.splice(oIndex, 1, ...childList);
-                                    oldColumn.children = [];
+                                    dragColumn.children = [];
                                 }
                             }
                             else {
@@ -1162,12 +1163,12 @@ export default {
                                 const { items: nCols, index: nIndex, parent: nParent } = newMatchRest;
                                 // 转子级
                                 if ((isCrossDrag && isToChildDrag) && prevDragToChild) {
-                                    oldColumn.parentId = newColumn.id;
-                                    newColumn.children = (newColumn.children || []).concat([oldColumn]);
+                                    dragColumn.parentId = newColumn.id;
+                                    newColumn.children = (newColumn.children || []).concat([dragColumn]);
                                 }
                                 else {
-                                    oldColumn.parentId = newColumn.parentId;
-                                    nCols.splice(nIndex + dragOffsetIndex, 0, oldColumn);
+                                    dragColumn.parentId = newColumn.parentId;
+                                    nCols.splice(nIndex + dragOffsetIndex, 0, dragColumn);
                                 }
                                 if (!nParent) {
                                     nafIndex = nIndex;
@@ -1181,10 +1182,10 @@ export default {
                             });
                         }
                         else {
-                            oafIndex = XEUtils.findIndexOf(customColumnList, item => item.id === oldColumn.id);
+                            oafIndex = XEUtils.findIndexOf(customColumnList, item => item.id === dragColumn.id);
                             customColumnList.splice(oafIndex, 1);
                             nafIndex = XEUtils.findIndexOf(customColumnList, item => item.id === newColumn.id);
-                            customColumnList.splice(nafIndex + dragOffsetIndex, 0, oldColumn);
+                            customColumnList.splice(nafIndex + dragOffsetIndex, 0, dragColumn);
                         }
                         reactData.isDragColMove = true;
                         if (mouseConfig) {
@@ -1197,8 +1198,9 @@ export default {
                             }
                         }
                         $xeTable.dispatchEvent('column-dragend', {
-                            oldColumn,
+                            oldColumn: dragColumn,
                             newColumn,
+                            dragColumn,
                             dragPos: prevDragPos,
                             offsetIndex: dragOffsetIndex,
                             _index: {

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

@@ -276,7 +276,7 @@ function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInser
         return handleInsertRowAt($xeTable, records.map((item) => Object.assign({}, item, { [parentField]: parentRow[rowField] })), targetRow, isInsertNextRow);
     }
     else {
-        errLog('vxe.error.errProp', ['tree-config.treeConfig=false', 'tree-config.treeConfig=true']);
+        errLog('vxe.error.errProp', ['tree-config.transform=false', 'tree-config.transform=true']);
     }
     return Promise.resolve({ row: null, rows: [] });
 }
@@ -854,7 +854,9 @@ export default {
             let isPos = false;
             if (fieldOrColumn) {
                 isPos = true;
-                column = XEUtils.isString(fieldOrColumn) ? this.getColumnByField(fieldOrColumn) : fieldOrColumn;
+                if (fieldOrColumn !== true) {
+                    column = XEUtils.isString(fieldOrColumn) ? this.getColumnByField(fieldOrColumn) : fieldOrColumn;
+                }
             }
             return handleEditCell($xeTable, row, column, isPos);
         },

package/es/table/src/cell.js

@@ -81,12 +81,13 @@ function renderCellBaseVNs(h, params, content) {
     const { treeConfig, dragConfig } = tableProps;
     const rowOpts = $table.computeRowOpts;
     const rowDragOpts = $table.computeRowDragOpts;
+    const treeOpts = $table.computeTreeOpts;
     const { showIcon, isPeerDrag, isCrossDrag, visibleMethod } = rowDragOpts;
     const rVisibleMethod = visibleMethod || (dragConfig ? dragConfig.rowVisibleMethod : null);
     const vns = XEUtils.isArray(content) ? content : [content];
     if (dragSort && rowOpts.drag && ((showIcon || (dragConfig ? dragConfig.showRowIcon : false)) && (!rVisibleMethod || rVisibleMethod(params)))) {
         if (treeConfig) {
-            if (isPeerDrag || isCrossDrag || !level) {
+            if (treeOpts.transform && (isPeerDrag || isCrossDrag || !level)) {
                 vns.unshift(renderCellDragIcon(h, params));
             }
         }

package/es/table/src/column.js

@@ -143,7 +143,7 @@ Object.keys(columnProps).forEach(name => {
         }
     };
 });
-export default defineVxeComponent({
+export default {
     name: 'VxeColumn',
     props: columnProps,
     provide() {
@@ -175,4 +175,4 @@ export default defineVxeComponent({
         return h('div', this.$slots.default);
     },
     methods: Cell
-});
+};

package/es/table/src/group.js

@@ -2,7 +2,7 @@ import Cell from './cell';
 import { defineVxeComponent } from '../../ui/src/comp';
 import { assembleColumn, destroyColumn } from './util';
 import { columnProps, columnWatch } from './column';
-export default defineVxeComponent({
+export default {
     name: 'VxeColgroup',
     props: columnProps,
     provide() {
@@ -39,4 +39,4 @@ export default defineVxeComponent({
         return h('div', this.$slots.default);
     },
     methods: Cell
-});
+};

package/es/table/src/methods.js

@@ -6378,6 +6378,7 @@ const Methods = {
                 const dragParams = {
                     oldRow: dragRow,
                     newRow: prevDragRow,
+                    dragRow,
                     dragPos: prevDragPos,
                     dragToChild: !!prevDragToChild,
                     offsetIndex: dragOffsetIndex
@@ -6518,6 +6519,7 @@ const Methods = {
                     $xeTable.dispatchEvent('row-dragend', {
                         oldRow: dragRow,
                         newRow: prevDragRow,
+                        dragRow,
                         dragPos: prevDragPos,
                         dragToChild: isDragToChildFlag,
                         offsetIndex: dragOffsetIndex,
@@ -6678,11 +6680,12 @@ const Methods = {
         if (prevDragCol && dragCol) {
             // 判断是否有拖动
             if (prevDragCol !== dragCol) {
-                const oldColumn = dragCol;
+                const dragColumn = dragCol;
                 const newColumn = prevDragCol;
                 const dragParams = {
-                    oldColumn,
+                    oldColumn: dragColumn,
                     newColumn,
+                    dragColumn,
                     dragPos: prevDragPos,
                     dragToChild: !!prevDragToChild,
                     offsetIndex: dragOffsetIndex
@@ -6695,14 +6698,14 @@ const Methods = {
                     let oafIndex = -1;
                     let nafIndex = -1;
                     const oldAllMaps = {};
-                    XEUtils.eachTree([oldColumn], column => {
+                    XEUtils.eachTree([dragColumn], column => {
                         oldAllMaps[column.id] = column;
                     });
                     let isSelfToChildStatus = false;
-                    if (oldColumn.parentId && newColumn.parentId) {
+                    if (dragColumn.parentId && newColumn.parentId) {
                         // 子到子
                         if (isPeerDrag && !isCrossDrag) {
-                            if (oldColumn.parentId !== newColumn.parentId) {
+                            if (dragColumn.parentId !== newColumn.parentId) {
                                 // 非同级
                                 return;
                             }
@@ -6725,7 +6728,7 @@ const Methods = {
                             }
                         }
                     }
-                    else if (oldColumn.parentId) {
+                    else if (dragColumn.parentId) {
                         // 子到根
                         if (!isCrossDrag) {
                             return;
@@ -6752,17 +6755,17 @@ const Methods = {
                     else {
                         // 根到根
                     }
-                    const oldewMatchRest = XEUtils.findTree(collectColumn, item => item.id === oldColumn.id);
+                    const oldewMatchRest = XEUtils.findTree(collectColumn, item => item.id === dragColumn.id);
                     // 改变层级
                     if (isSelfToChildStatus && (isCrossDrag && isSelfToChildDrag)) {
                         if (oldewMatchRest) {
                             const { items: oCols, index: oIndex } = oldewMatchRest;
-                            const childList = oldColumn.children || [];
+                            const childList = dragColumn.children || [];
                             childList.forEach(column => {
-                                column.parentId = oldColumn.parentId;
+                                column.parentId = dragColumn.parentId;
                             });
                             oCols.splice(oIndex, 1, ...childList);
-                            oldColumn.children = [];
+                            dragColumn.children = [];
                         }
                     }
                     else {
@@ -6779,12 +6782,12 @@ const Methods = {
                         const { items: nCols, index: nIndex, parent: nParent } = newMatchRest;
                         // 转子级
                         if ((isCrossDrag && isToChildDrag) && isDragToChildFlag) {
-                            oldColumn.parentId = newColumn.id;
-                            newColumn.children = (newColumn.children || []).concat([oldColumn]);
+                            dragColumn.parentId = newColumn.id;
+                            newColumn.children = (newColumn.children || []).concat([dragColumn]);
                         }
                         else {
-                            oldColumn.parentId = newColumn.parentId;
-                            nCols.splice(nIndex + dragOffsetIndex, 0, oldColumn);
+                            dragColumn.parentId = newColumn.parentId;
+                            nCols.splice(nIndex + dragOffsetIndex, 0, dragColumn);
                         }
                         if (!nParent) {
                             nafIndex = nIndex;
@@ -6807,8 +6810,9 @@ const Methods = {
                         }
                     }
                     $xeTable.dispatchEvent('column-dragend', {
-                        oldColumn,
+                        oldColumn: dragColumn,
                         newColumn,
+                        dragColumn,
                         dragPos: prevDragPos,
                         dragToChild: isDragToChildFlag,
                         offsetIndex: dragOffsetIndex,
@@ -8168,7 +8172,7 @@ const Methods = {
         const tableProps = $xeTable;
         const reactData = $xeTable;
         const internalData = $xeTable;
-        const { target, deltaY, deltaX } = evnt;
+        const { target, deltaY, deltaX, shiftKey } = evnt;
         if (target && /^textarea$/i.test(target.tagName)) {
             return;
         }
@@ -8199,8 +8203,8 @@ const Methods = {
             return;
         }
         const wheelSpeed = getWheelSpeed(reactData.lastScrollTime);
-        const deltaTop = Math.ceil(deltaY * wheelSpeed);
-        const deltaLeft = Math.ceil(deltaX * wheelSpeed);
+        const deltaTop = Math.ceil((shiftKey ? deltaX : deltaY) * wheelSpeed);
+        const deltaLeft = Math.ceil((shiftKey ? deltaY : deltaX) * wheelSpeed);
         const isTopWheel = deltaTop < 0;
         const currScrollTop = bodyScrollElem.scrollTop;
         // 如果滚动位置已经是顶部或底部，则不需要触发

package/es/table/src/table.js

@@ -1216,7 +1216,9 @@ export default {
     },
     created() {
         const $xeTable = this;
-        const { scrollXStore, sYOpts, scrollYStore, data, editOpts, treeOpts, treeConfig, showOverflow, rowOpts } = Object.assign(this, {
+        const props = $xeTable;
+        const internalData = $xeTable;
+        Object.assign($xeTable, {
             tZindex: 0,
             elemStore: {},
             // 存放横向 X 虚拟滚动相关的信息
@@ -1282,162 +1284,164 @@ export default {
             swYInterval: 0,
             swYTotal: 0
         });
-        if (process.env.NODE_ENV === 'development') {
-            if (this.rowId) {
-                warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField']);
-            }
-            if (this.rowKey) {
-                warnLog('vxe.error.delProp', ['row-key', 'row-config.useKey']);
-            }
-            if (this.columnKey) {
-                warnLog('vxe.error.delProp', ['column-id', 'column-config.useKey']);
-            }
-            if (!(this.rowId || rowOpts.keyField) && (this.checkboxOpts.reserve || this.checkboxOpts.checkRowKeys || this.radioOpts.reserve || this.radioOpts.checkRowKey || this.expandOpts.expandRowKeys || this.treeOpts.expandRowKeys)) {
-                warnLog('vxe.error.reqProp', ['row-config.keyField']);
-            }
-            if (this.editConfig && editOpts.showStatus && !this.keepSource) {
-                warnLog('vxe.error.reqProp', ['keep-source']);
-            }
-            if (treeConfig && (treeOpts.showLine || treeOpts.line) && (!(this.rowKey || rowOpts.useKey) || !showOverflow)) {
-                warnLog('vxe.error.reqProp', ['row-config.useKey | show-overflow']);
-            }
-            if (treeConfig && !treeOpts.transform && this.stripe) {
-                warnLog('vxe.error.noTree', ['stripe']);
-            }
-            if (this.showFooter && !(this.footerMethod || this.footerData)) {
-                warnLog('vxe.error.reqProp', ['footer-data | footer-method']);
-            }
-            if (rowOpts.height) {
-                warnLog('vxe.error.delProp', ['row-config.height', 'cell-config.height']);
-            }
-            if (this.tooltipOpts.enabled) {
-                warnLog('vxe.error.delProp', ['tooltip-config.enabled', 'tooltip-config.showAll']);
-            }
-            // if (this.highlightCurrentRow) {
-            //   warnLog('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent'])
-            // }
-            // if (this.highlightHoverRow) {
-            //   warnLog('vxe.error.delProp', ['highlight-hover-row', 'row-config.isHover'])
-            // }
-            // if (this.highlightCurrentColumn) {
-            //   warnLog('vxe.error.delProp', ['highlight-current-column', 'column-config.isCurrent'])
-            // }
-            // if (this.highlightHoverColumn) {
-            //   warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover'])
-            // }
-            // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
-            const { exportConfig, exportOpts, importConfig, importOpts } = this;
-            if (importConfig && 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)) {
-                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(',')]);
-            }
+        const { data, exportConfig, importConfig, treeConfig, showOverflow } = props;
+        const { scrollXStore, scrollYStore } = internalData;
+        const sYOpts = $xeTable.computeSYOpts;
+        const editOpts = $xeTable.computeEditOpts;
+        const treeOpts = $xeTable.computeTreeOpts;
+        const radioOpts = $xeTable.computeRadioOpts;
+        const checkboxOpts = $xeTable.computeCheckboxOpts;
+        const expandOpts = $xeTable.computeExpandOpts;
+        const rowOpts = $xeTable.computeRowOpts;
+        const customOpts = $xeTable.computeCustomOpts;
+        const mouseOpts = $xeTable.computeMouseOpts;
+        const exportOpts = $xeTable.computeExportOpts;
+        const importOpts = $xeTable.computeImportOpts;
+        if (this.rowId) {
+            warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField']);
         }
-        if (process.env.NODE_ENV === 'development') {
-            const customOpts = this.customOpts;
-            if (!this.id) {
-                if ((this.customConfig ? isEnableConf(customOpts) : customOpts.enabled) && customOpts.storage) {
-                    errLog('vxe.error.reqProp', ['id']);
-                }
-            }
-            if (this.treeConfig && this.checkboxOpts.range) {
-                errLog('vxe.error.noTree', ['checkbox-config.range']);
-            }
-            if (this.rowOpts.height && !this.showOverflow) {
-                warnLog('vxe.error.notProp', ['table.show-overflow']);
-            }
-            if (!this.handleMousedownCellAreaEvent) {
-                if (this.areaConfig) {
-                    warnLog('vxe.error.notProp', ['area-config']);
-                }
-                if (this.clipConfig) {
-                    warnLog('vxe.error.notProp', ['clip-config']);
-                }
-                if (this.fnrConfig) {
-                    warnLog('vxe.error.notProp', ['fnr-config']);
-                }
-                if (this.mouseOpts.area) {
-                    errLog('vxe.error.notProp', ['mouse-config.area']);
-                    return;
-                }
-            }
-            if (this.dragConfig) {
-                warnLog('vxe.error.delProp', ['drag-config', 'row-drag-config']);
-            }
-            if (this.treeConfig && treeOpts.children) {
-                warnLog('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField']);
-            }
-            if (this.treeConfig && treeOpts.line) {
-                warnLog('vxe.error.delProp', ['tree-config.line', 'tree-config.showLine']);
-            }
-            if (this.mouseOpts.area && this.mouseOpts.selected) {
-                warnLog('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected']);
-            }
-            // if (this.mouseOpts.area && this.checkboxOpts.range) {
-            //   warnLog('vxe.error.errConflicts', ['mouse-config.area', 'checkbox-config.range'])
-            // }
-            if (this.mouseOpts.area && (this.treeConfig && !treeOpts.transform)) {
-                errLog('vxe.error.noTree', ['mouse-config.area']);
-            }
+        if (this.rowKey) {
+            warnLog('vxe.error.delProp', ['row-key', 'row-config.useKey']);
         }
-        // v4 中只支持对象类型
-        if (process.env.NODE_ENV === 'development') {
-            // 在 v3.0 中废弃 context-menu
-            if (this.contextMenu) {
-                warnLog('vxe.error.delProp', ['context-menu', 'menu-config']);
-                if (!XEUtils.isObject(this.contextMenu)) {
-                    warnLog('vxe.error.errProp', [`table.context-menu=${this.contextMenu}`, 'table.context-menu={}']);
-                }
-            }
-            if (this.menuConfig && !XEUtils.isObject(this.menuConfig)) {
-                warnLog('vxe.error.errProp', [`table.menu-config=${this.menuConfig}`, 'table.menu-config={}']);
-            }
-            if (this.exportConfig && !XEUtils.isObject(this.exportConfig)) {
-                warnLog('vxe.error.errProp', [`table.export-config=${this.exportConfig}`, 'table.export-config={}']);
-            }
-            if (this.importConfig && !XEUtils.isObject(this.importConfig)) {
-                warnLog('vxe.error.errProp', [`table.import-config=${this.importConfig}`, 'table.import-config={}']);
-            }
-            if (this.printConfig && !XEUtils.isObject(this.printConfig)) {
-                warnLog('vxe.error.errProp', [`table.print-config=${this.printConfig}`, 'table.print-config={}']);
-            }
-            if (this.treeConfig && !XEUtils.isObject(this.treeConfig)) {
-                warnLog('vxe.error.errProp', [`table.tree-config=${this.treeConfig}`, 'table.tree-config={}']);
-            }
-            if (this.customConfig && !XEUtils.isObject(this.customConfig)) {
-                warnLog('vxe.error.errProp', [`table.custom-config=${this.customConfig}`, 'table.custom-config={}']);
+        if (this.columnKey) {
+            warnLog('vxe.error.delProp', ['column-id', 'column-config.useKey']);
+        }
+        if (!(this.rowId || rowOpts.keyField) && (checkboxOpts.reserve || checkboxOpts.checkRowKeys || radioOpts.reserve || radioOpts.checkRowKey || expandOpts.expandRowKeys || this.treeOpts.expandRowKeys)) {
+            warnLog('vxe.error.reqProp', ['row-config.keyField']);
+        }
+        if (this.editConfig && editOpts.showStatus && !this.keepSource) {
+            warnLog('vxe.error.reqProp', ['keep-source']);
+        }
+        if (treeConfig && (treeOpts.showLine || treeOpts.line) && (!(this.rowKey || rowOpts.useKey) || !showOverflow)) {
+            warnLog('vxe.error.reqProp', ['row-config.useKey | show-overflow']);
+        }
+        if (treeConfig && !treeOpts.transform && this.stripe) {
+            warnLog('vxe.error.noTree', ['stripe']);
+        }
+        if (this.showFooter && !(this.footerMethod || this.footerData)) {
+            warnLog('vxe.error.reqProp', ['footer-data | footer-method']);
+        }
+        if (rowOpts.height) {
+            warnLog('vxe.error.delProp', ['row-config.height', 'cell-config.height']);
+        }
+        if (this.tooltipOpts.enabled) {
+            warnLog('vxe.error.delProp', ['tooltip-config.enabled', 'tooltip-config.showAll']);
+        }
+        if (this.highlightCurrentRow) {
+            warnLog('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent']);
+        }
+        if (this.highlightHoverRow) {
+            warnLog('vxe.error.delProp', ['highlight-hover-row', 'row-config.isHover']);
+        }
+        if (this.highlightCurrentColumn) {
+            warnLog('vxe.error.delProp', ['highlight-current-column', 'column-config.isCurrent']);
+        }
+        if (this.highlightHoverColumn) {
+            warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover']);
+        }
+        // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
+        if (importConfig && 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)) {
+            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 (!this.id) {
+            if ((this.customConfig ? isEnableConf(customOpts) : customOpts.enabled) && customOpts.storage) {
+                errLog('vxe.error.reqProp', ['id']);
             }
-            if (this.editConfig && !XEUtils.isObject(this.editConfig)) {
-                warnLog('vxe.error.errProp', [`table.edit-config=${this.editConfig}`, 'table.edit-config={}']);
+        }
+        if (this.treeConfig && this.checkboxOpts.range) {
+            errLog('vxe.error.noTree', ['checkbox-config.range']);
+        }
+        if (this.rowOpts.height && !this.showOverflow) {
+            warnLog('vxe.error.notProp', ['table.show-overflow']);
+        }
+        if (!this.handleMousedownCellAreaEvent) {
+            if (this.areaConfig) {
+                warnLog('vxe.error.notProp', ['area-config']);
             }
-            if (this.emptyRender && !XEUtils.isObject(this.emptyRender)) {
-                warnLog('vxe.error.errProp', [`table.empty-render=${this.emptyRender}`, 'table.empty-render={}']);
+            if (this.clipConfig) {
+                warnLog('vxe.error.notProp', ['clip-config']);
             }
-            if (this.editConfig && this.editOpts.activeMethod) {
-                warnLog('vxe.error.delProp', ['table.edit-config.activeMethod', 'table.edit-config.beforeEditMethod']);
+            if (this.fnrConfig) {
+                warnLog('vxe.error.notProp', ['fnr-config']);
             }
-            if (this.treeConfig && this.checkboxOpts.isShiftKey) {
-                errLog('vxe.error.errConflicts', ['tree-config', 'checkbox-config.isShiftKey']);
+            if (mouseOpts.area) {
+                errLog('vxe.error.notProp', ['mouse-config.area']);
+                return;
             }
-            if (this.checkboxOpts.halfField) {
-                warnLog('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField']);
+        }
+        if (treeConfig && rowOpts.drag && !treeOpts.transform) {
+            warnLog('vxe.error.notSupportProp', ['column-config.drag', 'tree-config.transform=false', 'tree-config.transform=true']);
+        }
+        if (this.dragConfig) {
+            warnLog('vxe.error.delProp', ['drag-config', 'row-drag-config']);
+        }
+        if (this.treeConfig && treeOpts.children) {
+            warnLog('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField']);
+        }
+        if (this.treeConfig && treeOpts.line) {
+            warnLog('vxe.error.delProp', ['tree-config.line', 'tree-config.showLine']);
+        }
+        if (mouseOpts.area && mouseOpts.selected) {
+            warnLog('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected']);
+        }
+        if (mouseOpts.area && (this.treeConfig && !treeOpts.transform)) {
+            errLog('vxe.error.noTree', ['mouse-config.area']);
+        }
+        // 在 v3.0 中废弃 context-menu
+        if (this.contextMenu) {
+            warnLog('vxe.error.delProp', ['context-menu', 'menu-config']);
+            if (!XEUtils.isObject(this.contextMenu)) {
+                warnLog('vxe.error.errProp', [`table.context-menu=${this.contextMenu}`, 'table.context-menu={}']);
             }
         }
+        if (this.menuConfig && !XEUtils.isObject(this.menuConfig)) {
+            warnLog('vxe.error.errProp', [`table.menu-config=${this.menuConfig}`, 'table.menu-config={}']);
+        }
+        if (this.exportConfig && !XEUtils.isObject(this.exportConfig)) {
+            warnLog('vxe.error.errProp', [`table.export-config=${this.exportConfig}`, 'table.export-config={}']);
+        }
+        if (this.importConfig && !XEUtils.isObject(this.importConfig)) {
+            warnLog('vxe.error.errProp', [`table.import-config=${this.importConfig}`, 'table.import-config={}']);
+        }
+        if (this.printConfig && !XEUtils.isObject(this.printConfig)) {
+            warnLog('vxe.error.errProp', [`table.print-config=${this.printConfig}`, 'table.print-config={}']);
+        }
+        if (this.treeConfig && !XEUtils.isObject(this.treeConfig)) {
+            warnLog('vxe.error.errProp', [`table.tree-config=${this.treeConfig}`, 'table.tree-config={}']);
+        }
+        if (this.customConfig && !XEUtils.isObject(this.customConfig)) {
+            warnLog('vxe.error.errProp', [`table.custom-config=${this.customConfig}`, 'table.custom-config={}']);
+        }
+        if (this.editConfig && !XEUtils.isObject(this.editConfig)) {
+            warnLog('vxe.error.errProp', [`table.edit-config=${this.editConfig}`, 'table.edit-config={}']);
+        }
+        if (this.emptyRender && !XEUtils.isObject(this.emptyRender)) {
+            warnLog('vxe.error.errProp', [`table.empty-render=${this.emptyRender}`, 'table.empty-render={}']);
+        }
+        if (this.editConfig && this.editOpts.activeMethod) {
+            warnLog('vxe.error.delProp', ['table.edit-config.activeMethod', 'table.edit-config.beforeEditMethod']);
+        }
+        if (this.treeConfig && this.checkboxOpts.isShiftKey) {
+            errLog('vxe.error.errConflicts', ['tree-config', 'checkbox-config.isShiftKey']);
+        }
+        if (this.checkboxOpts.halfField) {
+            warnLog('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField']);
+        }
         // 检查是否有安装需要的模块
-        if (process.env.NODE_ENV === 'development') {
-            if (this.editConfig && !this._insert) {
-                errLog('vxe.error.reqModule', ['Edit']);
-            }
-            if (this.editRules && !this._validate) {
-                errLog('vxe.error.reqModule', ['Validator']);
-            }
-            if ((this.checkboxOpts.range || this.keyboardConfig || this.mouseConfig) && !this.handleCellMousedownEvent) {
-                errLog('vxe.error.reqModule', ['Keyboard']);
-            }
-            if ((this.printConfig || this.importConfig || this.exportConfig) && !this._exportData) {
-                errLog('vxe.error.reqModule', ['Export']);
-            }
+        if (this.editConfig && !this._insert) {
+            errLog('vxe.error.reqModule', ['Edit']);
+        }
+        if (this.editRules && !this._validate) {
+            errLog('vxe.error.reqModule', ['Validator']);
+        }
+        if ((this.checkboxOpts.range || this.keyboardConfig || this.mouseConfig) && !this.handleCellMousedownEvent) {
+            errLog('vxe.error.reqModule', ['Keyboard']);
+        }
+        if ((this.printConfig || this.importConfig || this.exportConfig) && !this._exportData) {
+            errLog('vxe.error.reqModule', ['Export']);
         }
         Object.assign(scrollYStore, {
             startIndex: 0,

package/es/toolbar/src/toolbar.js

@@ -4,7 +4,7 @@ import { VxeUI } from '../../ui';
 import { getSlotVNs } from '../../ui/src/vn';
 import { warnLog, errLog } from '../../ui/src/log';
 const { getConfig, getIcon, getI18n, renderer, commands, createEvent, globalMixins, renderEmptyElement } = VxeUI;
-export default defineVxeComponent({
+export default {
     name: 'VxeToolbar',
     mixins: [
         globalMixins.sizeMixin
@@ -704,4 +704,4 @@ export default defineVxeComponent({
     render(h) {
         return this.renderVN(h);
     }
-});
+};