stk-table-vue 0.6.14 → 0.6.15

package/lib/stk-table-vue.js

@@ -1089,9 +1089,18 @@ function useVirtualScroll({
   });
   const virtual_offsetBottom = computed(() => {
     if (!virtual_on.value) return 0;
-    const { startIndex } = virtualScroll.value;
+    const { startIndex, endIndex } = virtualScroll.value;
+    const dataSourceCopyValue = dataSourceCopy.value;
     const rowHeight = getRowHeightFn.value();
-    return (dataSourceCopy.value.length - startIndex - virtual_dataSourcePart.value.length) * rowHeight;
+    if (props.autoRowHeight) {
+      let offsetBottom = 0;
+      for (let i = endIndex; i < dataSourceCopyValue.length; i++) {
+        const rowHeight2 = getRowHeightFn.value(dataSourceCopyValue[i]);
+        offsetBottom += rowHeight2;
+      }
+      return offsetBottom;
+    }
+    return (dataSourceCopyValue.length - startIndex - virtual_dataSourcePart.value.length) * rowHeight;
   });
   const virtualX_on = computed(() => {
     return props.virtualX && tableHeaderLast.value.reduce((sum, col) => sum += getCalculatedColWidth(col), 0) > virtualScrollX.value.containerWidth + 100;
@@ -1183,9 +1192,9 @@ function useVirtualScroll({
   const autoRowHeightMap = /* @__PURE__ */ new Map();
   function setAutoHeight(rowKey, height) {
     if (!height) {
-      autoRowHeightMap.delete(rowKey);
+      autoRowHeightMap.delete(String(rowKey));
     } else {
-      autoRowHeightMap.set(rowKey, height);
+      autoRowHeightMap.set(String(rowKey), height);
     }
   }
   function clearAllAutoHeight() {
@@ -1195,7 +1204,7 @@ function useVirtualScroll({
     var _a;
     if (!row) return;
     const rowKey = rowKeyGen(row);
-    const storedHeight = autoRowHeightMap.get(rowKey);
+    const storedHeight = autoRowHeightMap.get(String(rowKey));
     if (storedHeight) {
       return storedHeight;
     }
@@ -1232,7 +1241,7 @@ function useVirtualScroll({
       for (let i = 0; i < dataLength; i++) {
         const height = getRowHeightFn.value(dataSourceCopyTemp[i]);
         autoRowHeightTop += height;
-        if (autoRowHeightTop >= sTop) {
+        if (autoRowHeightTop > sTop) {
           startIndex = i;
           autoRowHeightTop -= height;
           break;

package/package.json

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

package/src/StkTable/useVirtualScroll.ts

@@ -107,9 +107,19 @@ export function useVirtualScroll<DT extends Record<string, any>>({
 
     const virtual_offsetBottom = computed(() => {
         if (!virtual_on.value) return 0;
-        const { startIndex } = virtualScroll.value;
+        const { startIndex, endIndex } = virtualScroll.value;
+        const dataSourceCopyValue = dataSourceCopy.value;
         const rowHeight = getRowHeightFn.value();
-        return (dataSourceCopy.value.length - startIndex - virtual_dataSourcePart.value.length) * rowHeight;
+        if (props.autoRowHeight) {
+            let offsetBottom = 0;
+            for (let i = endIndex; i < dataSourceCopyValue.length; i++) {
+                const rowHeight = getRowHeightFn.value(dataSourceCopyValue[i]);
+                offsetBottom += rowHeight;
+            }
+            return offsetBottom;
+        }
+
+        return (dataSourceCopyValue.length - startIndex - virtual_dataSourcePart.value.length) * rowHeight;
     });
 
     const virtualX_on = computed(() => {
@@ -232,13 +242,13 @@ export function useVirtualScroll<DT extends Record<string, any>>({
     let vue2ScrollYTimeout: null | number = null;
 
     /** every row actual height */
-    const autoRowHeightMap = new Map<UniqKey, number>();
+    const autoRowHeightMap = new Map<string, number>();
     /** 如果行高度有变化，则要调用此方法清除保存的行高 */
     function setAutoHeight(rowKey: UniqKey, height?: number | null) {
         if (!height) {
-            autoRowHeightMap.delete(rowKey);
+            autoRowHeightMap.delete(String(rowKey));
         } else {
-            autoRowHeightMap.set(rowKey, height);
+            autoRowHeightMap.set(String(rowKey), height);
         }
     }
 
@@ -249,7 +259,7 @@ export function useVirtualScroll<DT extends Record<string, any>>({
     function getAutoRowHeight(row?: DT) {
         if (!row) return;
         const rowKey = rowKeyGen(row);
-        const storedHeight = autoRowHeightMap.get(rowKey);
+        const storedHeight = autoRowHeightMap.get(String(rowKey));
         if (storedHeight) {
             return storedHeight;
         }
@@ -294,7 +304,7 @@ export function useVirtualScroll<DT extends Record<string, any>>({
             for (let i = 0; i < dataLength; i++) {
                 const height = getRowHeightFn.value(dataSourceCopyTemp[i]);
                 autoRowHeightTop += height;
-                if (autoRowHeightTop >= sTop) {
+                if (autoRowHeightTop > sTop) {
                     startIndex = i;
                     autoRowHeightTop -= height;
                     break;