diff --git a/src/frontend/devops-stream/src/components/setting/agent-detail/basic-information.vue b/src/frontend/devops-stream/src/components/setting/agent-detail/basic-information.vue index 7ca564fe307a..a49744a2ef9d 100644 --- a/src/frontend/devops-stream/src/components/setting/agent-detail/basic-information.vue +++ b/src/frontend/devops-stream/src/components/setting/agent-detail/basic-information.vue @@ -39,6 +39,33 @@
{{ $t('edit') }}
+
+
{{ $t('setting.nodeInfo.dockerMaxConcurrency') }}
+
+
+ +
+
{{ nodeDetails.dockerParallelTaskCount || '--' }}
+
+
+
+ {{ $t('setting.save') }} + {{ $t('setting.cancel') }} +
+
+ {{ $t('setting.edit') }} +
+
+
{{ $t('status') }}
@@ -79,7 +106,9 @@ return { nodeDetails: {}, isEditCount: false, - parallelTaskCount: 0 + parallelTaskCount: 0, + isEditDockerCount: false, + dockerParallelTaskCount: 0 } }, computed: { @@ -110,20 +139,46 @@ }) } break + case 'dockerParallelTaskCount': + this.isEditDockerCount = isOpen + if (isOpen) { + this.dockerParallelTaskCount = this.nodeDetails.dockerParallelTaskCount + this.$nextTick(() => { + this.$refs.dockerParallelTaskCount.focus() + }) + } + break default: break } }, - async saveHandle () { + async saveHandle (type) { const valid = await this.$validator.validate() - if (valid) { - this.saveParallelTaskCount(this.parallelTaskCount) + if (!valid) return + switch (type) { + case 'parallelTaskCount': + this.saveParallelTaskCount(this.parallelTaskCount, 'parallelTaskCount') + break + case 'dockerParallelTaskCount': + this.saveParallelTaskCount(this.dockerParallelTaskCount, 'dockerParallelTaskCount') + break + default: + break } + }, - async saveParallelTaskCount (parallelTaskCount) { + async saveParallelTaskCount (count, type) { let message, theme + const fn = type === 'dockerParallelTaskCount' + ? setting.saveDockerParallelTaskCount + : setting.saveParallelTaskCount + const params = { + projectId: this.projectId, + nodeHashId: this.nodeHashId, + count: count + } try { - await setting.saveParallelTaskCount(this.projectId, this.nodeHashId, parallelTaskCount) + await fn(params) message = this.$t('setting.successfullySaved') theme = 'success' this.requestNodeDetail() @@ -131,6 +186,8 @@ message = err.message ? err.message : err theme = 'error' } finally { + this.isEditCount = false + this.isEditDockerCount = false this.$bkMessage({ message, theme @@ -140,7 +197,6 @@ async requestNodeDetail () { try { this.nodeDetails = await setting.requestNodeDetail(this.projectId, this.nodeHashId) - this.isEditCount = false } catch (err) { const message = err.message ? err.message : err const theme = 'error' @@ -179,7 +235,7 @@ align-items: center; border-bottom: 1px solid #DDE4EB; .item-label { - width: 180px; + width: 188px; padding: 12px 20px; border-right: 1px solid #DDE4EB; } diff --git a/src/frontend/devops-stream/src/http/setting.js b/src/frontend/devops-stream/src/http/setting.js index 7cffeb49ad89..a03e7734d35e 100644 --- a/src/frontend/devops-stream/src/http/setting.js +++ b/src/frontend/devops-stream/src/http/setting.js @@ -210,8 +210,14 @@ export default { /** * 设置agent构建并发数 */ - saveParallelTaskCount (projectId, nodeHashId, parallelTaskCount) { - return api.post(`${ENVIRNMENT_PERFIX}/user/environment/thirdPartyAgent/projects/${projectId}/nodes/${nodeHashId}/parallelTaskCount?parallelTaskCount=${parallelTaskCount}`).then(response => { + saveParallelTaskCount ({ projectId, nodeHashId, count }) { + return api.post(`${ENVIRNMENT_PERFIX}/user/environment/thirdPartyAgent/projects/${projectId}/nodes/${nodeHashId}/parallelTaskCount?parallelTaskCount=${count }`).then(response => { + return response + }) + }, + + saveDockerParallelTaskCount ({ projectId, nodeHashId, count }) { + return api.post(`${ENVIRNMENT_PERFIX}/user/environment/thirdPartyAgent/projects/${projectId}/nodes/${nodeHashId}/dockerParallelTaskCount?count=${count}`).then(response => { return response }) }, diff --git a/src/frontend/locale/stream/en-US.json b/src/frontend/locale/stream/en-US.json index 99d728011f71..e6be946bbce7 100644 --- a/src/frontend/locale/stream/en-US.json +++ b/src/frontend/locale/stream/en-US.json @@ -459,7 +459,8 @@ "set": "Set", "remaining": "Remaining", "canApplyCount": "Can apply count", - "selectNewNode": "Select new Agent" + "selectNewNode": "Select new Agent", + "dockerMaxConcurrency": "Maximum Docker Build Concurrency" } }, "清空筛选条件": "Clear Search Conditions", diff --git a/src/frontend/locale/stream/zh-CN.json b/src/frontend/locale/stream/zh-CN.json index da23f471b68a..84e7c92ae04f 100644 --- a/src/frontend/locale/stream/zh-CN.json +++ b/src/frontend/locale/stream/zh-CN.json @@ -459,7 +459,8 @@ "set": "台", "remaining": "还剩", "canApplyCount": "台可申请", - "selectNewNode": "请选择你的新节点" + "selectNewNode": "请选择你的新节点", + "dockerMaxConcurrency": "docker构建最大并发数" } }, "清空筛选条件": "清空筛选条件",