vxe-table 4.11.0-beta.10 → 4.11.0-beta.2

package/lib/table/src/table.js

@@ -1299,7 +1299,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
       const fullColumnIdData = internalData.fullColumnIdData = {};
       const fullColumnFieldData = internalData.fullColumnFieldData = {};
       const mouseOpts = computeMouseOpts.value;
-      const expandOpts = computeExpandOpts.value;
       const columnOpts = computeColumnOpts.value;
       const columnDragOpts = computeColumnDragOpts.value;
       const {
@@ -1405,8 +1404,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
       } else {
         tableFullColumn.forEach(handleFunc);
       }
-      if (expandColumn && expandOpts.mode !== 'fixed' && mouseOpts.area) {
-        (0, _log.errLog)('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
+      if (process.env.NODE_ENV === 'development') {
+        if (expandColumn && mouseOpts.area) {
+          (0, _log.errLog)('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
+        }
       }
       if (process.env.NODE_ENV === 'development') {
         if (htmlColumn) {
@@ -2917,7 +2918,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
               delete rExpandLazyLoadedMaps[rowid];
             }
             reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
-            (0, _vue.nextTick)().then(() => $xeTable.recalculate()).then(() => $xeTable.updateCellAreas()).then(() => resolve());
+            (0, _vue.nextTick)().then(() => tableMethods.recalculate()).then(() => resolve());
           });
         } else {
           resolve();
@@ -3448,7 +3449,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
       });
     };
     const handleColumn = collectColumn => {
-      const expandOpts = computeExpandOpts.value;
       internalData.collectColumn = collectColumn;
       const tableFullColumn = getColumnList(collectColumn);
       internalData.tableFullColumn = tableFullColumn;
@@ -3456,11 +3456,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
       reactData.isDragColMove = false;
       initColumnSort();
       return Promise.resolve(restoreCustomStorage()).then(() => {
-        const {
-          scrollXLoad,
-          scrollYLoad,
-          expandColumn
-        } = reactData;
         cacheColumnMap();
         parseColumns(true).then(() => {
           if (reactData.scrollXLoad) {
@@ -3470,9 +3465,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
         $xeTable.clearMergeCells();
         $xeTable.clearMergeFooterItems();
         $xeTable.handleTableData(true);
-        if ((scrollXLoad || scrollYLoad) && expandColumn && expandOpts.mode !== 'fixed') {
-          (0, _log.warnLog)('vxe.error.scrollErrProp', ['column.type=expand']);
-        }
+        // if (process.env.NODE_ENV === 'development') {
+        //   if ((reactData.scrollXLoad || reactData.scrollYLoad) && reactData.expandColumn) {
+        //     warnLog('vxe.error.scrollErrProp', ['column.type=expand'])
+        //   }
+        // }
         return (0, _vue.nextTick)().then(() => {
           if ($xeToolbar) {
             $xeToolbar.syncUpdate({
@@ -3913,16 +3910,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
       }
     };
-    const handleRowExpandScroll = () => {
-      const {
-        elemStore
-      } = internalData;
-      const rowExpandEl = refRowExpandElem.value;
-      const bodyScrollElem = (0, _util.getRefElem)(elemStore['main-body-scroll']);
-      if (rowExpandEl && bodyScrollElem) {
-        rowExpandEl.scrollTop = bodyScrollElem.scrollTop;
-      }
-    };
     tableMethods = {
       dispatchEvent,
       /**
@@ -5908,7 +5895,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const {
           rowExpandedMaps,
           rowExpandLazyLoadedMaps,
-          expandColumn
+          expandColumn: column
         } = reactData;
         const {
           fullAllDataRowIdData
@@ -5922,8 +5909,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
           toggleMethod
         } = expandOpts;
         const lazyRests = [];
-        const columnIndex = tableMethods.getColumnIndex(expandColumn);
-        const $columnIndex = tableMethods.getVMColumnIndex(expandColumn);
+        const columnIndex = tableMethods.getColumnIndex(column);
+        const $columnIndex = tableMethods.getVMColumnIndex(column);
         if (rows) {
           if (!_xeUtils.default.isArray(rows)) {
             rows = [rows];
@@ -5936,7 +5923,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           const validRows = toggleMethod ? rows.filter(row => toggleMethod({
             $table: $xeTable,
             expanded,
-            column: expandColumn,
+            column,
             columnIndex,
             $columnIndex,
             row,
@@ -5969,13 +5956,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           }
         }
         reactData.rowExpandedMaps = rExpandedMaps;
-        return Promise.all(lazyRests).then(() => $xeTable.recalculate()).then(() => {
-          if (expandColumn) {
-            updateRowExpandStyle();
-            handleRowExpandScroll();
-          }
-          return $xeTable.updateCellAreas();
-        });
+        return Promise.all(lazyRests).then(() => tableMethods.recalculate());
       },
       /**
        * 判断行是否为展开状态
@@ -6015,7 +5996,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           if (expList.length) {
             tableMethods.recalculate();
           }
-        }).then(() => $xeTable.updateCellAreas());
+        });
       },
       clearRowExpandReserve() {
         internalData.rowExpandedReserveRowMap = {};
@@ -6494,8 +6475,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
           mouseConfig
         } = props;
         const mouseOpts = computeMouseOpts.value;
-        if (mouseConfig && mouseOpts.area && $xeTable.handleRecalculateCellAreaEvent) {
-          return $xeTable.handleRecalculateCellAreaEvent();
+        if (mouseConfig && mouseOpts.area && $xeTable.handleRecalculateCellAreas) {
+          return $xeTable.handleRecalculateCellAreas();
         }
         return (0, _vue.nextTick)();
       },
@@ -8395,7 +8376,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           }
           vLen++;
         });
-        const isSelected = rootList.length > 0 ? vLen > 0 ? sLen >= vLen : sLen >= rootList.length : false;
+        const isSelected = vLen > 0 ? sLen >= vLen : sLen >= rootList.length;
         const halfSelect = !isSelected && (sLen >= 1 || hLen >= 1);
         reactData.isAllSelected = isSelected;
         reactData.isIndeterminate = halfSelect;
@@ -10396,8 +10377,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       updateScrollXSpace() {
         const {
           isGroup,
-          scrollXLoad,
-          overflowX
+          scrollXLoad
         } = reactData;
         const {
           visibleColumn,
@@ -10417,7 +10397,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           const footerElem = tableFooterElem ? tableFooterElem.querySelector('.vxe-table--footer') : null;
           const leftSpaceWidth = visibleColumn.slice(0, scrollXStore.startIndex).reduce((previous, column) => previous + column.renderWidth, 0);
           let marginLeft = '';
-          if (scrollXLoad && overflowX) {
+          if (scrollXLoad) {
             marginLeft = `${leftSpaceWidth}px`;
           }
           if (headerElem) {
@@ -11233,12 +11213,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         (0, _log.warnLog)('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
       }
       loadTableData(value, true).then(() => {
-        const {
-          scrollXLoad,
-          scrollYLoad,
-          expandColumn
-        } = reactData;
-        const expandOpts = computeExpandOpts.value;
+        // const { scrollXLoad, scrollYLoad, expandColumn } = reactData
         internalData.inited = true;
         internalData.initStatus = true;
         if (!initStatus) {
@@ -11249,9 +11224,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
         // if (checkboxColumn && internalData.tableFullData.length > 300 && !checkboxOpts.checkField) {
         //   warnLog('vxe.error.checkProp', ['checkbox-config.checkField'])
         // }
-        if ((scrollXLoad || scrollYLoad) && expandColumn && expandOpts.mode !== 'fixed') {
-          (0, _log.warnLog)('vxe.error.scrollErrProp', ['column.type=expand']);
-        }
+        // if ((scrollXLoad || scrollYLoad) && expandColumn) {
+        //   warnLog('vxe.error.scrollErrProp', ['column.type=expand'])
+        // }
         return tableMethods.recalculate();
       });
     });
@@ -11295,12 +11270,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
     (0, _vue.watch)(() => props.showFooter, () => {
       reScrollFlag.value++;
     });
-    (0, _vue.watch)(() => reactData.overflowX, () => {
-      reScrollFlag.value++;
-    });
-    (0, _vue.watch)(() => reactData.overflowY, () => {
-      reScrollFlag.value++;
-    });
     (0, _vue.watch)(reScrollFlag, () => {
       (0, _vue.nextTick)(() => {
         tableMethods.recalculate(true).then(() => tableMethods.refreshScroll());