From 06899d69322270a05ad74e0cab54f63621ab19fb Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 30 Jun 2023 18:31:50 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=20chatgpt=20?= =?UTF-8?q?=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/AccountCreateUpdateForm/index.vue | 16 +++++++++++++--- .../AccountTemplateCreateUpdate.vue | 2 +- .../AccountTemplateChangeSecretDialog.vue | 10 +++++----- src/views/accounts/AccountTemplate/const.js | 2 +- src/views/assets/Asset/AssetList/index.vue | 2 +- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/components/AccountCreateUpdateForm/index.vue b/src/components/AccountCreateUpdateForm/index.vue index d4ce03fea..ace44cbe4 100644 --- a/src/components/AccountCreateUpdateForm/index.vue +++ b/src/components/AccountCreateUpdateForm/index.vue @@ -55,7 +55,7 @@ export default { protocols: [ { name: 'ssh', - secret_types: ['password', 'ssh_key', 'token', 'access_key'] + secret_types: ['password', 'ssh_key', 'token', 'access_key', 'api_key'] } ] }, @@ -67,8 +67,8 @@ export default { [this.$t('accounts.AccountTemplate'), ['template']], [this.$t('common.Basic'), ['name', 'username', 'privileged', 'su_from', 'su_from_username']], [this.$t('assets.Secret'), [ - 'secret_type', 'secret', 'ssh_key', - 'token', 'access_key', 'passphrase' + 'secret_type', 'secret', 'ssh_key', 'token', + 'access_key', 'passphrase', 'api_key' ]], [this.$t('common.Other'), ['push_now', 'params', 'on_invalid', 'is_active', 'comment']] ], @@ -199,6 +199,12 @@ export default { component: UploadSecret, hidden: (formValue) => formValue.secret_type !== 'access_key' || this.addTemplate }, + api_key: { + id: 'access_key', + label: this.$t('assets.ApiKey'), + component: UploadSecret, + hidden: (formValue) => formValue.secret_type !== 'api_key' || this.addTemplate + }, secret_type: { type: 'radio-group', options: [], @@ -276,6 +282,10 @@ export default { { label: this.$t('assets.AccessKey'), value: 'access_key' + }, + { + label: this.$t('assets.ApiKey'), + value: 'api_key' } ] const secretTypes = [] diff --git a/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue b/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue index e8b48b405..f10226625 100644 --- a/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue +++ b/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue @@ -25,7 +25,7 @@ export default { }, cleanFormValue(value) { Object.keys(value).forEach((item, index, arr) => { - if (['ssh_key', 'token', 'access_key'].includes(item)) { + if (['ssh_key', 'token', 'access_key', 'api_key'].includes(item)) { value['secret'] = value[item] delete value[item] } diff --git a/src/views/accounts/AccountTemplate/AccountTemplateDetail/AccountTemplateChangeSecretDialog.vue b/src/views/accounts/AccountTemplate/AccountTemplateDetail/AccountTemplateChangeSecretDialog.vue index b853d9beb..a47b9856f 100644 --- a/src/views/accounts/AccountTemplate/AccountTemplateDetail/AccountTemplateChangeSecretDialog.vue +++ b/src/views/accounts/AccountTemplate/AccountTemplateDetail/AccountTemplateChangeSecretDialog.vue @@ -1,12 +1,12 @@