vxe-table 4.11.0-beta.4 → 4.11.0-beta.6

package/es/table/src/table.js

@@ -1141,7 +1141,8 @@ export default defineComponent({
             const { tableFullColumn, collectColumn } = internalData;
             const fullColumnIdData = internalData.fullColumnIdData = {};
             const fullColumnFieldData = internalData.fullColumnFieldData = {};
-            // const mouseOpts = computeMouseOpts.value
+            const mouseOpts = computeMouseOpts.value;
+            const expandOpts = computeExpandOpts.value;
             const columnOpts = computeColumnOpts.value;
             const columnDragOpts = computeColumnDragOpts.value;
             const { isCrossDrag, isSelfToChildDrag } = columnDragOpts;
@@ -1231,11 +1232,9 @@ export default defineComponent({
             else {
                 tableFullColumn.forEach(handleFunc);
             }
-            // if (process.env.NODE_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 (process.env.NODE_ENV === 'development') {
                 if (htmlColumn) {
                     if (!columnOpts.useKey) {
@@ -2953,6 +2952,7 @@ export default defineComponent({
             });
         };
         const handleColumn = (collectColumn) => {
+            const expandOpts = computeExpandOpts.value;
             internalData.collectColumn = collectColumn;
             const tableFullColumn = getColumnList(collectColumn);
             internalData.tableFullColumn = tableFullColumn;
@@ -2960,6 +2960,7 @@ export default defineComponent({
             reactData.isDragColMove = false;
             initColumnSort();
             return Promise.resolve(restoreCustomStorage()).then(() => {
+                const { scrollXLoad, scrollYLoad, expandColumn } = reactData;
                 cacheColumnMap();
                 parseColumns(true).then(() => {
                     if (reactData.scrollXLoad) {
@@ -2969,11 +2970,9 @@ export default defineComponent({
                 $xeTable.clearMergeCells();
                 $xeTable.clearMergeFooterItems();
                 $xeTable.handleTableData(true);
-                // if (process.env.NODE_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 nextTick().then(() => {
                     if ($xeToolbar) {
                         $xeToolbar.syncUpdate({
@@ -9754,7 +9753,8 @@ export default defineComponent({
                 warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
             }
             loadTableData(value, true).then(() => {
-                // const { scrollXLoad, scrollYLoad, expandColumn } = reactData
+                const { scrollXLoad, scrollYLoad, expandColumn } = reactData;
+                const expandOpts = computeExpandOpts.value;
                 internalData.inited = true;
                 internalData.initStatus = true;
                 if (!initStatus) {
@@ -9765,9 +9765,9 @@ export default defineComponent({
                 // if (checkboxColumn && internalData.tableFullData.length > 300 && !checkboxOpts.checkField) {
                 //   warnLog('vxe.error.checkProp', ['checkbox-config.checkField'])
                 // }
-                // if ((scrollXLoad || scrollYLoad) && expandColumn) {
-                //   warnLog('vxe.error.scrollErrProp', ['column.type=expand'])
-                // }
+                if ((scrollXLoad || scrollYLoad) && (expandColumn && expandOpts.mode !== 'fixed')) {
+                    warnLog('vxe.error.scrollErrProp', ['column.type=expand']);
+                }
                 return tableMethods.recalculate();
             });
         });

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.0-beta.4";
+export const version = "4.11.0-beta.6";
 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.0-beta.4"}`;
+const version = `table v${"4.11.0-beta.6"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.11.0-beta.4";
+const version = "4.11.0-beta.6";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3586,7 +3586,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.11.0-beta.4"}`;
+const log_version = `table v${"4.11.0-beta.6"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -7268,8 +7268,8 @@ const header_renderType = 'header';
             'is--sortable': column.sortable,
             'col--filter': !!filters,
             'is--filter-active': hasFilter,
-            'is--drag-active': !column.fixed && !isDisabledDrag && (isCrossDrag || isPeerDrag || !column.parentId),
-            'is--drag-disabled': isDisabledDrag,
+            'is--drag-active': columnOpts.drag && !column.fixed && !isDisabledDrag && (isCrossDrag || isPeerDrag || !column.parentId),
+            'is--drag-disabled': columnOpts.drag && isDisabledDrag,
             'col--current': currentColumn === column
           }, headerClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(headerClassName) ? headerClassName(cellParams) : headerClassName : '', headerCellClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(headerCellClassName) ? headerCellClassName(cellParams) : headerCellClassName : ''],
           style: headerCellStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(headerCellStyle) ? headerCellStyle(cellParams) : headerCellStyle : null,
@@ -11600,7 +11600,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       } = internalData;
       const fullColumnIdData = internalData.fullColumnIdData = {};
       const fullColumnFieldData = internalData.fullColumnFieldData = {};
-      // const mouseOpts = computeMouseOpts.value
+      const mouseOpts = computeMouseOpts.value;
+      const expandOpts = computeExpandOpts.value;
       const columnOpts = computeColumnOpts.value;
       const columnDragOpts = computeColumnDragOpts.value;
       const {
@@ -11706,11 +11707,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       } 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 (true) {
         if (htmlColumn) {
           if (!columnOpts.useKey) {
@@ -13757,6 +13756,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       });
     };
     const handleColumn = collectColumn => {
+      const expandOpts = computeExpandOpts.value;
       internalData.collectColumn = collectColumn;
       const tableFullColumn = getColumnList(collectColumn);
       internalData.tableFullColumn = tableFullColumn;
@@ -13764,6 +13764,11 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       reactData.isDragColMove = false;
       initColumnSort();
       return Promise.resolve(restoreCustomStorage()).then(() => {
+        const {
+          scrollXLoad,
+          scrollYLoad,
+          expandColumn
+        } = reactData;
         cacheColumnMap();
         parseColumns(true).then(() => {
           if (reactData.scrollXLoad) {
@@ -13773,11 +13778,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         $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 (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
           if ($xeToolbar) {
             $xeToolbar.syncUpdate({
@@ -21538,7 +21541,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
       }
       loadTableData(value, true).then(() => {
-        // const { scrollXLoad, scrollYLoad, expandColumn } = reactData
+        const {
+          scrollXLoad,
+          scrollYLoad,
+          expandColumn
+        } = reactData;
+        const expandOpts = computeExpandOpts.value;
         internalData.inited = true;
         internalData.initStatus = true;
         if (!initStatus) {
@@ -21549,9 +21557,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         // if (checkboxColumn && internalData.tableFullData.length > 300 && !checkboxOpts.checkField) {
         //   warnLog('vxe.error.checkProp', ['checkbox-config.checkField'])
         // }
-        // if ((scrollXLoad || scrollYLoad) && expandColumn) {
-        //   warnLog('vxe.error.scrollErrProp', ['column.type=expand'])
-        // }
+        if ((scrollXLoad || scrollYLoad) && expandColumn && expandOpts.mode !== 'fixed') {
+          warnLog('vxe.error.scrollErrProp', ['column.type=expand']);
+        }
         return tableMethods.recalculate();
       });
     });