vxe-table 4.11.14 → 4.11.16

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

@@ -247,12 +247,13 @@ export default defineComponent({
             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
@@ -264,13 +265,13 @@ export default defineComponent({
                         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;
@@ -288,7 +289,7 @@ export default defineComponent({
                                     }
                                 }
                             }
-                            else if (oldColumn.parentId) {
+                            else if (dragColumn.parentId) {
                                 // 子到根
                                 if (!isCrossDrag) {
                                     return;
@@ -315,17 +316,17 @@ export default defineComponent({
                             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 {
@@ -342,12 +343,12 @@ export default defineComponent({
                                 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;
@@ -361,10 +362,10 @@ export default defineComponent({
                             });
                         }
                         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) {
@@ -377,8 +378,9 @@ export default defineComponent({
                             }
                         }
                         $xeTable.dispatchEvent('column-dragend', {
-                            oldColumn,
+                            oldColumn: dragColumn,
                             newColumn,
+                            dragColumn,
                             dragPos: prevDragPos,
                             offsetIndex: dragOffsetIndex,
                             _index: {

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

@@ -281,7 +281,7 @@ hooks.add('tableEditModule', {
                 return handleInsertRowAt(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: [] });
         };
@@ -778,7 +778,9 @@ hooks.add('tableEditModule', {
                 let isPos = false;
                 if (fieldOrColumn) {
                     isPos = true;
-                    column = XEUtils.isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn;
+                    if (fieldOrColumn !== true) {
+                        column = XEUtils.isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn;
+                    }
                 }
                 return handleEditCell(row, column, isPos);
             },

package/es/table/src/body.js

@@ -79,7 +79,7 @@ export default defineComponent({
          */
         const renderTdColumn = (seq, rowid, fixedType, isOptimizeMode, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) => {
             const { fullAllDataRowIdData } = tableInternalData;
-            const { columnKey, resizable: allResizable, border, height, cellClassName: allCellClassName, cellStyle, align: allAlign, spanMethod, mouseConfig, editConfig, editRules, tooltipConfig, padding: allPadding } = tableProps;
+            const { columnKey, resizable: allResizable, showOverflow: allShowOverflow, border, height, cellClassName: allCellClassName, cellStyle, align: allAlign, spanMethod, mouseConfig, editConfig, editRules, tooltipConfig, padding: allPadding } = tableProps;
             const { tableData, dragRow, overflowX, currentColumn, scrollXLoad, scrollYLoad, calcCellHeightFlag, resizeHeightFlag, mergeList, editStore, isAllOverflow, validErrorMaps } = tableReactData;
             const { afterFullData, scrollXStore, scrollYStore } = tableInternalData;
             const cellOpts = computeCellOpts.value;
@@ -114,7 +114,7 @@ export default defineComponent({
             const resizeHeight = resizeHeightFlag ? rowRest.resizeHeight : 0;
             let fixedHiddenColumn = fixedType ? column.fixed !== fixedType : column.fixed && overflowX;
             const isCellPadding = XEUtils.eqNull(padding) ? (allPadding === null ? cellOpts.padding : allPadding) : padding;
-            const cellOverflow = XEUtils.eqNull(showOverflow) ? isAllOverflow : showOverflow;
+            const cellOverflow = XEUtils.eqNull(showOverflow) ? allShowOverflow : showOverflow;
             const showEllipsis = cellOverflow === 'ellipsis';
             const showTitle = cellOverflow === 'title';
             const showTooltip = cellOverflow === true || cellOverflow === 'tooltip';

package/es/table/src/cell.js

@@ -75,15 +75,16 @@ function renderCellBaseVNs(params, content) {
     const { dragSort } = column;
     const tableProps = $table.props;
     const { treeConfig, dragConfig } = tableProps;
-    const { computeRowOpts, computeRowDragOpts } = $table.getComputeMaps();
+    const { computeRowOpts, computeRowDragOpts, computeTreeOpts } = $table.getComputeMaps();
     const rowOpts = computeRowOpts.value;
     const rowDragOpts = computeRowDragOpts.value;
+    const treeOpts = computeTreeOpts.value;
     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(params));
             }
         }

package/es/table/src/table.js

@@ -7998,6 +7998,7 @@ export default defineComponent({
                         const dragParams = {
                             oldRow: dragRow,
                             newRow: prevDragRow,
+                            dragRow,
                             dragPos: prevDragPos,
                             dragToChild: !!prevDragToChild,
                             offsetIndex: dragOffsetIndex
@@ -8138,6 +8139,7 @@ export default defineComponent({
                             dispatchEvent('row-dragend', {
                                 oldRow: dragRow,
                                 newRow: prevDragRow,
+                                dragRow,
                                 dragPos: prevDragPos,
                                 dragToChild: isDragToChildFlag,
                                 offsetIndex: dragOffsetIndex,
@@ -8280,11 +8282,12 @@ export default defineComponent({
                 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
@@ -8297,14 +8300,14 @@ export default defineComponent({
                             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;
                                     }
@@ -8327,7 +8330,7 @@ export default defineComponent({
                                     }
                                 }
                             }
-                            else if (oldColumn.parentId) {
+                            else if (dragColumn.parentId) {
                                 // 子到根
                                 if (!isCrossDrag) {
                                     return;
@@ -8354,17 +8357,17 @@ export default defineComponent({
                             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 {
@@ -8381,12 +8384,12 @@ export default defineComponent({
                                 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;
@@ -8409,8 +8412,9 @@ export default defineComponent({
                                 }
                             }
                             dispatchEvent('column-dragend', {
-                                oldColumn,
+                                oldColumn: dragColumn,
                                 newColumn,
+                                dragColumn,
                                 dragPos: prevDragPos,
                                 dragToChild: isDragToChildFlag,
                                 offsetIndex: dragOffsetIndex,
@@ -8815,7 +8819,7 @@ export default defineComponent({
                 });
             },
             triggerBodyWheelEvent(evnt) {
-                const { target, deltaY, deltaX } = evnt;
+                const { target, deltaY, deltaX, shiftKey } = evnt;
                 if (target && /^textarea$/i.test(target.tagName)) {
                     return;
                 }
@@ -8846,8 +8850,8 @@ export default defineComponent({
                     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;
                 // 如果滚动位置已经是顶部或底部，则不需要触发
@@ -9983,7 +9987,7 @@ export default defineComponent({
                 initTpImg();
             }
             nextTick(() => {
-                const { data, treeConfig, showOverflow } = props;
+                const { data, exportConfig, importConfig, treeConfig, showOverflow } = props;
                 const { scrollXStore, scrollYStore } = internalData;
                 const sYOpts = computeSYOpts.value;
                 const editOpts = computeEditOpts.value;
@@ -9992,129 +9996,121 @@ export default defineComponent({
                 const checkboxOpts = computeCheckboxOpts.value;
                 const expandOpts = computeExpandOpts.value;
                 const rowOpts = computeRowOpts.value;
-                if (process.env.NODE_ENV === 'development') {
-                    if (props.rowId) {
-                        warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField']);
-                    }
-                    if (props.rowKey) {
-                        warnLog('vxe.error.delProp', ['row-key', 'row-config.useKey']);
-                    }
-                    if (props.columnKey) {
-                        warnLog('vxe.error.delProp', ['column-id', 'column-config.useKey']);
-                    }
-                    if (!(props.rowId || rowOpts.keyField) && (checkboxOpts.reserve || checkboxOpts.checkRowKeys || radioOpts.reserve || radioOpts.checkRowKey || expandOpts.expandRowKeys || treeOpts.expandRowKeys)) {
-                        warnLog('vxe.error.reqProp', ['row-config.keyField']);
-                    }
-                    if (props.editConfig && (editOpts.showStatus || editOpts.showUpdateStatus || editOpts.showInsertStatus) && !props.keepSource) {
-                        warnLog('vxe.error.reqProp', ['keep-source']);
-                    }
-                    if (treeConfig && (treeOpts.showLine || treeOpts.line) && (!(props.rowKey || rowOpts.useKey) || !showOverflow)) {
-                        warnLog('vxe.error.reqProp', ['row-config.useKey | show-overflow']);
-                    }
-                    if (treeConfig && !treeOpts.transform && props.stripe) {
-                        warnLog('vxe.error.noTree', ['stripe']);
-                    }
-                    if (props.showFooter && !(props.footerMethod || props.footerData)) {
-                        warnLog('vxe.error.reqProp', ['footer-data | footer-method']);
-                    }
-                    if (rowOpts.height) {
-                        warnLog('vxe.error.delProp', ['row-config.height', 'cell-config.height']);
-                    }
-                    // if (props.highlightCurrentRow) {
-                    //   warnLog('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent'])
-                    // }
-                    // if (props.highlightHoverRow) {
-                    //   warnLog('vxe.error.delProp', ['highlight-hover-row', 'row-config.isHover'])
-                    // }
-                    // if (props.highlightCurrentColumn) {
-                    //   warnLog('vxe.error.delProp', ['highlight-current-column', 'column-config.isCurrent'])
-                    // }
-                    // if (props.highlightHoverColumn) {
-                    //   warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover'])
-                    // }
-                    // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
-                    const { exportConfig, importConfig } = props;
-                    const exportOpts = computeExportOpts.value;
-                    const importOpts = computeImportOpts.value;
-                    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 customOpts = computeCustomOpts.value;
+                const mouseOpts = computeMouseOpts.value;
+                const exportOpts = computeExportOpts.value;
+                const importOpts = computeImportOpts.value;
+                if (props.rowId) {
+                    warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField']);
                 }
-                if (process.env.NODE_ENV === 'development') {
-                    const customOpts = computeCustomOpts.value;
-                    const mouseOpts = computeMouseOpts.value;
-                    const rowOpts = computeRowOpts.value;
-                    if (!props.id) {
-                        if ((props.customConfig ? isEnableConf(customOpts) : customOpts.enabled) && customOpts.storage) {
-                            errLog('vxe.error.reqProp', ['id']);
-                        }
-                    }
-                    if (props.treeConfig && checkboxOpts.range) {
-                        errLog('vxe.error.noTree', ['checkbox-config.range']);
-                    }
-                    if (rowOpts.height && !props.showOverflow) {
-                        warnLog('vxe.error.notProp', ['table.show-overflow']);
-                    }
-                    if (!$xeTable.handleMousedownCellAreaEvent) {
-                        if (props.areaConfig) {
-                            warnLog('vxe.error.notProp', ['area-config']);
-                        }
-                        if (props.clipConfig) {
-                            warnLog('vxe.error.notProp', ['clip-config']);
-                        }
-                        if (props.fnrConfig) {
-                            warnLog('vxe.error.notProp', ['fnr-config']);
-                        }
-                        if (mouseOpts.area) {
-                            errLog('vxe.error.notProp', ['mouse-config.area']);
-                            return;
-                        }
-                    }
-                    if (props.dragConfig) {
-                        warnLog('vxe.error.delProp', ['drag-config', 'row-drag-config']);
-                    }
-                    if (props.treeConfig && treeOpts.children) {
-                        warnLog('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField']);
-                    }
-                    if (props.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 (props.rowKey) {
+                    warnLog('vxe.error.delProp', ['row-key', 'row-config.useKey']);
+                }
+                if (props.columnKey) {
+                    warnLog('vxe.error.delProp', ['column-id', 'column-config.useKey']);
+                }
+                if (!(props.rowId || rowOpts.keyField) && (checkboxOpts.reserve || checkboxOpts.checkRowKeys || radioOpts.reserve || radioOpts.checkRowKey || expandOpts.expandRowKeys || treeOpts.expandRowKeys)) {
+                    warnLog('vxe.error.reqProp', ['row-config.keyField']);
+                }
+                if (props.editConfig && (editOpts.showStatus || editOpts.showUpdateStatus || editOpts.showInsertStatus) && !props.keepSource) {
+                    warnLog('vxe.error.reqProp', ['keep-source']);
+                }
+                if (treeConfig && (treeOpts.showLine || treeOpts.line) && (!(props.rowKey || rowOpts.useKey) || !showOverflow)) {
+                    warnLog('vxe.error.reqProp', ['row-config.useKey | show-overflow']);
+                }
+                if (treeConfig && !treeOpts.transform && props.stripe) {
+                    warnLog('vxe.error.noTree', ['stripe']);
+                }
+                if (props.showFooter && !(props.footerMethod || props.footerData)) {
+                    warnLog('vxe.error.reqProp', ['footer-data | footer-method']);
+                }
+                if (rowOpts.height) {
+                    warnLog('vxe.error.delProp', ['row-config.height', 'cell-config.height']);
+                }
+                if (props.highlightCurrentRow) {
+                    warnLog('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent']);
+                }
+                if (props.highlightHoverRow) {
+                    warnLog('vxe.error.delProp', ['highlight-hover-row', 'row-config.isHover']);
+                }
+                if (props.highlightCurrentColumn) {
+                    warnLog('vxe.error.delProp', ['highlight-current-column', 'column-config.isCurrent']);
+                }
+                if (props.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 (!props.id) {
+                    if ((props.customConfig ? isEnableConf(customOpts) : customOpts.enabled) && customOpts.storage) {
+                        errLog('vxe.error.reqProp', ['id']);
                     }
-                    // if (mouseOpts.area && checkboxOpts.range) {
-                    //   warnLog('vxe.error.errConflicts', ['mouse-config.area', 'checkbox-config.range'])
-                    // }
-                    if (mouseOpts.area && (props.treeConfig && !treeOpts.transform)) {
-                        errLog('vxe.error.noTree', ['mouse-config.area']);
+                }
+                if (props.treeConfig && checkboxOpts.range) {
+                    errLog('vxe.error.noTree', ['checkbox-config.range']);
+                }
+                if (rowOpts.height && !props.showOverflow) {
+                    warnLog('vxe.error.notProp', ['table.show-overflow']);
+                }
+                if (!$xeTable.handleMousedownCellAreaEvent) {
+                    if (props.areaConfig) {
+                        warnLog('vxe.error.notProp', ['area-config']);
                     }
-                    if (props.editConfig && editOpts.activeMethod) {
-                        warnLog('vxe.error.delProp', ['edit-config.activeMethod', 'edit-config.beforeEditMethod']);
+                    if (props.clipConfig) {
+                        warnLog('vxe.error.notProp', ['clip-config']);
                     }
-                    if (props.treeConfig && checkboxOpts.isShiftKey) {
-                        errLog('vxe.error.errConflicts', ['tree-config', 'checkbox-config.isShiftKey']);
+                    if (props.fnrConfig) {
+                        warnLog('vxe.error.notProp', ['fnr-config']);
                     }
-                    if (checkboxOpts.halfField) {
-                        warnLog('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField']);
+                    if (mouseOpts.area) {
+                        errLog('vxe.error.notProp', ['mouse-config.area']);
+                        return;
                     }
                 }
+                if (treeConfig && rowOpts.drag && !treeOpts.transform) {
+                    warnLog('vxe.error.notSupportProp', ['column-config.drag', 'tree-config.transform=false', 'tree-config.transform=true']);
+                }
+                if (props.dragConfig) {
+                    warnLog('vxe.error.delProp', ['drag-config', 'row-drag-config']);
+                }
+                if (props.treeConfig && treeOpts.children) {
+                    warnLog('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField']);
+                }
+                if (props.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 && (props.treeConfig && !treeOpts.transform)) {
+                    errLog('vxe.error.noTree', ['mouse-config.area']);
+                }
+                if (props.editConfig && editOpts.activeMethod) {
+                    warnLog('vxe.error.delProp', ['edit-config.activeMethod', 'edit-config.beforeEditMethod']);
+                }
+                if (props.treeConfig && checkboxOpts.isShiftKey) {
+                    errLog('vxe.error.errConflicts', ['tree-config', 'checkbox-config.isShiftKey']);
+                }
+                if (checkboxOpts.halfField) {
+                    warnLog('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField']);
+                }
                 // 检查是否有安装需要的模块
-                if (process.env.NODE_ENV === 'development') {
-                    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 || 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']);
                 }
                 Object.assign(scrollYStore, {
                     startIndex: 0,

package/es/ui/index.js

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

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"4.11.14"}`;
+const version = `table v${"4.11.16"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/grid/src/grid.js

@@ -1407,9 +1407,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
        * 获取需要排除的高度
        */
       getExcludeHeight() {
-        const {
-          height
-        } = props;
         const {
           isZMax
         } = reactData;
@@ -1419,7 +1416,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const topWrapper = refTopWrapper.value;
         const bottomWrapper = refBottomWrapper.value;
         const pagerWrapper = refPagerWrapper.value;
-        const parentPaddingSize = isZMax || !(height === 'auto' || height === '100%') ? 0 : (0, _dom.getPaddingTopBottomSize)(el.parentNode);
+        const parentPaddingSize = isZMax ? 0 : (0, _dom.getPaddingTopBottomSize)(el.parentNode);
         return parentPaddingSize + (0, _dom.getPaddingTopBottomSize)(el) + (0, _dom.getOffsetHeight)(formWrapper) + (0, _dom.getOffsetHeight)(toolbarWrapper) + (0, _dom.getOffsetHeight)(topWrapper) + (0, _dom.getOffsetHeight)(bottomWrapper) + (0, _dom.getOffsetHeight)(pagerWrapper);
       },
       getParentHeight() {