Skip to content

Commit f2f6f82

Browse files
committed
refactor: user group
1 parent 62d0089 commit f2f6f82

File tree

3 files changed

+22
-110
lines changed

3 files changed

+22
-110
lines changed

ui/src/api/chat-user/user-login.ts

Lines changed: 0 additions & 94 deletions
This file was deleted.

ui/src/api/system/user-group.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const delUserGroup: (user_group_id: string, loading?: Ref<boolean>) => Promise<R
4444
*/
4545
const postAddMember: (
4646
user_group_id: string,
47-
body: string[],
47+
body: any,
4848
loading?: Ref<boolean>,
4949
) => Promise<Result<any>> = (user_group_id, body, loading) => {
5050
return post(`${prefix}/${user_group_id}/add_member`, body, {}, loading)

ui/src/views/system-chat-user/group/component/CreateGroupUserDialog.vue

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
<template>
2-
<el-dialog :title="$t('views.role.member.add')" v-model="dialogVisible" :close-on-click-modal="false"
3-
:close-on-press-escape="false" :destroy-on-close="true">
4-
<el-form label-position="top" ref="formRef" :rules="rules" :model="form" require-asterisk-position="right">
2+
<el-dialog :title="$t('views.role.member.add')" v-model="dialogVisible"
3+
:close-on-click-modal="false"
4+
:close-on-press-escape="false" :destroy-on-close="true">
5+
<el-form label-position="top" ref="formRef" :rules="rules" :model="form"
6+
require-asterisk-position="right">
57
<el-form-item :label="$t('views.chatUser.group.usernameOrName')" prop="user">
6-
<el-select v-model="form.user" multiple filterable :placeholder="$t('common.selectPlaceholder')"
7-
:loading="optionLoading">
8-
<el-option v-for="item in chatUserList" :key="item.id" :label="item.nick_name" :value="item.id">
8+
<el-select v-model="form.user" multiple filterable
9+
:placeholder="$t('common.selectPlaceholder')"
10+
:loading="optionLoading">
11+
<el-option v-for="item in chatUserList" :key="item.id" :label="item.nick_name"
12+
:value="item.id">
913
</el-option>
1014
</el-select>
1115
</el-form-item>
@@ -22,13 +26,13 @@
2226
</template>
2327

2428
<script setup lang="ts">
25-
import { ref, reactive, onBeforeMount } from 'vue'
26-
import type { FormInstance } from 'element-plus'
27-
import { MsgSuccess } from '@/utils/message'
28-
import { t } from '@/locales'
29+
import {ref, reactive, onBeforeMount} from 'vue'
30+
import type {FormInstance} from 'element-plus'
31+
import {MsgSuccess} from '@/utils/message'
32+
import {t} from '@/locales'
2933
import SystemGroupApi from '@/api/system/user-group'
3034
import userManageApi from '@/api/system/chat-user'
31-
import type { ChatUserItem } from '@/api/type/systemChatUser'
35+
import type {ChatUserItem} from '@/api/type/systemChatUser'
3236
3337
const emit = defineEmits<{
3438
(e: 'refresh'): void;
@@ -44,6 +48,7 @@ const form = ref<{ user: string[] }>({
4448
4549
const optionLoading = ref(false)
4650
const chatUserList = ref<ChatUserItem[]>([])
51+
4752
async function getChatUserList() {
4853
try {
4954
const res = await userManageApi.getChatUserList(optionLoading)
@@ -58,24 +63,25 @@ onBeforeMount(() => {
5863
})
5964
6065
const groupId = ref('');
66+
6167
function open(id: string) {
62-
form.value = { ...defaultForm }
68+
form.value = {...defaultForm}
6369
groupId.value = id
6470
dialogVisible.value = true
6571
}
6672
6773
const formRef = ref<FormInstance>();
6874
6975
const rules = reactive({
70-
user: [{ required: true, message: t('common.selectPlaceholder'), trigger: 'blur' }],
76+
user: [{required: true, message: t('common.selectPlaceholder'), trigger: 'blur'}],
7177
})
7278
7379
const loading = ref<boolean>(false)
7480
const submit = async (formEl: FormInstance | undefined) => {
7581
if (!formEl) return
7682
await formEl.validate((valid) => {
7783
if (valid) {
78-
SystemGroupApi.postAddMember(groupId.value, form.value.user, loading).then(() => {
84+
SystemGroupApi.postAddMember(groupId.value, {"user_ids": form.value.user}, loading).then(() => {
7985
MsgSuccess(t('common.createSuccess'))
8086
emit('refresh')
8187
dialogVisible.value = false
@@ -84,5 +90,5 @@ const submit = async (formEl: FormInstance | undefined) => {
8490
})
8591
}
8692
87-
defineExpose({ open })
93+
defineExpose({open})
8894
</script>

0 commit comments

Comments
 (0)