Skip to content

Commit

Permalink
bugfix: 手动安装指引 - 任务历史场景覆盖(closed TencentBlueKing#1421)
Browse files Browse the repository at this point in the history
  • Loading branch information
GONGONGONG committed Feb 24, 2023
1 parent 4d86a15 commit 7da3b0d
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 4 deletions.
2 changes: 2 additions & 0 deletions frontend/src/i18n/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,8 @@ export default {
操作指引: 'Operation guide',
手动安装Guide: 'Installation',
手动卸载Guide: 'Uninstall',
手动卸载Agent: 'Uninstall Agent',
手动卸载Proxy: 'Uninstall Proxy',

插件管理: 'Plugin',
全局配置: 'Global Configuration',
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/i18n/zh.js
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,8 @@ export default {
操作指引: '操作指引',
手动安装Guide: '安装',
手动卸载Guide: '卸载',
手动卸载Agent: '卸载Agent',
手动卸载Proxy: '卸载Proxy',

插件管理: '插件管理',
全局配置: '全局配置',
Expand Down
15 changes: 13 additions & 2 deletions frontend/src/views/task/task-detail-table.vue
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,19 @@ export default class TaskDeatailTable extends Mixins(HeaderRenderMixin) {
return MainStore.windowHeight - 322;
}
private get commandStep() {
return [this.$t('手动安装Guide'), '安装', this.$t('手动卸载Guide'), '卸载', '卸载Agent', '卸载Proxy'];
// return this.isUninstallType ? [this.$t('手动卸载Guide'), '卸载'] : [this.$t('手动安装Guide'), '安装'];
return [
// => proxy安装、agent安装、agent重装
'安装', 'Install', this.$t('安装'),
'Installation', this.$t('手动安装Guide'),
// Agent卸载
'卸载Agent', 'Uninstall Agent', this.$t('手动卸载Agent'),
// Proxy卸载
'卸载Proxy', 'Uninstall Proxy', this.$t('手动卸载Proxy'),
// 卸载
'卸载', 'Uninstall', 'Uninstallation', this.$t('手动卸载Guide'),
// other
this.$t('Proxy安装'),
];
}
private get showTargetVersionColumn() {
return this.category === 'policy';
Expand Down
15 changes: 13 additions & 2 deletions frontend/src/views/task/task-log.vue
Original file line number Diff line number Diff line change
Expand Up @@ -375,8 +375,19 @@ export default {
return /(INSTALL)|(REINSTALL)|(UPGRADE)/ig.test(this.jobType);
},
commandStep() {
return [this.$t('手动安装Guide'), '安装', this.$t('手动卸载Guide'), '卸载', '卸载Agent', '卸载Proxy'];
// return /UN/ig.test(this.jobType) ? [this.$t('手动卸载Guide'), '卸载'] : [this.$t('手动安装Guide'), '安装'];
return [
// => proxy安装、agent安装、agent重装
'安装', 'Install', this.$t('安装'),
'Installation', this.$t('手动安装Guide'),
// Agent卸载
'卸载Agent', 'Uninstall Agent', this.$t('手动卸载Agent'),
// Proxy卸载
'卸载Proxy', 'Uninstall Proxy', this.$t('手动卸载Proxy'),
// 卸载
'卸载', 'Uninstall', 'Uninstallation', this.$t('手动卸载Guide'),
// other
this.$t('Proxy安装'),
];
},
},
watch: {
Expand Down

0 comments on commit 7da3b0d

Please sign in to comment.