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

refactor(认证): 认证文案调整

This commit is contained in:
baiqi 2024-08-02 11:29:51 +08:00 committed by 刘瑞斌
parent 81d49f281b
commit a3a0064b2f
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/views/login/components/login-form.vue
View File

@ -102,7 +102,7 @@
<span class="type-text text-[10px]">OIDC</span> <span class="type-text text-[10px]">OIDC</span>
</div> </div>
<div v-if="isShowOAUTH && userInfo.authenticate !== 'OAUTH2'" class="loginType" @click="redirectAuth('OAUTH2')"> <div v-if="isShowOAUTH && userInfo.authenticate !== 'OAUTH2'" class="loginType" @click="redirectAuth('OAUTH2')">
<span class="type-text text-[7px]">OAUTH</span> <span class="type-text text-[10px]">OAuth</span>
</div> </div>
<div v-if="isShowCAS && userInfo.authenticate !== 'CAS'" class="loginType" @click="redirectAuth('CAS')"> <div v-if="isShowCAS && userInfo.authenticate !== 'CAS'" class="loginType" @click="redirectAuth('CAS')">
<span class="type-text text-[10px]">CAS</span> <span class="type-text text-[10px]">CAS</span>

11
frontend/src/views/setting/system/config/components/authConfig.vue
View File

@ -27,6 +27,9 @@
</div> </div>
</a-button> </a-button>
</template> </template>
<template #type="{ record }">
<div>{{ record.type === 'OAUTH2' ? 'OAuth 2.0' : record.type }}</div>
</template>
<template #action="{ record }"> <template #action="{ record }">
<MsButton v-permission="['SYSTEM_PARAMETER_SETTING_AUTH:READ+UPDATE']" @click="editAuth(record)"> <MsButton v-permission="['SYSTEM_PARAMETER_SETTING_AUTH:READ+UPDATE']" @click="editAuth(record)">
{{ t('system.config.auth.edit') }} {{ t('system.config.auth.edit') }}
@ -113,7 +116,9 @@
</a-form-item> </a-form-item>
<a-form-item :label="t('system.config.auth.addResource')" field="type" asterisk-position="end"> <a-form-item :label="t('system.config.auth.addResource')" field="type" asterisk-position="end">
<a-radio-group v-model:model-value="activeAuthForm.type" type="button" :disabled="!!activeAuthForm.id"> <a-radio-group v-model:model-value="activeAuthForm.type" type="button" :disabled="!!activeAuthForm.id">
<a-radio v-for="item of authTypeList" :key="item" :value="item">{{ item }}</a-radio> <a-radio v-for="item of authTypeList" :key="item" :value="item">
{{ item === 'OAUTH2' ? 'OAuth 2.0' : item }}
</a-radio>
</a-radio-group> </a-radio-group>
</a-form-item> </a-form-item>
<template v-if="activeAuthForm.type === 'CAS'"> <template v-if="activeAuthForm.type === 'CAS'">
@ -687,10 +692,12 @@
{ {
title: 'system.config.auth.createTime', title: 'system.config.auth.createTime',
dataIndex: 'createTime', dataIndex: 'createTime',
width: 180,
}, },
{ {
title: 'system.config.auth.updateTime', title: 'system.config.auth.updateTime',
dataIndex: 'updateTime', dataIndex: 'updateTime',
width: 180,
}, },
{ {
title: hasOperationPermission.value ? 'system.config.auth.action' : '', title: hasOperationPermission.value ? 'system.config.auth.action' : '',
@ -705,7 +712,7 @@
const { propsRes, propsEvent, loadList, setLoadListParams } = useTable(getAuthList, { const { propsRes, propsEvent, loadList, setLoadListParams } = useTable(getAuthList, {
tableKey: TableKeyEnum.SYSTEM_AUTH, tableKey: TableKeyEnum.SYSTEM_AUTH,
columns, columns,
scroll: { y: 'auto' }, scroll: { y: 'auto', x: '100%' },
selectable: false, selectable: false,
showSelectAll: false, showSelectAll: false,
}); });