feat：代码库优化一期功能点 #9347

TencentBlueKing · Oct 26, 2023 · d6b69e1 · d6b69e1
1 parent 766729d
commit d6b69e1
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 103 deletions.
diff --git a/src/frontend/devops-codelib/src/components/CodeLibDetail/ResetAuthDialog.vue b/src/frontend/devops-codelib/src/components/CodeLibDetail/ResetAuthDialog.vue
@@ -159,7 +159,7 @@
                     <bk-radio
                         value="http"
                     >
-                        {{ $t('codelib.用户名密码') }}
+                        {{ $t('codelib.用户名+密码') }}
                     </bk-radio>
                 </bk-radio-group>
             </bk-form-item>

diff --git a/src/frontend/devops-codelib/src/components/CodeLibDetail/basic-setting.vue b/src/frontend/devops-codelib/src/components/CodeLibDetail/basic-setting.vue
@@ -196,7 +196,7 @@
                 <p>
                     {{ $t('codelib.请先将目录') }}
                     <span>{{ $t('codelib.改名或删除') }}</span>
-                    {{ $t('codelib.后重试，避免项目其他成员进行无效的YAML 文件修改') }}
+                    {{ $t('codelib.后重试，避免项目其他成员进行无效的YAML文件修改') }}
                     {{ $t('codelib.。') }}
                 </p>
             </span>

