vxe-table 4.11.14 → 4.11.16

package/lib/index.umd.js

@@ -3051,7 +3051,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.11.14";
+const version = "4.11.15";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3499,7 +3499,7 @@ var es_iterator_some = __webpack_require__(3579);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.11.14"}`;
+const log_version = `table v${"4.11.15"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -4645,10 +4645,12 @@ function renderCellBaseVNs(params, content) {
   } = tableProps;
   const {
     computeRowOpts,
-    computeRowDragOpts
+    computeRowDragOpts,
+    computeTreeOpts
   } = $table.getComputeMaps();
   const rowOpts = computeRowOpts.value;
   const rowDragOpts = computeRowDragOpts.value;
+  const treeOpts = computeTreeOpts.value;
   const {
     showIcon,
     isPeerDrag,
@@ -4659,7 +4661,7 @@ function renderCellBaseVNs(params, content) {
   const vns = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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));
       }
     } else {
@@ -6190,6 +6192,7 @@ const renderType = 'body';
       const {
         columnKey,
         resizable: allResizable,
+        showOverflow: allShowOverflow,
         border,
         height,
         cellClassName: allCellClassName,
@@ -6278,7 +6281,7 @@ const renderType = 'body';
       const resizeHeight = resizeHeightFlag ? rowRest.resizeHeight : 0;
       let fixedHiddenColumn = fixedType ? column.fixed !== fixedType : column.fixed && overflowX;
       const isCellPadding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(padding) ? allPadding === null ? cellOpts.padding : allPadding : padding;
-      const cellOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(showOverflow) ? isAllOverflow : showOverflow;
+      const cellOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(showOverflow) ? allShowOverflow : showOverflow;
       const showEllipsis = cellOverflow === 'ellipsis';
       const showTitle = cellOverflow === 'title';
       const showTooltip = cellOverflow === true || cellOverflow === 'tooltip';
@@ -8448,11 +8451,12 @@ const {
       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
@@ -8463,13 +8467,13 @@ const {
             let oafIndex = -1;
             let nafIndex = -1;
             const oldAllMaps = {};
-            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([oldColumn], column => {
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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;
@@ -8486,7 +8490,7 @@ const {
                     return;
                   }
                 }
-              } else if (oldColumn.parentId) {
+              } else if (dragColumn.parentId) {
                 // 子到根
                 if (!isCrossDrag) {
                   return;
@@ -8511,7 +8515,7 @@ const {
               } else {
                 // 根到根
               }
-              const oldewMatchRest = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(collectColumn, item => item.id === oldColumn.id);
+              const oldewMatchRest = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(collectColumn, item => item.id === dragColumn.id);
               // 改变层级
               if (isSelfToChildStatus && isCrossDrag && isSelfToChildDrag) {
                 if (oldewMatchRest) {
@@ -8519,12 +8523,12 @@ 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 {
                 if (oldewMatchRest) {
@@ -8548,11 +8552,11 @@ const {
                 } = 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;
@@ -8565,10 +8569,10 @@ const {
                 }
               });
             } else {
-              oafIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(customColumnList, item => item.id === oldColumn.id);
+              oafIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(customColumnList, item => item.id === dragColumn.id);
               customColumnList.splice(oafIndex, 1);
               nafIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(customColumnList, item => item.id === newColumn.id);
-              customColumnList.splice(nafIndex + dragOffsetIndex, 0, oldColumn);
+              customColumnList.splice(nafIndex + dragOffsetIndex, 0, dragColumn);
             }
             reactData.isDragColMove = true;
             if (mouseConfig) {
@@ -8581,8 +8585,9 @@ const {
               }
             }
             $xeTable.dispatchEvent('column-dragend', {
-              oldColumn,
+              oldColumn: dragColumn,
               newColumn,
+              dragColumn,
               dragPos: prevDragPos,
               offsetIndex: dragOffsetIndex,
               _index: {
@@ -19551,6 +19556,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             const dragParams = {
               oldRow: dragRow,
               newRow: prevDragRow,
+              dragRow,
               dragPos: prevDragPos,
               dragToChild: !!prevDragToChild,
               offsetIndex: dragOffsetIndex
@@ -19692,6 +19698,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               dispatchEvent('row-dragend', {
                 oldRow: dragRow,
                 newRow: prevDragRow,
+                dragRow,
                 dragPos: prevDragPos,
                 dragToChild: isDragToChildFlag,
                 offsetIndex: dragOffsetIndex,
@@ -19874,11 +19881,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         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
@@ -19891,14 +19899,14 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               let oafIndex = -1;
               let nafIndex = -1;
               const oldAllMaps = {};
-              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([oldColumn], column => {
+              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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;
                   }
@@ -19919,7 +19927,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                     }
                   }
                 }
-              } else if (oldColumn.parentId) {
+              } else if (dragColumn.parentId) {
                 // 子到根
                 if (!isCrossDrag) {
                   return;
@@ -19944,7 +19952,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               } else {
                 // 根到根
               }
-              const oldewMatchRest = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(collectColumn, item => item.id === oldColumn.id);
+              const oldewMatchRest = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(collectColumn, item => item.id === dragColumn.id);
               // 改变层级
               if (isSelfToChildStatus && isCrossDrag && isSelfToChildDrag) {
                 if (oldewMatchRest) {
@@ -19952,12 +19960,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                     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 {
                 if (oldewMatchRest) {
@@ -19981,11 +19989,11 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                 } = 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;
@@ -20008,8 +20016,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                 }
               }
               dispatchEvent('column-dragend', {
-                oldColumn,
+                oldColumn: dragColumn,
                 newColumn,
+                dragColumn,
                 dragPos: prevDragPos,
                 dragToChild: isDragToChildFlag,
                 offsetIndex: dragOffsetIndex,
@@ -20466,7 +20475,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const {
           target,
           deltaY,
-          deltaX
+          deltaX,
+          shiftKey
         } = evnt;
         if (target && /^textarea$/i.test(target.tagName)) {
           return;
@@ -20507,8 +20517,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           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;
         // 如果滚动位置已经是顶部或底部，则不需要触发
@@ -21698,6 +21708,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
         const {
           data,
+          exportConfig,
+          importConfig,
           treeConfig,
           showOverflow
         } = props;
@@ -21712,132 +21724,121 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const checkboxOpts = computeCheckboxOpts.value;
         const expandOpts = computeExpandOpts.value;
         const rowOpts = computeRowOpts.value;
-        if (true) {
-          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 && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includeArrays(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps), importOpts.types)) {
-            warnLog('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter(type => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps), type)).join(',') || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps).join(',')]);
-          }
-          if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includeArrays(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps), exportOpts.types)) {
-            warnLog('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter(type => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps), type)).join(',') || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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 (true) {
-          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 && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includeArrays(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps), importOpts.types)) {
+          warnLog('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter(type => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps), type)).join(',') || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps).join(',')]);
+        }
+        if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includeArrays(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps), exportOpts.types)) {
+          warnLog('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter(type => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps), type)).join(',') || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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 (true) {
-          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,
@@ -23267,7 +23268,7 @@ edit_hook_hooks.add('tableEditModule', {
           [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,
@@ -23864,7 +23865,9 @@ edit_hook_hooks.add('tableEditModule', {
         let isPos = false;
         if (fieldOrColumn) {
           isPos = true;
-          column = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn;
+          if (fieldOrColumn !== true) {
+            column = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn;
+          }
         }
         return handleEditCell(row, column, isPos);
       },
@@ -30697,9 +30700,6 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
        * 获取需要排除的高度
        */
       getExcludeHeight() {
-        const {
-          height
-        } = props;
         const {
           isZMax
         } = reactData;
@@ -30709,7 +30709,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
         const topWrapper = refTopWrapper.value;
         const bottomWrapper = refBottomWrapper.value;
         const pagerWrapper = refPagerWrapper.value;
-        const parentPaddingSize = isZMax || !(height === 'auto' || height === '100%') ? 0 : getPaddingTopBottomSize(el.parentNode);
+        const parentPaddingSize = isZMax ? 0 : getPaddingTopBottomSize(el.parentNode);
         return parentPaddingSize + getPaddingTopBottomSize(el) + getOffsetHeight(formWrapper) + getOffsetHeight(toolbarWrapper) + getOffsetHeight(topWrapper) + getOffsetHeight(bottomWrapper) + getOffsetHeight(pagerWrapper);
       },
       getParentHeight() {
@@ -30883,6 +30883,7 @@ const Grid = VxeGrid;
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',
       scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
       errConflicts: '参数 "{0}" 与 "{1}" 有冲突',
+      notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       unableInsert: '无法插入到指定位置，请检查参数是否正确',
       useErr: '安装 "{0}" 模块时发生错误，可能顺序不正确，依赖的模块需要在 Table 之前安装',
       barUnableLink: '工具栏无法关联表格',