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

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.43" || '0.0.0';
+  var version = "3.0.0-beta.44" || '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;AAef,OAAO,cAAc,CAAC;AACtB,OAAO,KAAK,EAGV,sBAAsB,EACtB,oBAAoB,EACrB,MAAM,SAAS,CAAC;AAwEjB,QAAA,MAAM,iBAAiB,qGAoxCtB,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,qGAkyCtB,CAAC;AAIF,eAAe,iBAAiB,CAAC"}

package/dist/esm/PipelineLogViewer/PipelineLogViewer.js

@@ -36,14 +36,14 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { Virtuoso } from 'react-virtuoso';
 import { GroupHeader, LogRow, SearchBar, StickyHeader } from "./components";
-import { BOUNDARY_PREFETCH_INDEX_MARGIN, DEFAULT_MAX_MEMORY_LINES, DEFAULT_PAGE_SIZE, DEFAULT_VIRTUOSO_ITEM_HEIGHT } from "./constants";
+import { BOUNDARY_PREFETCH_INDEX_MARGIN, DEFAULT_MAX_MEMORY_LINES, DEFAULT_PAGE_SIZE, DEFAULT_VIRTUOSO_ITEM_HEIGHT, IGNORE_BOUNDARY_FETCH_MS_AFTER_SCROLL, IGNORE_BOUNDARY_FETCH_MS_FIRST_SCREEN } from "./constants";
 import useDisplayLogs from "./hooks/useDisplayLogs";
 import useGroupManager from "./hooks/useGroupManager";
 import useLogFetcher from "./hooks/useLogFetcher";
 import useLogSearch from "./hooks/useLogSearch";
 import useStickyHeader from "./hooks/useStickyHeader";
 import "./index.less";
-import { getGlobalVisibleLineNumberLabel } from "./utils/groupLineNumber";
+import { getPipelineGroupedLineNumberLabel } from "./utils/groupLineNumber";
 import normalizeGroupsForPipelineStatus from "./utils/normalizeGroupsForPipelineStatus";
 import { applyBoundaryScrollCompensation } from "./utils/virtuosoBoundaryScroll";
 import { firstVisibleIndexFromRenderedItems, lastVisibleIndexFromRenderedItems } from "./utils/virtuosoVisibleItems";
@@ -137,7 +137,9 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     groupStatusIcons = _ref2.groupStatusIcons,
     onCollapsedChange = _ref2.onCollapsedChange,
     serverOffsetTime = _ref2.serverOffsetTime,
-    highlightOptions = _ref2.highlightOptions;
+    highlightOptions = _ref2.highlightOptions,
+    _ref2$showLogTime = _ref2.showLogTime,
+    showLogTime = _ref2$showLogTime === void 0 ? true : _ref2$showLogTime;
   // ===================================================================
   // 一、分组数据
   // ===================================================================