diff --git a/src/frontend/devops-codelib/src/components/CodeLibDetail/timeline-collapse.vue b/src/frontend/devops-codelib/src/components/CodeLibDetail/timeline-collapse.vue
@@ -143,7 +143,8 @@
              */
             handleReplayAll (eventId) {
                 this.$bkInfo({
-                    title: this.$t('codelib.确认重放此事件吗？'),
+                    title: this.$t('codelib.是否一键重新触发？'),
+                    subTitle: this.$t('codelib.将使用此事件重新触发关联的流水线'),
                     confirmLoading: true,
                     confirmFn: async () => {
                         this.replayAllEvent({
@@ -168,7 +169,8 @@
                 this.$bkInfo({
                     extCls: 'replay-dialog',
                     width: 400,
-                    title: this.$t('codelib.确认以此事件重新触发流水线 X 吗？', [pipelineName]),
+                    title: this.$t('codelib.是否重新触发？'),
+                    subTitle: this.$t('codelib.确认以此事件重新触发流水线X吗？', [pipelineName]),
                     confirmLoading: true,
                     confirmFn: async () => {
                         this.replayEvent({
@@ -287,7 +289,7 @@
             margin-left: 50px;
             .one-click-trigger {
                 font-size: 12px;
-                margin-right: 20px;
+                margin-right: 22px;
             }
         }
         .right-shape {

diff --git a/src/frontend/devops-codelib/src/components/CodeLibDetail/trigger.vue b/src/frontend/devops-codelib/src/components/CodeLibDetail/trigger.vue
@@ -263,13 +263,13 @@
                 this.triggerType = paramsMap.triggerType || ''
                 this.eventType = paramsMap.eventType || ''
                 this.getTriggerData()
+            },
+            scmType (val) {
+                this.getEventTypeList()
+                this.getTriggerTypeList()
+                this.getTriggerData()
             }
         },
-        created () {
-            this.getEventTypeList()
-            this.getTriggerTypeList()
-            this.getTriggerData()
-        },
         methods: {
             ...mapActions('codelib', [
                 'fetchEventType',

diff --git a/src/frontend/devops-codelib/src/components/CodeLibDialog/SVN.vue b/src/frontend/devops-codelib/src/components/CodeLibDialog/SVN.vue
@@ -22,7 +22,7 @@
                 <bk-radio
                     value="http"
                 >
-                    {{ $t('codelib.用户名密码') }}
+                    {{ $t('codelib.用户名+密码') }}
                 </bk-radio>
             </bk-radio-group>
         </bk-form-item>

diff --git a/src/frontend/locale/codelib/en-US.json b/src/frontend/locale/codelib/en-US.json
@@ -77,9 +77,9 @@
     "historyInfo": "History Info",
     "creator": "Creator",
     "expandList": "Expand",
-    "recentlyEditedBy": "Recently edited by",
+    "recentlyEditedBy": "Last Modified By",
     "createdTime": "Created Time",
-    "lastModifiedTime": "Last modified time",
+    "lastModifiedTime": "Last Modified On",
     "pacTips": "Pipeline As Code 模式下，使用代码库 .ci 目录下的 YAML 文件编排流水线，且 YAML 文件变更将自动同步到对应的蓝盾流水线。",
     "暂无数据": "No Data",
     "搜索结果为空": "Search result is empty",
@@ -91,8 +91,8 @@
     "copySuccess": "Copied",
     "save": "Save",
     "cancel": "Cancel",
-    "如需重置，请先点击按钮授权。": "如需重置，请先点击按钮授权。",
-    "尚未授权，请先点击按钮授权。": "尚未授权，请先点击按钮授权。",
+    "如需重置，请先点击按钮授权。": "If need to reset, please authorize first.",
+    "尚未授权，请先点击按钮授权。": "Not yet authorized, please authorize first.",
     "此授权用于平台和工蜂进行交互，用于如下场景：": "This authorization is applicable in the following scenarios:",
     "注册 Webhook 到工蜂": "Registering Webhook to TGit",
     "回写提交检测状态到工蜂": "Writing back commit check status to TGit",
@@ -102,102 +102,78 @@
     "回写 Commit statuses 到 Github": "Writing back commit check status to Github",
     "需拥有代码库 Push 权限": "Push permissions is required.",
     "此授权用于平台和 SVN 代码库进行交互，用于如下场景：": "This authorization is applicable in the following scenarios:",
-    "注册 Webhook 到代码库": "注册 Webhook 到代码库",
-    "需拥有代码库 Write 权限": "需拥有代码库 Write 权限",
+    "注册 Webhook 到代码库": "Register the webhook to the repository",
+    "需拥有代码库 Write 权限": "Requires Write permission on the repository",
     "此授权用于平台和 P4 代码库进行交互，用于如下场景：": "This authorization is applicable in the following scenarios:",
     "需拥有代码库 Read 权限": "Read permissions is required.",
     "代码库别名不能重复。": "Codelib alias already exists.",
     "noPermission": "No permission",
     "sshExampleTips": "eg: svn+ssh://svn.sample.com/test_proj",
     "httpExampleTips": "eg: http://svn.sample.com/test_proj or https://svn.sample.com/test_proj",
-    "用户名+密码": "用户名 + 密码",
-    "用户名密码": "用户名密码",
-    "同一个代码库可以关联到多个蓝盾项目，但仅支持在一个蓝盾项目下开启 PAC (Pipeline As Code) 模式": "同一个代码库可以关联到多个蓝盾项目，但仅支持在一个蓝盾项目下开启 PAC (Pipeline As Code) 模式",
-    "PAC 模式下，使用代码库 ci 目录下的 YAML 文件编排流水线，且 YAML 文件变更将自动同步到对应的蓝盾流水线。": "PAC 模式下，使用代码库 .ci 目录下的 YAML 文件编排流水线，且 YAML 文件变更将自动同步到对应的蓝盾流水线。",
-    "查看同步规则": "查看同步规则",
-    "当前代码库已在【】项目中开启 PAC 模式": "当前代码库已在【{0}】项目中开启 PAC 模式",
-    "最近修改人": "最近修改人",
-    "保存成功": "保存成功",
-    "关闭成功": "关闭成功",
-    "开启成功": "开启成功",
-    "确定关闭 PAC 模式？": "确定关闭 PAC 模式？",
-    "确定开启 PAC 模式？": "确定开启 PAC 模式？",
-    "关闭 PAC 模式失败": "关闭 PAC 模式失败",
-    "检测到默认分支仍存在ci 文件目录，关闭 PAC 模式后该目录下的文件修改将": "检测到默认分支仍存在.ci 文件目录，关闭 PAC 模式后该目录下的文件修改将",
-    "不再同步到蓝盾流水线": "不再同步到蓝盾流水线",
-    "请先将目录": "请先将目录", 
-    "改名或删除": "改名或删除",
-    "后重试，避免项目其他成员进行无效的YAML 文件修改": "后重试，避免项目其他成员进行无效的YAML 文件修改",
+    "用户名+密码": "Username + Password",
+    "同一个代码库可以关联到多个蓝盾项目，但仅支持在一个蓝盾项目下开启 PAC (Pipeline As Code) 模式": "The same repository can be associated with multiple BlueKing projects, but only supports PAC (Pipeline As Code) mode under one BlueKing project.",
+    "PAC 模式下，使用代码库 ci 目录下的 YAML 文件编排流水线，且 YAML 文件变更将自动同步到对应的蓝盾流水线。": "In PAC mode, the YAML file in the ci directory of the repository is used to arrange the pipeline, and YAML file changes will be automatically synchronized to the corresponding Blue Shield pipeline.",
+    "查看同步规则": "View sync rules",
+    "当前代码库已在【】项目中开启 PAC 模式": "The repository has enabled PAC mode in the project [{0}]",
+    "最近修改人": "Last Edited By",
+    "最近修改时间": "Last Modified On",
+    "保存成功": "Saved Successfully",
+    "关闭成功": "Closed Successfully",
+    "开启成功": "Enabled Successfully",
+    "确定关闭 PAC 模式？": "Confirm to close PAC mode?",
+    "确定开启 PAC 模式？": "Confirm to enable PAC mode?",
+    "关闭 PAC 模式失败": "Closed PAC mode failed",
+    "检测到默认分支仍存在ci 文件目录，关闭 PAC 模式后该目录下的文件修改将": "It is detected that the default branch still exists in the .ci file directory. After turning off PAC mode, the file modifications in this directory will",
+    "不再同步到蓝盾流水线": "No longer in sync to BlueKing Pipeline",
+    "请先将目录": "Please", 
+    "改名或删除": "rename or delete",
+    "后重试，避免项目其他成员进行无效的YAML文件修改": " the directory and try again to avoid invalid YAML file modifications by other project members.",
     "。": ".",
-    "ci目录已改名或删除": ".ci目录已改名或删除",
-    "继续关闭": "继续关闭",
-    "关闭": "关闭",
-    "PAC 模式需使用 OAUTH 授权": "PAC 模式需使用 OAUTH 授权",
-    "确定重置授权为 OAUTH，同时开启 PAC 模式吗？": "确定重置授权为 OAUTH，同时开启 PAC 模式吗？",
-    "以下流水线仍在使用此代码库": "以下流水线仍在使用此代码库",
-    "请前往流水线处理后，再删除代码库": "请前往流水线处理后，再删除代码库",
-    "是否删除该代码库？": "是否删除该代码库？",
-    "重置成功": "重置成功",
-    "已开启 PAC 模式": "已开启 PAC 模式",
-    "未开启 PAC 模式": "未开启 PAC 模式",
-    "选择日期范围": "选择日期范围",
-    "触发器类型": "触发器类型",
-    "事件类型": "事件类型",
-    "触发人": "触发人",
-    "流水线名称": "流水线名称",
-    "触发器类型/事件类型/触发人/流水线名称": "触发器类型/事件类型/触发人/流水线名称",
+    "ci目录已改名或删除": "The .ci directory has been renamed or deleted",
+    "继续关闭": "Close",
+    "关闭": "Close",
+    "PAC 模式需使用 OAUTH 授权": "PAC mode requires OAUTH authorization",
+    "确定重置授权为 OAUTH，同时开启 PAC 模式吗？": "Reset authorization to OAUTH and enable PAC mode?",
+    "以下流水线仍在使用此代码库": "The following pipelines are still using this repository",
+    "请前往流水线处理后，再删除代码库": "Please go to the pipeline for processing before deleting the repository.",
+    "是否删除该代码库？": "Delete this repository?",
+    "重置成功": "Reset Successfully",
+    "已开启 PAC 模式": "PAC mode opened",
+    "未开启 PAC 模式": "PAC mode closed",
+    "选择日期范围": "Select date range",
+    "触发器类型": "Trigger Type",
+    "事件类型": "Event Type",
+    "触发人": "Trigger",
+    "流水线名称": "Pipeline Name",
+    "触发器类型/事件类型/触发人/流水线名称": "Trigger Type / Event Type / Trigger / Pipeline Name",
     "加载更多": "Load More",
     "到底啦": "End",
-    "一键重新触发": "一键重新触发",
-    "重新触发": "重新触发",
-    "触发成功": "触发成功",
-    "触发器类型/事件类型": "触发器类型/事件类型",
-    "事件": "事件",
-    "流水线数量": "流水线数量",
+    "一键重新触发": "Replay Event",
+    "重新触发": "Re-trigger",
+    "触发成功": "Trigger Successfully",
+    "触发器类型/事件类型": "Trigger type / Event type",
+    "事件": "Event",
+    "流水线数量": "Pipeline Count",
     "操作": "Actions",
     "访问令牌": "Access Token",
-    "请选择凭证": "请选择凭证",
-    "详情": "详情",
-    "触发条件": "触发条件",
+    "请选择凭证": "Please select a ticket",
+    "详情": "Detail",
+    "触发条件": "Trigger Conditions",
     "确认以此事件重新触发流水线 X 吗？": "确认以此事件重新触发流水线 {0} 吗？",
     "确认重放此事件吗？": "确认重放此事件吗？",
-    "自定义触发控制": "自定义触发控制",
-    "满足基础过滤条件后，根据第三方接口返回判断是否能够触发": "满足基础过滤条件后，根据第三方接口返回判断是否能够触发",
-    "查看使用指引和示例": "查看使用指引和示例",
-    "分支": "分支",
-    "排除分支": "排除分支",
-    "路径": "路径",
-    "排除路径": "排除路径",
-    "人员": "人员",
-    "排除人员": "排除人员",
-    "排除的目标分支": "排除的目标分支",
-    "源分支": "源分支",
-    "排除的源分支": "排除的源分支",
-    "排除Tag": "排除Tag",
-    "来源分支": "来源分支",
-    "评论内容": "评论内容",
-    "评论类型": "评论类型",
-    "CR状态": "CR状态",
-    "动作": "动作",
-    "相对路径": "相对路径",
-    "评审中": "评审中",
-    "评审通过": "评审通过",
-    "评审被拒绝": "评审被拒绝",
-    "代码要求修改": "代码要求修改",
-    "对提交进行评论": "对提交进行评论",
-    "对评审进行评论": "对评审进行评论",
-    "对缺陷进行评论": "对缺陷进行评论",
-    "创建": "创建",
-    "更新": "更新",
-    "重新打开": "重新打开",
-    "触发器详情": "触发器详情",
-    "无权限查看": "无权限查看",
-    "要素名": "要素名",
-    "排除要素名": "排除要素名",
-    "HTTP/HTTPS地址": "HTTP/HTTPS地址",
-    "SSH地址": "SSH地址",
-    "今天": "今天",
-    "昨天": "昨天",
-    "近3天": "近3天",
-    "近7天": "近7天"
+    "自定义触发控制": "Custom Control option",
+    "满足基础过滤条件后，根据第三方接口返回判断是否能够触发": "After meeting the basic filter conditions, judge whether it can be triggered according to the return of the third-party interface",
+    "查看使用指引和示例": "Introduction and demos",
+    "触发器详情": "Trigger Details",
+    "无权限查看": "No permission to view",
+    "HTTP/HTTPS地址": "HTTP/HTTPS Address",
+    "SSH地址": "SSH Address",
+    "今天": "Today",
+    "昨天": "Yesterday",
+    "近3天": "Last 3 days",
+    "近7天": "Last 7 days",
+    "是否一键重新触发？": "Replay event?",
+    "将使用此事件重新触发关联的流水线": "Will be re-trigger the associated pipeline by this event.",
+    "是否重新触发？": "Re-trigger pipeline?",
+    "确认以此事件重新触发流水线X吗？": "Re-trigger the pipeline [{0}] with this event？"
 }
diff --git a/src/frontend/locale/codelib/zh-CN.json b/src/frontend/locale/codelib/zh-CN.json
@@ -112,7 +112,6 @@
   "sshExampleTips": "eg: svn+ssh://svn.sample.com/test_proj",
   "httpExampleTips": "eg: http://svn.sample.com/test_proj or https://svn.sample.com/test_proj",
   "用户名+密码": "用户名 + 密码",
-  "用户名密码": "用户名密码",
   "同一个代码库可以关联到多个蓝盾项目，但仅支持在一个蓝盾项目下开启 PAC (Pipeline As Code) 模式": "同一个代码库可以关联到多个蓝盾项目，但仅支持在一个蓝盾项目下开启 PAC (Pipeline As Code) 模式",
   "PAC 模式下，使用代码库 ci 目录下的 YAML 文件编排流水线，且 YAML 文件变更将自动同步到对应的蓝盾流水线。": "PAC 模式下，使用代码库 .ci 目录下的 YAML 文件编排流水线，且 YAML 文件变更将自动同步到对应的蓝盾流水线。",
   "查看同步规则": "查看同步规则",
@@ -127,7 +126,7 @@
   "不再同步到蓝盾流水线": "不再同步到蓝盾流水线",
   "请先将目录": "请先将目录",
   "改名或删除": "改名或删除",
-  "后重试，避免项目其他成员进行无效的YAML 文件修改": "后重试，避免项目其他成员进行无效的YAML 文件修改",
+  "后重试，避免项目其他成员进行无效的YAML文件修改": "后重试，避免项目其他成员进行无效的YAML文件修改",
   "。": "。",
   "ci目录已改名或删除": ".ci目录已改名或删除",
   "继续关闭": "继续关闭",
@@ -203,5 +202,9 @@
   "今天": "今天",
   "昨天": "昨天",
   "近3天": "近3天",
-  "近7天": "近7天"
+  "近7天": "近7天",
+  "是否一键重新触发？": "是否一键重新触发？",
+  "将使用此事件重新触发关联的流水线": "将使用此事件重新触发关联的流水线",
+  "是否重新触发？": "是否重新触发？",
+  "确认以此事件重新触发流水线X吗？": "确认以此事件重新触发流水线{0}吗？"
 }