Skip to content

Commit dd2dfbd

Browse files
committed
feat(User Management): Supports user synchronization
1 parent 839639b commit dd2dfbd

File tree

6 files changed

+12
-4
lines changed

6 files changed

+12
-4
lines changed

frontend/src/i18n/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"Details": "Details"
99
},
1010
"sync": {
11+
"the_existing_user": "If the user already exists, overwrite the existing user.",
1112
"sync_users": "Sync Users",
1213
"sync_wechat_users": "Sync WeChat Users",
1314
"sync_dingtalk_users": "Sync DingTalk Users",

frontend/src/i18n/ko-KR.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"Details": "세부"
99
},
1010
"sync": {
11+
"the_existing_user": "해당 사용자가 이미 존재하는 경우 기존 사용자를 덮어씁니다.",
1112
"sync_users": "사용자 동기화",
1213
"sync_wechat_users": "위챗 사용자 동기화",
1314
"sync_dingtalk_users": "딩톡 사용자 동기화",

frontend/src/i18n/zh-CN.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"Details": "详情"
99
},
1010
"sync": {
11+
"the_existing_user": "若用户已存在,覆盖旧用户",
1112
"sync_users": "同步用户",
1213
"sync_wechat_users": "同步企业微信用户",
1314
"sync_dingtalk_users": "同步钉钉用户",

frontend/src/views/chat/chat-block/ChartBlock.vue

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -640,9 +640,6 @@ watch(
640640
padding: 16px;
641641
display: flex;
642642
flex-direction: column;
643-
position: relative;
644-
z-index: 10;
645-
646643
border: 1px solid rgba(222, 224, 227, 1);
647644
border-radius: 12px;
648645

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,9 @@
102102
</div>
103103

104104
<template #footer>
105+
<el-checkbox style="float: left" v-model="existingUser">
106+
{{ $t('sync.the_existing_user') }}
107+
</el-checkbox>
105108
<el-button secondary @click="centerDialogVisible = false">
106109
{{ $t('common.cancel') }}</el-button
107110
>
@@ -123,14 +126,15 @@ import Close from '@/assets/svg/icon_close_outlined_w.svg'
123126
import Search from '@/assets/svg/icon_search-outline_outlined.svg'
124127
import type { CheckboxValueType } from 'element-plus-secondary'
125128
const checkAll = ref(false)
129+
const existingUser = ref(false)
126130
const isIndeterminate = ref(false)
127131
const checkedWorkspace = ref<any[]>([])
128132
const workspace = ref<any[]>([])
129133
const search = ref('')
130134
const dialogTitle = ref('')
131135
132136
const loading = ref(false)
133-
const centerDialogVisible = ref(false)
137+
const centerDialogVisible = ref(true)
134138
const checkTableList = ref([] as any[])
135139
136140
const workspaceWithKeywords = computed(() => {

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@
9595
</div>
9696

9797
<template #footer>
98+
<el-checkbox style="float: left" v-model="existingUser">
99+
{{ $t('sync.the_existing_user') }}
100+
</el-checkbox>
98101
<el-button secondary @click="centerDialogVisible = false">
99102
{{ $t('common.cancel') }}</el-button
100103
>
@@ -118,6 +121,7 @@ import Search from '@/assets/svg/icon_search-outline_outlined.svg'
118121
import type { CheckboxValueType } from 'element-plus-secondary'
119122
import type { FilterNodeMethodFunction } from 'element-plus-secondary'
120123
const checkAll = ref(false)
124+
const existingUser = ref(false)
121125
const isIndeterminate = ref(false)
122126
const checkedWorkspace = ref<any[]>([])
123127
const workspace = ref<any[]>([])

0 commit comments

Comments
 (0)