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

package/es/table/src/table.js

@@ -2333,7 +2333,6 @@ export default defineVxeComponent({
                 emptyPlaceholderElem.style.height = bodyWrapperElem ? `${bodyWrapperElem.offsetHeight - osbHeight}px` : '';
             }
             const scrollbarXConf = scrollbarOpts.x || {};
-            const scrollbarXToTop = computeScrollbarXToTop.value;
             const scrollbarYConf = scrollbarOpts.y || {};
             const scrollbarYToLeft = computeScrollbarYToLeft.value;
             let xScrollbarVisible = overflowX ? 'visible' : 'hidden';
@@ -2383,16 +2382,31 @@ export default defineVxeComponent({
             }
             const xWrapperEl = refScrollXWrapperElem.value;
             if (xWrapperEl) {
-                xWrapperEl.style.left = scrollbarXToTop ? `${osbWidth}px` : '';
                 xWrapperEl.style.width = `${el.clientWidth - osbWidth}px`;
+                if (scrollbarYToLeft) {
+                    xWrapperEl.style.left = `${osbWidth}px`;
+                }
+                else {
+                    xWrapperEl.style.left = '';
+                }
             }
             if (xLeftCornerEl) {
-                xLeftCornerEl.style.width = scrollbarXToTop ? `${osbWidth}px` : '';
-                xLeftCornerEl.style.display = scrollbarXToTop ? (overflowX && osbHeight ? 'block' : '') : '';
+                if (scrollbarYToLeft) {
+                    xLeftCornerEl.style.width = `${osbWidth}px`;
+                    xLeftCornerEl.style.display = overflowY && osbWidth ? 'block' : '';
+                }
+                else {
+                    xLeftCornerEl.style.display = '';
+                }
             }
             if (xRightCornerEl) {
-                xRightCornerEl.style.width = scrollbarXToTop ? '' : `${osbWidth}px`;
-                xRightCornerEl.style.display = scrollbarXToTop ? '' : (xScrollbarVisible === 'visible' ? 'block' : '');
+                if (scrollbarYToLeft) {
+                    xRightCornerEl.style.display = '';
+                }
+                else {
+                    xRightCornerEl.style.width = `${osbWidth}px`;
+                    xRightCornerEl.style.display = xScrollbarVisible === 'visible' ? 'block' : '';
+                }
             }
             const scrollYVirtualEl = refScrollYVirtualElem.value;
             if (scrollYVirtualEl) {
@@ -3970,8 +3984,10 @@ export default defineVxeComponent({
                 updateAfterDataIndex();
                 return nextTick();
             }).then(() => {
+                updateTreeLineStyle();
                 return handleLazyRecalculate(true, true, true);
             }).then(() => {
+                updateTreeLineStyle();
                 setTimeout(() => {
                     $xeTable.updateCellAreas();
                 }, 30);
@@ -4232,7 +4248,10 @@ export default defineVxeComponent({
             let countTop = 0;
             const step = (timestamp) => {
                 let progress = (timestamp - startTime) / duration;
-                if (progress > 1) {
+                if (progress < 0) {
+                    progress = 0;
+                }
+                else if (progress > 1) {
                     progress = 1;
                 }
                 const easedProgress = Math.pow(progress, 2);
@@ -4326,6 +4345,9 @@ export default defineVxeComponent({
                 }
             }
         };
+        /**
+         * 更新展开行样式
+         */
         const updateRowExpandStyle = () => {
             const { expandColumn, scrollYLoad, scrollYTop, isScrollYBig } = reactData;
             const expandOpts = computeExpandOpts.value;
@@ -4381,6 +4403,12 @@ export default defineVxeComponent({
                 }
             }
         };
+        /**
+         * 更新树连接线样式
+         */
+        const updateTreeLineStyle = () => {
+            // 待优化
+        };
         const handleRowExpandScroll = () => {
             const { elemStore } = internalData;
             const rowExpandEl = refRowExpandElem.value;
@@ -11194,6 +11222,10 @@ export default defineVxeComponent({
                 if (target && /^textarea$/i.test(target.tagName)) {
                     return;
                 }
+                // 如果滚轮未移动或者触摸板未变化位置
+                if (!deltaY && !deltaX) {
+                    return;
+                }
                 const { highlightHoverRow } = tableProps;
                 const { scrollXLoad, scrollYLoad, expandColumn } = reactData;
                 const leftFixedWidth = computeLeftFixedWidth.value;
@@ -11221,18 +11253,21 @@ export default defineVxeComponent({
                     return;
                 }
                 const wheelSpeed = getWheelSpeed(reactData.lastScrollTime);
-                const deltaTop = shiftKey ? 0 : Math.ceil(deltaY * wheelSpeed);
-                const deltaLeft = shiftKey ? Math.ceil((shiftKey ? (deltaY || deltaX) : deltaX) * wheelSpeed) : 0;
-                const isTopWheel = deltaTop < 0;
+                const deltaTop = shiftKey ? 0 : (deltaY * wheelSpeed);
+                const deltaLeft = (shiftKey ? (deltaX || deltaY) : deltaX) * wheelSpeed;
                 const currScrollTop = bodyScrollElem.scrollTop;
-                // 如果滚动位置已经是顶部或底部，则不需要触发
-                if (isTopWheel ? currScrollTop <= 0 : currScrollTop >= bodyScrollElem.scrollHeight - bodyScrollElem.clientHeight) {
-                    return;
-                }
+                const currScrollLeft = bodyScrollElem.scrollLeft;
                 const scrollTop = currScrollTop + deltaTop;
-                const scrollLeft = bodyScrollElem.scrollLeft + deltaLeft;
+                const scrollLeft = currScrollLeft + deltaLeft;
                 const isRollX = scrollLeft !== lastScrollLeft;
                 const isRollY = scrollTop !== lastScrollTop;
+                if (isRollY) {
+                    const isTopWheel = deltaTop < 0;
+                    // 如果滚动位置已经是顶部或底部，则不需要触发
+                    if (isTopWheel ? currScrollTop <= 0 : currScrollTop >= bodyScrollElem.scrollHeight - bodyScrollElem.clientHeight) {
+                        return;
+                    }
+                }
                 if (rowOpts.isHover || highlightHoverRow) {
                     $xeTable.clearHoverRow();
                 }

package/es/table/src/util.js

@@ -566,7 +566,7 @@ const lineOffsetSizes = {
     medium: 1,
     large: 0
 };
-function countTreeExpand(prevRow, params) {
+function countTreeExpandSize(prevRow, params) {
     let count = 1;
     if (!prevRow) {
         return count;
@@ -583,7 +583,7 @@ function countTreeExpand(prevRow, params) {
     const rowChildren = prevRow[transform ? mapChildrenField : childrenField];
     if (rowChildren && treeExpandedFlag && treeExpandedMaps[getRowid($table, prevRow)]) {
         for (let index = 0; index < rowChildren.length; index++) {
-            count += countTreeExpand(rowChildren[index], params);
+            count += countTreeExpandSize(rowChildren[index], params);
         }
     }
     return count;
@@ -613,7 +613,7 @@ export function calcTreeLine(params, prevRow) {
     const currCellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
     let expandSize = 1;
     if (prevRow) {
-        expandSize = countTreeExpand(prevRow, params);
+        expandSize = countTreeExpandSize(prevRow, params);
     }
     let cellHeight = currCellHeight;
     const vnHeight = rowRest.height;

package/es/table/style.css

@@ -2212,6 +2212,9 @@
   left: 0;
   bottom: 0;
 }
+.vxe-table .vxe-table--scroll-x-wrapper {
+  height: 100%;
+}
 .vxe-table .vxe-table--scroll-x-handle {
   overflow-y: hidden;
   overflow-x: scroll;