diff --git a/frontend/src/business/components/settings/organization/components/JiraSetting.vue b/frontend/src/business/components/settings/organization/components/JiraSetting.vue index 08c721631e..77db317592 100644 --- a/frontend/src/business/components/settings/organization/components/JiraSetting.vue +++ b/frontend/src/business/components/settings/organization/components/JiraSetting.vue @@ -3,10 +3,10 @@
{{ $t('organization.integration.basic_auth_info') }}
- + - + @@ -53,9 +53,6 @@ export default { created() { this.init(); }, - beforeDestroy() { - console.log("jira setting destroy"); - }, data() { return { show: true, @@ -73,12 +70,12 @@ export default { }, url: { required: true, - message: this.$t('organization.integration.input_api_password'), + message: this.$t('organization.integration.input_jira_url'), trigger: ['change', 'blur'] }, issuetype: { required: true, - message: this.$t('organization.integration.input_api_password'), + message: this.$t('organization.integration.input_jira_issuetype'), trigger: ['change', 'blur'] } }, @@ -86,9 +83,9 @@ export default { }, methods: { init() { + const {lastOrganizationId} = getCurrentUser(); let param = {}; param.platform = JIRA; - const {lastOrganizationId} = getCurrentUser(); param.orgId = lastOrganizationId; this.$parent.result = this.$post("service/integration/type", param, response => { let data = response.data; @@ -159,8 +156,8 @@ export default { confirmButtonText: this.$t('commons.confirm'), callback: (action) => { if (action === 'confirm') { - let param = {}; const {lastOrganizationId} = getCurrentUser(); + let param = {}; param.orgId = lastOrganizationId; param.platform = JIRA; this.$parent.result = this.$post("service/integration/delete", param, () => { diff --git a/frontend/src/business/components/settings/organization/components/TapdSetting.vue b/frontend/src/business/components/settings/organization/components/TapdSetting.vue index 73d78240c5..cefa7dc86e 100644 --- a/frontend/src/business/components/settings/organization/components/TapdSetting.vue +++ b/frontend/src/business/components/settings/organization/components/TapdSetting.vue @@ -49,9 +49,6 @@ export default { created() { this.init(); }, - beforeDestroy() { - console.log("tapd setting destroy"); - }, data() { return { show: true, @@ -72,9 +69,9 @@ export default { }, methods: { init() { + const {lastOrganizationId} = getCurrentUser(); let param = {}; param.platform = TAPD; - const {lastOrganizationId} = getCurrentUser(); param.orgId = lastOrganizationId; this.$parent.result = this.$post("service/integration/type", param, response => { let data = response.data; @@ -87,7 +84,7 @@ export default { } }) }, - save: function () { + save() { this.$refs['form'].validate(valid => { if (valid) { @@ -137,8 +134,8 @@ export default { confirmButtonText: this.$t('commons.confirm'), callback: (action) => { if (action === 'confirm') { - let param = {}; const {lastOrganizationId} = getCurrentUser(); + let param = {}; param.orgId = lastOrganizationId; param.platform = TAPD; this.$parent.result = this.$post("service/integration/delete", param, () => { diff --git a/frontend/src/business/components/settings/organization/components/ZentaoSetting.vue b/frontend/src/business/components/settings/organization/components/ZentaoSetting.vue index 54cce82a5e..64f9b5205f 100644 --- a/frontend/src/business/components/settings/organization/components/ZentaoSetting.vue +++ b/frontend/src/business/components/settings/organization/components/ZentaoSetting.vue @@ -3,12 +3,12 @@
{{ $t('organization.integration.basic_auth_info') }}
- - + + - + + :placeholder="$t('organization.integration.input_app_key')" show-password/>
@@ -24,7 +24,7 @@
{{ $t('organization.integration.use_tip') }}
- 1. {{ $t('organization.integration.use_tip_tapd') }} + 1. {{ $t('organization.integration.use_tip_zentao') }}
2. {{ $t('organization.integration.use_tip_two') }} @@ -49,9 +49,6 @@ export default { created() { this.init(); }, - beforeDestroy() { - console.log("zentao setting destroy"); - }, data() { return { show: true, @@ -59,12 +56,12 @@ export default { rules: { account: { required: true, - message: this.$t('organization.integration.input_api_account'), + message: this.$t('organization.integration.input_app_name'), trigger: ['change', 'blur'] }, password: { required: true, - message: this.$t('organization.integration.input_api_password'), + message: this.$t('organization.integration.input_app_key'), trigger: ['change', 'blur'] } }, @@ -75,12 +72,12 @@ export default { this.$refs['form'].validate(valid => { if (valid) { + const {lastOrganizationId} = getCurrentUser(); let param = {}; let auth = { account: this.form.account, password: this.form.password, }; - const {lastOrganizationId} = getCurrentUser(); param.organizationId = lastOrganizationId; param.platform = ZEN_TAO; param.configuration = JSON.stringify(auth); @@ -99,9 +96,9 @@ export default { }) }, init() { + const {lastOrganizationId} = getCurrentUser(); let param = {}; param.platform = ZEN_TAO; - const {lastOrganizationId} = getCurrentUser(); param.orgId = lastOrganizationId; this.$parent.result = this.$post("service/integration/type", param, response => { let data = response.data; @@ -137,8 +134,8 @@ export default { confirmButtonText: this.$t('commons.confirm'), callback: (action) => { if (action === 'confirm') { - let param = {}; const {lastOrganizationId} = getCurrentUser(); + let param = {}; param.orgId = lastOrganizationId; param.platform = ZEN_TAO; this.$parent.result = this.$post("service/integration/delete", param, () => { diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js index 2d61eb2afc..2fbdc80cc1 100644 --- a/frontend/src/i18n/en-US.js +++ b/frontend/src/i18n/en-US.js @@ -250,15 +250,22 @@ export default { basic_auth_info: 'Basic Auth account information:', api_account: 'API account', api_password: 'API password', + app_name: 'APP name', + app_key: 'APP key', + account: 'Account', + password: 'Password', jira_url: 'JIRA url', jira_issuetype: 'JIRA issuetype', input_api_account: 'please enter account', input_api_password: 'Please enter password', + input_app_name: 'Please enter the application code', + input_app_key: 'Please enter the key', input_jira_url: 'Please enter Jira address, for example: https://metersphere.atlassian.net/', input_jira_issuetype: 'Please enter the question type', use_tip: 'Usage guidelines:', use_tip_tapd: 'Basic Auth account information is queried in "Company Management-Security and Integration-Open Platform"', use_tip_jira: 'Jira software server authentication information is account password, Jira software cloud authentication information is account + token (account settings-security-create API token)', + use_tip_zentao: 'Log in to ZenTao as a super administrator user, enter the background-secondary development-application, click [Add Application] to add an application', use_tip_two: 'After saving the Basic Auth account information, you need to manually associate the ID/key in the Metersphere project', link_the_project_now: 'Link the project now', cancel_edit: 'Cancel edit', diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js index 14b8c2292c..b77911f571 100644 --- a/frontend/src/i18n/zh-CN.js +++ b/frontend/src/i18n/zh-CN.js @@ -250,15 +250,22 @@ export default { basic_auth_info: 'Basic Auth 账号信息:', api_account: 'API 账号', api_password: 'API 口令', + app_name: '应用代号', + app_key: '密钥', + account: '账号', + password: '密码', jira_url: 'JIRA 地址', jira_issuetype: '问题类型', input_api_account: '请输入账号', input_api_password: '请输入口令', + input_app_name: '请输入应用代号', + input_app_key: '请输入密钥', input_jira_url: '请输入Jira地址,例:https://metersphere.atlassian.net/', input_jira_issuetype: '请输入问题类型', use_tip: '使用指引:', use_tip_tapd: 'Tapd Basic Auth 账号信息在"公司管理-安全与集成-开放平台"中查询', use_tip_jira: 'Jira software server 认证信息为 账号密码,Jira software cloud 认证信息为 账号+令牌(账户设置-安全-创建API令牌)', + use_tip_zentao: '用超级管理员用户登录禅道,进入后台-二次开发-应用,点击【添加应用】新增一个应用', use_tip_two: '保存 Basic Auth 账号信息后,需要在 Metersphere 项目中手动关联 ID/key', link_the_project_now: '马上关联项目', cancel_edit: '取消编辑', diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js index bed8f7a34c..43cc46c469 100644 --- a/frontend/src/i18n/zh-TW.js +++ b/frontend/src/i18n/zh-TW.js @@ -252,15 +252,22 @@ export default { basic_auth_info: 'Basic Auth 賬號信息:', api_account: 'API 賬號', api_password: 'API 口令', + app_name: '應用代號', + app_key: '密鑰', + account: '賬號', + password: '密碼', jira_url: 'JIRA 地址', jira_issuetype: '問題類型', input_api_account: '請輸入賬號', input_api_password: '請輸入口令', + input_app_name: '請輸入應用代號', + input_app_key: '請輸入密鑰', input_jira_url: '請輸入Jira地址,例:https://metersphere.atlassian.net/', input_jira_issuetype: '請輸入問題類型', use_tip: '使用指引:', use_tip_tapd: 'Tapd Basic Auth 賬號信息在"公司管理-安全與集成-開放平臺"中查詢', use_tip_jira: 'Jira software server 認證信息為 賬號密碼,Jira software cloud 認證信息為 賬號+令牌(賬戶設置-安全-創建API令牌)', + use_tip_zentao: '用超級管理員用戶登錄禪道,進入後台-二次開發-應用,點擊【添加應用】添加一個應用', use_tip_two: '保存 Basic Auth 賬號信息後,需要在 Metersphere 項目中手動關聯 ID/key', link_the_project_now: '馬上關聯項目', cancel_edit: '取消編輯',