vxe-table 4.11.0-beta.9 → 4.11.1

package/es/table/src/table.js

@@ -1474,6 +1474,7 @@ export default defineComponent({
             };
         };
         const updateAfterListIndex = () => {
+            const { treeConfig } = props;
             const { afterFullData, fullDataRowIdData, fullAllDataRowIdData } = internalData;
             const fullMaps = {};
             afterFullData.forEach((row, index) => {
@@ -1481,7 +1482,9 @@ export default defineComponent({
                 const rowRest = fullAllDataRowIdData[rowid];
                 const seq = index + 1;
                 if (rowRest) {
-                    rowRest.seq = seq;
+                    if (!treeConfig) {
+                        rowRest.seq = seq;
+                    }
                     rowRest._index = index;
                 }
                 else {
@@ -3344,6 +3347,14 @@ export default defineComponent({
                 }
             }
         };
+        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,
             /**
@@ -5078,14 +5089,14 @@ export default defineComponent({
              * @param {Boolean} expanded 是否展开
              */
             setRowExpand(rows, expanded) {
-                const { rowExpandedMaps, rowExpandLazyLoadedMaps, expandColumn: column } = reactData;
+                const { rowExpandedMaps, rowExpandLazyLoadedMaps, expandColumn } = reactData;
                 const { fullAllDataRowIdData } = internalData;
                 let rExpandedMaps = Object.assign({}, rowExpandedMaps);
                 const expandOpts = computeExpandOpts.value;
                 const { reserve, lazy, accordion, toggleMethod } = expandOpts;
                 const lazyRests = [];
-                const columnIndex = tableMethods.getColumnIndex(column);
-                const $columnIndex = tableMethods.getVMColumnIndex(column);
+                const columnIndex = $xeTable.getColumnIndex(expandColumn);
+                const $columnIndex = $xeTable.getVMColumnIndex(expandColumn);
                 if (rows) {
                     if (!XEUtils.isArray(rows)) {
                         rows = [rows];
@@ -5095,7 +5106,7 @@ export default defineComponent({
                         rExpandedMaps = {};
                         rows = rows.slice(rows.length - 1, rows.length);
                     }
-                    const validRows = toggleMethod ? rows.filter((row) => toggleMethod({ $table: $xeTable, expanded, column, columnIndex, $columnIndex, row, rowIndex: tableMethods.getRowIndex(row), $rowIndex: tableMethods.getVMRowIndex(row) })) : rows;
+                    const validRows = toggleMethod ? rows.filter((row) => toggleMethod({ $table: $xeTable, expanded, column: expandColumn, columnIndex, $columnIndex, row, rowIndex: tableMethods.getRowIndex(row), $rowIndex: tableMethods.getVMRowIndex(row) })) : rows;
                     if (expanded) {
                         validRows.forEach((row) => {
                             const rowid = getRowid($xeTable, row);
@@ -5126,7 +5137,13 @@ export default defineComponent({
                 reactData.rowExpandedMaps = rExpandedMaps;
                 return Promise.all(lazyRests)
                     .then(() => $xeTable.recalculate())
-                    .then(() => $xeTable.updateCellAreas());
+                    .then(() => {
+                    if (expandColumn) {
+                        updateRowExpandStyle();
+                        handleRowExpandScroll();
+                    }
+                    return $xeTable.updateCellAreas();
+                });
             },
             /**
              * 判断行是否为展开状态
@@ -7208,7 +7225,7 @@ export default defineComponent({
                         const isSelected = sLen >= vLen;
                         const halfSelect = !isSelected && (sLen >= 1 || hLen >= 1);
                         if (checkField) {
-                            XEUtils.get(row, checkField, isSelected);
+                            XEUtils.set(row, checkField, isSelected);
                         }
                         if (isSelected) {
                             if (!checkField) {
@@ -8811,7 +8828,6 @@ export default defineComponent({
                 const isRollY = scrollTop !== lastScrollTop;
                 // 用于鼠标纵向滚轮处理
                 if (isRollY) {
-                    evnt.preventDefault();
                     if (rowOpts.isHover || highlightHoverRow) {
                         $xeTable.clearHoverRow();
                     }
@@ -9419,7 +9435,7 @@ export default defineComponent({
             const rightFixedWidth = computeRightFixedWidth.value;
             const ons = {};
             if (scrollYLoad || leftFixedWidth || rightFixedWidth) {
-                ons.onWheel = $xeTable.triggerBodyWheelEvent;
+                ons.onWheelPassive = $xeTable.triggerBodyWheelEvent;
             }
             return h('div', Object.assign({ ref: refTableViewportElem, class: 'vxe-table--viewport-wrapper' }, ons), [
                 h('div', {

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.9";
+export const version = "4.11.1";
 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.9"}`;
+const version = `table v${"4.11.1"}`;
 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.9";
+const version = "4.11.0";
 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.9"}`;
+const log_version = `table v${"4.11.0"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -11975,6 +11975,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       };
     };
     const updateAfterListIndex = () => {
+      const {
+        treeConfig
+      } = props;
       const {
         afterFullData,
         fullDataRowIdData,
@@ -11986,7 +11989,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const rowRest = fullAllDataRowIdData[rowid];
         const seq = index + 1;
         if (rowRest) {
-          rowRest.seq = seq;
+          if (!treeConfig) {
+            rowRest.seq = seq;
+          }
           rowRest._index = index;
         } else {
           const rest = {
@@ -14223,6 +14228,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,
       /**
@@ -16210,7 +16225,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const {
           rowExpandedMaps,
           rowExpandLazyLoadedMaps,
-          expandColumn: column
+          expandColumn
         } = reactData;
         const {
           fullAllDataRowIdData
@@ -16226,8 +16241,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           toggleMethod
         } = expandOpts;
         const lazyRests = [];
-        const columnIndex = tableMethods.getColumnIndex(column);
-        const $columnIndex = tableMethods.getVMColumnIndex(column);
+        const columnIndex = $xeTable.getColumnIndex(expandColumn);
+        const $columnIndex = $xeTable.getVMColumnIndex(expandColumn);
         if (rows) {
           if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
             rows = [rows];
@@ -16240,7 +16255,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           const validRows = toggleMethod ? rows.filter(row => toggleMethod({
             $table: $xeTable,
             expanded,
-            column,
+            column: expandColumn,
             columnIndex,
             $columnIndex,
             row,
@@ -16273,7 +16288,13 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           }
         }
         reactData.rowExpandedMaps = rExpandedMaps;
-        return Promise.all(lazyRests).then(() => $xeTable.recalculate()).then(() => $xeTable.updateCellAreas());
+        return Promise.all(lazyRests).then(() => $xeTable.recalculate()).then(() => {
+          if (expandColumn) {
+            updateRowExpandStyle();
+            handleRowExpandScroll();
+          }
+          return $xeTable.updateCellAreas();
+        });
       },
       /**
        * 判断行是否为展开状态
@@ -18623,7 +18644,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             const isSelected = sLen >= vLen;
             const halfSelect = !isSelected && (sLen >= 1 || hLen >= 1);
             if (checkField) {
-              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField, isSelected);
+              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, checkField, isSelected);
             }
             if (isSelected) {
               if (!checkField) {
@@ -20554,7 +20575,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const isRollY = scrollTop !== lastScrollTop;
         // 用于鼠标纵向滚轮处理
         if (isRollY) {
-          evnt.preventDefault();
           if (rowOpts.isHover || highlightHoverRow) {
             $xeTable.clearHoverRow();
           }
@@ -21233,7 +21253,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       const rightFixedWidth = computeRightFixedWidth.value;
       const ons = {};
       if (scrollYLoad || leftFixedWidth || rightFixedWidth) {
-        ons.onWheel = $xeTable.triggerBodyWheelEvent;
+        ons.onWheelPassive = $xeTable.triggerBodyWheelEvent;
       }
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: refTableViewportElem,
@@ -25381,12 +25401,12 @@ export_hook_hooks.add('tableExportModule', {
         const {
           mergeList,
           mergeFooterList,
-          isGroup,
-          tableGroupColumn
+          isGroup
         } = reactData;
         const {
           tableFullColumn,
-          afterFullData
+          afterFullData,
+          collectColumn
         } = internalData;
         const exportOpts = computeExportOpts.value;
         const treeOpts = computeTreeOpts.value;
@@ -25416,7 +25436,7 @@ export_hook_hooks.add('tableExportModule', {
           // beforeExportMethod: null,
           // afterExportMethod: null
         }, exportOpts, options);
-        const {
+        let {
           filename,
           sheetName,
           type,
@@ -25429,7 +25449,11 @@ export_hook_hooks.add('tableExportModule', {
           excludeFields
         } = opts;
         let groups = [];
-        const customCols = columns && columns.length ? columns : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableGroupColumn, column => {
+        const selectRecords = $xeTable.getCheckboxRecords();
+        if (!mode) {
+          mode = selectRecords.length ? 'selected' : 'current';
+        }
+        const customCols = columns && columns.length ? columns : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(collectColumn, column => {
           const isColGroup = column.children && column.children.length;
           let isChecked = false;
           if (columns && columns.length) {
@@ -25505,7 +25529,7 @@ export_hook_hooks.add('tableExportModule', {
             original: true
           });
         } else {
-          groups = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(isGroup ? tableGroupColumn : tableFullColumn, (column, index) => column.visible && (!columnFilterMethod || columnFilterMethod({
+          groups = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(isGroup ? collectColumn : tableFullColumn, (column, index) => column.visible && (!columnFilterMethod || columnFilterMethod({
             column,
             $columnIndex: index
           })), {
@@ -25580,7 +25604,6 @@ export_hook_hooks.add('tableExportModule', {
         if (!handleOptions.data) {
           handleOptions.data = [];
           if (mode === 'selected') {
-            const selectRecords = $xeTable.getCheckboxRecords();
             if (['html', 'pdf'].indexOf(type) > -1 && treeConfig) {
               handleOptions.data = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree($xeTable.getTableData().fullData, item => $xeTable.findRowIndexOf(selectRecords, item) > -1, Object.assign({}, treeOpts, {
                 data: '_row'