vxe-table 3.13.0-beta.5 → 3.13.0-beta.7

package/es/table/src/table.js

@@ -1114,11 +1114,15 @@ export default {
         } }),
     watch: {
         data(value) {
+            const $xeTable = this;
+            const reactData = $xeTable;
             const { initStatus } = this;
             if (value && value.length >= 50000) {
                 warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
             }
             this.loadTableData(value || [], true).then(() => {
+                const { scrollXLoad, scrollYLoad, expandColumn } = reactData;
+                const expandOpts = $xeTable.computeExpandOpts;
                 this.inited = true;
                 this.initStatus = true;
                 if (!initStatus) {
@@ -1128,9 +1132,9 @@ export default {
                 // if (checkboxColumn && this.tableFullData.length > 300 && !this.checkboxOpts.checkField) {
                 //   warnLog('vxe.error.checkProp', ['checkbox-config.checkField'])
                 // }
-                // if ((this.scrollXLoad || this.scrollYLoad) && this.expandColumn) {
-                //   warnLog('vxe.error.scrollErrProp', ['column.type=expand'])
-                // }
+                if ((scrollXLoad || scrollYLoad) && (expandColumn && expandOpts.mode !== 'fixed')) {
+                    warnLog('vxe.error.scrollErrProp', ['column.type=expand']);
+                }
                 this.recalculate();
             });
         },

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.13.0-beta.5";
+export const version = "3.13.0-beta.7";
 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${"3.13.0-beta.5"}`;
+const version = `table v${"3.13.0-beta.7"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.13.0-beta.5";
+const version = "3.13.0-beta.7";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2843,7 +2843,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.13.0-beta.5"}`;
+const log_version = `table v${"3.13.0-beta.7"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5290,7 +5290,8 @@ function cacheColumnMap($xeTable) {
   } = internalData;
   const fullColumnIdData = internalData.fullColumnIdData = {};
   const fullColumnFieldData = internalData.fullColumnFieldData = {};
-  // const mouseOpts = $xeTable.computeMouseOpts
+  const mouseOpts = $xeTable.computeMouseOpts;
+  const expandOpts = $xeTable.computeExpandOpts;
   const columnOpts = $xeTable.computeColumnOpts;
   const columnDragOpts = $xeTable.computeColumnDragOpts;
   const {
@@ -5396,11 +5397,9 @@ function cacheColumnMap($xeTable) {
   } else {
     tableFullColumn.forEach(handleFunc);
   }
-  // if (process.env.VUE_APP_VXE_ENV === 'development') {
-  //   if (expandColumn && mouseOpts.area) {
-  //     errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand'])
-  //   }
-  // }
+  if (expandColumn && expandOpts.mode !== 'fixed' && mouseOpts.area) {
+    errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
+  }
   if (false) {}
   reactData.isGroup = isGroup;
   reactData.treeNodeColumn = treeNodeColumn;
@@ -6971,6 +6970,7 @@ function handleColumn($xeTable, collectColumn) {
   const $xeToolbar = $xeTable.$refs.$xeToolbar;
   const reactData = $xeTable;
   const internalData = $xeTable;
+  const expandOpts = $xeTable.computeExpandOpts;
   internalData.collectColumn = collectColumn;
   const tableFullColumn = getColumnList(collectColumn);
   internalData.tableFullColumn = tableFullColumn;
@@ -6978,6 +6978,11 @@ function handleColumn($xeTable, collectColumn) {
   reactData.isDragColMove = false;
   initColumnSort($xeTable);
   return Promise.resolve(restoreCustomStorage($xeTable)).then(() => {
+    const {
+      scrollXLoad,
+      scrollYLoad,
+      expandColumn
+    } = reactData;
     cacheColumnMap($xeTable);
     parseColumns($xeTable, true).then(() => {
       if (reactData.scrollXLoad) {
@@ -6987,11 +6992,9 @@ function handleColumn($xeTable, collectColumn) {
     $xeTable.clearMergeCells();
     $xeTable.clearMergeFooterItems();
     $xeTable.handleTableData(true);
-    // if (process.env.VUE_APP_VXE_ENV === 'development') {
-    //   if ((reactData.scrollXLoad || reactData.scrollYLoad) && reactData.expandColumn) {
-    //     warnLog('vxe.error.scrollErrProp', ['column.type=expand'])
-    //   }
-    // }
+    if ((scrollXLoad || scrollYLoad) && expandColumn && expandOpts.mode !== 'fixed') {
+      warnLog('vxe.error.scrollErrProp', ['column.type=expand']);
+    }
     return $xeTable.$nextTick().then(() => {
       if ($xeToolbar) {
         $xeToolbar.syncUpdate({
@@ -26219,6 +26222,8 @@ function renderBody(h, $xeTable) {
   },
   watch: {
     data(value) {
+      const $xeTable = this;
+      const reactData = $xeTable;
       const {
         initStatus
       } = this;
@@ -26226,6 +26231,12 @@ function renderBody(h, $xeTable) {
         warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
       }
       this.loadTableData(value || [], true).then(() => {
+        const {
+          scrollXLoad,
+          scrollYLoad,
+          expandColumn
+        } = reactData;
+        const expandOpts = $xeTable.computeExpandOpts;
         this.inited = true;
         this.initStatus = true;
         if (!initStatus) {
@@ -26235,9 +26246,9 @@ function renderBody(h, $xeTable) {
         // if (checkboxColumn && this.tableFullData.length > 300 && !this.checkboxOpts.checkField) {
         //   warnLog('vxe.error.checkProp', ['checkbox-config.checkField'])
         // }
-        // if ((this.scrollXLoad || this.scrollYLoad) && this.expandColumn) {
-        //   warnLog('vxe.error.scrollErrProp', ['column.type=expand'])
-        // }
+        if ((scrollXLoad || scrollYLoad) && expandColumn && expandOpts.mode !== 'fixed') {
+          warnLog('vxe.error.scrollErrProp', ['column.type=expand']);
+        }
         this.recalculate();
       });
     },