feat: 角色组成员管理

shared/index.tsx

@@ -86,6 +86,7 @@ export {
   showToasts,
   setToasts,
   showErrorToasts,
+  showSuccessToasts,
   showAlert,
   setAlert,
   showGlobalLoading,

shared/manager/ui.ts

@@ -1,3 +1,4 @@
+import { t } from '../i18n';
 import { buildRegFn } from './buildRegFn';
 
 /**
@@ -23,6 +24,13 @@ export function showErrorToasts(error: unknown) {
   showToasts(msg, 'error');
 }
 
+/**
+ * 展示成功消息
+ */
+export function showSuccessToasts(msg = t('操作成功')) {
+  showToasts(msg, 'success');
+}
+
 interface AlertOptions {
   message: React.ReactNode;
   onConfirm?: () => void | Promise<void>;

shared/model/group.ts

@@ -7,7 +7,7 @@ export enum GroupPanelType {
 }
 
 export interface GroupMember {
-  role: string; // 角色
+  roles: string[]; // 角色组
   userId: string;
   /**
    * 日期字符串 禁言到xxx
@@ -139,6 +139,42 @@ export async function quitGroup(groupId: string) {
   });
 }
 
+/**
+ * 更新用户所在的权限组
+ * @param groupId 群组ID
+ * @param memberIds 成员信息
+ * @param roles 权限组名
+ */
+export async function appendGroupMemberRoles(
+  groupId: string,
+  memberIds: string[],
+  roles: string[]
+) {
+  await request.post('/api/group/appendGroupMemberRoles', {
+    groupId,
+    memberIds,
+    roles,
+  });
+}
+
+/**
+ * 更新用户所在的权限组
+ * @param groupId 群组ID
+ * @param memberIds 成员信息
+ * @param roles 权限组名
+ */
+export async function removeGroupMemberRoles(
+  groupId: string,
+  memberIds: string[],
+  roles: string[]
+) {
+  await request.post('/api/group/removeGroupMemberRoles', {
+    groupId,
+    memberIds,
+    roles,
+  });
+}
+
 /**
  * 创建群组邀请码
  * 邀请码默认 7天有效期

web/src/components/UserPicker/UserPicker.tsx

@@ -1,4 +1,4 @@
-import { Checkbox, Input } from 'antd';
+import { Checkbox, Empty, Input } from 'antd';
 import React, { useCallback, useState } from 'react';
 import { t, useUserInfoList } from 'tailchat-shared';
 import _take from 'lodash/take';
@@ -47,6 +47,11 @@ export const UserPicker: React.FC<UserPickerProps> = React.memo((props) => {
     [selectedIds, onChange]
   );
 
+  const matchedList = _take(
+    userInfoList.filter((info) => info.nickname.includes(searchValue)),
+    10
+  );
+
   return (
     <div>
       {withSearch && (
@@ -64,28 +69,29 @@ export const UserPicker: React.FC<UserPickerProps> = React.memo((props) => {
         })}
       </div>
 
-      {_take(
+      {matchedList.length > 0 ? (
-        userInfoList.filter((info) => info.nickname.includes(searchValue)),
+        matchedList.map((info) => {
-        10
+          return (
-      ).map((info) => {
+            <div key={info._id} className="my-1">
-        return (
+              <Checkbox
-          <div key={info._id} className="my-1">
+                className="mr-2 items-center"
-            <Checkbox
+                checked={selectedIds.includes(info._id)}
-              className="mr-2 items-center"
+                onChange={(e) => handleSelectUser(info._id, e.target.checked)}
-              checked={selectedIds.includes(info._id)}
+              >
-              onChange={(e) => handleSelectUser(info._id, e.target.checked)}
+                <div className="flex items-center">
-            >
+                  <Avatar size="small" name={info.nickname} src={info.avatar} />
-              <div className="flex items-center">
-                <Avatar size="small" name={info.nickname} src={info.avatar} />
 
-                <div className="ml-1 text-typography-light dark:text-typography-dark">
+                  <div className="ml-1 text-typography-light dark:text-typography-dark">
-                  {info.nickname}
+                    {info.nickname}
+                  </div>
                 </div>
-              </div>
+              </Checkbox>
-            </Checkbox>
+            </div>
-          </div>
+          );
-        );
+        })
-      })}
+      ) : (
+        <Empty />
+      )}
     </div>
   );
 });

web/src/components/modals/GroupDetail/Role/index.tsx

@@ -4,17 +4,29 @@ import {
 } from '@/components/FullModal/Field';
 import { IconBtn } from '@/components/IconBtn';
 import { Loading } from '@/components/Loading';
+import { closeModal, openModal } from '@/components/Modal';
 import { PillTabPane, PillTabs } from '@/components/PillTabs';
 import { UserListItem } from '@/components/UserListItem';
 import { AllPermission, permissionList } from '@/utils/role-helper';
 import { Button, Input } from 'antd';
 import React, { useCallback, useMemo, useState } from 'react';
 import { Icon } from 'tailchat-design';
-import { t, useGroupInfo, useSearch, useUserInfoList } from 'tailchat-shared';
+import {
+  model,
+  showErrorToasts,
+  showSuccessToasts,
+  t,
+  useGroupInfo,
+  useSearch,
+  useUserId,
+  useUserInfoList,
+} from 'tailchat-shared';
+import { SelectGroupMember } from '../../SelectGroupMember';
 import { PermissionItem } from './PermissionItem';
 import { RoleItem } from './RoleItem';
 import { useModifyPermission } from './useModifyPermission';
 import { useRoleActions } from './useRoleActions';
+import _compact from 'lodash/compact';
 
 interface GroupPermissionProps {
   groupId: string;
@@ -26,8 +38,12 @@ export const GroupRole: React.FC<GroupPermissionProps> = React.memo((props) => {
   );
   const groupInfo = useGroupInfo(groupId);
   const roles = groupInfo?.roles ?? [];
-  const members = (groupInfo?.members ?? []).filter((m) => m.role === roleId);
+  const members =
-  const userInfoList = useUserInfoList(members.map((m) => m.userId));
+    roleId === AllPermission
+      ? []
+      : (groupInfo?.members ?? []).filter((m) => m.roles.includes(roleId));
+  const memberIds = members.map((m) => m.userId);
+  const userInfoList = useUserInfoList(memberIds);
   const {
     searchText,
     setSearchText,
@@ -37,6 +53,7 @@ export const GroupRole: React.FC<GroupPermissionProps> = React.memo((props) => {
     dataSource: userInfoList,
     filterFn: (item, searchText) => item.nickname.includes(searchText),
   });
+  const userId = useUserId();
   const currentRoleInfo = useMemo(
     () => roles.find((r) => r._id === roleId),
     [roles, roleId]
@@ -63,7 +80,42 @@ export const GroupRole: React.FC<GroupPermissionProps> = React.memo((props) => {
     handleSwitchPermission,
   } = useModifyPermission(currentRolePermissions);
 
-  const handleAddMember = useCallback(() => {}, []);
+  const handleAddMember = useCallback(() => {
+    const key = openModal(
+      <SelectGroupMember
+        groupId={groupId}
+        withoutMemberIds={_compact([...memberIds, userId])}
+        onConfirm={async (selectedIds) => {
+          if (!currentRoleInfo?._id) {
+            showErrorToasts(t('当前没有选择任何角色组'));
+            return;
+          }
+          await model.group.appendGroupMemberRoles(groupId, selectedIds, [
+            currentRoleInfo._id,
+          ]);
+          showSuccessToasts();
+          closeModal(key);
+        }}
+      />
+    );
+  }, [groupId, memberIds, currentRoleInfo?._id]);
+
+  const handleRemoveMember = useCallback(
+    async (memberId: string) => {
+      if (!currentRoleInfo?._id) {
+        showErrorToasts(t('当前没有选择任何角色组'));
+        return;
+      }
+
+      await model.group.removeGroupMemberRoles(
+        groupId,
+        [memberId],
+        [currentRoleInfo._id]
+      );
+      showSuccessToasts();
+    },
+    [groupId, currentRoleInfo?._id]
+  );
 
   const handleResetPermission = useCallback(() => {
     setEditingPermission(
@@ -169,7 +221,13 @@ export const GroupRole: React.FC<GroupPermissionProps> = React.memo((props) => {
                 <UserListItem
                   key={m._id}
                   userId={m._id}
-                  actions={[<IconBtn key="remove" icon="mdi:close" />]}
+                  actions={[
+                    <IconBtn
+                      key="remove"
+                      icon="mdi:close"
+                      onClick={() => handleRemoveMember(m._id)}
+                    />,
+                  ]}
                 />
               ))}
             </PillTabPane>

web/src/components/modals/SelectGroupMember.tsx

@@ -0,0 +1,59 @@
+import { Button } from 'antd';
+import React, { useMemo, useState } from 'react';
+import { t, useAsyncFn, useGroupMemberIds } from 'tailchat-shared';
+import { ModalWrapper } from '../Modal';
+import { UserPicker } from '../UserPicker/UserPicker';
+import _without from 'lodash/without';
+
+interface SelectGroupMemberProps {
+  /**
+   * 群组id
+   */
+  groupId: string;
+  /**
+   * 排除的用户id
+   * 在选择好友时会进行过滤
+   */
+  withoutMemberIds?: string[];
+
+  /**
+   * 点击确认按钮的回调
+   */
+  onConfirm: (selectedUserIds: string[]) => void | Promise<void>;
+}
+
+/**
+ * 选择群组成员
+ */
+export const SelectGroupMember: React.FC<SelectGroupMemberProps> = React.memo(
+  (props) => {
+    const { groupId, withoutMemberIds = [], onConfirm } = props;
+    const [selectedUserIds, setSelectedUserIds] = useState<string[]>([]);
+    const groupMemberIds = useGroupMemberIds(groupId);
+    const filterMemberIds = useMemo(
+      () => _without(groupMemberIds, ...withoutMemberIds),
+      [groupMemberIds, withoutMemberIds]
+    );
+
+    const [{ loading }, handleConfirm] = useAsyncFn(async () => {
+      await onConfirm(selectedUserIds);
+    }, [onConfirm, selectedUserIds]);
+
+    return (
+      <ModalWrapper title={t('选择群组成员')}>
+        <UserPicker
+          allUserIds={filterMemberIds}
+          selectedIds={selectedUserIds}
+          onChange={setSelectedUserIds}
+        />
+
+        <div className="text-right">
+          <Button type="primary" loading={loading} onClick={handleConfirm}>
+            {t('确认')}
+          </Button>
+        </div>
+      </ModalWrapper>
+    );
+  }
+);
+SelectGroupMember.displayName = 'SelectGroupMember';