Skip to content

Commit 18935b0

Browse files
perf: Optimize user sources
1 parent cba9e5f commit 18935b0

File tree

6 files changed

+23
-13
lines changed

6 files changed

+23
-13
lines changed

frontend/src/i18n/en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@
450450
"lark": "Lark",
451451
"larksuite": "Larksuite",
452452
"dingtalk": "DingTalk",
453-
"wechat_for_business": "WeChat for business",
453+
"wecom": "WeCom",
454454
"1240_results": "{msg} results",
455455
"clear_conditions": "Clear conditions",
456456
"disabled": "Disabled",

frontend/src/i18n/ko-KR.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@
450450
"lark": "페이슈",
451451
"larksuite": "페이수 (Pei-su)",
452452
"dingtalk": "딩톡",
453-
"wechat_for_business": "기업용 위챗",
453+
"wecom": "기업용 위챗",
454454
"1240_results": "{msg}개 결과 ",
455455
"clear_conditions": "조건 지우기",
456456
"disabled": "비활성화됨",

frontend/src/i18n/zh-CN.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@
450450
"lark": "飞书",
451451
"larksuite": "国际飞书",
452452
"dingtalk": "钉钉",
453-
"wechat_for_business": "企业微信",
453+
"wecom": "企业微信",
454454
"1240_results": "{msg} 个结果 ",
455455
"clear_conditions": "清空条件",
456456
"disabled": "已禁用",

frontend/src/views/login/xpack/QrTab.vue

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<template>
22
<el-tabs v-model="activeName" @tab-click="handleClick">
3-
<el-tab-pane
4-
v-if="props.wecom"
5-
:label="t('user.wechat_for_business')"
6-
name="wecom"
7-
></el-tab-pane>
3+
<el-tab-pane v-if="props.wecom" :label="t('user.wecom')" name="wecom"></el-tab-pane>
84
<el-tab-pane v-if="props.dingtalk" :label="t('user.dingtalk')" name="dingtalk"></el-tab-pane>
95
<el-tab-pane v-if="props.lark" :label="t('user.lark')" name="lark"></el-tab-pane>
106
<el-tab-pane v-if="props.larksuite" :label="t('user.larksuite')" name="larksuite"></el-tab-pane>
@@ -14,7 +10,7 @@
1410
<el-icon>
1511
<Icon name="logo_wechat-work"><logo_wechatWork class="svg-icon" /></Icon>
1612
</el-icon>
17-
{{ t('user.wechat_for_business') }}
13+
{{ t('user.wecom') }}
1814
</div>
1915
<div class="qrcode">
2016
<wecom-qr v-if="activeName === 'wecom'" />

frontend/src/views/system/platform/common/SettingTemplate.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,14 @@ export const settingMapping = {
105105

106106
export const cardMapping = {
107107
6: {
108-
title: 'user.wechat_for_business',
109-
icon: logo_dingtalk,
108+
title: 'user.wecom',
109+
icon: logo_wechatWork,
110110
settingList: settingMapping[6],
111111
copyField: ['CorpId', 'APP Secret'],
112112
},
113113
7: {
114114
title: 'user.dingtalk',
115-
icon: logo_wechatWork,
115+
icon: logo_dingtalk,
116116
settingList: settingMapping[7],
117117
copyField: ['CorpId', 'APP Secret'],
118118
},

frontend/src/views/system/user/User.vue

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,10 @@ const filterOption = ref<any[]>([
435435
{ id: '3', name: 'LDAP' },
436436
{ id: '4', name: 'OAuth2' },
437437
/* { id: '5', name: 'SAML2' }, */
438+
{ id: '6', name: t('user.wecom') },
439+
{ id: '7', name: t('user.dingtalk') },
440+
{ id: '8', name: t('user.lark') },
441+
/* { id: '9', name: t('user.larksuite') }, */
438442
],
439443
field: 'origins',
440444
title: t('user.user_source'),
@@ -834,7 +838,17 @@ const formatUserOrigin = (origin?: number) => {
834838
if (!origin) {
835839
return t('user.local_creation')
836840
}
837-
const originArray = ['CAS', 'OIDC', 'LDAP', 'OAuth2', 'SAML2']
841+
const originArray = [
842+
'CAS',
843+
'OIDC',
844+
'LDAP',
845+
'OAuth2',
846+
'SAML2',
847+
t('user.wecom'),
848+
t('user.dingtalk'),
849+
t('user.lark'),
850+
t('user.larksuite'),
851+
]
838852
return originArray[origin - 1]
839853
}
840854
onMounted(() => {

0 commit comments

Comments
 (0)