vxe-table 3.18.8 → 3.18.9

package/es/table/src/methods.js

@@ -252,6 +252,7 @@ function cacheColumnMap($xeTable) {
     const props = $xeTable;
     const reactData = $xeTable;
     const internalData = $xeTable;
+    const { treeConfig, showOverflow } = props;
     const { tableFullColumn, collectColumn } = internalData;
     const fullColIdData = internalData.fullColumnIdData = {};
     const fullColFieldData = internalData.fullColumnFieldData = {};
@@ -259,12 +260,14 @@ function cacheColumnMap($xeTable) {
     const expandOpts = $xeTable.computeExpandOpts;
     const columnOpts = $xeTable.computeColumnOpts;
     const columnDragOpts = $xeTable.computeColumnDragOpts;
+    const virtualYOpts = $xeTable.computeVirtualYOpts;
     const { isCrossDrag, isSelfToChildDrag } = columnDragOpts;
     const customOpts = $xeTable.computeCustomOpts;
+    const treeOpts = $xeTable.computeTreeOpts;
     const { storage } = customOpts;
     const rowOpts = $xeTable.computeRowOpts;
     const isGroup = collectColumn.some(hasChildrenList);
-    let isAllOverflow = !!props.showOverflow;
+    let isAllOverflow = !!showOverflow;
     let rowGroupColumn;
     let expandColumn;
     let treeNodeColumn;
@@ -352,9 +355,15 @@ function cacheColumnMap($xeTable) {
     else {
         tableFullColumn.forEach(handleFunc);
     }
+    if (expandColumn && expandOpts.mode !== 'fixed' && virtualYOpts.enabled) {
+        warnLog('vxe.error.notConflictProp', ['column.type="expand', 'virtual-y-config.enabled=false']);
+    }
     if ((expandColumn && expandOpts.mode !== 'fixed') && mouseOpts.area) {
         errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
     }
+    if (expandColumn && expandOpts.mode !== 'inside' && (treeConfig && !treeOpts.transform)) {
+        errLog('vxe.error.notConflictProp', ['tree-config.transform=false', 'expand-config.mode=fixed']);
+    }
     if (htmlColumn) {
         if (!columnOpts.useKey) {
             errLog('vxe.error.notSupportProp', ['column.type=html', 'column-config.useKey=false', 'column-config.useKey=true']);

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.18.8";
+export const version = "3.18.9";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -239,9 +239,6 @@ VxeUI.setConfig({
             }
         }
     },
-    // export: {
-    //   types: {}
-    // },
     grid: {
         // size: null,
         // zoomConfig: {

package/es/ui/src/log.js

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

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.18.8";
+const version = "3.18.9";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2241,9 +2241,6 @@ core_.VxeUI.setConfig({
       }
     }
   },
-  // export: {
-  //   types: {}
-  // },
   grid: {
     // size: null,
     // zoomConfig: {
@@ -2678,7 +2675,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.18.8"}`;
+const log_version = `table v${"3.18.9"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -6155,6 +6152,10 @@ function cacheColumnMap($xeTable) {
   const props = $xeTable;
   const reactData = $xeTable;
   const internalData = $xeTable;
+  const {
+    treeConfig,
+    showOverflow
+  } = props;
   const {
     tableFullColumn,
     collectColumn
@@ -6165,17 +6166,19 @@ function cacheColumnMap($xeTable) {
   const expandOpts = $xeTable.computeExpandOpts;
   const columnOpts = $xeTable.computeColumnOpts;
   const columnDragOpts = $xeTable.computeColumnDragOpts;
+  const virtualYOpts = $xeTable.computeVirtualYOpts;
   const {
     isCrossDrag,
     isSelfToChildDrag
   } = columnDragOpts;
   const customOpts = $xeTable.computeCustomOpts;
+  const treeOpts = $xeTable.computeTreeOpts;
   const {
     storage
   } = customOpts;
   const rowOpts = $xeTable.computeRowOpts;
   const isGroup = collectColumn.some(hasChildrenList);
-  let isAllOverflow = !!props.showOverflow;
+  let isAllOverflow = !!showOverflow;
   let rowGroupColumn;
   let expandColumn;
   let treeNodeColumn;
@@ -6277,9 +6280,15 @@ function cacheColumnMap($xeTable) {
   } else {
     tableFullColumn.forEach(handleFunc);
   }
+  if (expandColumn && expandOpts.mode !== 'fixed' && virtualYOpts.enabled) {
+    warnLog('vxe.error.notConflictProp', ['column.type="expand', 'virtual-y-config.enabled=false']);
+  }
   if (expandColumn && expandOpts.mode !== 'fixed' && mouseOpts.area) {
     errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
   }
+  if (expandColumn && expandOpts.mode !== 'inside' && treeConfig && !treeOpts.transform) {
+    errLog('vxe.error.notConflictProp', ['tree-config.transform=false', 'expand-config.mode=fixed']);
+  }
   if (htmlColumn) {
     if (!columnOpts.useKey) {
       errLog('vxe.error.notSupportProp', ['column.type=html', 'column-config.useKey=false', 'column-config.useKey=true']);