feat: systemChatUserGroup

Author: 1myuan

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

@@ -19,12 +19,12 @@ const getUserGroupUserList: (
   resource: ChatUserResourceParams,
   user_group_id: string,
   page: pageRequest,
-  param: any,
+  username_or_nickname: string,
   loading?: Ref<boolean>,
-) => Promise<Result<PageList<ChatUserGroupUserItem[]>>> = (resource, user_group_id, page, param, loading) => {
+) => Promise<Result<PageList<ChatUserGroupUserItem[]>>> = (resource, user_group_id, page, username_or_nickname, loading) => {
   return get(
     `${prefix}/${resource.resource_type}/${resource.resource_id}/user_group_id/${user_group_id}/${page.current_page}/${page.page_size}`,
-    param,
+    username_or_nickname ? { username_or_nickname } : undefined,
     loading,
   )
 }

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

@@ -1,9 +1,18 @@
 import { Result } from '@/request/Result'
 import { get, put, post, del } from '@/request/index'
 import type { pageRequest } from '@/api/type/common'
+import type { ChatUserItem } from '@/api/type/systemChatUser'
 import type { Ref } from 'vue'
-
 const prefix = '/system/chat_user'
+
+
+/**
+ * 用户列表
+ */
+const getChatUserList: (loading?: Ref<boolean>) => Promise<Result<ChatUserItem[]>> = (loading) => {
+  return get(`${prefix}/list`, undefined, loading)
+}
+
 /**
  * 用户分页列表
  * @query 参数
@@ -71,4 +80,5 @@ export default {
   delUserManage,
   postUserManage,
   putUserManagePassword,
+  getChatUserList
 }

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

@@ -1,13 +1,15 @@
-import {Result} from '@/request/Result'
-import {get, post, del, put} from '@/request/index'
-import type {Ref} from 'vue'
+import { Result } from '@/request/Result'
+import { get, post, del } from '@/request/index'
+import type { Ref } from 'vue'
+import type { ChatUserGroupUserItem, } from '@/api/type/systemChatUser'
+import type { pageRequest, PageList, ListItem } from '@/api/type/common'
 
 const prefix = '/system/group'
 
 /**
  * 获取用户组列表
  */
