react-terminal-viewer-cicd 3.0.0-beta.24 → 3.0.0-beta.26

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.24" || '0.0.0';
+  var version = "3.0.0-beta.26" || '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/TerminalViewer/index.d.ts

@@ -199,5 +199,5 @@ export interface TerminalViewerProps {
      */
     disableStickyHeader?: boolean;
 }
-declare const TerminalViewer: React.ForwardRefExoticComponent<Omit<TerminalViewerProps, "ref"> & React.RefAttributes<TerminalRef<VirtualDomTerminal | Terminal> | undefined>>;
+declare const TerminalViewer: React.ForwardRefExoticComponent<Omit<TerminalViewerProps, "ref"> & React.RefAttributes<TerminalRef<Terminal | VirtualDomTerminal> | undefined>>;
 export default TerminalViewer;

package/dist/esm/TerminalViewerBody/index.d.ts

@@ -83,5 +83,5 @@ export interface TerminalViewerBodyProps {
      */
     onLoading?: (loading: boolean) => void;
 }
-declare const TerminalViewerBody: React.ForwardRefExoticComponent<TerminalViewerBodyProps & React.RefAttributes<TerminalRef<import("../types").VirtualDomTerminal | Terminal> | undefined>>;
+declare const TerminalViewerBody: React.ForwardRefExoticComponent<TerminalViewerBodyProps & React.RefAttributes<TerminalRef<Terminal | import("../types").VirtualDomTerminal> | undefined>>;
 export default TerminalViewerBody;

package/dist/esm/TerminalViewerHeader/index.d.ts

@@ -98,5 +98,5 @@ export interface TerminalViewerHeaderProps<T extends Terminal | VirtualDomTermin
      */
     collapseAction?: (terminal: T, allCollapsed: boolean) => React.ReactNode;
 }
-declare const TerminalViewerHeader: <T extends VirtualDomTerminal | Terminal = VirtualDomTerminal | Terminal>({ placeholder, defaultValue, clearable, refreshable, loading, activeTitleIndex, titles, searchResult, inputAddonBefore, inputAddonAfter, icons, onTitleChange, onSearchPrev, onSearchNext, onSearchChange, onSearchClear, onRefresh, terminalRef, allCollapsed, collapseAction, }: TerminalViewerHeaderProps<T>) => React.JSX.Element;
+declare const TerminalViewerHeader: <T extends Terminal | VirtualDomTerminal = Terminal | VirtualDomTerminal>({ placeholder, defaultValue, clearable, refreshable, loading, activeTitleIndex, titles, searchResult, inputAddonBefore, inputAddonAfter, icons, onTitleChange, onSearchPrev, onSearchNext, onSearchChange, onSearchClear, onRefresh, terminalRef, allCollapsed, collapseAction, }: TerminalViewerHeaderProps<T>) => React.JSX.Element;
 export default TerminalViewerHeader;

package/dist/esm/TerminalViewerVirtualDom/index.d.ts

@@ -84,5 +84,5 @@ export interface TerminalViewerVirtualDomProps {
  * 最后一个分组折叠时，在折叠之前，添加底部空间
  * 最后一个分组展开时，在展开之前，删除底部空间
  */
-declare const ReactVirtuoso: React.ForwardRefExoticComponent<TerminalViewerVirtualDomProps & React.RefAttributes<TerminalRef<VirtualDomTerminal | import("src").Terminal> | undefined>>;
+declare const ReactVirtuoso: React.ForwardRefExoticComponent<TerminalViewerVirtualDomProps & React.RefAttributes<TerminalRef<import("src").Terminal | VirtualDomTerminal> | undefined>>;
 export default ReactVirtuoso;

package/dist/esm/TerminalViewerVirtualDom/index.less

@@ -29,8 +29,6 @@
 
 .terminal-viewer-line-number,
 .terminal-viewer-text-placeholder {
-  margin-right: 8px;
-  padding-right: 8px;
   color: #959da5bf;
   font-size: 12px;
   font-family: Roboto Mono, Andale Mono, Consolas, Courier New, monospace;
@@ -41,6 +39,7 @@
 .terminal-viewer-line-number {
   display: inline-block;
   flex-shrink: 0;
+  margin-top: 16px;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;

package/dist/esm/TerminalViewerVirtualDom/useStreamStepWorkerLogs.js

@@ -184,6 +184,12 @@ export var useStreamStepWorkerLogs = function useStreamStepWorkerLogs(string, ch
   useEffect(function () {
     var preLength = 0;
     var preStagesLength = 0;
+    var preStagesSignature = '';
+    var getStagesSignature = function getStagesSignature(stageList) {
+      return (stageList || []).map(function (s) {
+        return "".concat(s.stepId, "_").concat(s.status, "_").concat(s.endStatus || '');
+      }).join('_');
+    };
     var worker = globalContext.getWorker();
     var onHighlightSuccess = function onHighlightSuccess(_ref) {
       var id = _ref.id,
@@ -199,7 +205,11 @@ export var useStreamStepWorkerLogs = function useStreamStepWorkerLogs(string, ch
         setWorking(false);
         if ((array === null || array === void 0 ? void 0 : array.length) > 0) {
           var stagesLength = (stages === null || stages === void 0 ? void 0 : stages.length) || 0;
-          if (array.length !== preLength || stagesLength !== preStagesLength) {
+          var stagesSignature = getStagesSignature(stages);
+          var hasArrayChanged = array.length !== preLength;
+          var hasStagesLengthChanged = stagesLength !== preStagesLength;
+          var hasStagesContentChanged = stagesLength > 0 && stagesSignature !== preStagesSignature;
+          if (hasArrayChanged || hasStagesLengthChanged || hasStagesContentChanged) {
             // 直接使用 Worker 返回的解析结果
             if (flatLines) {
               setLogs(flatLines);
@@ -250,6 +260,7 @@ export var useStreamStepWorkerLogs = function useStreamStepWorkerLogs(string, ch
             // 同步长度记录
             preLength = array.length;
             preStagesLength = stagesLength;
+            preStagesSignature = stagesSignature;
           }
         }
       }
@@ -276,6 +287,7 @@ export var useStreamStepWorkerLogs = function useStreamStepWorkerLogs(string, ch
     return function () {
       preLength = 0;
       preStagesLength = 0;
+      preStagesSignature = '';
       worker === null || worker === void 0 || worker.off('highlight-log-success', onHighlightSuccess);
       worker === null || worker === void 0 || worker.off('search-log-success', onSearchSuccess);
     };

package/dist/esm/TerminalViewerVirtualDom/virtualized.less

@@ -22,6 +22,7 @@
 
 .terminal-viewer-line-number,
 .terminal-viewer-text-placeholder {
+  box-sizing: border-box;
   margin-right: 8px;
   padding-right: 8px;
   color: #959da5bf;

package/package.json

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