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

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.11.0-beta.1";
+const version = "4.11.0-beta.10";
 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.1"}`;
+const log_version = `table v${"4.11.0-beta.10"}`;
 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);
       }
@@ -6882,6 +6885,7 @@ const renderType = 'body';
         tableData,
         isRowLoading,
         isColLoading,
+        overflowX,
         scrollXLoad,
         scrollYLoad,
         isAllOverflow,
@@ -6911,8 +6915,10 @@ const renderType = 'body';
           isOptimizeMode = true;
         }
       }
-      if (fixedType) {
+      if (fixedType || !overflowX) {
         renderColumnList = visibleColumn;
+      }
+      if (fixedType) {
         if (isOptimizeMode) {
           renderColumnList = fixedColumn || [];
         }
@@ -7262,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,
@@ -7346,6 +7352,7 @@ const header_renderType = 'header';
       } = tableProps;
       const {
         isGroup,
+        overflowX,
         scrollXLoad,
         scrollYLoad,
         dragCol
@@ -7369,8 +7376,10 @@ const header_renderType = 'header';
             isOptimizeMode = true;
           }
         }
-        if (fixedType) {
+        if (fixedType || !overflowX) {
           renderColumnList = visibleColumn;
+        }
+        if (fixedType) {
           // 如果是使用优化模式
           if (isOptimizeMode) {
             renderColumnList = fixedColumn || [];
@@ -7838,6 +7847,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
       } = tableInternalData;
       const {
         isGroup,
+        overflowX,
         scrollXLoad,
         scrollYLoad,
         dragCol
@@ -7852,8 +7862,10 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
           isOptimizeMode = true;
         }
       }
-      if (fixedType) {
+      if (fixedType || !overflowX) {
         renderColumnList = visibleColumn;
+      }
+      if (fixedType) {
         if (isOptimizeMode) {
           renderColumnList = fixedColumn || [];
         }
@@ -9762,6 +9774,10 @@ const {
       } = props;
       return !defaultOptions.original && defaultOptions.mode === 'current' && (storeData.isPrint || ['html', 'xlsx'].indexOf(defaultOptions.type) > -1);
     });
+    // const computeSupportGroup = computed(() => {
+    //   const { defaultOptions } = props
+    //   return ['html', 'xlsx', 'csv', 'txt'].indexOf(defaultOptions.type) > -1
+    // })
     const computeSupportStyle = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const {
         defaultOptions
@@ -9909,6 +9925,7 @@ const {
       const showSheet = computeShowSheet.value;
       const supportMerge = computeSupportMerge.value;
       const supportStyle = computeSupportStyle.value;
+      // const supportGroup = computeSupportGroup.value
       const slots = defaultOptions.slots || {};
       const topSlot = slots.top;
       const bottomSlot = slots.bottom;
@@ -10067,6 +10084,9 @@ const {
           }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             class: 'vxe-table-export--panel-option-row'
           }, [VxeUICheckboxComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUICheckboxComponent, {
+            // modelValue: supportGroup || (isHeader && hasColgroup && supportMerge) ? defaultOptions.isColgroup : false,
+            // title: getI18n('vxe.export.expColgroupTitle'),
+            // disabled: !supportGroup && (!isHeader || !hasColgroup || !supportMerge),
             modelValue: isHeader && hasColgroup && supportMerge ? defaultOptions.isColgroup : false,
             title: export_panel_getI18n('vxe.export.expColgroupTitle'),
             disabled: !isHeader || !hasColgroup || !supportMerge,
@@ -11581,6 +11601,7 @@ 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 {
@@ -11686,10 +11707,8 @@ 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 (expandColumn && expandOpts.mode !== 'fixed' && mouseOpts.area) {
+        errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
       }
       if (true) {
         if (htmlColumn) {
@@ -13206,7 +13225,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();
@@ -13737,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;
@@ -13744,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) {
@@ -13753,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({
@@ -14200,6 +14223,16 @@ 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,
       /**
@@ -16187,7 +16220,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const {
           rowExpandedMaps,
           rowExpandLazyLoadedMaps,
-          expandColumn: column
+          expandColumn
         } = reactData;
         const {
           fullAllDataRowIdData
@@ -16203,8 +16236,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           toggleMethod
         } = expandOpts;
         const lazyRests = [];
-        const columnIndex = tableMethods.getColumnIndex(column);
-        const $columnIndex = tableMethods.getVMColumnIndex(column);
+        const columnIndex = tableMethods.getColumnIndex(expandColumn);
+        const $columnIndex = tableMethods.getVMColumnIndex(expandColumn);
         if (rows) {
           if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
             rows = [rows];
@@ -16217,7 +16250,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           const validRows = toggleMethod ? rows.filter(row => toggleMethod({
             $table: $xeTable,
             expanded,
-            column,
+            column: expandColumn,
             columnIndex,
             $columnIndex,
             row,
@@ -16250,7 +16283,13 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           }
         }
         reactData.rowExpandedMaps = rExpandedMaps;
-        return Promise.all(lazyRests).then(() => tableMethods.recalculate());
+        return Promise.all(lazyRests).then(() => $xeTable.recalculate()).then(() => {
+          if (expandColumn) {
+            updateRowExpandStyle();
+            handleRowExpandScroll();
+          }
+          return $xeTable.updateCellAreas();
+        });
       },
       /**
        * 判断行是否为展开状态
@@ -16290,7 +16329,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           if (expList.length) {
             tableMethods.recalculate();
           }
-        });
+        }).then(() => $xeTable.updateCellAreas());
       },
       clearRowExpandReserve() {
         internalData.rowExpandedReserveRowMap = {};
@@ -16771,8 +16810,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)();
       },
@@ -18678,7 +18717,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           }
           vLen++;
         });
-        const isSelected = vLen > 0 ? sLen >= vLen : sLen >= rootList.length;
+        const isSelected = rootList.length > 0 ? vLen > 0 ? sLen >= vLen : sLen >= rootList.length : false;
         const halfSelect = !isSelected && (sLen >= 1 || hLen >= 1);
         reactData.isAllSelected = isSelected;
         reactData.isIndeterminate = halfSelect;
@@ -20680,7 +20719,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       updateScrollXSpace() {
         const {
           isGroup,
-          scrollXLoad
+          scrollXLoad,
+          overflowX
         } = reactData;
         const {
           visibleColumn,
@@ -20700,7 +20740,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) {
+          if (scrollXLoad && overflowX) {
             marginLeft = `${leftSpaceWidth}px`;
           }
           if (headerElem) {
@@ -21517,7 +21557,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) {
@@ -21528,9 +21573,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();
       });
     });
@@ -21574,6 +21619,12 @@ 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());
@@ -23254,9 +23305,6 @@ edit_hook_hooks.add('tableEditModule', {
       });
     };
     const handleClearEdit = (evnt, targetRow) => {
-      const {
-        mouseConfig
-      } = props;
       const {
         editStore
       } = reactData;
@@ -23269,7 +23317,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)();
@@ -23297,11 +23344,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 {
@@ -25347,9 +25390,13 @@ export_hook_hooks.add('tableExportModule', {
        */
       exportData(options) {
         const {
-          treeConfig
+          treeConfig,
+          showHeader,
+          showFooter
         } = props;
         const {
+          mergeList,
+          mergeFooterList,
           isGroup,
           tableGroupColumn
         } = reactData;
@@ -25359,19 +25406,23 @@ export_hook_hooks.add('tableExportModule', {
         } = internalData;
         const exportOpts = computeExportOpts.value;
         const treeOpts = computeTreeOpts.value;
+        const proxyOpts = $xeGrid ? $xeGrid.getComputeMaps().computeProxyOpts.value : {};
+        const hasMerge = !!(mergeList.length || mergeFooterList.length);
         const opts = Object.assign({
+          message: true,
+          isHeader: showHeader,
+          isFooter: showFooter,
+          isColgroup: isGroup,
+          isMerge: hasMerge,
+          useStyle: true,
+          current: 'current',
+          modes: ['current', 'selected'].concat(proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : []),
+          download: true,
+          type: 'csv'
           // filename: '',
           // sheetName: '',
           // original: false,
-          // message: false,
-          isHeader: true,
-          isFooter: true,
-          isColgroup: true,
-          // isMerge: false,
           // isAllExpand: false,
-          download: true,
-          type: 'csv',
-          mode: 'current'
           // data: null,
           // remote: false,
           // dataFilterMethod: null,
@@ -25394,7 +25445,22 @@ export_hook_hooks.add('tableExportModule', {
           excludeFields
         } = opts;
         let groups = [];
-        const customCols = columns && columns.length ? columns : null;
+        const customCols = columns && columns.length ? columns : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableGroupColumn, column => {
+          const isColGroup = column.children && column.children.length;
+          let isChecked = false;
+          if (columns && columns.length) {
+            isChecked = handleFilterColumns(opts, column, columns);
+          } else if (excludeFields || includeFields) {
+            isChecked = handleFilterFields(opts, column, includeFields, excludeFields);
+          } else {
+            isChecked = column.visible && (isColGroup || defaultFilterExportColumn(column));
+          }
+          return isChecked;
+        }, {
+          children: 'children',
+          mapChildren: 'childNodes',
+          original: true
+        });
         const handleOptions = Object.assign({}, opts, {
           filename: '',
           sheetName: ''
@@ -28244,6 +28310,11 @@ render_renderer.mixin({
     tableFilterDefaultMethod: handleFilterMethod,
     tableExportMethod: handleExportSelectMethod
   },
+  formatOption: {
+    renderTableDefault(renderOpts, params) {
+      return getCellLabelVNs(renderOpts, params, getSelectCellValue(renderOpts, params));
+    }
+  },
   VxeTreeSelect: {
     tableAutoFocus: 'input',
     renderTableEdit: defaultTableOrTreeSelectEditRender,
@@ -28252,6 +28323,11 @@ render_renderer.mixin({
     },
     tableExportMethod: handleExportTreeSelectMethod
   },
+  formatTree: {
+    renderTableDefault(renderOpts, params) {
+      return getCellLabelVNs(renderOpts, params, getTreeSelectCellValue(renderOpts, params));
+    }
+  },
   VxeTableSelect: {
     tableAutoFocus: 'input',
     renderTableEdit: defaultTableOrTreeSelectEditRender,