-const getUserGroup: (loading?: Ref<boolean>) => Promise<Result<any[]>> = () => {
+const getUserGroup: (loading?: Ref<boolean>) => Promise<Result<ListItem[]>> = () => {
   return get(`${prefix}`)
 }
 
@@ -19,7 +21,7 @@ const getUserGroup: (loading?: Ref<boolean>) => Promise<Result<any[]>> = () => {
  "name": "string"
  }
  */
-const postUserGroup: (data: any, loading?: Ref<boolean>) => Promise<Result<boolean>> = (
+const postUserGroup: (data: ListItem, loading?: Ref<boolean>) => Promise<Result<boolean>> = (
   data,
   loading,
 ) => {
@@ -30,7 +32,7 @@ const postUserGroup: (data: any, loading?: Ref<boolean>) => Promise<Result<boole
  * 删除用户组
  * @param 参数 user_group_id
  */
-const delUserGroup: (user_group_id: String, loading?: Ref<boolean>) => Promise<Result<boolean>> = (
+const delUserGroup: (user_group_id: string, loading?: Ref<boolean>) => Promise<Result<boolean>> = (
   user_group_id,
   loading,
 ) => {
@@ -48,7 +50,7 @@ const delUserGroup: (user_group_id: String, loading?: Ref<boolean>) => Promise<R
  */
 const postAddMember: (
   user_group_id: string,
-  body: any,
+  body: Record<string, any>,
   loading?: Ref<boolean>,
 ) => Promise<Result<any>> = (user_group_id, body, loading) => {
   return post(`${prefix}/${user_group_id}/add_member`, body, {}, loading)
@@ -64,16 +66,32 @@ const postAddMember: (
  */
 const postRemoveMember: (
   user_group_id: string,
-  body: any,
+  body: Record<string, any>,
   loading?: Ref<boolean>,
 ) => Promise<Result<any>> = (user_group_id, body, loading) => {
-  return post(`${prefix}/${user_group_id}`, body, {}, loading)
+  return post(`${prefix}/${user_group_id}/remove_member`, body, {}, loading)
 }
 
+/**
+ * 获取用户组的成员列表
+ */
+const getUserListByGroup: (
+  user_group_id: string,
+  page: pageRequest,
+  username: string,
+  loading?: Ref<boolean>,
+) => Promise<Result<PageList<ChatUserGroupUserItem[]>>> = (user_group_id, page, username, loading) => {
+  return get(
+    `${prefix}/${user_group_id}/user_list/${page.current_page}/${page.page_size}`,
+    username ? { username } : undefined,
+    loading,
+  )
+}
 export default {
   getUserGroup,
   postUserGroup,
   delUserGroup,
   postAddMember,
   postRemoveMember,
+  getUserListByGroup
 }

ui/src/api/type/common.ts

@@ -18,4 +18,8 @@ interface PageList<T> {
   records: T
 }
 
-export type { KeyValue, Dict, pageRequest, PageList }
+interface ListItem {
+  name: string,
+  id?: string,
+}
+export type { KeyValue, Dict, pageRequest, PageList, ListItem }

ui/src/api/type/systemChatUser.ts

@@ -0,0 +1,29 @@
+interface ChatUserItem {
+  create_time: string,
+  email: string,
+  id: string,
+  nick_name: string,
+  phone: string,
+  source: string,
+  update_time: string,
+  username: string,
+  is_active: boolean,
+  user_group_ids?: string[],
+  user_group_names?: string[],
+}
+
+// TODO
+interface ChatUserGroupUserItem {
+  id: string,
+  is_auth: boolean,
+  email: string,
+  phone: string,
+  nick_name: string,
+  username: string,
+  password: string,
+  source: string,
+  is_active: boolean,
+  create_time: string,
+  update_time: string,
+}
+export type { ChatUserGroupUserItem, ChatUserItem }

ui/src/locales/lang/zh-CN/views/chat-user.ts

@@ -6,5 +6,10 @@ export default {
   authorization: '授权',
   group: {
     title: '用户组',
+    name: '用户组名称',
+    delete: {
+      confirmTitle: '是否删除用户组：',
+      confirmMessage: '删除后，该用户组下的成员将全部移除，请谨慎操作！',
+    },
   }
 }

ui/src/views/chat-user/index.vue

@@ -37,7 +37,7 @@
               <el-divider direction="vertical" class="mr-8 ml-8" />
               <AppIcon iconName="app-wordspace" style="font-size: 16px" class="color-input-placeholder"></AppIcon>
               <span class="color-input-placeholder ml-4">
-                {{ current?.user_count }}
+                {{ paginationConfig.total }}
               </span>
             </div>
             <el-button type="primary" @click="handleSave">
@@ -48,9 +48,9 @@
           <div class="flex-between mb-16" style="margin-top: 18px;">
             <div class="flex complex-search">
               <el-select class="complex-search__left" v-model="searchType" style="width: 120px">
-                <el-option :label="$t('views.login.loginForm.username.label')" value="username_or_nickname" />
+                <el-option :label="$t('views.login.loginForm.username.label')" value="name" />
               </el-select>
-              <el-input v-if="searchType === 'username_or_nickname'" v-model="searchForm.username_or_nickname"
+              <el-input v-if="searchType === 'name'" v-model="searchForm.name"
                 @change="getList" :placeholder="$t('common.inputPlaceholder')" style="width: 220px" clearable />
             </div>
             <div class="flex align-center">
@@ -60,7 +60,7 @@
           </div>
 
           <app-table :data="tableData" :pagination-config="paginationConfig" @sizeChange="handleSizeChange"
-            @changePage="getList" v-loading="rightLoading">
+            @changePage="getList">
             <el-table-column prop="nick_name" :label="$t('views.userManage.userForm.nick_name.label')" />
             <el-table-column prop="username" :label="$t('views.login.loginForm.username.label')" />
             <el-table-column prop="source" :label="$t('views.userManage.source.label')">
@@ -150,9 +150,9 @@ function clickUserGroup(item: ChatUserGroupItem) {
 
 const rightLoading = ref(false)
 
-const searchType = ref('username_or_nickname')
+const searchType = ref('name')
 const searchForm = ref<Record<string, any>>({
-  username_or_nickname: '',
+  name: '',
 })
 const automaticAuthorization = ref(false)
 const paginationConfig = reactive({
@@ -166,10 +166,7 @@ const tableData = ref<ChatUserGroupUserItem[]>([])
 async function getList() {
   if (!current.value?.id) return
   try {
-    const params = {
-      [searchType.value]: searchForm.value[searchType.value],
-    }
-    const res = await ChatUserApi.getUserGroupUserList(resource, current.value?.id, paginationConfig, params, rightLoading)
+    const res = await ChatUserApi.getUserGroupUserList(resource, current.value?.id, paginationConfig, searchForm.value.name, rightLoading)
     tableData.value = res.data.records
     paginationConfig.total = res.data.total
   } catch (error) {