test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(系统设置): 解决个人信息ui设置显示问题 

https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001017149
--user=郭雨琦
This commit is contained in:
guoyuqi 2022-10-21 22:08:54 +08:00 committed by xiaomeinvG
parent 68e0a06916
commit db354eb0ab
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
framework/sdk-parent/frontend/src/components/personal/PersonRouter.vue
View File

@ -1,20 +1,25 @@
<template> <template>
<div> <div>
<el-tabs v-model="activeIndex"> <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> 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> 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> class="setting-item"></el-tab-pane>
<el-tab-pane <el-tab-pane
v-if="hasPermission('PERSONAL_INFORMATION:READ+THIRD_ACCOUNT')&&(hasJira||hasTapd||hasZentao||hasAzure)&&hasPermission('WORKSPACE_SERVICE:READ')" 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> 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> class="setting-item"></el-tab-pane>
</el-tabs> </el-tabs>
<ms-main-container> <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'"/> <ms-api-keys v-if="activeIndex==='commons.api_keys'"/>
<password-info v-if="activeIndex==='change_password'" :rule-form="ruleForm" @cancel="cancel"></password-info> <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> <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"/> <azure-devops-user-info @auth="handleAuth" v-if="hasAzure" :data="currentPlatformInfo"/>
<el-form-item> <el-form-item>
<el-button @click="cancel">{{ $t('commons.cancel') }}</el-button> <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-item>
</el-form> </el-form>
</ms-main-container> </ms-main-container>
@ -218,6 +225,9 @@ export default {
} else if (hasPermission('PERSONAL_INFORMATION:READ+THIRD_ACCOUNT')) { } else if (hasPermission('PERSONAL_INFORMATION:READ+THIRD_ACCOUNT')) {
this.activeIndex = 'third_account'; this.activeIndex = 'third_account';
return; return;
} else if (hasPermission('PERSONAL_INFORMATION:READ+UI_SETTING')) {
this.activeIndex = 'commons.ui_setting';
return;
} }
}, },
}, },