stk-table-vue 0.11.1 → 0.11.2

package/lib/index-t5SJ6KNv.js

@@ -1,6 +1,6 @@
 /**
  * name: stk-table-vue
- * version: v0.11.1
+ * version: v0.11.2
  * description: High performance realtime virtual table for vue3 and vue2.7
  * author: japlus
  * homepage: https://ja-plus.github.io/stk-table-vue/

package/lib/src/StkTable/useScrollbar.d.ts

@@ -18,7 +18,7 @@ export type ScrollbarOptions = {
  * @param options 滚动条配置选项
  * @returns 滚动条相关状态和方法
  */
-export declare function useScrollbar(props: any, containerRef: Ref<HTMLDivElement | undefined>, virtualScroll: Ref<VirtualScrollStore>, virtualScrollX: Ref<VirtualScrollXStore>, updateVirtualScrollY: (sTop?: number) => void, scrollbarOptions: Ref<Required<ScrollbarOptions>>): readonly [Ref<{
+export declare function useScrollbar(props: any, containerRef: Ref<HTMLDivElement | undefined>, virtualScroll: Ref<VirtualScrollStore>, virtualScrollX: Ref<VirtualScrollXStore>, updateVirtualScrollY: (sTop?: number) => void, scrollbarOptions: Ref<Required<ScrollbarOptions>>, isExperimentalScrollY: Ref<boolean | undefined>): readonly [Ref<{
     h: number;
     w: number;
     t: number;

package/lib/src/StkTable/useVirtualScroll.d.ts

@@ -41,7 +41,7 @@ export type VirtualScrollXStore = {
  * virtual scroll
  * @returns
  */
-export declare function useVirtualScroll<DT extends Record<string, any>>(props: any, tableContainerRef: Ref<HTMLElement | undefined>, trRef: Ref<HTMLTableRowElement[] | undefined>, dataSourceCopy: ShallowRef<PrivateRowDT[]>, tableHeaderLast: ShallowRef<PrivateStkTableColumn<PrivateRowDT>[]>, tableHeaders: ShallowRef<PrivateStkTableColumn<PrivateRowDT>[][]>, rowKeyGen: RowKeyGen, maxRowSpan: Map<UniqKey, number>, scrollbarOptions: Ref<Required<ScrollbarOptions>>): readonly [Ref<{
+export declare function useVirtualScroll<DT extends Record<string, any>>(props: any, tableContainerRef: Ref<HTMLElement | undefined>, trRef: Ref<HTMLTableRowElement[] | undefined>, dataSourceCopy: ShallowRef<PrivateRowDT[]>, tableHeaderLast: ShallowRef<PrivateStkTableColumn<PrivateRowDT>[]>, tableHeaders: ShallowRef<PrivateStkTableColumn<PrivateRowDT>[][]>, rowKeyGen: RowKeyGen, maxRowSpan: Map<UniqKey, number>, scrollbarOptions: Ref<Required<ScrollbarOptions>>, isExperimentalScrollY: Ref<boolean | undefined>): readonly [Ref<{
     containerHeight: number;
     pageSize: number;
     startIndex: number;

package/lib/stk-table-vue.js

@@ -1,6 +1,6 @@
 /**
  * name: stk-table-vue
- * version: v0.11.1
+ * version: v0.11.2
  * description: High performance realtime virtual table for vue3 and vue2.7
  * author: japlus
  * homepage: https://ja-plus.github.io/stk-table-vue/
@@ -365,6 +365,42 @@ function useAreaSelection(props, emits, tableContainerRef, dataSourceCopy, table
     }
     return map;
   });
+  const getFixedColWidths = computed(() => {
+    const cols = tableHeaderLast.value;
+    const leftAccumulated = [];
+    const rightAccumulated = [];
+    let leftSum = 0;
+    let rightSum = 0;
+    for (let i = 0, j = cols.length - 1; i < cols.length; i++, j--) {
+      const leftCol = cols[i];
+      const rightCol = cols[j];
+      if ((leftCol == null ? void 0 : leftCol.fixed) === "left") {
+        leftSum += getCalculatedColWidth(leftCol);
+        leftAccumulated.push({ i, w: leftSum });
+      }
+      if ((rightCol == null ? void 0 : rightCol.fixed) === "right") {
+        rightSum += getCalculatedColWidth(rightCol);
+        rightAccumulated.unshift({ i: j, w: rightSum });
+      }
+    }
+    return (colIndex) => {
+      let leftFixedWidth = 0;
+      for (let i = leftAccumulated.length - 1; i >= 0; i--) {
+        if (leftAccumulated[i].i < colIndex) {
+          leftFixedWidth = leftAccumulated[i].w;
+          break;
+        }
+      }
+      let rightFixedWidth = 0;
+      for (let i = rightAccumulated.length - 1; i >= 0; i--) {
+        if (rightAccumulated[i].i > colIndex) {
+          rightFixedWidth = rightAccumulated[i].w;
+          break;
+        }
+      }
+      return [leftFixedWidth, rightFixedWidth];
+    };
+  });
   const selectedCellKeys = computed(() => {
     const range = selectionRange.value;
     if (!range) return /* @__PURE__ */ new Set();
@@ -764,11 +800,12 @@ function useAreaSelection(props, emits, tableContainerRef, dataSourceCopy, table
     const targetColRight = targetColLeft + targetColWidth;
     const visibleLeft = container.scrollLeft;
     const visibleRight = visibleLeft + vsx.containerWidth;
+    const [leftFixedWidth, rightFixedWidth] = getFixedColWidths.value(colIndex);
     let newScrollLeft = null;
-    if (targetColLeft < visibleLeft) {
-      newScrollLeft = targetColLeft;
-    } else if (targetColRight > visibleRight) {
-      newScrollLeft = targetColRight - vsx.containerWidth;
+    if (targetColLeft < visibleLeft + leftFixedWidth) {
+      newScrollLeft = targetColLeft - leftFixedWidth;
+    } else if (targetColRight > visibleRight - rightFixedWidth) {
+      newScrollLeft = targetColRight - vsx.containerWidth + rightFixedWidth;
     }
     if (newScrollTop !== null || newScrollLeft !== null) {
       scrollTo(newScrollTop, newScrollLeft);
@@ -1586,7 +1623,7 @@ function useRowExpand(emits, dataSourceCopy, rowKeyGen) {
   }
   return [toggleExpandRow, setRowExpand];
 }
-function useScrollbar(props, containerRef, virtualScroll, virtualScrollX, updateVirtualScrollY, scrollbarOptions) {
+function useScrollbar(props, containerRef, virtualScroll, virtualScrollX, updateVirtualScrollY, scrollbarOptions, isExperimentalScrollY) {
   const showScrollbar = ref({ x: false, y: false });
   const scrollbar = ref({ h: 0, w: 0, t: 0, l: 0 });
   let isDraggingVertical = false;
@@ -1650,7 +1687,6 @@ function useScrollbar(props, containerRef, virtualScroll, virtualScrollX, update
     document.addEventListener("touchend", onDragEnd);
   }
   function onVerticalDrag(e) {
-    var _a;
     if (!isDraggingVertical) return;
     e.preventDefault();
     const clientY = e instanceof MouseEvent ? e.clientY : e.touches[0].clientY;
@@ -1659,7 +1695,7 @@ function useScrollbar(props, containerRef, virtualScroll, virtualScrollX, update
     const scrollRange = scrollHeight - containerHeight;
     const trackRange = containerHeight - scrollbar.value.h;
     const scrollDelta = deltaY / trackRange * scrollRange;
-    if ((_a = props.experimental) == null ? void 0 : _a.scrollY) {
+    if (isExperimentalScrollY.value) {
       const ratio = containerHeight / scrollHeight;
       const top = Math.round((dragStartTop + scrollDelta) * ratio);
       const maxTop = containerHeight - scrollbar.value.h;
@@ -2106,7 +2142,7 @@ function useTree(props, dataSourceCopy, rowKeyGen, emits) {
   return [toggleTreeNode, setTreeExpand, flatTreeData];
 }
 const VUE2_SCROLL_TIMEOUT_MS = 200;
-function useVirtualScroll(props, tableContainerRef, trRef, dataSourceCopy, tableHeaderLast, tableHeaders, rowKeyGen, maxRowSpan, scrollbarOptions) {
+function useVirtualScroll(props, tableContainerRef, trRef, dataSourceCopy, tableHeaderLast, tableHeaders, rowKeyGen, maxRowSpan, scrollbarOptions, isExperimentalScrollY) {
   const tableHeaderHeight = computed(() => props.headerRowHeight * tableHeaders.value.length);
   const virtualScroll = ref({
     containerHeight: 0,
@@ -2266,7 +2302,6 @@ function useVirtualScroll(props, tableContainerRef, trRef, dataSourceCopy, table
     }
   }
   function updateVirtualScrollY(sTop = 0) {
-    var _a;
     const { pageSize, scrollTop, startIndex: oldStartIndex, endIndex: oldEndIndex, containerHeight } = virtualScroll.value;
     const dataSourceCopyTemp = dataSourceCopy.value;
     const dataLength = dataSourceCopyTemp.length;
@@ -2276,7 +2311,7 @@ function useVirtualScroll(props, tableContainerRef, trRef, dataSourceCopy, table
     const { enabled: scrollbarEnable } = scrollbarOptions.value;
     if (scrollbarEnable) {
       vsValue.scrollHeight = scrollHeight;
-      if ((_a = props.experimental) == null ? void 0 : _a.scrollY) {
+      if (isExperimentalScrollY.value) {
         let maxTop;
         sTop = sTop < 0 ? 0 : sTop < (maxTop = scrollHeight - containerHeight) ? sTop : maxTop;
         vsValue.translateY = props.scrollRowByRow ? 0 : -(sTop % rowHeight);
@@ -2647,6 +2682,13 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       height: 8,
       ...typeof props.scrollbar === "boolean" ? { enabled: props.scrollbar } : props.scrollbar
     }));
+    const isExperimentalScrollY = computed(() => {
+      var _a, _b;
+      if (((_a = scrollbarOptions.value) == null ? void 0 : _a.enabled) && props.scrollRowByRow) {
+        return true;
+      }
+      return (_b = props.experimental) == null ? void 0 : _b.scrollY;
+    });
     const rowKeyGenCache = /* @__PURE__ */ new WeakMap();
     const [isSRBRActive] = useScrollRowByRow(props, tableContainerRef);
     const [onThDragStart, onThDragOver, onThDrop, isHeaderDraggable] = useThDrag(props, emits, colKeyGen);
@@ -2669,7 +2711,18 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       updateVirtualScrollX,
       setAutoHeight,
       clearAllAutoHeight
-    ] = useVirtualScroll(props, tableContainerRef, trRef, dataSourceCopy, tableHeaderLast, tableHeaders, rowKeyGen, maxRowSpan, scrollbarOptions);
+    ] = useVirtualScroll(
+      props,
+      tableContainerRef,
+      trRef,
+      dataSourceCopy,
+      tableHeaderLast,
+      tableHeaders,
+      rowKeyGen,
+      maxRowSpan,
+      scrollbarOptions,
+      isExperimentalScrollY
+    );
     const rafUpdateVirtualScrollYForWheel = rafThrottle((scrollTop) => {
       updateVirtualScrollY(scrollTop);
     });
@@ -2679,7 +2732,8 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       virtualScroll,
       virtualScrollX,
       updateVirtualScrollY,
-      scrollbarOptions
+      scrollbarOptions,
+      isExperimentalScrollY
     );
     const [hiddenCellMap, mergeCellsWrapper, hoverMergedCells, updateHoverMergedCells, activeMergedCells, updateActiveMergedCells] = useMergeCells(
       rowActiveProp,
@@ -3151,7 +3205,6 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     }
     const [isWheeling, setIsWheeling] = useWheeling();
     function onTableWheel(e) {
-      var _a;
       if (props.smoothScroll) return;
       if (isColResizing.value) {
         e.stopPropagation();
@@ -3169,7 +3222,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         if (isWheeling()) {
           e.preventDefault();
         }
-        if ((_a = props.experimental) == null ? void 0 : _a.scrollY) {
+        if (isExperimentalScrollY.value) {
           rafUpdateVirtualScrollYForWheel(scrollTop + deltaY);
           updateCustomScrollbar();
         } else {
@@ -3487,7 +3540,6 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       setFilter
     });
     return (_ctx, _cache) => {
-      var _a, _b, _c, _d;
       return openBlock(), createElementBlock("div", {
         ref_key: "tableContainerRef",
         ref: tableContainerRef,
@@ -3514,7 +3566,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
           "scroll-row-by-row": unref(isSRBRActive),
           "scrollbar-on": scrollbarOptions.value.enabled,
           "is-area-selecting": unref(isAreaSelecting),
-          "exp-scroll-y": (_a = __props.experimental) == null ? void 0 : _a.scrollY
+          "exp-scroll-y": isExperimentalScrollY.value
         }]),
         tabindex: props.areaSelection ? 0 : void 0,
         style: normalizeStyle({
@@ -3529,7 +3581,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         onScroll: onTableScroll,
         onWheel: onTableWheel
       }, [
-        !((_b = __props.experimental) == null ? void 0 : _b.scrollY) && SRBRTotalHeight.value ? (openBlock(), createElementBlock("div", {
+        !isExperimentalScrollY.value && SRBRTotalHeight.value ? (openBlock(), createElementBlock("div", {
           key: 0,
           class: "row-by-row-table-height",
           style: normalizeStyle(`height: ${SRBRTotalHeight.value}px`)
@@ -3656,7 +3708,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               onMousedown: onCellMouseDown,
               onMouseover: onCellMouseOver
             }, [
-              !((_c = __props.experimental) == null ? void 0 : _c.scrollY) && unref(virtual_on) && !unref(isSRBRActive) ? (openBlock(), createElementBlock("tr", {
+              !isExperimentalScrollY.value && unref(virtual_on) && !unref(isSRBRActive) ? (openBlock(), createElementBlock("tr", {
                 key: 0,
                 style: normalizeStyle(`height:${unref(virtualScroll).offsetTop}px`),
                 class: "padding-top-tr"
@@ -3689,16 +3741,16 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                         row: row.__EXP_R__,
                         col: row.__EXP_C__
                       }, () => {
-                        var _a2;
+                        var _a;
                         return [
-                          createTextVNode(toDisplayString(((_a2 = row.__EXP_R__) == null ? void 0 : _a2[row.__EXP_C__.dataIndex]) ?? ""), 1)
+                          createTextVNode(toDisplayString(((_a = row.__EXP_R__) == null ? void 0 : _a[row.__EXP_C__.dataIndex]) ?? ""), 1)
                         ];
                       })
                     ])
                   ], 8, _hoisted_16)) : (openBlock(true), createElementBlock(Fragment, { key: 2 }, renderList(unref(virtualX_columnPart), (col, colIndex) => {
-                    var _a2;
+                    var _a;
                     return openBlock(), createElementBlock(Fragment, null, [
-                      !unref(hiddenCellMap) || !((_a2 = unref(hiddenCellMap)[rowKeyGen(row)]) == null ? void 0 : _a2.has(colKeyGen.value(col))) ? (openBlock(), createElementBlock("td", mergeProps({
+                      !unref(hiddenCellMap) || !((_a = unref(hiddenCellMap)[rowKeyGen(row)]) == null ? void 0 : _a.has(colKeyGen.value(col))) ? (openBlock(), createElementBlock("td", mergeProps({
                         key: colKeyGen.value(col)
                       }, { ref_for: true }, getTDProps(row, col, rowIndex, colIndex), {
                         onMouseenter: onCellMouseEnter,
@@ -3756,7 +3808,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                   unref(virtualX_on) ? (openBlock(), createElementBlock("td", _hoisted_22)) : createCommentVNode("", true)
                 ], 16, _hoisted_14);
               }), 128)),
-              !((_d = __props.experimental) == null ? void 0 : _d.scrollY) ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
+              !isExperimentalScrollY.value ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
                 unref(virtual_on) && !unref(isSRBRActive) ? (openBlock(), createElementBlock("tr", {
                   key: 0,
                   style: normalizeStyle(`height: ${unref(virtual_offsetBottom)}px`)

package/lib/style.css

@@ -1,6 +1,6 @@
 /**
  * name: stk-table-vue
- * version: v0.11.1
+ * version: v0.11.2
  * description: High performance realtime virtual table for vue3 and vue2.7
  * author: japlus
  * homepage: https://ja-plus.github.io/stk-table-vue/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stk-table-vue",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "High performance realtime virtual table for vue3 and vue2.7",
   "main": "./lib/stk-table-vue.js",
   "types": "./lib/src/StkTable/index.d.ts",

package/src/StkTable/StkTable.vue

@@ -26,7 +26,7 @@
             'scroll-row-by-row': isSRBRActive,
             'scrollbar-on': scrollbarOptions.enabled,
             'is-area-selecting': isAreaSelecting,
-            'exp-scroll-y': experimental?.scrollY,
+            'exp-scroll-y': isExperimentalScrollY,
         }"
         :tabindex="props.areaSelection ? 0 : void 0"
         :style="{
@@ -41,7 +41,7 @@
         @scroll="onTableScroll"
         @wheel="onTableWheel"
     >
-        <div v-if="!experimental?.scrollY && SRBRTotalHeight" class="row-by-row-table-height" :style="`height: ${SRBRTotalHeight}px`"></div>
+        <div v-if="!isExperimentalScrollY && SRBRTotalHeight" class="row-by-row-table-height" :style="`height: ${SRBRTotalHeight}px`"></div>
 
         <div v-if="colResizable" ref="colResizeIndicatorRef" class="column-resize-indicator"></div>
 
@@ -132,7 +132,7 @@
                     @mouseover="onCellMouseOver"
                 >
                     <tr
-                        v-if="!experimental?.scrollY && virtual_on && !isSRBRActive"
+                        v-if="!isExperimentalScrollY && virtual_on && !isSRBRActive"
                         :style="`height:${virtualScroll.offsetTop}px`"
                         class="padding-top-tr"
                     >
@@ -208,7 +208,7 @@
                         </template>
                         <td v-if="virtualX_on" class="vt-x-right"></td>
                     </tr>
-                    <template v-if="!experimental?.scrollY">
+                    <template v-if="!isExperimentalScrollY">
                         <tr v-if="virtual_on && !isSRBRActive" :style="`height: ${virtual_offsetBottom}px`"></tr>
                         <tr v-if="SRBRBottomHeight" :style="`height: ${SRBRBottomHeight}px`"></tr>
                     </template>
@@ -798,6 +798,13 @@ const scrollbarOptions = computed(() => ({
     ...(typeof props.scrollbar === 'boolean' ? { enabled: props.scrollbar } : props.scrollbar),
 }));
 
+const isExperimentalScrollY = computed(() => {
+    if (scrollbarOptions.value?.enabled && props.scrollRowByRow) {
+        return true;
+    }
+    return props.experimental?.scrollY;
+});
+
 const rowKeyGenCache = new WeakMap();
 
 const [isSRBRActive] = useScrollRowByRow(props, tableContainerRef);
@@ -825,7 +832,18 @@ const [
     updateVirtualScrollX,
     setAutoHeight,
     clearAllAutoHeight,
-] = useVirtualScroll(props, tableContainerRef, trRef, dataSourceCopy, tableHeaderLast, tableHeaders, rowKeyGen, maxRowSpan, scrollbarOptions);
+] = useVirtualScroll(
+    props,
+    tableContainerRef,
+    trRef,
+    dataSourceCopy,
+    tableHeaderLast,
+    tableHeaders,
+    rowKeyGen,
+    maxRowSpan,
+    scrollbarOptions,
+    isExperimentalScrollY,
+);
 
 /** requestAnimationFrame throttled version of updateVirtualScrollY for smoother wheel scrolling */
 const rafUpdateVirtualScrollYForWheel = rafThrottle((scrollTop: number) => {
@@ -839,6 +857,7 @@ const [scrollbar, showScrollbar, onVerticalScrollbarMouseDown, onHorizontalScrol
     virtualScrollX,
     updateVirtualScrollY,
     scrollbarOptions,
+    isExperimentalScrollY,
 );
 
 const [hiddenCellMap, mergeCellsWrapper, hoverMergedCells, updateHoverMergedCells, activeMergedCells, updateActiveMergedCells] = useMergeCells(
@@ -1438,7 +1457,7 @@ function onTableWheel(e: WheelEvent) {
         if (isWheeling()) {
             e.preventDefault();
         }
-        if (props.experimental?.scrollY) {
+        if (isExperimentalScrollY.value) {
             rafUpdateVirtualScrollYForWheel(scrollTop + deltaY);
             updateCustomScrollbar();
         } else {

package/src/StkTable/features/useAreaSelection.ts

@@ -72,6 +72,60 @@ export function useAreaSelection<DT extends Record<string, any>>(
         return map;
     });
 
+    /**
+     * 获取固定列宽度的函数
+     * 缓存每个固定列位置的累计宽度，查询时直接返回
+     * @param colIndex 目标列索引
+     * @returns [leftFixedWidth, rightFixedWidth]
+     */
+    const getFixedColWidths = computed(() => {
+        const cols = tableHeaderLast.value;
+        type FixedColWidth = { i: number; /** accumulated width */ w: number };
+        // 保存每个固定列位置的累计宽度（包含当前列）
+        const leftAccumulated: FixedColWidth[] = [];
+        const rightAccumulated: FixedColWidth[] = [];
+
+        let leftSum = 0;
+        let rightSum = 0;
+
+        for (let i = 0, j = cols.length - 1; i < cols.length; i++, j--) {
+            const leftCol = cols[i];
+            const rightCol = cols[j];
+
+            if (leftCol?.fixed === 'left') {
+                leftSum += getCalculatedColWidth(leftCol);
+                leftAccumulated.push({ i, w: leftSum });
+            }
+
+            if (rightCol?.fixed === 'right') {
+                rightSum += getCalculatedColWidth(rightCol);
+                rightAccumulated.unshift({ i: j, w: rightSum });
+            }
+        }
+
+        return (colIndex: number) => {
+            // 查找目标列左侧最近的固定列的累计宽度
+            let leftFixedWidth = 0;
+            for (let i = leftAccumulated.length - 1; i >= 0; i--) {
+                if (leftAccumulated[i].i < colIndex) {
+                    leftFixedWidth = leftAccumulated[i].w;
+                    break;
+                }
+            }
+
+            // 查找目标列右侧最近的固定列的累计宽度
+            let rightFixedWidth = 0;
+            for (let i = rightAccumulated.length - 1; i >= 0; i--) {
+                if (rightAccumulated[i].i > colIndex) {
+                    rightFixedWidth = rightAccumulated[i].w;
+                    break;
+                }
+            }
+
+            return [leftFixedWidth, rightFixedWidth] as const;
+        };
+    });
+
     /** 根据 selectionRange 计算选区内所有 cellKey 的集合 */
     const selectedCellKeys = computed<Set<string>>(() => {
         const range = selectionRange.value;
@@ -639,14 +693,15 @@ export function useAreaSelection<DT extends Record<string, any>>(
         const visibleLeft = container.scrollLeft;
         const visibleRight = visibleLeft + vsx.containerWidth;
 
-        // 计算需要的水平滚动位置
+        // 计算固定列的宽度（用于检测遮挡）
+        const [leftFixedWidth, rightFixedWidth] = getFixedColWidths.value(colIndex);
         let newScrollLeft: number | null = null;
-        if (targetColLeft < visibleLeft) {
-            // 目标列在可视区域左侧
-            newScrollLeft = targetColLeft;
-        } else if (targetColRight > visibleRight) {
-            // 目标列在可视区域右侧
-            newScrollLeft = targetColRight - vsx.containerWidth;
+        if (targetColLeft < visibleLeft + leftFixedWidth) {
+            // 目标列在左侧固定列遮挡区域内，需要向左滚动
+            newScrollLeft = targetColLeft - leftFixedWidth;
+        } else if (targetColRight > visibleRight - rightFixedWidth) {
+            // 目标列在右侧固定列遮挡区域内，需要向右滚动
+            newScrollLeft = targetColRight - vsx.containerWidth + rightFixedWidth;
         }
 
         // 执行滚动

package/src/StkTable/useScrollbar.ts

@@ -27,6 +27,7 @@ export function useScrollbar(
     virtualScrollX: Ref<VirtualScrollXStore>,
     updateVirtualScrollY: (sTop?: number) => void,
     scrollbarOptions: Ref<Required<ScrollbarOptions>>,
+    isExperimentalScrollY: Ref<boolean | undefined>,
 ) {
     const showScrollbar = ref({ x: false, y: false });
     const scrollbar = ref({ h: 0, w: 0, t: 0, l: 0 });
@@ -114,7 +115,7 @@ export function useScrollbar(
         const trackRange = containerHeight - scrollbar.value.h;
         const scrollDelta = (deltaY / trackRange) * scrollRange;
 
-        if (props.experimental?.scrollY) {
+        if (isExperimentalScrollY.value) {
             const ratio = containerHeight / scrollHeight;
             const top = Math.round((dragStartTop + scrollDelta) * ratio);
             const maxTop = containerHeight - scrollbar.value.h;

package/src/StkTable/useVirtualScroll.ts

@@ -57,6 +57,7 @@ export function useVirtualScroll<DT extends Record<string, any>>(
     rowKeyGen: RowKeyGen,
     maxRowSpan: Map<UniqKey, number>,
     scrollbarOptions: Ref<Required<ScrollbarOptions>>,
+    isExperimentalScrollY: Ref<boolean | undefined>,
 ) {
     const tableHeaderHeight = computed(() => props.headerRowHeight * tableHeaders.value.length);
 
@@ -276,7 +277,7 @@ export function useVirtualScroll<DT extends Record<string, any>>(
         const { enabled: scrollbarEnable } = scrollbarOptions.value;
         if (scrollbarEnable) {
             vsValue.scrollHeight = scrollHeight;
-            if (props.experimental?.scrollY) {
+            if (isExperimentalScrollY.value) {
                 let maxTop: number;
                 sTop = sTop < 0 ? 0 : sTop < (maxTop = scrollHeight - containerHeight) ? sTop : maxTop;
                 vsValue.translateY = props.scrollRowByRow ? 0 : -(sTop % rowHeight);