vxe-table 3.13.0 → 3.13.2

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.13.0";
+const version = "3.13.2";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2843,7 +2843,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.13.0"}`;
+const log_version = `table v${"3.13.2"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -7161,7 +7161,12 @@ const getWheelSpeed = lastScrollTime => {
   }
   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;
@@ -14432,6 +14437,9 @@ const Methods = {
       scrollRenderType,
       inFooterScroll
     } = internalData;
+    if (inWheelScroll || inVirtualScroll || inHeaderScroll || inFooterScroll) {
+      return;
+    }
     const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
     const yHandleEl = $xeTable.$refs.refScrollYHandleElem;
     const leftScrollElem = getRefElem(elemStore['left-body-scroll']);
@@ -14440,9 +14448,6 @@ const Methods = {
     const headerScrollElem = getRefElem(elemStore['main-header-scroll']);
     const footerScrollElem = getRefElem(elemStore['main-footer-scroll']);
     const rowExpandEl = $xeTable.$refs.refRowExpandElem;
-    if (inWheelScroll || inVirtualScroll || inHeaderScroll || inFooterScroll) {
-      return;
-    }
     if (intoRunScroll) {
       return;
     }
@@ -14519,17 +14524,17 @@ const Methods = {
       inBodyScroll,
       inFooterScroll
     } = internalData;
-    const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
-    const yHandleEl = $xeTable.$refs.refScrollYHandleElem;
-    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;
     }
+    const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
+    const yHandleEl = $xeTable.$refs.refScrollYHandleElem;
+    const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+    const headerScrollElem = getRefElem(elemStore['main-header-scroll']);
+    const footerScrollElem = getRefElem(elemStore['main-footer-scroll']);
     if (!headerScrollElem) {
       return;
     }
@@ -14570,14 +14575,14 @@ const Methods = {
       inHeaderScroll,
       inBodyScroll
     } = internalData;
+    if (inWheelScroll || inVirtualScroll || inHeaderScroll || inBodyScroll) {
+      return;
+    }
     const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
     const yHandleEl = $xeTable.$refs.refScrollYHandleElem;
     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;
     }
@@ -14623,8 +14628,14 @@ const Methods = {
       highlightHoverRow
     } = tableProps;
     const {
+      scrollXLoad,
       scrollYLoad
     } = reactData;
+    const leftFixedWidth = $xeTable.computeLeftFixedWidth;
+    const rightFixedWidth = $xeTable.computeRightFixedWidth;
+    if (!(scrollYLoad || leftFixedWidth || rightFixedWidth)) {
+      return;
+    }
     const {
       elemStore,
       lastScrollTop,
@@ -14634,7 +14645,9 @@ const Methods = {
     const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
     const yHandleEl = $xeTable.$refs.refScrollYHandleElem;
     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 = $xeTable.$refs.refRowExpandElem;
     if (!xHandleEl) {
@@ -14647,25 +14660,43 @@ const Methods = {
       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);
@@ -14676,7 +14707,7 @@ const Methods = {
         if (scrollYLoad) {
           $xeTable.triggerScrollYEvent(evnt);
         }
-        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, currTopNum, scrollLeft, {
+        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, currTopNum, bodyScrollElem.scrollLeft, {
           type: 'table',
           fixed: ''
         });
@@ -23140,12 +23171,12 @@ const convertToRows = originColumns => {
       const {
         mergeList,
         mergeFooterList,
-        isGroup,
-        tableGroupColumn
+        isGroup
       } = reactData;
       const {
         tableFullColumn,
-        afterFullData
+        afterFullData,
+        collectColumn
       } = internalData;
       const exportOpts = $xeTable.computeExportOpts;
       const treeOpts = $xeTable.computeTreeOpts;
@@ -23175,7 +23206,7 @@ const convertToRows = originColumns => {
         // beforeExportMethod: null,
         // afterExportMethod: null
       }, exportOpts, options);
-      const {
+      let {
         filename,
         sheetName,
         type,
@@ -23188,7 +23219,11 @@ const convertToRows = originColumns => {
         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) {
@@ -23264,7 +23299,7 @@ const convertToRows = originColumns => {
           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
         })), {
@@ -23339,7 +23374,6 @@ const convertToRows = originColumns => {
       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'
@@ -25399,7 +25433,6 @@ function renderViewport(h, $xeTable) {
   } = props;
   const {
     overflowX,
-    scrollYLoad,
     tableData,
     tableColumn,
     tableGroupColumn,
@@ -25410,16 +25443,9 @@ function renderViewport(h, $xeTable) {
     leftList,
     rightList
   } = columnStore;
-  const leftFixedWidth = $xeTable.computeLeftFixedWidth;
-  const rightFixedWidth = $xeTable.computeRightFixedWidth;
-  const ons = {};
-  if (scrollYLoad || leftFixedWidth || rightFixedWidth) {
-    ons.onWheel = $xeTable.triggerBodyWheelEvent;
-  }
   return h('div', {
     ref: 'refTableViewportElem',
-    class: 'vxe-table--viewport-wrapper',
-    on: ons
+    class: 'vxe-table--viewport-wrapper'
   }, [h('div', {
     class: 'vxe-table--main-wrapper'
   }, [
@@ -26353,6 +26379,7 @@ function renderBody(h, $xeTable) {
     }
   },
   created() {
+    const $xeTable = this;
     const {
       scrollXStore,
       sYOpts,
@@ -26620,7 +26647,7 @@ function renderBody(h, $xeTable) {
     table_globalEvents.on(this, 'keydown', this.handleGlobalKeydownEvent);
     table_globalEvents.on(this, 'resize', this.handleGlobalResizeEvent);
     table_globalEvents.on(this, 'contextmenu', this.handleGlobalContextmenuEvent);
-    this.preventEvent(null, 'created');
+    $xeTable.preventEvent(null, 'created');
   },
   mounted() {
     const $xeTable = this;
@@ -26669,6 +26696,12 @@ function renderBody(h, $xeTable) {
       resizeObserver.observe(this.getParentElem());
       this.$resize = resizeObserver;
     }
+    const tableViewportEl = $xeTable.$refs.refTableViewportElem;
+    if (tableViewportEl) {
+      tableViewportEl.addEventListener('wheel', $xeTable.triggerBodyWheelEvent, {
+        passive: false
+      });
+    }
     this.preventEvent(null, 'mounted');
   },
   activated() {
@@ -26679,6 +26712,11 @@ function renderBody(h, $xeTable) {
     this.preventEvent(null, 'deactivated');
   },
   beforeDestroy() {
+    const $xeTable = this;
+    const tableViewportEl = $xeTable.$refs.refTableViewportElem;
+    if (tableViewportEl) {
+      tableViewportEl.removeEventListener('wheel', $xeTable.triggerBodyWheelEvent);
+    }
     if (this.$resize) {
       this.$resize.disconnect();
     }