From 39defe8a3bb17e46105326f31d423ef3b8a2cadc Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Tue, 6 Dec 2022 16:12:20 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?= =?UTF-8?q?=E7=A6=85=E9=81=93=E6=8F=92=E4=BB=B6=E5=8C=96=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sdk-parent/frontend/src/assets/zentao.jpg | Bin 5854 -> 0 bytes .../src/components/personal/JiraUserInfo.vue | 35 -------- .../components/personal/PersonFromSetting.vue | 6 +- .../src/components/personal/PersonRouter.vue | 19 +--- .../src/components/personal/PersonSetting.vue | 33 ++++--- .../components/personal/ZentaoUserInfo.vue | 35 -------- .../frontend/src/utils/table-constants.js | 1 - .../src/business/home/EditProject.vue | 21 +---- .../src/business/home/ProjectJiraConfig.vue | 84 ------------------ .../business/home/ProjectPlatformConfig.vue | 7 +- .../workspace/integration/BugManagement.vue | 15 +--- .../workspace/integration/PlatformConfig.vue | 14 ++- .../workspace/project/EditProject.vue | 21 +---- .../workspace/project/ProjectJiraConfig.vue | 84 ------------------ .../project/ProjectPlatformConfig.vue | 7 +- 15 files changed, 51 insertions(+), 331 deletions(-) delete mode 100644 framework/sdk-parent/frontend/src/assets/zentao.jpg delete mode 100644 framework/sdk-parent/frontend/src/components/personal/JiraUserInfo.vue delete mode 100644 framework/sdk-parent/frontend/src/components/personal/ZentaoUserInfo.vue delete mode 100644 project-management/frontend/src/business/home/ProjectJiraConfig.vue delete mode 100644 system-setting/frontend/src/business/workspace/project/ProjectJiraConfig.vue diff --git a/framework/sdk-parent/frontend/src/assets/zentao.jpg b/framework/sdk-parent/frontend/src/assets/zentao.jpg deleted file mode 100644 index 703a90689856abd1ea2b5c2d543b039d65c5c9f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5854 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 - - - - - - - - - - - - - {{ $t('commons.validate') }} - - - - - - - - diff --git a/framework/sdk-parent/frontend/src/components/personal/PersonFromSetting.vue b/framework/sdk-parent/frontend/src/components/personal/PersonFromSetting.vue index 43c6ace5e7..8c63eb1510 100644 --- a/framework/sdk-parent/frontend/src/components/personal/PersonFromSetting.vue +++ b/framework/sdk-parent/frontend/src/components/personal/PersonFromSetting.vue @@ -27,10 +27,6 @@ import MsDialogFooter from "../MsDialogFooter"; import {removeGoBackListener} from "../../utils"; import MsTableOperatorButton from "../MsTableOperatorButton"; import {EMAIL_REGEX, PHONE_REGEX} from "../../utils/regex"; -import JiraUserInfo from "./JiraUserInfo"; -import TapdUserInfo from "./TapdUserInfo"; -import ZentaoUserInfo from "./ZentaoUserInfo"; -import AzureDevopsUserInfo from "./AzureDevopsUserInfo"; import {useUserStore} from "@/store"; import {updateInfo} from "../../api/user"; @@ -38,7 +34,7 @@ const userStore = useUserStore(); export default { name: "MsPersonFromSetting", - components: {ZentaoUserInfo, TapdUserInfo, JiraUserInfo, AzureDevopsUserInfo, MsDialogFooter, MsTableOperatorButton}, + components: {MsDialogFooter, MsTableOperatorButton}, inject: [ 'reload', 'reloadTopMenus' diff --git a/framework/sdk-parent/frontend/src/components/personal/PersonRouter.vue b/framework/sdk-parent/frontend/src/components/personal/PersonRouter.vue index c8e37f4d7a..2ea5245f9b 100644 --- a/framework/sdk-parent/frontend/src/components/personal/PersonRouter.vue +++ b/framework/sdk-parent/frontend/src/components/personal/PersonRouter.vue @@ -12,7 +12,7 @@ class="setting-item"> 0 || hasTapd || hasAzure) && hasPermission('WORKSPACE_SERVICE:READ')" name="third_account" :label="$t('commons.third_account')" class="setting-item"> - {{ $t('commons.cancel') }} @@ -56,7 +55,6 @@ import PasswordInfo from "./PasswordInfo"; import UiSetting from "./UiSetting"; import {getCurrentUser, getCurrentWorkspaceId} from "../../utils/token"; import {hasLicense, hasPermission} from "../../utils/permission"; -import ZentaoUserInfo from "./ZentaoUserInfo"; import TapdUserInfo from "./TapdUserInfo"; import AzureDevopsUserInfo from "./AzureDevopsUserInfo"; import {getIntegrationService} from "../../api/workspace"; @@ -77,7 +75,6 @@ export default { MsPersonFromSetting, MsApiKeys, PasswordInfo, - ZentaoUserInfo, TapdUserInfo, AzureDevopsUserInfo, UiSetting @@ -90,7 +87,6 @@ export default { activeIndex: '', ruleForm: {}, hasTapd: false, - hasZentao: false, hasAzure: false, isXpack: false, updatePath: '/user/update/current', @@ -131,15 +127,7 @@ export default { }, handleAuth(type) { let param = {...this.currentPlatformInfo}; - if (type === 'Zentao') { - if (!param.zentaoUserName) { - this.$error(this.$t('organization.integration.input_api_account')); - return - } else if (!param.zentaoPassword) { - this.$error(this.$t('organization.integration.input_api_password')); - return - } - } else if (type === 'AzureDevops') { + if (type === 'AzureDevops') { if (!param.azureDevopsPat) { this.$error(this.$t('organization.integration.input_azure_pat')); return @@ -171,9 +159,6 @@ export default { if (platforms.indexOf("Tapd") !== -1) { this.hasTapd = true; } - if (platforms.indexOf("Zentao") !== -1) { - this.hasZentao = true; - } if (platforms.indexOf("AzureDevops") !== -1) { this.hasAzure = true; } diff --git a/framework/sdk-parent/frontend/src/components/personal/PersonSetting.vue b/framework/sdk-parent/frontend/src/components/personal/PersonSetting.vue index 93043899b8..8310b77848 100644 --- a/framework/sdk-parent/frontend/src/components/personal/PersonSetting.vue +++ b/framework/sdk-parent/frontend/src/components/personal/PersonSetting.vue @@ -52,9 +52,15 @@ - + +
+ +
-