vxe-table 4.11.0 → 4.11.2

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.11.0";
+const version = "4.11.2";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3335,8 +3335,8 @@ core_.VxeUI.setConfig({
     virtualYConfig: {
       enabled: true,
       gt: 100,
-      preSize: 1,
-      oSize: 2
+      preSize: 0,
+      oSize: 1
     },
     scrollbarConfig: {
       // width: 0,
@@ -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"}`;
+const log_version = `table v${"4.11.2"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -14103,7 +14103,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       }
       return multiple;
     };
-    const wheelScrollTo = (diffNum, cb) => {
+    const wheelScrollLeftTo = (scrollLeft, cb) => {
+      requestAnimationFrame(() => {
+        cb(scrollLeft);
+      });
+    };
+    const wheelScrollTopTo = (diffNum, cb) => {
       const duration = Math.abs(diffNum);
       const startTime = performance.now();
       let countTop = 0;
@@ -20356,6 +20361,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           scrollRenderType,
           inFooterScroll
         } = internalData;
+        if (inWheelScroll || inVirtualScroll || inHeaderScroll || inFooterScroll) {
+          return;
+        }
         const xHandleEl = refScrollXHandleElem.value;
         const yHandleEl = refScrollYHandleElem.value;
         const leftScrollElem = getRefElem(elemStore['left-body-scroll']);
@@ -20364,9 +20372,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const headerScrollElem = getRefElem(elemStore['main-header-scroll']);
         const footerScrollElem = getRefElem(elemStore['main-footer-scroll']);
         const rowExpandEl = refRowExpandElem.value;
-        if (inWheelScroll || inVirtualScroll || inHeaderScroll || inFooterScroll) {
-          return;
-        }
         if (intoRunScroll) {
           return;
         }
@@ -20384,6 +20389,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             return;
           }
         }
+        console.log('triggerBodyScrollEvent', 11);
         let scrollTop = yHandleEl.scrollTop;
         let scrollLeft = xHandleEl.scrollLeft;
         if (leftScrollElem && fixedType === 'left') {
@@ -20440,14 +20446,14 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           inBodyScroll,
           inFooterScroll
         } = internalData;
+        if (inWheelScroll || inVirtualScroll || inBodyScroll || inFooterScroll) {
+          return;
+        }
         const yHandleEl = refScrollYHandleElem.value;
         const xHandleEl = refScrollXHandleElem.value;
         const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
         const headerScrollElem = getRefElem(elemStore['main-header-scroll']);
         const footerScrollElem = getRefElem(elemStore['main-footer-scroll']);
-        if (inWheelScroll || inVirtualScroll || inBodyScroll || inFooterScroll) {
-          return;
-        }
         if (intoRunScroll) {
           return;
         }
@@ -20460,6 +20466,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         if (!yHandleEl) {
           return;
         }
+        console.log('triggerHeaderScrollEvent', 11);
         const scrollTop = yHandleEl.scrollTop;
         const scrollLeft = headerScrollElem.scrollLeft;
         const isRollX = true;
@@ -20488,14 +20495,14 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           inHeaderScroll,
           inBodyScroll
         } = internalData;
+        if (inWheelScroll || inVirtualScroll || inHeaderScroll || inBodyScroll) {
+          return;
+        }
         const yHandleEl = refScrollYHandleElem.value;
         const xHandleEl = refScrollXHandleElem.value;
         const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
         const headerScrollElem = getRefElem(elemStore['main-header-scroll']);
         const footerScrollElem = getRefElem(elemStore['main-footer-scroll']);
-        if (inWheelScroll || inVirtualScroll || inHeaderScroll || inBodyScroll) {
-          return;
-        }
         if (intoRunScroll) {
           return;
         }
@@ -20508,6 +20515,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         if (!yHandleEl) {
           return;
         }
+        console.log('triggerFooterScrollEvent');
         const scrollTop = yHandleEl.scrollTop;
         const scrollLeft = footerScrollElem.scrollLeft;
         const isRollX = true;
@@ -20537,8 +20545,14 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           highlightHoverRow
         } = src_props;
         const {
+          scrollXLoad,
           scrollYLoad
         } = reactData;
+        const leftFixedWidth = computeLeftFixedWidth.value;
+        const rightFixedWidth = computeRightFixedWidth.value;
+        if (!(scrollYLoad || leftFixedWidth || rightFixedWidth)) {
+          return;
+        }
         const {
           elemStore,
           lastScrollTop,
@@ -20548,7 +20562,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const xHandleEl = refScrollXHandleElem.value;
         const yHandleEl = refScrollYHandleElem.value;
         const leftScrollElem = getRefElem(elemStore['left-body-scroll']);
+        const headerScrollElem = getRefElem(elemStore['main-header-scroll']);
         const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+        const footerScrollElem = getRefElem(elemStore['main-footer-scroll']);
         const rightScrollElem = getRefElem(elemStore['right-body-scroll']);
         const rowExpandEl = refRowExpandElem.value;
         if (!xHandleEl) {
@@ -20561,25 +20577,43 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           return;
         }
         const wheelSpeed = getWheelSpeed(reactData.lastScrollTime);
-        const deltaTop = deltaY * wheelSpeed;
-        const deltaLeft = deltaX * wheelSpeed;
+        const deltaTop = Math.ceil(deltaY * wheelSpeed);
+        const deltaLeft = Math.ceil(deltaX * wheelSpeed);
         const isTopWheel = deltaTop < 0;
         const currScrollTop = bodyScrollElem.scrollTop;
         // 如果滚动位置已经是顶部或底部，则不需要触发
         if (isTopWheel ? currScrollTop <= 0 : currScrollTop >= bodyScrollElem.scrollHeight - bodyScrollElem.clientHeight) {
           return;
         }
-        const scrollTop = bodyScrollElem.scrollTop + deltaTop;
+        const scrollTop = currScrollTop + deltaTop;
         const scrollLeft = bodyScrollElem.scrollLeft + deltaLeft;
         const isRollX = scrollLeft !== lastScrollLeft;
         const isRollY = scrollTop !== lastScrollTop;
+        if (rowOpts.isHover || highlightHoverRow) {
+          $xeTable.clearHoverRow();
+        }
         // 用于鼠标纵向滚轮处理
+        if (isRollX) {
+          evnt.preventDefault();
+          internalData.inWheelScroll = true;
+          wheelScrollLeftTo(scrollLeft, offsetLeft => {
+            const currLeftNum = offsetLeft;
+            setScrollLeft(xHandleEl, currLeftNum);
+            setScrollLeft(bodyScrollElem, currLeftNum);
+            setScrollLeft(headerScrollElem, currLeftNum);
+            setScrollLeft(footerScrollElem, currLeftNum);
+            if (scrollXLoad) {
+              $xeTable.triggerScrollXEvent(evnt);
+            }
+            $xeTable.handleScrollEvent(evnt, isRollY, isRollX, bodyScrollElem.scrollTop, currLeftNum, {
+              type: 'table',
+              fixed: ''
+            });
+          });
+        }
         if (isRollY) {
           evnt.preventDefault();
-          if (rowOpts.isHover || highlightHoverRow) {
-            $xeTable.clearHoverRow();
-          }
-          wheelScrollTo(scrollTop - bodyScrollElem.scrollTop, offsetTop => {
+          wheelScrollTopTo(scrollTop - currScrollTop, offsetTop => {
             const currTopNum = bodyScrollElem.scrollTop + offsetTop;
             internalData.inWheelScroll = true;
             setScrollTop(yHandleEl, currTopNum);
@@ -20590,7 +20624,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             if (scrollYLoad) {
               $xeTable.triggerScrollYEvent(evnt);
             }
-            $xeTable.handleScrollEvent(evnt, isRollY, isRollX, currTopNum, scrollLeft, {
+            $xeTable.handleScrollEvent(evnt, isRollY, isRollX, currTopNum, bodyScrollElem.scrollLeft, {
               type: 'table',
               fixed: ''
             });
@@ -21239,7 +21273,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       } = props;
       const {
         overflowX,
-        scrollYLoad,
         tableData,
         tableColumn,
         tableGroupColumn,
@@ -21250,16 +21283,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         leftList,
         rightList
       } = columnStore;
-      const leftFixedWidth = computeLeftFixedWidth.value;
-      const rightFixedWidth = computeRightFixedWidth.value;
-      const ons = {};
-      if (scrollYLoad || leftFixedWidth || rightFixedWidth) {
-        ons.onWheel = $xeTable.triggerBodyWheelEvent;
-      }
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: refTableViewportElem,
-        class: 'vxe-table--viewport-wrapper',
-        ...ons
+        class: 'vxe-table--viewport-wrapper'
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-table--main-wrapper'
       }, [
@@ -21919,6 +21945,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           }
         }
       });
+      const tableViewportEl = refTableViewportElem.value;
+      if (tableViewportEl) {
+        tableViewportEl.addEventListener('wheel', $xeTable.triggerBodyWheelEvent, {
+          passive: false
+        });
+      }
       table_globalEvents.on($xeTable, 'paste', handleGlobalPasteEvent);
       table_globalEvents.on($xeTable, 'copy', handleGlobalCopyEvent);
       table_globalEvents.on($xeTable, 'cut', handleGlobalCutEvent);
@@ -21933,6 +21965,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       });
     });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onBeforeUnmount)(() => {
+      const tableViewportEl = refTableViewportElem.value;
+      if (tableViewportEl) {
+        tableViewportEl.removeEventListener('wheel', $xeTable.triggerBodyWheelEvent);
+      }
       if (resizeObserver) {
         resizeObserver.disconnect();
       }
@@ -25402,12 +25438,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;
@@ -25437,7 +25473,7 @@ export_hook_hooks.add('tableExportModule', {
           // beforeExportMethod: null,
           // afterExportMethod: null
         }, exportOpts, options);
-        const {
+        let {
           filename,
           sheetName,
           type,
@@ -25450,7 +25486,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) {
@@ -25526,7 +25566,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
           })), {
@@ -25601,7 +25641,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'