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

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.11.0-beta.3";
+const version = "4.11.0-beta.4";
 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.3"}`;
+const log_version = `table v${"4.11.0-beta.4"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -5612,6 +5612,9 @@ const Cell = {
       class: ['vxe-table--expanded', {
         'is--active': isActive
       }],
+      onMousedown(evnt) {
+        evnt.stopPropagation();
+      },
       onClick(evnt) {
         $table.triggerRowExpandEvent(evnt, params);
       }
@@ -11597,7 +11600,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       } = internalData;
       const fullColumnIdData = internalData.fullColumnIdData = {};
       const fullColumnFieldData = internalData.fullColumnFieldData = {};
-      const mouseOpts = computeMouseOpts.value;
+      // const mouseOpts = computeMouseOpts.value
       const columnOpts = computeColumnOpts.value;
       const columnDragOpts = computeColumnDragOpts.value;
       const {
@@ -11703,11 +11706,11 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       } else {
         tableFullColumn.forEach(handleFunc);
       }
-      if (true) {
-        if (expandColumn && mouseOpts.area) {
-          errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
-        }
-      }
+      // if (process.env.VUE_APP_VXE_ENV === 'development') {
+      //   if (expandColumn && mouseOpts.area) {
+      //     errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand'])
+      //   }
+      // }
       if (true) {
         if (htmlColumn) {
           if (!columnOpts.useKey) {
@@ -13223,7 +13226,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               delete rExpandLazyLoadedMaps[rowid];
             }
             reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
-            (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => tableMethods.recalculate()).then(() => resolve());
+            (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => $xeTable.recalculate()).then(() => $xeTable.updateCellAreas()).then(() => resolve());
           });
         } else {
           resolve();
@@ -16267,7 +16270,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           }
         }
         reactData.rowExpandedMaps = rExpandedMaps;
-        return Promise.all(lazyRests).then(() => tableMethods.recalculate());
+        return Promise.all(lazyRests).then(() => $xeTable.recalculate()).then(() => $xeTable.updateCellAreas());
       },
       /**
        * 判断行是否为展开状态
@@ -16307,7 +16310,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           if (expList.length) {
             tableMethods.recalculate();
           }
-        });
+        }).then(() => $xeTable.updateCellAreas());
       },
       clearRowExpandReserve() {
         internalData.rowExpandedReserveRowMap = {};
@@ -16788,8 +16791,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           mouseConfig
         } = props;
         const mouseOpts = computeMouseOpts.value;
-        if (mouseConfig && mouseOpts.area && $xeTable.handleRecalculateCellAreas) {
-          return $xeTable.handleRecalculateCellAreas();
+        if (mouseConfig && mouseOpts.area && $xeTable.handleRecalculateCellAreaEvent) {
+          return $xeTable.handleRecalculateCellAreaEvent();
         }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       },
@@ -23278,9 +23281,6 @@ edit_hook_hooks.add('tableEditModule', {
       });
     };
     const handleClearEdit = (evnt, targetRow) => {
-      const {
-        mouseConfig
-      } = props;
       const {
         editStore
       } = reactData;
@@ -23293,7 +23293,6 @@ edit_hook_hooks.add('tableEditModule', {
         column
       } = actived;
       const validOpts = computeValidOpts.value;
-      const mouseOpts = computeMouseOpts.value;
       if (row || column) {
         if (targetRow && getRowid($xeTable, targetRow) !== getRowid($xeTable, row)) {
           return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
@@ -23321,11 +23320,7 @@ edit_hook_hooks.add('tableEditModule', {
           }
         }
       }
-      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
-        if (mouseConfig && mouseOpts.area && $xeTable.handleRecalculateCellAreas) {
-          return $xeTable.handleRecalculateCellAreas();
-        }
-      });
+      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => $xeTable.updateCellAreas());
     };
     const handleEditActive = (params, evnt, isFocus) => {
       const {