From db354eb0aba22b87d1ed60ad31415536e3fd6243 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Fri, 21 Oct 2022 22:08:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AFui?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001017149
--user=郭雨琦
---
 .../src/components/personal/PersonRouter.vue  | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/framework/sdk-parent/frontend/src/components/personal/PersonRouter.vue b/framework/sdk-parent/frontend/src/components/personal/PersonRouter.vue
index 5da1985899..cbf7785493 100644
--- a/framework/sdk-parent/frontend/src/components/personal/PersonRouter.vue
+++ b/framework/sdk-parent/frontend/src/components/personal/PersonRouter.vue
@@ -1,20 +1,25 @@
 <template>
   <div>
     <el-tabs v-model="activeIndex">
-      <el-tab-pane v-if="hasPermission('PERSONAL_INFORMATION:READ+EDIT')" name="commons.personal_setting" :label="$t('commons.personal_setting')"
+      <el-tab-pane v-if="hasPermission('PERSONAL_INFORMATION:READ+EDIT')" name="commons.personal_setting"
+                   :label="$t('commons.personal_setting')"
                    class="setting-item"></el-tab-pane>
-      <el-tab-pane v-if="hasPermission('PERSONAL_INFORMATION:READ+API_KEYS')" name="commons.api_keys" :label="$t('commons.api_keys')"
+      <el-tab-pane v-if="hasPermission('PERSONAL_INFORMATION:READ+API_KEYS')" name="commons.api_keys"
+                   :label="$t('commons.api_keys')"
                    class="setting-item"></el-tab-pane>
-      <el-tab-pane v-if="hasPermission('PERSONAL_INFORMATION:READ+EDIT_PASSWORD')" name="change_password" :label="$t('member.edit_password')"
+      <el-tab-pane v-if="hasPermission('PERSONAL_INFORMATION:READ+EDIT_PASSWORD')" name="change_password"
+                   :label="$t('member.edit_password')"
                    class="setting-item"></el-tab-pane>
       <el-tab-pane
         v-if="hasPermission('PERSONAL_INFORMATION:READ+THIRD_ACCOUNT')&&(hasJira||hasTapd||hasZentao||hasAzure)&&hasPermission('WORKSPACE_SERVICE:READ')"
         name="third_account" :label="$t('commons.third_account')" class="setting-item"></el-tab-pane>
-      <el-tab-pane v-if="hasPermission('PERSONAL_INFORMATION:READ+UI_SETTING') && isXpack" name="commons.ui_setting" :label="$t('commons.ui_setting')"
+      <el-tab-pane v-if="hasPermission('PERSONAL_INFORMATION:READ+UI_SETTING') && isXpack" name="commons.ui_setting"
+                   :label="$t('commons.ui_setting')"
                    class="setting-item"></el-tab-pane>
     </el-tabs>
     <ms-main-container>
-      <ms-person-from-setting v-if="activeIndex==='commons.personal_setting'" :form=form @getPlatformInfo="getPlatformInfo" @cancel="cancel"/>
+      <ms-person-from-setting v-if="activeIndex==='commons.personal_setting'" :form=form
+                              @getPlatformInfo="getPlatformInfo" @cancel="cancel"/>
       <ms-api-keys v-if="activeIndex==='commons.api_keys'"/>
       <password-info v-if="activeIndex==='change_password'" :rule-form="ruleForm" @cancel="cancel"></password-info>
       <ui-setting v-if="activeIndex==='commons.ui_setting'" @cancel="cancel"></ui-setting>
@@ -25,7 +30,9 @@
         <azure-devops-user-info @auth="handleAuth" v-if="hasAzure" :data="currentPlatformInfo"/>
         <el-form-item>
           <el-button @click="cancel">{{ $t('commons.cancel') }}</el-button>
-          <el-button type="primary" @click="updateUser('updateUserForm')" @keydown.enter.native.prevent>{{ $t('commons.confirm') }}</el-button>
+          <el-button type="primary" @click="updateUser('updateUserForm')" @keydown.enter.native.prevent>
+            {{ $t('commons.confirm') }}
+          </el-button>
         </el-form-item>
       </el-form>
     </ms-main-container>
@@ -218,6 +225,9 @@ export default {
       } else if (hasPermission('PERSONAL_INFORMATION:READ+THIRD_ACCOUNT')) {
         this.activeIndex = 'third_account';
         return;
+      } else if (hasPermission('PERSONAL_INFORMATION:READ+UI_SETTING')) {
+        this.activeIndex = 'commons.ui_setting';
+        return;
       }
     },
   },