Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@
class="resource-dependency__loading"
>
<!-- 推荐处理策略提示 -->
<div class="recommend-strategy">
<div
class="recommend-strategy"
v-if="!isReadOnly"
>
<Logo
name="recommend"
size="32"
Expand Down Expand Up @@ -74,12 +77,19 @@
size="16px"
/>
<p>
<span> {{ $t('strategyCompleted', [strategyCompletedData.processedCount]) }}</span>
<span>
{{ $t('strategyCompleted') }}
<b>{{ strategyCompletedData.processedCount }}</b>
{{ $t('strategyCompleted1') }}
</span>
<i18n
path="strategyCompletedDesc"
tag="p"
>
<span v-if="strategyCompletedData.nodeNotSetCount > 0">{{ $t('nodeAuthorized', [strategyCompletedData.nodeNotSetCount]) }}</span>
<span v-if="strategyCompletedData.nodeNotSetCount > 0">
<b>{{ strategyCompletedData.nodeNotSetCount }}</b>
{{ $t('nodeAuthorized') }}
</span>
</i18n>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,12 @@
</div>
<div class="step-info">
<div class="step-title">{{ step.title }}</div>
<div class="step-desc">{{ step.desc }}</div>
<div
class="step-desc"
:title="step.desc"
>
{{ step.desc }}
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -1438,7 +1443,6 @@
padding: 16px 15%;
gap: 16px;
z-index: 99;
// transition: all 0.3s ease;
transition: all 0.3s ease;

