react-terminal-viewer-cicd 3.0.0-beta.31 → 3.0.0-beta.33

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,7 +1,7 @@
1
1
  function LogWorker() {
2
2
  var workerPath = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '/worker';
3
3
  var worker = null;
4
- var version = "3.0.0-beta.31" || '0.0.0';
4
+ var version = "3.0.0-beta.33" || '0.0.0';
5
5
  var path = workerPath.includes('http') ? "".concat(workerPath, "/log.worker.js") : "".concat(window.location.origin).concat(workerPath, "/log.worker.js");
6
6
  var blob = new Blob(["importScripts(\"".concat(path, "?v=").concat(version, "\")")], {
7
7
  type: 'application/javascript'
@@ -1,7 +1,7 @@
1
1
  import React from 'react';
2
2
  export declare const shortDuration: (value: number | string, unit?: 'years' | 'months' | 'weeks' | 'days' | 'hours' | 'minutes' | 'seconds' | 'milliseconds') => string;
3
3
  type HumenTimeProps = {
4
- serverTime?: string;
4
+ serverTime?: string | number;
5
5
  time?: number;
6
6
  convert?: boolean;
7
7
  offsetTime?: number;
@@ -47,6 +47,12 @@ export var shortDuration = function shortDuration(value, unit) {
47
47
  str += "".concat(s, "s");
48
48
  return str;
49
49
  };
50
+
51
+ /** 展示层:0s 无业务含义时改为 0.1 */
52
+ var displayShortDurationSeconds = function displayShortDurationSeconds(value) {
53
+ var t = shortDuration(value, 'seconds');
54
+ return t === '0s' ? '0.1s' : t;
55
+ };
50
56
  var HumenTime = function HumenTime(_ref) {
51
57
  var time = _ref.time,
52
58
  _ref$convert = _ref.convert,
@@ -102,10 +108,10 @@ var HumenTime = function HumenTime(_ref) {
102
108
  if (!time) {
103
109
  return /*#__PURE__*/React.createElement("div", {
104
110
  className: "terminal-viewer-virtuoso-list-row-step-time"
105
- }, /*#__PURE__*/React.createElement("span", null, Number.isFinite(Number(computedTime)) && convert ? shortDuration(Number(computedTime), 'seconds') : Number(computedTime), !Number.isFinite(Number(computedTime)) && '-'));
111
+ }, /*#__PURE__*/React.createElement("span", null, Number.isFinite(Number(computedTime)) && convert ? displayShortDurationSeconds(Number(computedTime)) : Number(computedTime), !Number.isFinite(Number(computedTime)) && '-'));
106
112
  }
107
113
  return /*#__PURE__*/React.createElement("div", {
108
114
  className: "terminal-viewer-virtuoso-list-row-step-time"
109
- }, /*#__PURE__*/React.createElement("span", null, convert ? shortDuration(time, 'seconds') : time));
115
+ }, /*#__PURE__*/React.createElement("span", null, convert ? displayShortDurationSeconds(time) : time));
110
116
  };
111
117
  export default /*#__PURE__*/memo(HumenTime);
@@ -139,7 +139,6 @@ var ReactVirtuoso = /*#__PURE__*/forwardRef(function (_ref, ref) {
139
139
  parserRef = _useStreamStepWorkerL.parserRef,
140
140
  stageStatsRef = _useStreamStepWorkerL.stageStatsRef,
141
141
  hasUserCollapseRef = _useStreamStepWorkerL.hasUserCollapseRef,
142
- lastCollapseRef = _useStreamStepWorkerL.lastCollapseRef,
143
142
  isAllCollapsed = _useStreamStepWorkerL.isAllCollapsed,
144
143
  collapseAll = _useStreamStepWorkerL.collapseAll,
145
144
  expandAll = _useStreamStepWorkerL.expandAll;
@@ -252,7 +251,7 @@ var ReactVirtuoso = /*#__PURE__*/forwardRef(function (_ref, ref) {
252
251
  }, [parserRef, stageStatsRef, toggleStage]);
253
252
  var isLastStageRunningRef = useRef(true);
254
253
  var groupContent = useCallback(function (groupIndex) {
255
- var _parserRef$current2, _parserRef$current3, _extraOptionsRef$curr3, _extraOptionsRef$curr4, _extraOptionsRef$curr5;
254
+ var _parserRef$current2, _parserRef$current3, _extraOptionsRef$curr3, _extraOptionsRef$curr4, _extraOptionsRef$curr5, _extraOptionsRef$curr6;
256
255
  var stage = (_parserRef$current2 = parserRef.current) === null || _parserRef$current2 === void 0 ? void 0 : _parserRef$current2.stages[groupIndex];
257
256
  var collapsed = stageStatsRef.current[groupIndex].collapse;
258
257
  var status = (stage === null || stage === void 0 ? void 0 : stage.endStatus) || (stage === null || stage === void 0 ? void 0 : stage.status) || '';
@@ -286,7 +285,8 @@ var ReactVirtuoso = /*#__PURE__*/forwardRef(function (_ref, ref) {
286
285
  }, stage === null || stage === void 0 ? void 0 : stage.name)), /*#__PURE__*/React.createElement(HumenTime, {
287
286
  startTime: stage === null || stage === void 0 ? void 0 : stage.startTime,
288
287
  endTime: stage === null || stage === void 0 ? void 0 : stage.endTime,
289
- timing: status === 'running'
288
+ timing: status === 'running',
289
+ offsetTime: (_extraOptionsRef$curr6 = extraOptionsRef.current) === null || _extraOptionsRef$curr6 === void 0 ? void 0 : _extraOptionsRef$curr6.offsetTime
290
290
  }));
291
291
  }, [parserRef, stageStatsRef, handleToggleStage, lineNumberWidth]);
292
292
  useEffect(function () {
@@ -22,6 +22,8 @@ export interface ExtraOptions {
22
22
  * 分步骤展示时,icon 配置
23
23
  */
24
24
  stepIcons?: Record<string, React.ReactNode>;
25
+ /** 客户端时间和服务端时间偏差 */
26
+ offsetTime?: number;
25
27
  }
26
28
  export interface VirtualDomTerminal {
27
29
  scrollToTop: () => void;
@@ -1,7 +1,7 @@
1
1
  import React from 'react';
2
2
  export declare const shortDuration: (value: number | string, unit?: 'years' | 'months' | 'weeks' | 'days' | 'hours' | 'minutes' | 'seconds' | 'milliseconds') => string;
3
3
  type HumenTimeProps = {
4
- serverTime?: string;
4
+ serverTime?: string | number;
5
5
  time?: number;
6
6
  convert?: boolean;
7
7
  offsetTime?: number;
@@ -22,6 +22,8 @@ export interface ExtraOptions {
22
22
  * 分步骤展示时,icon 配置
23
23
  */
24
24
  stepIcons?: Record<string, React.ReactNode>;
25
+ /** 客户端时间和服务端时间偏差 */
26
+ offsetTime?: number;
25
27
  }
26
28
  export interface VirtualDomTerminal {
27
29
  scrollToTop: () => void;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "react-terminal-viewer-cicd",
3
- "version": "3.0.0-beta.31",
4
- "author": "https://gitee.com/gitee-frontend",
3
+ "version": "3.0.0-beta.33",
4
+ "author": "https://gitee.com/gitee-frontend",
5
5
  "license": "MIT",
6
6
  "keywords": [
7
7
  "react",