element-pe 2.2.101 → 2.2.102

package/dist/index.full.js

@@ -44114,6 +44114,7 @@
         const rows = instance.setupState.scrollBarRef.wrapRef.querySelectorAll(".el-table .el-table__body tbody>tr");
         if (rows.length > 0) {
           const wrapRect = instance.setupState.scrollBarRef.wrapRef.getBoundingClientRect();
+          const wrapStart = wrapRect.y;
           const wrapEnd = wrapRect.y + wrapRect.height;
           let firstIndex = -1;
           let lastIndex = -1;
@@ -44121,23 +44122,34 @@
           if (lastRect.y + lastRect.height < wrapEnd) {
             lastIndex = rows.length - 1;
           }
-          let firstRow = null;
-          let lastRow = null;
-          const firstCell = document.elementFromPoint(wrapRect.x + 5, wrapRect.y + 5);
-          if (firstCell.nodeName === "TD") {
-            firstRow = firstCell.parentElement;
-          } else if (firstCell.nodeName === "TR") {
-            firstRow = firstCell;
-          }
-          const lastCell = document.elementFromPoint(wrapRect.x + 5, wrapRect.y + wrapRect.height - 5);
-          if (lastCell.nodeName === "TD") {
-            lastRow = lastCell.parentElement;
-          } else if (lastCell.nodeName === "TR") {
-            lastRow = lastCell;
-          }
-          if (firstRow && lastRow) {
-            firstIndex = parseInt(firstRow.getAttribute("row-index"));
-            lastIndex = parseInt(lastRow.getAttribute("row-index"));
+          if (evt) {
+            let rowTop = 0;
+            for (let i = 0; i < rows.length; i++) {
+              const row = rows[i];
+              if (row.style.display !== "none") {
+                rowTop += row.getBoundingClientRect().height;
+                if (firstIndex === -1 && rowTop >= evt.scrollTop) {
+                  firstIndex = i;
+                }
+                if (lastIndex === -1 && rowTop >= evt.scrollTop + wrapRect.height) {
+                  lastIndex = i;
+                  break;
+                }
+              }
+            }
+          } else {
+            for (let i = 0; i < rows.length; i++) {
+              if (firstIndex !== -1 && lastIndex !== -1) {
+                break;
+              }
+              const rowRect = rows[i].getBoundingClientRect();
+              if (rowRect.y <= wrapStart && rowRect.y + rowRect.height > wrapStart) {
+                firstIndex = i;
+              }
+              if (rowRect.y + rowRect.height >= wrapEnd && rowRect.y < wrapEnd) {
+                lastIndex = i;
+              }
+            }
           }
           if (firstIndex !== -1 && lastIndex !== -1) {
             if (firstIndex !== oldRenderRange.value[0] || lastIndex !== oldRenderRange.value[1]) {