react-terminal-viewer-cicd 3.0.0-beta.44 → 3.0.0-beta.45

package/dist/esm/Addon/WorkerLog/LogWorker.js

@@ -1,7 +1,7 @@
 function LogWorker() {
   var workerPath = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '/worker';
   var worker = null;
-  var version = "3.0.0-beta.44" || '0.0.0';
+  var version = "3.0.0-beta.45" || '0.0.0';
   var path = workerPath.includes('http') ? "".concat(workerPath, "/log.worker.js") : "".concat(window.location.origin).concat(workerPath, "/log.worker.js");
   var blob = new Blob(["importScripts(\"".concat(path, "?v=").concat(version, "\")")], {
     type: 'application/javascript'

package/dist/esm/PipelineLogViewer/PipelineLogViewer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PipelineLogViewer.d.ts","sourceRoot":"","sources":["../../../src/PipelineLogViewer/PipelineLogViewer.tsx"],"names":[],"mappings":"AAoBA,OAAO,KASN,MAAM,OAAO,CAAC;AAiBf,OAAO,cAAc,CAAC;AACtB,OAAO,KAAK,EAGV,sBAAsB,EACtB,oBAAoB,EACrB,MAAM,SAAS,CAAC;AAwEjB,QAAA,MAAM,iBAAiB,qGAkyCtB,CAAC;AAIF,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"PipelineLogViewer.d.ts","sourceRoot":"","sources":["../../../src/PipelineLogViewer/PipelineLogViewer.tsx"],"names":[],"mappings":"AAoBA,OAAO,KASN,MAAM,OAAO,CAAC;AAiBf,OAAO,cAAc,CAAC;AACtB,OAAO,KAAK,EAGV,sBAAsB,EACtB,oBAAoB,EACrB,MAAM,SAAS,CAAC;AAwEjB,QAAA,MAAM,iBAAiB,qGAkzCtB,CAAC;AAIF,eAAe,iBAAiB,CAAC"}

package/dist/esm/PipelineLogViewer/PipelineLogViewer.js

@@ -580,26 +580,39 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     }
     var anchorRowNext = pendingScrollAfterNextRef.current;
     if (anchorRowNext !== null) {
+      var _scrollerDomRef$curre3, _scrollerDomRef$curre4;
       var _lenBefore = displayLogsLenBeforeLoadNextRef.current;
       var _sameLength = _lenBefore !== null && _lenBefore === displayLogs.length && displayLogs.length > 0;
       var headRemoved = headRemovedFromNextRef.current;
       pendingScrollAfterNextRef.current = null;
       displayLogsLenBeforeLoadNextRef.current = null;
-      ignoreBoundaryFetchRef.current = Date.now() + IGNORE_BOUNDARY_FETCH_MS_AFTER_SCROLL;
-      var comp = applyBoundaryScrollCompensation(v, anchorRowNext, displayLogs, {
+
+      // 极大缩短屏蔽窗口（原本500ms）：仅用 50ms 屏蔽当前帧由于 scrollTop 重置引起的乱序 rangeChanged。
+      // 不再长时间屏蔽，使得用户在快速下滚时 rangeChanged 依然灵敏，消除“触底发呆/卡顿”感。
+      ignoreBoundaryFetchRef.current = Date.now() + 50;
+
+      // 因为不再有漫长的屏蔽期，无需跟进定时器补偿，直接清理
+      if (boundaryIgnoreFollowUpTimeoutRef.current) {
+        clearTimeout(boundaryIgnoreFollowUpTimeoutRef.current);
+        boundaryIgnoreFollowUpTimeoutRef.current = null;
+      }
+
+      // 读取当前实时 scrollTop，而非请求前快照的 scrollTopBeforeLoadNextRef，
+      // 避免用户在 API 请求期间继续滚动导致补偿基准过时（跳屏）。
+      var realTimeScrollTop = (_scrollerDomRef$curre3 = (_scrollerDomRef$curre4 = scrollerDomRef.current) === null || _scrollerDomRef$curre4 === void 0 ? void 0 : _scrollerDomRef$curre4.scrollTop) !== null && _scrollerDomRef$curre3 !== void 0 ? _scrollerDomRef$curre3 : scrollTopBeforeLoadNextRef.current;
+      applyBoundaryScrollCompensation(v, anchorRowNext, displayLogs, {
         sameLength: _sameLength && headRemoved > 0,
         sameLengthPixelDeltaCount: headRemoved,
         scrollTopBefore: scrollTopBeforeLoadNextRef.current,
+        // 保留接口签名所需，但已被 currentScrollTop 覆盖作用
         defaultItemHeight: DEFAULT_VIRTUOSO_ITEM_HEIGHT,
-        mode: 'appendHeadSlice'
+        mode: 'appendHeadSlice',
+        currentScrollTop: realTimeScrollTop
       });
-      if (comp.kind === 'anchorMissing') {
-        v.scrollToIndex({
-          index: 'LAST',
-          align: 'end',
-          behavior: 'auto'
-        });
-      }
+
+      // 注意：这里不再添加 scrollIntoView 精修对齐。
+      // 实测在用户连续滚动滑轮/触摸板时，scrollIntoView 会强行接管视口，打断浏览器的滚动动量（momentum），
+      // 导致体感上每翻 5000 行截断时就会“硬卡一下”。仅做单纯的 scrollTop 像素增减，能保持滚动的平滑。
     }
   }, [displayLogs]);
 

package/dist/esm/PipelineLogViewer/constants.d.ts

@@ -9,7 +9,7 @@ export declare const DEFAULT_VIRTUOSO_ITEM_HEIGHT = 20;
  * 过小（如 10）时，必须把「缓冲区内第一屏」滚到几乎贴顶才触发，此时锚点往往是 bufferStart（如 7550），
  * 而不是用户刚看到的行（如 7571 在顶时 startIndex 可能已是 21，却满足不了 <=10）。
  */
-export declare const BOUNDARY_PREFETCH_INDEX_MARGIN = 200;
+export declare const BOUNDARY_PREFETCH_INDEX_MARGIN = 400;
 /**
  * 首屏 init / 新日志源首包：屏蔽 rangeChanged 边界预取时长 (ms)。
  * 略长于普通窗口，避免弹窗首帧、scrollToIndex(LAST) 前误判触顶触发 loadPrev。

package/dist/esm/PipelineLogViewer/constants.js

@@ -17,7 +17,7 @@ export var DEFAULT_VIRTUOSO_ITEM_HEIGHT = 20;
  * 过小（如 10）时，必须把「缓冲区内第一屏」滚到几乎贴顶才触发，此时锚点往往是 bufferStart（如 7550），
  * 而不是用户刚看到的行（如 7571 在顶时 startIndex 可能已是 21，却满足不了 <=10）。
  */
-export var BOUNDARY_PREFETCH_INDEX_MARGIN = 200;
+export var BOUNDARY_PREFETCH_INDEX_MARGIN = 400;
 
 /**
  * 首屏 init / 新日志源首包：屏蔽 rangeChanged 边界预取时长 (ms)。

package/dist/esm/PipelineLogViewer/hooks/useStickyHeader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useStickyHeader.d.ts","sourceRoot":"","sources":["../../../../src/PipelineLogViewer/hooks/useStickyHeader.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,UAAU,sBAAsB;IAC9B,WAAW;IACX,MAAM,EAAE,SAAS,EAAE,CAAC;CACrB;AAED,UAAU,qBAAqB;IAC7B,0CAA0C;IAC1C,WAAW,EAAE,SAAS,GAAG,IAAI,CAAC;IAC9B;;;;OAIG;IACH,kBAAkB,EAAE,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;CACzE;AAqCD;;GAEG;AACH,iBAAS,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,qBAAqB,CA0B/E;AAED,eAAe,eAAe,CAAC"}
+{"version":3,"file":"useStickyHeader.d.ts","sourceRoot":"","sources":["../../../../src/PipelineLogViewer/hooks/useStickyHeader.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,UAAU,sBAAsB;IAC9B,WAAW;IACX,MAAM,EAAE,SAAS,EAAE,CAAC;CACrB;AAED,UAAU,qBAAqB;IAC7B,0CAA0C;IAC1C,WAAW,EAAE,SAAS,GAAG,IAAI,CAAC;IAC9B;;;;OAIG;IACH,kBAAkB,EAAE,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;CACzE;AA6CD;;GAEG;AACH,iBAAS,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,qBAAqB,CAsC/E;AAED,eAAe,eAAe,CAAC"}

package/dist/esm/PipelineLogViewer/hooks/useStickyHeader.js

@@ -15,6 +15,14 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 // ============================================================================
 
 import { useCallback, useEffect, useState } from 'react';
+/** 提前探测行数：让吸顶分组在边界前更早感知切换趋势 */
+var STICKY_LEAD_ROWS = 2;
+/**
+ * 新分组头仍在视口可见区时，暂不渲染吸顶，避免出现「吸顶头 + 列表头」双头重影。
+ * 该窗口用绝对行号近似：Top 仍落在 group.start 附近时，优先显示列表内真实头。
+ */
+var STICKY_SUPPRESS_ROWS_NEAR_GROUP_START = 1;
+
 /** 与 useDisplayLogs 折叠区间算法一致的有效上界（用于判断行是否落在该组） */
 function effectiveGroupEnd(group, gi, groups, bufferEnd) {
   var start = group.start,
@@ -68,7 +76,19 @@ function useStickyHeader(options) {
       setStickyGroup(null);
       return;
     }
-    setStickyGroup(findStickyGroup(groups, absoluteTopRow, bufferEnd));
+    var stickyProbeRow = Math.max(0, absoluteTopRow + STICKY_LEAD_ROWS);
+    var nextStickyGroup = findStickyGroup(groups, stickyProbeRow, bufferEnd);
+    if (!nextStickyGroup) {
+      setStickyGroup(null);
+      return;
+    }
+    // 边界抑制：提前命中新分组时，其真实 GroupHeader 常仍在视口内，
+    // 这时渲染吸顶会出现双头。让列表内头部先过顶，再接管吸顶展示。
+    if (absoluteTopRow <= nextStickyGroup.start + STICKY_SUPPRESS_ROWS_NEAR_GROUP_START) {
+      setStickyGroup(null);
+      return;
+    }
+    setStickyGroup(nextStickyGroup);
   }, [groups]);
   return {
     stickyGroup: stickyGroup,

package/dist/esm/PipelineLogViewer/utils/virtuosoBoundaryScroll.d.ts

@@ -8,7 +8,9 @@ export type BoundaryScrollResult = {
 };
 /**
  * 滑动窗口 totalCount 不变时，Virtuoso 不会自动补偿 scrollTop。
- * 用像素粗调 + scrollIntoView 对齐到锚点行（与 loadPrev/loadNext 对称）。
+ * - prepend 模式：像素粗调 + scrollIntoView 对齐到锚点行。
+ * - appendHeadSlice 模式：仅用当前实时 scrollTop 减去截断行的像素偏移量。
+ *   不做锚点行定位，避免用户在 API 请求期间继续滚动时被强行拉回旧位置（跳屏）。
  */
 export declare function applyBoundaryScrollCompensation(v: VirtuosoHandle, anchorRow: number, rowsWithAbsolute: Array<{
     absoluteRow: number;
@@ -19,4 +21,9 @@ export declare function applyBoundaryScrollCompensation(v: VirtuosoHandle, ancho
     scrollTopBefore: number;
     defaultItemHeight: number;
     mode: BoundaryScrollMode;
+    /**
+     * appendHeadSlice 专用：当前实时 scrollTop（从 scroller DOM 读取）。
+     * 优先于 scrollTopBefore 使用，避免请求期间用户继续滚动导致补偿基准过时。
+     */
+    currentScrollTop?: number;
 }): BoundaryScrollResult;

package/dist/esm/PipelineLogViewer/utils/virtuosoBoundaryScroll.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"virtuosoBoundaryScroll.d.ts","sourceRoot":"","sources":["../../../../src/PipelineLogViewer/utils/virtuosoBoundaryScroll.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD,6DAA6D;AAC7D,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,iBAAiB,CAAC;AAE/D,MAAM,MAAM,oBAAoB,GAAG;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,eAAe,CAAA;CAAE,CAAC;AAE9E;;;GAGG;AACH,wBAAgB,+BAA+B,CAC7C,CAAC,EAAE,cAAc,EACjB,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,KAAK,CAAC;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAAC,EAC5D,OAAO,EAAE;IACP,UAAU,EAAE,OAAO,CAAC;IACpB,+CAA+C;IAC/C,yBAAyB,EAAE,MAAM,CAAC;IAClC,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,IAAI,EAAE,kBAAkB,CAAC;CAC1B,GACA,oBAAoB,CAgCtB"}
+{"version":3,"file":"virtuosoBoundaryScroll.d.ts","sourceRoot":"","sources":["../../../../src/PipelineLogViewer/utils/virtuosoBoundaryScroll.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD,6DAA6D;AAC7D,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,iBAAiB,CAAC;AAE/D,MAAM,MAAM,oBAAoB,GAAG;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,eAAe,CAAA;CAAE,CAAC;AAE9E;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAC7C,CAAC,EAAE,cAAc,EACjB,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,KAAK,CAAC;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAAC,EAC5D,OAAO,EAAE;IACP,UAAU,EAAE,OAAO,CAAC;IACpB,+CAA+C;IAC/C,yBAAyB,EAAE,MAAM,CAAC;IAClC,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,IAAI,EAAE,kBAAkB,CAAC;IACzB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,GACA,oBAAoB,CAyDtB"}

package/dist/esm/PipelineLogViewer/utils/virtuosoBoundaryScroll.js

@@ -2,9 +2,51 @@
 
 /**
  * 滑动窗口 totalCount 不变时，Virtuoso 不会自动补偿 scrollTop。
- * 用像素粗调 + scrollIntoView 对齐到锚点行（与 loadPrev/loadNext 对称）。
+ * - prepend 模式：像素粗调 + scrollIntoView 对齐到锚点行。
+ * - appendHeadSlice 模式：仅用当前实时 scrollTop 减去截断行的像素偏移量。
+ *   不做锚点行定位，避免用户在 API 请求期间继续滚动时被强行拉回旧位置（跳屏）。
  */
 export function applyBoundaryScrollCompensation(v, anchorRow, rowsWithAbsolute, options) {
+  var sameLength = options.sameLength,
+    sameLengthPixelDeltaCount = options.sameLengthPixelDeltaCount,
+    scrollTopBefore = options.scrollTopBefore,
+    defaultItemHeight = options.defaultItemHeight,
+    mode = options.mode;
+
+  // -----------------------------------------------------------------------
+  // appendHeadSlice（loadNext 满载截断头部）：
+  // 仅做像素偏移补偿，不做锚点行定位。
+  //
+  // 原理：head 截断 N 行后，所有 item 的 index 减小了 N，
+  // 视觉上内容整体上移了 N * itemHeight 像素。
+  // 要保持用户看到的内容不变，scrollTop 需减去同样的像素量。
+  //
+  // 使用 currentScrollTop（实时值）而非 scrollTopBefore（请求前快照），
+  // 解决用户在 API 请求期间继续滚动导致的跳屏问题。
+  // -----------------------------------------------------------------------
+  if (mode === 'appendHeadSlice') {
+    if (sameLength && sameLengthPixelDeltaCount > 0) {
+      var _options$currentScrol;
+      var baseScrollTop = (_options$currentScrol = options.currentScrollTop) !== null && _options$currentScrol !== void 0 ? _options$currentScrol : scrollTopBefore;
+      var delta = -sameLengthPixelDeltaCount * defaultItemHeight;
+      var top = Math.max(0, baseScrollTop + delta);
+      v.scrollTo({
+        top: top,
+        behavior: 'auto'
+      });
+    }
+    // 不管有没有像素补偿，都不再用锚点行做 scrollIntoView，
+    // 避免强行拉回旧位置。
+    return {
+      kind: 'ok'
+    };
+  }
+
+  // -----------------------------------------------------------------------
+  // prepend（loadPrev 满载截断尾部）：
+  // 像素粗调 + scrollIntoView 锚点行精确对齐。
+  // prepend 场景下用户通常在最顶部等待加载，scrollTopBefore 不会过时。
+  // -----------------------------------------------------------------------
   var newIndex = rowsWithAbsolute.findIndex(function (l) {
     return l && l.absoluteRow === anchorRow;
   });
@@ -13,22 +55,17 @@ export function applyBoundaryScrollCompensation(v, anchorRow, rowsWithAbsolute,
       kind: 'anchorMissing'
     };
   }
-  var sameLength = options.sameLength,
-    sameLengthPixelDeltaCount = options.sameLengthPixelDeltaCount,
-    scrollTopBefore = options.scrollTopBefore,
-    defaultItemHeight = options.defaultItemHeight,
-    mode = options.mode;
   if (sameLength && sameLengthPixelDeltaCount > 0) {
-    var delta = mode === 'prepend' ? sameLengthPixelDeltaCount * defaultItemHeight : -sameLengthPixelDeltaCount * defaultItemHeight;
-    var top = Math.max(0, scrollTopBefore + delta);
+    var _delta = sameLengthPixelDeltaCount * defaultItemHeight;
+    var _top = Math.max(0, scrollTopBefore + _delta);
     v.scrollTo({
-      top: top,
+      top: _top,
       behavior: 'auto'
     });
     requestAnimationFrame(function () {
       v.scrollIntoView({
         index: newIndex,
-        align: mode === 'prepend' ? 'start' : 'end',
+        align: 'start',
         behavior: 'auto'
       });
     });
@@ -38,7 +75,7 @@ export function applyBoundaryScrollCompensation(v, anchorRow, rowsWithAbsolute,
   }
   v.scrollToIndex({
     index: newIndex,
-    align: mode === 'prepend' ? 'start' : 'end',
+    align: 'start',
     behavior: 'auto'
   });
   return {

package/dist/worker/src/PipelineLogViewer/constants.d.ts

@@ -9,7 +9,7 @@ export declare const DEFAULT_VIRTUOSO_ITEM_HEIGHT = 20;
  * 过小（如 10）时，必须把「缓冲区内第一屏」滚到几乎贴顶才触发，此时锚点往往是 bufferStart（如 7550），
  * 而不是用户刚看到的行（如 7571 在顶时 startIndex 可能已是 21，却满足不了 <=10）。
  */
-export declare const BOUNDARY_PREFETCH_INDEX_MARGIN = 200;
+export declare const BOUNDARY_PREFETCH_INDEX_MARGIN = 400;
 /**
  * 首屏 init / 新日志源首包：屏蔽 rangeChanged 边界预取时长 (ms)。
  * 略长于普通窗口，避免弹窗首帧、scrollToIndex(LAST) 前误判触顶触发 loadPrev。

package/dist/worker/src/PipelineLogViewer/utils/virtuosoBoundaryScroll.d.ts

@@ -8,7 +8,9 @@ export type BoundaryScrollResult = {
 };
 /**
  * 滑动窗口 totalCount 不变时，Virtuoso 不会自动补偿 scrollTop。
- * 用像素粗调 + scrollIntoView 对齐到锚点行（与 loadPrev/loadNext 对称）。
+ * - prepend 模式：像素粗调 + scrollIntoView 对齐到锚点行。
+ * - appendHeadSlice 模式：仅用当前实时 scrollTop 减去截断行的像素偏移量。
+ *   不做锚点行定位，避免用户在 API 请求期间继续滚动时被强行拉回旧位置（跳屏）。
  */
 export declare function applyBoundaryScrollCompensation(v: VirtuosoHandle, anchorRow: number, rowsWithAbsolute: Array<{
     absoluteRow: number;
@@ -19,4 +21,9 @@ export declare function applyBoundaryScrollCompensation(v: VirtuosoHandle, ancho
     scrollTopBefore: number;
     defaultItemHeight: number;
     mode: BoundaryScrollMode;
+    /**
+     * appendHeadSlice 专用：当前实时 scrollTop（从 scroller DOM 读取）。
+     * 优先于 scrollTopBefore 使用，避免请求期间用户继续滚动导致补偿基准过时。
+     */
+    currentScrollTop?: number;
 }): BoundaryScrollResult;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-terminal-viewer-cicd",
-  "version": "3.0.0-beta.44",
+  "version": "3.0.0-beta.45",
   "author": "https://gitee.com/gitee-frontend",
   "license": "MIT",
   "keywords": [