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

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.11.0-beta.10";
+const version = "4.11.0-beta.2";
 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.10"}`;
+const log_version = `table v${"4.11.0-beta.2"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -5612,9 +5612,6 @@ const Cell = {
       class: ['vxe-table--expanded', {
         'is--active': isActive
       }],
-      onMousedown(evnt) {
-        evnt.stopPropagation();
-      },
       onClick(evnt) {
         $table.triggerRowExpandEvent(evnt, params);
       }
@@ -6885,7 +6882,6 @@ const renderType = 'body';
         tableData,
         isRowLoading,
         isColLoading,
-        overflowX,
         scrollXLoad,
         scrollYLoad,
         isAllOverflow,
@@ -6915,10 +6911,8 @@ const renderType = 'body';
           isOptimizeMode = true;
         }
       }
-      if (fixedType || !overflowX) {
-        renderColumnList = visibleColumn;
-      }
       if (fixedType) {
+        renderColumnList = visibleColumn;
         if (isOptimizeMode) {
           renderColumnList = fixedColumn || [];
         }
@@ -7268,8 +7262,8 @@ const header_renderType = 'header';
             'is--sortable': column.sortable,
             'col--filter': !!filters,
             'is--filter-active': hasFilter,
-            'is--drag-active': columnOpts.drag && !column.fixed && !isDisabledDrag && (isCrossDrag || isPeerDrag || !column.parentId),
-            'is--drag-disabled': columnOpts.drag && isDisabledDrag,
+            'is--drag-active': !column.fixed && !isDisabledDrag && (isCrossDrag || isPeerDrag || !column.parentId),
+            'is--drag-disabled': 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,
@@ -7352,7 +7346,6 @@ const header_renderType = 'header';
       } = tableProps;
       const {
         isGroup,
-        overflowX,
         scrollXLoad,
         scrollYLoad,
         dragCol
@@ -7376,10 +7369,8 @@ const header_renderType = 'header';
             isOptimizeMode = true;
           }
         }
-        if (fixedType || !overflowX) {
-          renderColumnList = visibleColumn;
-        }
         if (fixedType) {
+          renderColumnList = visibleColumn;
           // 如果是使用优化模式
           if (isOptimizeMode) {
             renderColumnList = fixedColumn || [];
@@ -7847,7 +7838,6 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
       } = tableInternalData;
       const {
         isGroup,
-        overflowX,
         scrollXLoad,
         scrollYLoad,
         dragCol
@@ -7862,10 +7852,8 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
           isOptimizeMode = true;
         }
       }
-      if (fixedType || !overflowX) {
-        renderColumnList = visibleColumn;
-      }
       if (fixedType) {
+        renderColumnList = visibleColumn;
         if (isOptimizeMode) {
           renderColumnList = fixedColumn || [];
         }
@@ -11601,7 +11589,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       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 {
@@ -11707,8 +11694,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       } else {
         tableFullColumn.forEach(handleFunc);
       }
-      if (expandColumn && expandOpts.mode !== 'fixed' && mouseOpts.area) {
-        errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
+      if (true) {
+        if (expandColumn && mouseOpts.area) {
+          errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
+        }
       }
       if (true) {
         if (htmlColumn) {
@@ -13225,7 +13214,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               delete rExpandLazyLoadedMaps[rowid];
             }
             reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
-            (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => $xeTable.recalculate()).then(() => $xeTable.updateCellAreas()).then(() => resolve());
+            (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => tableMethods.recalculate()).then(() => resolve());
           });
         } else {
           resolve();
@@ -13756,7 +13745,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       });
     };
     const handleColumn = collectColumn => {
-      const expandOpts = computeExpandOpts.value;
       internalData.collectColumn = collectColumn;
       const tableFullColumn = getColumnList(collectColumn);
       internalData.tableFullColumn = tableFullColumn;
@@ -13764,11 +13752,6 @@ 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) {
@@ -13778,9 +13761,11 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         $xeTable.clearMergeCells();
         $xeTable.clearMergeFooterItems();
         $xeTable.handleTableData(true);
-        if ((scrollXLoad || scrollYLoad) && expandColumn && expandOpts.mode !== 'fixed') {
-          warnLog('vxe.error.scrollErrProp', ['column.type=expand']);
-        }
+        // if (process.env.VUE_APP_VXE_ENV === 'development') {
+        //   if ((reactData.scrollXLoad || reactData.scrollYLoad) && reactData.expandColumn) {
+        //     warnLog('vxe.error.scrollErrProp', ['column.type=expand'])
+        //   }
+        // }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
           if ($xeToolbar) {
             $xeToolbar.syncUpdate({
@@ -14223,16 +14208,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         }
       }
     };
-    const handleRowExpandScroll = () => {
-      const {
-        elemStore
-      } = internalData;
-      const rowExpandEl = refRowExpandElem.value;
-      const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
-      if (rowExpandEl && bodyScrollElem) {
-        rowExpandEl.scrollTop = bodyScrollElem.scrollTop;
-      }
-    };
     tableMethods = {
       dispatchEvent,
       /**
@@ -16220,7 +16195,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const {
           rowExpandedMaps,
           rowExpandLazyLoadedMaps,
-          expandColumn
+          expandColumn: column
         } = reactData;
         const {
           fullAllDataRowIdData
@@ -16236,8 +16211,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           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 (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
             rows = [rows];
@@ -16250,7 +16225,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           const validRows = toggleMethod ? rows.filter(row => toggleMethod({
             $table: $xeTable,
             expanded,
-            column: expandColumn,
+            column,
             columnIndex,
             $columnIndex,
             row,
@@ -16283,13 +16258,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           }
         }
         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());
       },
       /**
        * 判断行是否为展开状态
@@ -16329,7 +16298,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           if (expList.length) {
             tableMethods.recalculate();
           }
-        }).then(() => $xeTable.updateCellAreas());
+        });
       },
       clearRowExpandReserve() {
         internalData.rowExpandedReserveRowMap = {};
@@ -16810,8 +16779,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           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,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       },
@@ -18717,7 +18686,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           }
           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;
@@ -20719,8 +20688,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       updateScrollXSpace() {
         const {
           isGroup,
-          scrollXLoad,
-          overflowX
+          scrollXLoad
         } = reactData;
         const {
           visibleColumn,
@@ -20740,7 +20708,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           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) {
@@ -21557,12 +21525,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         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) {
@@ -21573,9 +21536,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 && expandOpts.mode !== 'fixed') {
-          warnLog('vxe.error.scrollErrProp', ['column.type=expand']);
-        }
+        // if ((scrollXLoad || scrollYLoad) && expandColumn) {
+        //   warnLog('vxe.error.scrollErrProp', ['column.type=expand'])
+        // }
         return tableMethods.recalculate();
       });
     });
@@ -21619,12 +21582,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.showFooter, () => {
       reScrollFlag.value++;
     });
-    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => reactData.overflowX, () => {
-      reScrollFlag.value++;
-    });
-    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => reactData.overflowY, () => {
-      reScrollFlag.value++;
-    });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(reScrollFlag, () => {
       (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
         tableMethods.recalculate(true).then(() => tableMethods.refreshScroll());
@@ -23305,6 +23262,9 @@ edit_hook_hooks.add('tableEditModule', {
       });
     };
     const handleClearEdit = (evnt, targetRow) => {
+      const {
+        mouseConfig
+      } = props;
       const {
         editStore
       } = reactData;
@@ -23317,6 +23277,7 @@ 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)();
@@ -23344,7 +23305,11 @@ edit_hook_hooks.add('tableEditModule', {
           }
         }
       }
-      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => $xeTable.updateCellAreas());
+      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
+        if (mouseConfig && mouseOpts.area && $xeTable.handleRecalculateCellAreas) {
+          return $xeTable.handleRecalculateCellAreas();
+        }
+      });
     };
     const handleEditActive = (params, evnt, isFocus) => {
       const {
@@ -28310,11 +28275,6 @@ render_renderer.mixin({
     tableFilterDefaultMethod: handleFilterMethod,
     tableExportMethod: handleExportSelectMethod
   },
-  formatOption: {
-    renderTableDefault(renderOpts, params) {
-      return getCellLabelVNs(renderOpts, params, getSelectCellValue(renderOpts, params));
-    }
-  },
   VxeTreeSelect: {
     tableAutoFocus: 'input',
     renderTableEdit: defaultTableOrTreeSelectEditRender,
@@ -28323,11 +28283,6 @@ render_renderer.mixin({
     },
     tableExportMethod: handleExportTreeSelectMethod
   },
-  formatTree: {
-    renderTableDefault(renderOpts, params) {
-      return getCellLabelVNs(renderOpts, params, getTreeSelectCellValue(renderOpts, params));
-    }
-  },
   VxeTableSelect: {
     tableAutoFocus: 'input',
     renderTableEdit: defaultTableOrTreeSelectEditRender,