vxe-table 4.23.0-beta.1 → 4.23.0-beta.2

package/es/table/src/props.js

@@ -1,4 +1,5 @@
 import { VxeUI } from '../../ui';
+import { getDefaultConfig } from '../../ui/src/utils';
 const { getConfig } = VxeUI;
 export const tableProps = {
     /** 基本属性 */
@@ -76,7 +77,10 @@ export const tableProps = {
         type: Boolean,
         default: () => getConfig().table.highlightCurrentRow
     },
-    // （即将废弃）鼠标移到行是否要高亮显示
+    /**
+     * （即将废弃）鼠标移到行是否要高亮显示
+     * @deprecated
+     */
     highlightHoverRow: {
         type: Boolean,
         default: () => getConfig().table.highlightHoverRow
@@ -301,7 +305,7 @@ export const tableProps = {
     virtualYConfig: Object,
     useScrollbar: {
         type: Boolean,
-        default: () => getConfig().table.useScrollbar
+        default: () => getDefaultConfig(getConfig().table.useScrollbar, getConfig().useScrollbar)
     },
     // 滚动条配置项
     scrollbarConfig: Object,

package/es/table/src/scrollbar.js

@@ -0,0 +1,54 @@
+/**
+ * 计算滚动条滑块的长度
+ */
+export function getThumbSize(viewportSize, contentSize, trackSize) {
+    if (contentSize <= viewportSize) {
+        return 0;
+    }
+    const ratio = viewportSize / contentSize;
+    const ideal = trackSize * ratio;
+    return Math.max(20, Math.min(ideal, trackSize));
+}
+/**
+ * 计算滚动条滑块的偏移位置
+ */
+export function getThumbOffsetSize(offsetSize, viewportSize, contentSize, trackSize, thumbSize) {
+    const maxScroll = contentSize - viewportSize;
+    if (maxScroll <= 0) {
+        return 0;
+    }
+    const maxThumbOffset = trackSize - thumbSize;
+    if (maxThumbOffset <= 0) {
+        return 0;
+    }
+    const clamped = Math.min(Math.max(offsetSize, 0), maxScroll);
+    const ratio = clamped / maxScroll;
+    return ratio * maxThumbOffset;
+}
+/**
+ * 根据点击轨道的位置，计算滑块的偏移位置
+ */
+export function getScrollFromClick(clickPosition, viewportSize, contentSize, trackSize, thumbSize) {
+    const maxThumbOffset = trackSize - thumbSize;
+    const maxScroll = contentSize - viewportSize;
+    if (maxScroll <= 0 || maxThumbOffset <= 0) {
+        return 0;
+    }
+    let thumbOffset = clickPosition - thumbSize / 2;
+    thumbOffset = Math.min(Math.max(thumbOffset, 0), maxThumbOffset);
+    const scrollOffset = (thumbOffset / maxThumbOffset) * maxScroll;
+    return scrollOffset;
+}
+/**
+ * 拖拽 thumb 时，根据鼠标位置计算滑块的偏移位置
+ */
+export function getScrollFromDrag(pointerPosition, dragOffset, viewportSize, contentSize, trackSize, thumbSize) {
+    const maxScroll = contentSize - viewportSize;
+    const maxThumbOffset = trackSize - thumbSize;
+    if (maxScroll <= 0 || maxThumbOffset <= 0) {
+        return 0;
+    }
+    let thumbOffset = pointerPosition - dragOffset;
+    thumbOffset = Math.min(Math.max(thumbOffset, 0), maxThumbOffset);
+    return (thumbOffset / maxThumbOffset) * maxScroll;
+}