@@ -350,12 +352,13 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
   useEffect(function () {
     if (initializedRef.current) return;
     initializedRef.current = true;
+    ignoreBoundaryFetchRef.current = Date.now() + IGNORE_BOUNDARY_FETCH_MS_FIRST_SCREEN;
     Promise.all([fetchGroups().then(function (groupData) {
       if (groupData && groupData.length > 0) {
         setGroups(normalizeGroupsForPipelineStatus(groupData, status));
       }
     }), initLoadRef.current()]).then(function () {
-      ignoreBoundaryFetchRef.current = Date.now() + 500;
+      ignoreBoundaryFetchRef.current = Math.max(ignoreBoundaryFetchRef.current, Date.now() + IGNORE_BOUNDARY_FETCH_MS_AFTER_SCROLL);
       requestAnimationFrame(function () {
         var _virtuosoRef$current;
         (_virtuosoRef$current = virtuosoRef.current) === null || _virtuosoRef$current === void 0 || _virtuosoRef$current.scrollToIndex({
@@ -389,7 +392,7 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     boundaryFetchingRef.current = false;
     pendingScrollAfterPrevRef.current = null;
     pendingScrollAfterNextRef.current = null;
-    ignoreBoundaryFetchRef.current = Date.now() + 500;
+    ignoreBoundaryFetchRef.current = Date.now() + IGNORE_BOUNDARY_FETCH_MS_AFTER_SCROLL;
   }, [fetchLogs, logFetcherResult.reset, groupManager.expandAll, logSearchResult.clearSearch, status]);
   /* eslint-enable react-hooks/exhaustive-deps */
 
@@ -555,7 +558,7 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
       var prepended = prependedCountFromPrevRef.current;
       pendingScrollAfterPrevRef.current = null;
       displayLogsLenBeforeLoadPrevRef.current = null;
-      ignoreBoundaryFetchRef.current = Date.now() + 500;
+      ignoreBoundaryFetchRef.current = Date.now() + IGNORE_BOUNDARY_FETCH_MS_AFTER_SCROLL;
       if (boundaryIgnoreFollowUpTimeoutRef.current) {
         clearTimeout(boundaryIgnoreFollowUpTimeoutRef.current);
       }
@@ -582,7 +585,7 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
       var headRemoved = headRemovedFromNextRef.current;
       pendingScrollAfterNextRef.current = null;
       displayLogsLenBeforeLoadNextRef.current = null;
-      ignoreBoundaryFetchRef.current = Date.now() + 500;
+      ignoreBoundaryFetchRef.current = Date.now() + IGNORE_BOUNDARY_FETCH_MS_AFTER_SCROLL;
       var comp = applyBoundaryScrollCompensation(v, anchorRowNext, displayLogs, {
         sameLength: _sameLength && headRemoved > 0,
         sameLengthPixelDeltaCount: headRemoved,
@@ -740,7 +743,7 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
       if (groupActionRef.current) return;
       if (collapseAirdropActiveRef.current) return;
       if (userStoppedFollowingRef.current) return;
-      ignoreBoundaryFetchRef.current = Date.now() + 500;
+      ignoreBoundaryFetchRef.current = Date.now() + IGNORE_BOUNDARY_FETCH_MS_AFTER_SCROLL;
       (_virtuosoRef$current4 = virtuosoRef.current) === null || _virtuosoRef$current4 === void 0 || _virtuosoRef$current4.scrollToIndex({
         index: 'LAST',
         align: 'end',
@@ -758,7 +761,7 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
   // ===================================================================
   var scheduleScrollToDisplayIndex = useCallback(function (displayIndex) {
     var align = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'center';
-    ignoreBoundaryFetchRef.current = Date.now() + 500;
+    ignoreBoundaryFetchRef.current = Date.now() + IGNORE_BOUNDARY_FETCH_MS_AFTER_SCROLL;
     requestAnimationFrame(function () {
       var v = virtuosoRef.current;
       if (!v || displayLogsRef.current.length === 0) return;
@@ -916,7 +919,7 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
         if (newIndex !== -1) {
           var _virtuosoRef$current5;
           // 勿用更短的窗口覆盖分组操作已设置的较长忽略期
-          ignoreBoundaryFetchRef.current = Math.max(ignoreBoundaryFetchRef.current, Date.now() + 800);
+          ignoreBoundaryFetchRef.current = Math.max(ignoreBoundaryFetchRef.current, Date.now() + IGNORE_BOUNDARY_FETCH_MS_FIRST_SCREEN);
           (_virtuosoRef$current5 = virtuosoRef.current) === null || _virtuosoRef$current5 === void 0 || _virtuosoRef$current5.scrollToIndex({
             index: newIndex,
             align: 'start'
@@ -965,14 +968,20 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
       });
       if (group) {
         if (airdropExpandInFlightRef.current.has(name)) return;
-        suppressFollowForGroupAction();
-        if (group.status === 'running') {
-          // --- Running 分组：展开后跳到最新日志并恢复跟随 ---
+
+        /**
+         * 运行中、失败的分组从收起展开：始终 initLoad（倒序最后一页 = 当前最新日志窗口），
+         * 再展开并滚到底，避免仍停留在历史缓冲而看不到尾部输出。
+         * 此处不置 userStoppedFollowing / isUserBrowsingHistory，以便置底后继续 followOutput。
+         */
+        if (group.status === 'running' || group.status === 'failure') {
+          collapseAirdropActiveRef.current = false;
+          suppressFollowForGroupAction();
           airdropExpandInFlightRef.current.add(name);
           setLoadingGroupNames(function (prev) {
             return prev.includes(name) ? prev : [].concat(_toConsumableArray(prev), [name]);
           });
-          var runExpandToLatest = /*#__PURE__*/function () {
+          var runRunningExpandToTail = /*#__PURE__*/function () {
             var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
               return _regeneratorRuntime().wrap(function _callee5$(_context5) {
                 while (1) switch (_context5.prev = _context5.next) {
@@ -986,11 +995,8 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
                       silent: true
                     });
                   case 5:
+                    ignoreBoundaryFetchRef.current = Math.max(ignoreBoundaryFetchRef.current, Date.now() + IGNORE_BOUNDARY_FETCH_MS_FIRST_SCREEN);
                     groupManager.toggleGroup(name);
-                    userStoppedFollowingRef.current = false;
-                    collapseAirdropActiveRef.current = false;
-                    logFetcherResult.setIsUserBrowsingHistory(false);
-                    ignoreBoundaryFetchRef.current = Date.now() + 500;
                     requestAnimationFrame(function () {
                       var _virtuosoRef$current6;
                       (_virtuosoRef$current6 = virtuosoRef.current) === null || _virtuosoRef$current6 === void 0 || _virtuosoRef$current6.scrollToIndex({
@@ -998,102 +1004,108 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
                         align: 'end',
                         behavior: 'auto'
                       });
+                      // 未走「停跟」分支时仍可能带着此前的查阅历史态，置底后显式恢复跟随
+                      userStoppedFollowingRef.current = false;
+                      logFetcherResult.setIsUserBrowsingHistory(false);
                     });
-                  case 11:
-                    _context5.prev = 11;
+                    _context5.next = 13;
+                    break;
+                  case 10:
+                    _context5.prev = 10;
+                    _context5.t0 = _context5["catch"](0);
+                    console.error('[PipelineLogViewer] running group expand to tail failed:', _context5.t0);
+                  case 13:
+                    _context5.prev = 13;
                     airdropExpandInFlightRef.current.delete(name);
                     setLoadingGroupNames(function (prev) {
                       return prev.filter(function (n) {
                         return n !== name;
                       });
                     });
-                    return _context5.finish(11);
-                  case 15:
+                    return _context5.finish(13);
+                  case 17:
                   case "end":
                     return _context5.stop();
                 }
-              }, _callee5, null, [[0,, 11, 15]]);
+              }, _callee5, null, [[0, 10, 13, 17]]);
             }));
-            return function runExpandToLatest() {
+            return function runRunningExpandToTail() {
               return _ref9.apply(this, arguments);
             };
           }();
-          runExpandToLatest();
-        } else {
-          var _group$end2;
-          // --- 非 running 分组：展开后跳到分组最后一行 ---
-          var groupEnd = (_group$end2 = group.end) !== null && _group$end2 !== void 0 ? _group$end2 : group.start;
-          var _logFetcherResult$cur3 = logFetcherResult.cursor,
-            bufStart = _logFetcherResult$cur3.currentStartRow,
-            bufEnd = _logFetcherResult$cur3.currentEndRow;
-          var groupEndInBuffer = bufStart <= groupEnd && groupEnd <= bufEnd;
-          userStoppedFollowingRef.current = true;
-          logFetcherResult.setIsUserBrowsingHistory(true);
-          if (!groupEndInBuffer) {
-            airdropExpandInFlightRef.current.add(name);
-            setLoadingGroupNames(function (prev) {
-              return prev.includes(name) ? prev : [].concat(_toConsumableArray(prev), [name]);
-            });
-            var runAirdropThenExpand = /*#__PURE__*/function () {
-              var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-                var ok;
-                return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-                  while (1) switch (_context6.prev = _context6.next) {
-                    case 0:
-                      _context6.prev = 0;
-                      _context6.next = 3;
-                      return waitForFetchUnlock();
-                    case 3:
-                      _context6.next = 5;
-                      return logFetcherResult.airdropLoad(groupEnd, {
-                        window: 'center',
-                        silent: true
-                      });
-                    case 5:
-                      ok = _context6.sent;
-                      if (ok) {
-                        groupManager.toggleGroup(name);
-                        pendingScrollAlignRef.current = 'center';
-                        pendingScrollRowRef.current = groupEnd;
-                      }
-                    case 7:
-                      _context6.prev = 7;
-                      airdropExpandInFlightRef.current.delete(name);
-                      setLoadingGroupNames(function (prev) {
-                        return prev.filter(function (n) {
-                          return n !== name;
+          runRunningExpandToTail();
+          return;
+        }
+        suppressFollowForGroupAction();
+        userStoppedFollowingRef.current = true;
+        logFetcherResult.setIsUserBrowsingHistory(true);
+        var _logFetcherResult$cur3 = logFetcherResult.cursor,
+          bufStart = _logFetcherResult$cur3.currentStartRow,
+          bufEnd = _logFetcherResult$cur3.currentEndRow;
+        // 当前内存窗口是否已包含 group.start（重复展开同一分组时不重复空降）
+        var groupStartInBuffer = bufStart <= group.start && group.start <= bufEnd;
+        if (!groupStartInBuffer) {
+          airdropExpandInFlightRef.current.add(name);
+          setLoadingGroupNames(function (prev) {
+            return prev.includes(name) ? prev : [].concat(_toConsumableArray(prev), [name]);
+          });
+          var runAirdropThenExpand = /*#__PURE__*/function () {
+            var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+              var ok;
+              return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+                while (1) switch (_context6.prev = _context6.next) {
+                  case 0:
+                    _context6.prev = 0;
+                    _context6.next = 3;
+                    return logFetcherResult.airdropLoad(group.start, {
+                      window: 'fromStart',
+                      silent: true
+                    });
+                  case 3:
+                    ok = _context6.sent;
+                    if (!ok) {
+                      _context6.next = 7;
+                      break;
+                    }
+                    _context6.next = 7;
+                    return new Promise(function (resolve) {
+                      requestAnimationFrame(function () {
+                        requestAnimationFrame(function () {
+                          maintainScrollPosition(function () {
+                            groupManager.toggleGroup(name);
+                          });
+                          resolve();
                         });
                       });
-                      return _context6.finish(7);
-                    case 11:
-                    case "end":
-                      return _context6.stop();
-                  }
-                }, _callee6, null, [[0,, 7, 11]]);
-              }));
-              return function runAirdropThenExpand() {
-                return _ref10.apply(this, arguments);
-              };
-            }();
-            runAirdropThenExpand();
-          } else {
+                    });
+                  case 7:
+                    _context6.prev = 7;
+                    airdropExpandInFlightRef.current.delete(name);
+                    setLoadingGroupNames(function (prev) {
+                      return prev.filter(function (n) {
+                        return n !== name;
+                      });
+                    });
+                    return _context6.finish(7);
+                  case 11:
+                  case "end":
+                    return _context6.stop();
+                }
+              }, _callee6, null, [[0,, 7, 11]]);
+            }));
+            return function runAirdropThenExpand() {
+              return _ref10.apply(this, arguments);
+            };
+          }();
+          runAirdropThenExpand().catch(function (err) {
+            console.error('[PipelineLogViewer] airdrop expand failed:', err);
+          });
+        } else {
+          // 缓冲内展开：用当前视口锚点重定位，避免原先 scrollToIndex(group.start) 把起点硬拉到顶，
+          // running 等大分组展开时整屏上跳；与折叠分支一致走 maintainScrollPosition。
+          maintainScrollPosition(function () {
             groupManager.toggleGroup(name);
-            ignoreBoundaryFetchRef.current = Date.now() + 500;
-            requestAnimationFrame(function () {
-              var currentLogs = displayLogsRef.current;
-              var displayIndex = currentLogs.findIndex(function (l) {
-                return l.absoluteRow === groupEnd;
-              });
-              if (displayIndex >= 0) {
-                var _virtuosoRef$current7;
-                (_virtuosoRef$current7 = virtuosoRef.current) === null || _virtuosoRef$current7 === void 0 || _virtuosoRef$current7.scrollToIndex({
-                  index: displayIndex,
-                  align: 'center',
-                  behavior: 'auto'
-                });
-              }
-            });
-          }
+          });
         }
         return;
       }
@@ -1143,27 +1155,7 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     return map;
   }, [groups]);
 
-  /** START/END 控制行绝对行号集合（用于行号体系扣减，不参与分组边界判断） */
-  var controlMarkerRows = useMemo(function () {
-    var set = new Set();
-    var _iterator2 = _createForOfIteratorHelper(displayLogs),
-      _step2;
-    try {
-      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-        var line = _step2.value;
-        if (isPipelineEndMarkerText(line.text) || isPipelineStartMarkerText(line.text)) {
-          set.add(line.absoluteRow);
-        }
-      }
-    } catch (err) {
-      _iterator2.e(err);
-    } finally {
-      _iterator2.f();
-    }
-    return set;
-  }, [displayLogs]);
-
-  /** 整条流水线日志起算绝对行号（用于全局连续行号） */
+  /** 整条流水线日志起算绝对行号（早于该行的缓冲内容行号展示回退） */
   var pipelineMinAbsoluteRow = useMemo(function () {
     return groups.length > 0 ? Math.min.apply(Math, _toConsumableArray(groups.map(function (g) {
       return g.start;
@@ -1181,8 +1173,6 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
   handleToggleGroupRef.current = handleToggleGroup;
   var lineNumberWidthRef = useRef(lineNumberWidth);
   lineNumberWidthRef.current = lineNumberWidth;
-  var controlMarkerRowsRef = useRef(controlMarkerRows);
-  controlMarkerRowsRef.current = controlMarkerRows;
   var pipelineMinAbsoluteRowRef = useRef(pipelineMinAbsoluteRow);
   pipelineMinAbsoluteRowRef.current = pipelineMinAbsoluteRow;
 
@@ -1198,7 +1188,7 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     return {};
   },
   // eslint-disable-next-line react-hooks/exhaustive-deps
-  [groupManager.collapsedGroups, logSearchResult.searchState, lineNumberWidth, currentStartRow, highlightOptions, groups, loadingGroupNames]);
+  [groupManager.collapsedGroups, logSearchResult.searchState, lineNumberWidth, currentStartRow, highlightOptions, groups, loadingGroupNames, showLogTime]);
   var itemContent = useCallback(function (index) {
     var _groupsForHeader;
     var currentDisplayLogs = displayLogsRef.current;
@@ -1236,14 +1226,20 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     var showLogRow = !line.isFoldedGroupStart && !line.isEmptyGroupStart;
     var isControlEndMarker = isPipelineEndMarkerText(line.text);
     var isControlStartMarker = isPipelineStartMarkerText(line.text);
-    /** 仅压扁 START/END 控制行；行号体系也仅基于控制行扣减 */
+    /** 仅压扁 START/END 控制行；行号规则见 getPipelineGroupedLineNumberLabel */
     var collapseGroupEdgeLog = showLogRow && !line.isEmptyGroupStart && (isControlEndMarker || isControlStartMarker);
-    var lineNumberLabel = groups.length > 0 && showLogRow ? getGlobalVisibleLineNumberLabel(line.absoluteRow, controlMarkerRowsRef.current, pipelineMinAbsoluteRowRef.current) : undefined;
+    var rowGroup = currentGroupManager.getGroupByRow(line.absoluteRow);
+    var rowGroupIndex = rowGroup ? groups.findIndex(function (g) {
+      return g.name === rowGroup.name;
+    }) : -1;
+    var isControlMarkerRow = showLogRow && !line.isEmptyGroupStart && (isControlEndMarker || isControlStartMarker);
+    var lineNumberLabel = groups.length > 0 && showLogRow ? getPipelineGroupedLineNumberLabel(line.absoluteRow, rowGroup, rowGroupIndex, isControlMarkerRow, pipelineMinAbsoluteRowRef.current) : undefined;
     var logRow = /*#__PURE__*/React.createElement(LogRow, {
       absoluteRow: line.absoluteRow,
       lineNumberLabel: lineNumberLabel,
       text: line.text,
       logTime: line.logTime,
+      showLogTime: showLogTime,
       isMatched: isMatched,
       isActiveMatch: isActiveMatch,
       lineNumberWidth: lineNumberWidthRef.current,
@@ -1291,7 +1287,7 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
                 }))) : 0;
                 bufStart = logFetcherResult.cursor.currentStartRow;
                 needsTopWindow = bufStart > globalFirstRow;
-                ignoreBoundaryFetchRef.current = Date.now() + 500;
+                ignoreBoundaryFetchRef.current = Date.now() + IGNORE_BOUNDARY_FETCH_MS_AFTER_SCROLL;
                 if (!needsTopWindow) {
                   _context7.next = 21;
                   break;
@@ -1321,8 +1317,8 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
                 return _context7.abrupt("return");
               case 21:
                 requestAnimationFrame(function () {
-                  var _virtuosoRef$current8;
-                  (_virtuosoRef$current8 = virtuosoRef.current) === null || _virtuosoRef$current8 === void 0 || _virtuosoRef$current8.scrollToIndex({
+                  var _virtuosoRef$current7;
+                  (_virtuosoRef$current7 = virtuosoRef.current) === null || _virtuosoRef$current7 === void 0 || _virtuosoRef$current7.scrollToIndex({
                     index: 0,
                     align: 'start',
                     behavior: 'auto'
@@ -1345,30 +1341,33 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
           return _regeneratorRuntime().wrap(function _callee8$(_context8) {
             while (1) switch (_context8.prev = _context8.next) {
               case 0:
+                _context8.next = 2;
+                return waitForFetchUnlock();
+              case 2:
                 groupManager.expandAll();
                 userStoppedFollowingRef.current = false;
                 collapseAirdropActiveRef.current = false;
                 needsFetch = status !== 'running' && !logFetcherResult.boundaryLock.isLastPage || status === 'running' && logFetcherResult.isUserBrowsingHistory;
                 if (!needsFetch) {
-                  _context8.next = 8;
+                  _context8.next = 10;
                   break;
                 }
-                _context8.next = 7;
+                _context8.next = 9;
                 return logFetcherResult.initLoad();
-              case 7:
+              case 9:
                 logFetcherResult.updateBoundaryLock({
                   isFirstPage: false
                 });
-              case 8:
-                ignoreBoundaryFetchRef.current = Date.now() + 500;
+              case 10:
+                ignoreBoundaryFetchRef.current = Date.now() + IGNORE_BOUNDARY_FETCH_MS_AFTER_SCROLL;
                 setTimeout(function () {
-                  var _virtuosoRef$current9;
-                  (_virtuosoRef$current9 = virtuosoRef.current) === null || _virtuosoRef$current9 === void 0 || _virtuosoRef$current9.scrollToIndex({
+                  var _virtuosoRef$current8;
+                  (_virtuosoRef$current8 = virtuosoRef.current) === null || _virtuosoRef$current8 === void 0 || _virtuosoRef$current8.scrollToIndex({
                     index: 'LAST',
                     align: 'end'
                   });
                 }, 50);
-              case 10:
+              case 12:
               case "end":
                 return _context8.stop();
             }
@@ -1425,7 +1424,7 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     group: stickyHeader.stickyGroup,
     collapsed: stickyHeader.stickyGroup ? groupManager.collapsedGroups.has(stickyHeader.stickyGroup.name) : false,
     loading: stickyHeader.stickyGroup != null && loadingGroupNames.includes(stickyHeader.stickyGroup.name),
-    onToggle: handleToggleGroup,
+    onToggle: handleToggleGroupRef.current,
     groupStatusIcons: groupStatusIcons,
     serverOffsetTime: serverOffsetTime
   }), /*#__PURE__*/React.createElement(Virtuoso, {

package/dist/esm/PipelineLogViewer/components/LogRow.d.ts

@@ -17,6 +17,8 @@ interface LogRowProps {
     lineNumberWidth: number;
     /** 是否显示行号 */
     showLineNumber?: boolean;
+    /** 是否显示日志时间列（默认 true） */
+    showLogTime?: boolean;
     /** 关键字规则高亮；搜索命中时不会应用 */
     highlightOptions?: IHighlightOptions[];
     /** 当前搜索关键字（非空且本行命中时在 HTML 内包裹 mark，仅高亮关键字） */

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

@@ -1 +1 @@
-{"version":3,"file":"LogRow.d.ts","sourceRoot":"","sources":["../../../../src/PipelineLogViewer/components/LogRow.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAkB,MAAM,OAAO,CAAC;AACvC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AA4BlD,UAAU,WAAW;IACnB,aAAa;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,uDAAuD;IACvD,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,mCAAmC;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,aAAa;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe;IACf,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,kBAAkB;IAClB,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa;IACb,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa;IACb,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,wBAAwB;IACxB,gBAAgB,CAAC,EAAE,iBAAiB,EAAE,CAAC;IACvC,8CAA8C;IAC9C,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;;AAiED,wBAAkC"}
+{"version":3,"file":"LogRow.d.ts","sourceRoot":"","sources":["../../../../src/PipelineLogViewer/components/LogRow.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAkB,MAAM,OAAO,CAAC;AACvC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AA4BlD,UAAU,WAAW;IACnB,aAAa;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,uDAAuD;IACvD,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,mCAAmC;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,aAAa;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe;IACf,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,kBAAkB;IAClB,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa;IACb,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa;IACb,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,yBAAyB;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,wBAAwB;IACxB,gBAAgB,CAAC,EAAE,iBAAiB,EAAE,CAAC;IACvC,8CAA8C;IAC9C,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;;AAkED,wBAAkC"}

package/dist/esm/PipelineLogViewer/components/LogRow.js

@@ -40,6 +40,8 @@ var LogRow = function LogRow(_ref) {
     lineNumberWidth = _ref.lineNumberWidth,
     _ref$showLineNumber = _ref.showLineNumber,
     showLineNumber = _ref$showLineNumber === void 0 ? true : _ref$showLineNumber,
+    _ref$showLogTime = _ref.showLogTime,
+    showLogTime = _ref$showLogTime === void 0 ? true : _ref$showLogTime,
     highlightOptions = _ref.highlightOptions,
     _ref$searchKeyword = _ref.searchKeyword,
     searchKeyword = _ref$searchKeyword === void 0 ? '' : _ref$searchKeyword;
@@ -69,7 +71,7 @@ var LogRow = function LogRow(_ref) {
     style: {
       minWidth: "".concat(lineNumberWidth, "px")
     }
-  }, lineNumberLabel === null ? '' : lineNumberLabel !== null && lineNumberLabel !== void 0 ? lineNumberLabel : absoluteRow), logTime != null && logTime > 0 && /*#__PURE__*/React.createElement("span", {
+  }, lineNumberLabel === null ? '' : lineNumberLabel !== null && lineNumberLabel !== void 0 ? lineNumberLabel : absoluteRow), showLogTime && logTime != null && logTime > 0 && /*#__PURE__*/React.createElement("span", {
     className: "pipeline-log-row__log-time"
   }, formatLogTime(logTime)), /*#__PURE__*/React.createElement("span", {
     className: "pipeline-log-row__text",

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

@@ -9,7 +9,17 @@ export declare const DEFAULT_VIRTUOSO_ITEM_HEIGHT = 20;
  * 过小（如 10）时，必须把「缓冲区内第一屏」滚到几乎贴顶才触发，此时锚点往往是 bufferStart（如 7550），
  * 而不是用户刚看到的行（如 7571 在顶时 startIndex 可能已是 21，却满足不了 <=10）。
  */
-export declare const BOUNDARY_PREFETCH_INDEX_MARGIN = 400;
+export declare const BOUNDARY_PREFETCH_INDEX_MARGIN = 200;
+/**
+ * 首屏 init / 新日志源首包：屏蔽 rangeChanged 边界预取时长 (ms)。
+ * 略长于普通窗口，避免弹窗首帧、scrollToIndex(LAST) 前误判触顶触发 loadPrev。
+ */
+export declare const IGNORE_BOUNDARY_FETCH_MS_FIRST_SCREEN = 800;
+/**
+ * 程序化滚动、loadPrev/loadNext 补偿、scrollToTop/Bottom 等之后：
+ * 屏蔽 rangeChanged 边界预取时长 (ms)。
+ */
+export declare const IGNORE_BOUNDARY_FETCH_MS_AFTER_SCROLL = 500;
 /** running 态轮询间隔 (默认值，单位 ms) */
 export declare const DEFAULT_POLL_INTERVAL = 1000;
 /** running→结束态：收尾 initLoad 之后追加 loadNext 的次数 */

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

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/PipelineLogViewer/constants.ts"],"names":[],"mappings":"AAKA,mBAAmB;AACnB,eAAO,MAAM,iBAAiB,MAAM,CAAC;AAErC,qBAAqB;AACrB,eAAO,MAAM,wBAAwB,OAAO,CAAC;AAE7C,kGAAkG;AAClG,eAAO,MAAM,4BAA4B,KAAK,CAAC;AAE/C;;;;GAIG;AACH,eAAO,MAAM,8BAA8B,MAAM,CAAC;AAElD,gCAAgC;AAChC,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAE1C,gDAAgD;AAChD,eAAO,MAAM,6BAA6B,IAAI,CAAC;AAE/C,iCAAiC;AACjC,eAAO,MAAM,mCAAmC,OAAO,CAAC;AAExD,yBAAyB;AACzB,eAAO,MAAM,kBAAkB,MAAM,CAAC;AAEtC,gBAAgB;AAChB,eAAO,MAAM,iBAAiB,wBAAwB,CAAC;AAEvD,oBAAoB;AACpB,eAAO,MAAM,wBAAwB,gBAAgB,CAAC;AAEtD,cAAc;AACd,eAAO,MAAM,oBAAoB,YAAY,CAAC;AAE9C,cAAc;AACd,eAAO,MAAM,oBAAoB,YAAY,CAAC;AAE9C,oBAAoB;AACpB,eAAO,MAAM,mBAAmB,YAAY,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/PipelineLogViewer/constants.ts"],"names":[],"mappings":"AAKA,mBAAmB;AACnB,eAAO,MAAM,iBAAiB,MAAM,CAAC;AAErC,qBAAqB;AACrB,eAAO,MAAM,wBAAwB,OAAO,CAAC;AAE7C,kGAAkG;AAClG,eAAO,MAAM,4BAA4B,KAAK,CAAC;AAE/C;;;;GAIG;AACH,eAAO,MAAM,8BAA8B,MAAM,CAAC;AAElD;;;GAGG;AACH,eAAO,MAAM,qCAAqC,MAAM,CAAC;AAEzD;;;GAGG;AACH,eAAO,MAAM,qCAAqC,MAAM,CAAC;AAEzD,gCAAgC;AAChC,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAE1C,gDAAgD;AAChD,eAAO,MAAM,6BAA6B,IAAI,CAAC;AAE/C,iCAAiC;AACjC,eAAO,MAAM,mCAAmC,OAAO,CAAC;AAExD,yBAAyB;AACzB,eAAO,MAAM,kBAAkB,MAAM,CAAC;AAEtC,gBAAgB;AAChB,eAAO,MAAM,iBAAiB,wBAAwB,CAAC;AAEvD,oBAAoB;AACpB,eAAO,MAAM,wBAAwB,gBAAgB,CAAC;AAEtD,cAAc;AACd,eAAO,MAAM,oBAAoB,YAAY,CAAC;AAE9C,cAAc;AACd,eAAO,MAAM,oBAAoB,YAAY,CAAC;AAE9C,oBAAoB;AACpB,eAAO,MAAM,mBAAmB,YAAY,CAAC"}

package/dist/esm/PipelineLogViewer/constants.js

@@ -17,7 +17,19 @@ export var DEFAULT_VIRTUOSO_ITEM_HEIGHT = 20;
  * 过小（如 10）时，必须把「缓冲区内第一屏」滚到几乎贴顶才触发，此时锚点往往是 bufferStart（如 7550），
  * 而不是用户刚看到的行（如 7571 在顶时 startIndex 可能已是 21，却满足不了 <=10）。
  */
-export var BOUNDARY_PREFETCH_INDEX_MARGIN = 400;
+export var BOUNDARY_PREFETCH_INDEX_MARGIN = 200;
+
+/**
+ * 首屏 init / 新日志源首包：屏蔽 rangeChanged 边界预取时长 (ms)。
+ * 略长于普通窗口，避免弹窗首帧、scrollToIndex(LAST) 前误判触顶触发 loadPrev。
+ */
+export var IGNORE_BOUNDARY_FETCH_MS_FIRST_SCREEN = 800;
+
+/**
+ * 程序化滚动、loadPrev/loadNext 补偿、scrollToTop/Bottom 等之后：
+ * 屏蔽 rangeChanged 边界预取时长 (ms)。
+ */
+export var IGNORE_BOUNDARY_FETCH_MS_AFTER_SCROLL = 500;
 
 /** running 态轮询间隔 (默认值，单位 ms) */
 export var DEFAULT_POLL_INTERVAL = 1000;

package/dist/esm/PipelineLogViewer/index.less

@@ -232,7 +232,7 @@ input.pipeline-log-search-bar__input {
 
 .pipeline-log-search-bar__dirty-hint,
 .pipeline-log-search-bar__nav-hint {
-  margin-right: 4px;
+  margin: 0 4px;
   color: #959da5bf;
   font-size: 11px;
   line-height: 1.2;
@@ -335,7 +335,7 @@ input.pipeline-log-search-bar__input {
 }
 
 .pipeline-log-search-bar__result-count {
-  margin-right: 4px;
+  margin: 0 4px;
   font-size: 12px;
 }
 

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

@@ -92,6 +92,10 @@ export interface PipelineLogViewerProps {
     highlightOptions?: IHighlightOptions[];
     /** 服务器当前时间 (ms) 与本地 Date.now() 的偏移时间差 */
     serverOffsetTime?: number;
+    /**
+     * 是否展示每行日志时间列；默认 true。
+     */
+    showLogTime?: boolean;
 }
 /** 日志游标状态 —— 标识内存中日志块的物理边界 */
 export interface LogCursor {

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/PipelineLogViewer/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/PipelineLogViewer/types.ts"],"names":[],"mappings":"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"}

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

@@ -1,11 +1,13 @@
+import type { GroupData } from '../types';
 /**
- * 全局连续行号（隐藏各分组首尾边界行后，从 1 递增）。
+ * 流水线分组场景下的左侧行号。
  *
- * 对非边界行 R：序号 = 1 + |{ r | pipelineMinRow ≤ r < R 且 r 不在 edgeRows }|
- * 即：absoluteRow - pipelineMinRow - (落在 [pipelineMinRow, absoluteRow) 内的边界行个数) + 1
+ * 规则（与产品约定一致）：
+ * - 每个分组在日志流中有 START / END 两行控制标识，各占一个绝对行号。
+ * - 第一个分组（groups[0]）：非控制行展示 **绝对行号** `absoluteRow`。
+ * - 第 n 个分组（n = groups 下标，且 n ≥ 1）：非控制行展示 `absoluteRow - (2n)`， 不是 2n -1 是因为第一个分组第1行才是有效日志，把整体行号往前推了1。
+ * - START/END 控制行：左侧不展示数字（返回 null）。
  *
- * pipelineMinRow 取各分组 start 的最小值，作为整条流水日志的起算行。
- *
- * @returns null 表示当前行为分组首尾占位行，左侧不展示数字；undefined 表示早于流水线起点，沿用绝对行号
+ * @returns null = 控制行不占位数字；undefined = 无法归类或早于 pipeline 起点，由 LogRow 回退为 absoluteRow
  */
-export declare function getGlobalVisibleLineNumberLabel(absoluteRow: number, edgeRows: Set<number>, pipelineMinRow: number): number | null | undefined;
+export declare function getPipelineGroupedLineNumberLabel(absoluteRow: number, group: GroupData | undefined, groupIndex: number, isControlMarkerRow: boolean, pipelineMinRow: number): number | null | undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"groupLineNumber.d.ts","sourceRoot":"","sources":["../../../../src/PipelineLogViewer/utils/groupLineNumber.ts"],"names":[],"mappings":"AAGA;;;;;;;;;GASG;AACH,wBAAgB,+BAA+B,CAC7C,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,EACrB,cAAc,EAAE,MAAM,GACrB,MAAM,GAAG,IAAI,GAAG,SAAS,CAQ3B"}
+{"version":3,"file":"groupLineNumber.d.ts","sourceRoot":"","sources":["../../../../src/PipelineLogViewer/utils/groupLineNumber.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C;;;;;;;;;;GAUG;AACH,wBAAgB,iCAAiC,CAC/C,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,SAAS,GAAG,SAAS,EAC5B,UAAU,EAAE,MAAM,EAClB,kBAAkB,EAAE,OAAO,EAC3B,cAAc,EAAE,MAAM,GACrB,MAAM,GAAG,IAAI,GAAG,SAAS,CAS3B"}

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

@@ -1,34 +1,22 @@
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-/* eslint-disable no-plusplus */
 /* eslint-disable import/prefer-default-export */
-/* eslint-disable no-restricted-syntax */
+
 /**
- * 全局连续行号（隐藏各分组首尾边界行后，从 1 递增）。
+ * 流水线分组场景下的左侧行号。
  *
- * 对非边界行 R：序号 = 1 + |{ r | pipelineMinRow ≤ r < R 且 r 不在 edgeRows }|
- * 即：absoluteRow - pipelineMinRow - (落在 [pipelineMinRow, absoluteRow) 内的边界行个数) + 1
+ * 规则（与产品约定一致）：
+ * - 每个分组在日志流中有 START / END 两行控制标识，各占一个绝对行号。
+ * - 第一个分组（groups[0]）：非控制行展示 **绝对行号** `absoluteRow`。
+ * - 第 n 个分组（n = groups 下标，且 n ≥ 1）：非控制行展示 `absoluteRow - (2n)`， 不是 2n -1 是因为第一个分组第1行才是有效日志，把整体行号往前推了1。
+ * - START/END 控制行：左侧不展示数字（返回 null）。
  *
- * pipelineMinRow 取各分组 start 的最小值，作为整条流水日志的起算行。
- *
- * @returns null 表示当前行为分组首尾占位行，左侧不展示数字；undefined 表示早于流水线起点，沿用绝对行号
+ * @returns null = 控制行不占位数字；undefined = 无法归类或早于 pipeline 起点，由 LogRow 回退为 absoluteRow
  */
-export function getGlobalVisibleLineNumberLabel(absoluteRow, edgeRows, pipelineMinRow) {
-  if (edgeRows.has(absoluteRow)) return null;
+export function getPipelineGroupedLineNumberLabel(absoluteRow, group, groupIndex, isControlMarkerRow, pipelineMinRow) {
+  if (isControlMarkerRow) return null;
   if (absoluteRow < pipelineMinRow) return undefined;
-  var edgeBefore = 0;
-  var _iterator = _createForOfIteratorHelper(edgeRows),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var e = _step.value;
-      if (e >= pipelineMinRow && e < absoluteRow) edgeBefore++;
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
+  if (!group || groupIndex < 0) return undefined;
+  if (groupIndex === 0) {
+    return absoluteRow;
   }
-  return absoluteRow - pipelineMinRow - edgeBefore + 1;
+  return absoluteRow - 2 * groupIndex;
 }

package/dist/worker/src/PipelineLogViewer/components/LogRow.d.ts

@@ -17,6 +17,8 @@ interface LogRowProps {
     lineNumberWidth: number;
     /** 是否显示行号 */
     showLineNumber?: boolean;
+    /** 是否显示日志时间列（默认 true） */
+    showLogTime?: boolean;
     /** 关键字规则高亮；搜索命中时不会应用 */
     highlightOptions?: IHighlightOptions[];
     /** 当前搜索关键字（非空且本行命中时在 HTML 内包裹 mark，仅高亮关键字） */

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

@@ -9,7 +9,17 @@ export declare const DEFAULT_VIRTUOSO_ITEM_HEIGHT = 20;
  * 过小（如 10）时，必须把「缓冲区内第一屏」滚到几乎贴顶才触发，此时锚点往往是 bufferStart（如 7550），
  * 而不是用户刚看到的行（如 7571 在顶时 startIndex 可能已是 21，却满足不了 <=10）。
  */
-export declare const BOUNDARY_PREFETCH_INDEX_MARGIN = 400;
+export declare const BOUNDARY_PREFETCH_INDEX_MARGIN = 200;
+/**
+ * 首屏 init / 新日志源首包：屏蔽 rangeChanged 边界预取时长 (ms)。
+ * 略长于普通窗口，避免弹窗首帧、scrollToIndex(LAST) 前误判触顶触发 loadPrev。
+ */
+export declare const IGNORE_BOUNDARY_FETCH_MS_FIRST_SCREEN = 800;
+/**
+ * 程序化滚动、loadPrev/loadNext 补偿、scrollToTop/Bottom 等之后：
+ * 屏蔽 rangeChanged 边界预取时长 (ms)。
+ */
+export declare const IGNORE_BOUNDARY_FETCH_MS_AFTER_SCROLL = 500;
 /** running 态轮询间隔 (默认值，单位 ms) */
 export declare const DEFAULT_POLL_INTERVAL = 1000;
 /** running→结束态：收尾 initLoad 之后追加 loadNext 的次数 */

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

@@ -92,6 +92,10 @@ export interface PipelineLogViewerProps {
     highlightOptions?: IHighlightOptions[];
     /** 服务器当前时间 (ms) 与本地 Date.now() 的偏移时间差 */
     serverOffsetTime?: number;
+    /**
+     * 是否展示每行日志时间列；默认 true。
+     */
+    showLogTime?: boolean;
 }
 /** 日志游标状态 —— 标识内存中日志块的物理边界 */
 export interface LogCursor {

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

@@ -1,11 +1,13 @@
+import type { GroupData } from '../types';
 /**
- * 全局连续行号（隐藏各分组首尾边界行后，从 1 递增）。
+ * 流水线分组场景下的左侧行号。
  *
- * 对非边界行 R：序号 = 1 + |{ r | pipelineMinRow ≤ r < R 且 r 不在 edgeRows }|
- * 即：absoluteRow - pipelineMinRow - (落在 [pipelineMinRow, absoluteRow) 内的边界行个数) + 1
+ * 规则（与产品约定一致）：
+ * - 每个分组在日志流中有 START / END 两行控制标识，各占一个绝对行号。
+ * - 第一个分组（groups[0]）：非控制行展示 **绝对行号** `absoluteRow`。
+ * - 第 n 个分组（n = groups 下标，且 n ≥ 1）：非控制行展示 `absoluteRow - (2n)`， 不是 2n -1 是因为第一个分组第1行才是有效日志，把整体行号往前推了1。
+ * - START/END 控制行：左侧不展示数字（返回 null）。
  *
- * pipelineMinRow 取各分组 start 的最小值，作为整条流水日志的起算行。
- *
- * @returns null 表示当前行为分组首尾占位行，左侧不展示数字；undefined 表示早于流水线起点，沿用绝对行号
+ * @returns null = 控制行不占位数字；undefined = 无法归类或早于 pipeline 起点，由 LogRow 回退为 absoluteRow
  */
-export declare function getGlobalVisibleLineNumberLabel(absoluteRow: number, edgeRows: Set<number>, pipelineMinRow: number): number | null | undefined;
+export declare function getPipelineGroupedLineNumberLabel(absoluteRow: number, group: GroupData | undefined, groupIndex: number, isControlMarkerRow: boolean, pipelineMinRow: number): number | null | undefined;

package/package.json

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