&.is-sticky {
Expand All @@ -1454,6 +1458,7 @@
position: relative;
flex: 1;
cursor: default;
overflow: hidden;
border-bottom: 5px solid #DCDEE5;

&.is-completed {
Expand Down Expand Up @@ -1490,15 +1495,22 @@
display: flex;
align-items: center;
margin-left: 8px;
flex-shrink: 0;
min-width: 0;
overflow: hidden;

.step-title {
color: #313238;
white-space: nowrap;
flex-shrink: 0;
}
.step-desc {
font-size: 12px;
color: #979BA5;
margin-left: 16px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
max-width: 100%;
}
}
}
Expand Down
11 changes: 6 additions & 5 deletions src/frontend/locale/pipeline/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -2189,11 +2189,11 @@
"crossProjectCopy": "Cross-Project Copy",
"submitter": "Submitter",
"configScope": "Configure task information",
"configScopeDesc": "Target project | ID strategy | Copy scope",
"configScopeDesc": "Target project ID strategy Copy scope",
"resourceDependency": "Handle resource dependencies",
"resourceDependencyDesc": "Reference dependencies | Owned resources | Conflict handling",
"resourceDependencyDesc": "Reference dependencies Owned resources Conflict handling",
"taskExecution": "Task execution",
"taskExecutionDesc": "Execution confirmation | Result feedback | Post-execution guidance",
"taskExecutionDesc": "Execution confirmation Result feedback Post-execution guidance",
"newCrossProjectCopyTask": "New Cross-Project Copy Task",
"submitCheck": "Submit Check",
"noSubmitCheckItems": "No submit check items currently",
Expand Down Expand Up @@ -2408,10 +2408,11 @@
"autoResolveConflictDesc2": "Assign a new ID to the corresponding pipeline (this will not affect other pipelines that still retain the source ID)",
"skipThisPipeline": "Skip this pipeline, do not copy this time",
"skipThisPipelineDesc": "This pipeline will not be copied this time; it can be seen marked as 'Excluded' in the copy scope.",
"strategyCompleted": "Completed processing for <b>{0}</b> resources using the recommended strategy.",
"strategyCompleted": "Completed according to the recommended strategy",
"strategyCompleted1": "items of resource processing.",
"strategyCompletedDesc": "Among them, {0} pipeline conflicts require confirmation one by one.",
"repositoryNotAuthorized": "<b>{0}</b> code repositories still require authorization,",
"nodeAuthorized": "<b>{0}</b> build/deploy nodes that did not match by name require manual confirmation,",
"nodeAuthorized": "build/deploy nodes that did not match by name require manual confirmation,",
"unhandledResourceCount": "{0} resources have no handling method selected",
"allResourcesHandled": "Handling method selected for all dependency resources",
"highRiskOperationNotConfirmed": "High-risk operations not confirmed",
Expand Down
11 changes: 6 additions & 5 deletions src/frontend/locale/pipeline/ja-JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -2184,11 +2184,11 @@
"crossProjectCopy": "クロスプロジェクトコピー",
"submitter": "提出者",
"configScope": "タスク情報の設定",
"configScopeDesc": "対象プロジェクト | ID 戦略 | コピー範囲",
"configScopeDesc": "対象プロジェクト ID 戦略 コピー範囲",
"resourceDependency": "リソース依存関係の処理",
"resourceDependencyDesc": "参照依存 | 所属リソース | 競合処理",
"resourceDependencyDesc": "参照依存 所属リソース 競合処理",
"taskExecution": "タスク実行",
"taskExecutionDesc": "実行確認 | 結果フィードバック | 後続ガイダンス",
"taskExecutionDesc": "実行確認 結果フィードバック 後続ガイダンス",
"newCrossProjectCopyTask": "新規クロスプロジェクトコピータスク",
"submitCheck": "提出チェック",
"noSubmitCheckItems": "提出チェック項目は現在ありません",
Expand Down Expand Up @@ -2403,10 +2403,11 @@
"autoResolveConflictDesc2": "該当パイプラインに新しいIDを割り当てます(他のパイプラインが「ソースIDを保持する」ことに影響しません)",
"skipThisPipeline": "このパイプラインをスキップ、今回はコピーしない",
"skipThisPipelineDesc": "このパイプラインは今回はコピーされません。コピー範囲で「除外済み」マークを確認できます。",
"strategyCompleted": "推奨戦略を使用して <b>{0}</b> 件のリソース処理を完了しました。",
"strategyCompleted": "推奨戦略に従って完了",
"strategyCompleted1": "件のリソース処理。",
"strategyCompletedDesc": "このうち、{0}件のパイプライン衝突は一つずつ確認が必要です。",
"repositoryNotAuthorized": "<b>{0}</b> 件のコードリポジトリはまだ認証の追加が必要です、",
"nodeAuthorized": "<b>{0}</b> 件の同名にヒットしなかったビルド/デプロイノードは手動確認が必要です、",
"nodeAuthorized": "件の同名にヒットしなかったビルド/デプロイノードは手動確認が必要です、",
"unhandledResourceCount": "{0} 件のリソースは処理方法が選択されていません",
"allResourcesHandled": "依存リソースの処理方法が選択されました",
"highRiskOperationNotConfirmed": "高リスク操作が確認されていません",
Expand Down
11 changes: 6 additions & 5 deletions src/frontend/locale/pipeline/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -2186,11 +2186,11 @@
"crossProjectCopy": "跨项目复制",
"submitter": "提交人",
"configScope": "配置任务信息",
"configScopeDesc": "目标项目 | ID 策略 | 复制范围",
"configScopeDesc": "目标项目 策略 复制范围",
"resourceDependency": "处理资源依赖",
"resourceDependencyDesc": "引用依赖 | 归属资源 | 冲突处理",
"resourceDependencyDesc": "引用依赖 归属资源 冲突处理",
"taskExecution": "任务执行",
"taskExecutionDesc": "执行确认 | 结果反馈 | 后期指引",
"taskExecutionDesc": "执行确认 结果反馈 后期指引",
"newCrossProjectCopyTask": "新建跨项目复制任务",
"submitCheck": "提交检查",
"noSubmitCheckItems": "暂无提交检查项",
Expand Down Expand Up @@ -2405,10 +2405,11 @@
"autoResolveConflictDesc2": "为对应流水线改用新 ID(不影响其他流水线仍然「保持源 ID」)",
"skipThisPipeline": "跳过此流水线,本次不复制",
"skipThisPipelineDesc": "本次不复制这条流水线;可在复制范围中查看到「已排除」标记。",
"strategyCompleted": "已按推荐策略完成 <b>{0}</b> 项资源处理。",
"strategyCompleted": "已按推荐策略完成",
"strategyCompleted1": "项资源处理。",
"strategyCompletedDesc": "其中,{0}流水线冲突需逐条确认。",
"repositoryNotAuthorized": "<b>{0}</b> 个代码库仍需补充授权,",
"nodeAuthorized": "<b>{0}</b> 个未命中同名的构建/部署节点需手动确认,",
"nodeAuthorized": "个未命中同名的构建/部署节点需手动确认,",
"unhandledResourceCount": "{0} 项资源未选择处理方式",
"allResourcesHandled": "依赖资源已选择处理方式",
"highRiskOperationNotConfirmed": "高风险操作未确认",
Expand Down
Loading