vxe-table 3.13.14 → 3.13.16

package/lib/index.umd.js

@@ -3201,7 +3201,7 @@ function getClass(property, params) {
 ;// ./packages/ui/index.ts
 
 
-const version = "3.13.14";
+const version = "3.13.16";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3828,7 +3828,7 @@ var es_iterator_map = __webpack_require__(1701);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.13.14"}`;
+const log_version = `table v${"3.13.16"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -4692,6 +4692,7 @@ function renderCellBaseVNs(h, params, content) {
   } = tableProps;
   const rowOpts = $table.computeRowOpts;
   const rowDragOpts = $table.computeRowDragOpts;
+  const treeOpts = $table.computeTreeOpts;
   const {
     showIcon,
     isPeerDrag,
@@ -4702,7 +4703,7 @@ function renderCellBaseVNs(h, 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(h, params));
       }
     } else {
@@ -5949,7 +5950,7 @@ Object.keys(columnProps).forEach(name => {
     }
   };
 });
-/* harmony default export */ var column = (defineVxeComponent({
+/* harmony default export */ var column = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeColumn',
   props: columnProps,
   provide() {
@@ -5981,7 +5982,7 @@ Object.keys(columnProps).forEach(name => {
     return h('div', this.$slots.default);
   },
   methods: cell
-}));
+})); /* define-vxe-component end */
 ;// ./packages/column/index.ts
 
 
@@ -6005,7 +6006,7 @@ const Column = VxeColumn;
 
 
 
-/* harmony default export */ var group = (defineVxeComponent({
+/* harmony default export */ var group = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeColgroup',
   props: columnProps,
   provide() {
@@ -6044,7 +6045,7 @@ const Column = VxeColumn;
     return h('div', this.$slots.default);
   },
   methods: cell
-}));
+})); /* define-vxe-component end */
 ;// ./packages/colgroup/index.ts
 
 
@@ -13556,6 +13557,7 @@ const Methods = {
         const dragParams = {
           oldRow: dragRow,
           newRow: prevDragRow,
+          dragRow,
           dragPos: prevDragPos,
           dragToChild: !!prevDragToChild,
           offsetIndex: dragOffsetIndex
@@ -13697,6 +13699,7 @@ const Methods = {
           $xeTable.dispatchEvent('row-dragend', {
             oldRow: dragRow,
             newRow: prevDragRow,
+            dragRow,
             dragPos: prevDragPos,
             dragToChild: isDragToChildFlag,
             offsetIndex: dragOffsetIndex,
@@ -13897,11 +13900,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
@@ -13914,14 +13918,14 @@ const Methods = {
           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;
               }
@@ -13942,7 +13946,7 @@ const Methods = {
                 }
               }
             }
-          } else if (oldColumn.parentId) {
+          } else if (dragColumn.parentId) {
             // 子到根
             if (!isCrossDrag) {
               return;
@@ -13967,7 +13971,7 @@ const Methods = {
           } 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) {
@@ -13975,12 +13979,12 @@ const Methods = {
                 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) {
@@ -14004,11 +14008,11 @@ const Methods = {
             } = 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;
@@ -14031,8 +14035,9 @@ const Methods = {
             }
           }
           $xeTable.dispatchEvent('column-dragend', {
-            oldColumn,
+            oldColumn: dragColumn,
             newColumn,
+            dragColumn,
             dragPos: prevDragPos,
             dragToChild: isDragToChildFlag,
             offsetIndex: dragOffsetIndex,
@@ -15668,7 +15673,8 @@ const Methods = {
     const {
       target,
       deltaY,
-      deltaX
+      deltaX,
+      shiftKey
     } = evnt;
     if (target && /^textarea$/i.test(target.tagName)) {
       return;
@@ -15709,8 +15715,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;
     // 如果滚动位置已经是顶部或底部，则不需要触发
@@ -19571,11 +19577,12 @@ const renderPopupPanel = (h, _vm) => {
       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
@@ -19586,13 +19593,13 @@ const renderPopupPanel = (h, _vm) => {
             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;
@@ -19609,7 +19616,7 @@ const renderPopupPanel = (h, _vm) => {
                     return;
                   }
                 }
-              } else if (oldColumn.parentId) {
+              } else if (dragColumn.parentId) {
                 // 子到根
                 if (!isCrossDrag) {
                   return;
@@ -19634,7 +19641,7 @@ const renderPopupPanel = (h, _vm) => {
               } 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) {
@@ -19642,12 +19649,12 @@ const renderPopupPanel = (h, _vm) => {
                     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) {
@@ -19671,11 +19678,11 @@ const renderPopupPanel = (h, _vm) => {
                 } = 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;
@@ -19688,10 +19695,10 @@ const renderPopupPanel = (h, _vm) => {
                 }
               });
             } 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) {
@@ -19704,8 +19711,9 @@ const renderPopupPanel = (h, _vm) => {
               }
             }
             $xeTable.dispatchEvent('column-dragend', {
-              oldColumn,
+              oldColumn: dragColumn,
               newColumn,
+              dragColumn,
               dragPos: prevDragPos,
               offsetIndex: dragOffsetIndex,
               _index: {
@@ -22026,7 +22034,7 @@ function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInser
       [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,
@@ -22705,7 +22713,9 @@ function handleEditCell($xeTable, row, fieldOrColumn, isPos) {
       let isPos = false;
       if (fieldOrColumn) {
         isPos = true;
-        column = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) ? this.getColumnByField(fieldOrColumn) : fieldOrColumn;
+        if (fieldOrColumn !== true) {
+          column = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) ? this.getColumnByField(fieldOrColumn) : fieldOrColumn;
+        }
       }
       return handleEditCell($xeTable, row, column, isPos);
     },
@@ -27507,17 +27517,9 @@ function renderBody(h, $xeTable) {
   },
   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 虚拟滚动相关的信息
@@ -27583,167 +27585,173 @@ function renderBody(h, $xeTable) {
       swYInterval: 0,
       swYTotal: 0
     });
-    if (true) {
-      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 && !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 {
+      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 (true) {
-      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 (true) {
-      // 在 v3.0 中废弃 context-menu
-      if (this.contextMenu) {
-        warnLog('vxe.error.delProp', ['context-menu', 'menu-config']);
-        if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.contextMenu)) {
-          warnLog('vxe.error.errProp', [`table.context-menu=${this.contextMenu}`, 'table.context-menu={}']);
-        }
-      }
-      if (this.menuConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.menuConfig)) {
-        warnLog('vxe.error.errProp', [`table.menu-config=${this.menuConfig}`, 'table.menu-config={}']);
-      }
-      if (this.exportConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.exportConfig)) {
-        warnLog('vxe.error.errProp', [`table.export-config=${this.exportConfig}`, 'table.export-config={}']);
-      }
-      if (this.importConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.importConfig)) {
-        warnLog('vxe.error.errProp', [`table.import-config=${this.importConfig}`, 'table.import-config={}']);
-      }
-      if (this.printConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.printConfig)) {
-        warnLog('vxe.error.errProp', [`table.print-config=${this.printConfig}`, 'table.print-config={}']);
-      }
-      if (this.treeConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.treeConfig)) {
-        warnLog('vxe.error.errProp', [`table.tree-config=${this.treeConfig}`, 'table.tree-config={}']);
-      }
-      if (this.customConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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 && !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 (!this.id) {
+      if ((this.customConfig ? isEnableConf(customOpts) : customOpts.enabled) && customOpts.storage) {
+        errLog('vxe.error.reqProp', ['id']);
       }
-      if (this.editConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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 && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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 (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.contextMenu)) {
+        warnLog('vxe.error.errProp', [`table.context-menu=${this.contextMenu}`, 'table.context-menu={}']);
       }
     }
+    if (this.menuConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.menuConfig)) {
+      warnLog('vxe.error.errProp', [`table.menu-config=${this.menuConfig}`, 'table.menu-config={}']);
+    }
+    if (this.exportConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.exportConfig)) {
+      warnLog('vxe.error.errProp', [`table.export-config=${this.exportConfig}`, 'table.export-config={}']);
+    }
+    if (this.importConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.importConfig)) {
+      warnLog('vxe.error.errProp', [`table.import-config=${this.importConfig}`, 'table.import-config={}']);
+    }
+    if (this.printConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.printConfig)) {
+      warnLog('vxe.error.errProp', [`table.print-config=${this.printConfig}`, 'table.print-config={}']);
+    }
+    if (this.treeConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.treeConfig)) {
+      warnLog('vxe.error.errProp', [`table.tree-config=${this.treeConfig}`, 'table.tree-config={}']);
+    }
+    if (this.customConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.customConfig)) {
+      warnLog('vxe.error.errProp', [`table.custom-config=${this.customConfig}`, 'table.custom-config={}']);
+    }
+    if (this.editConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.editConfig)) {
+      warnLog('vxe.error.errProp', [`table.edit-config=${this.editConfig}`, 'table.edit-config={}']);
+    }
+    if (this.emptyRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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 (true) {
-      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,
@@ -28169,7 +28177,7 @@ const {
   globalMixins: toolbar_globalMixins,
   renderEmptyElement: toolbar_renderEmptyElement
 } = core_.VxeUI;
-/* harmony default export */ var src_toolbar = (defineVxeComponent({
+/* harmony default export */ var src_toolbar = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeToolbar',
   mixins: [toolbar_globalMixins.sizeMixin],
   props: {
@@ -28952,7 +28960,7 @@ const {
   render(h) {
     return this.renderVN(h);
   }
-}));
+})); /* define-vxe-component end */
 ;// ./packages/grid/src/grid.ts
 
 
@@ -31848,6 +31856,7 @@ const Toolbar = VxeToolbar;
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',
       scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
       errConflicts: '参数 "{0}" 与 "{1}" 有冲突',
+      notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       unableInsert: '无法插入到指定位置，请检查参数是否正确',
       useErr: '安装 "{0}" 模块时发生错误，可能顺序不正确，依赖的模块需要在 Table 之前安装',
       barUnableLink: '工具栏无法关联表格',