feat(分组): 成员改为标签云展示 + 添加成员支持多选批量
1) 成员不再一人一行
原先用 antd Table:成员一多就要滚很久,右侧还大片留白。
改为标签云(flex-wrap),一行能放好几个。
交互一并简化:
· 点标签正文 → 切换组长(悬停有提示)
· 点 × → 移出分组
· 无权限时两者都不出现,退化成纯展示
组长用金色标签 + 皇冠图标,一眼可辨。
2) 添加成员支持多选
Select 加 mode="multiple" + maxTagCount="responsive",可搜可多选、批量提交。
后端 POST /groups/{id}/members 由单个 user_id 改为 user_ids 数组,
返回 {added, skipped, skipped_names}:
· 已在组内的**静默跳过**而非整批 409 —— 多选时难免选中已在组里的人,
为此让整批失败体验很差;前端会把跳过的名单说清楚,
否则用户会疑惑「明明选了 5 个,怎么只多了 3 个」
· 批量里混入超管则**整批拒绝并指名道姓**,不制造「部分成功」这种
难以解释的中间状态
实测(后端):
批量加 3 人 → added 3
重复提交(2 旧 1 新) → added 1 / skipped 2,整批仍成功
混入超管 → 400「以下账号是超级管理员,业务分组对其不生效:sunxia」
空列表 → 422
测试成员已清理
This commit is contained in:
@ -38,8 +38,9 @@ from app.models.business_group import (
|
||||
from app.schemas.group import (
|
||||
GroupCreate,
|
||||
GroupDetailOut,
|
||||
GroupMemberAdd,
|
||||
GroupMemberOut,
|
||||
GroupMembersAdd,
|
||||
GroupMembersAddResult,
|
||||
GroupMemberUpdate,
|
||||
GroupOut,
|
||||
GroupUpdate,
|
||||
@ -563,18 +564,23 @@ async def delete_group(
|
||||
# 成员管理
|
||||
# ============================================================
|
||||
|
||||
@router.post("/{group_id}/members", response_model=GroupMemberOut,
|
||||
@router.post("/{group_id}/members", response_model=GroupMembersAddResult,
|
||||
status_code=status.HTTP_201_CREATED)
|
||||
async def add_member(
|
||||
async def add_members(
|
||||
group_id: int,
|
||||
payload: GroupMemberAdd,
|
||||
payload: GroupMembersAdd,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: dict = Depends(get_current_user),
|
||||
):
|
||||
"""把一个人加进分组。一个人可以在多个组 —— 多组 = 多看一个范围。
|
||||
"""**批量**把成员加进分组。一个人可以在多个组 —— 多组 = 多看一个范围。
|
||||
|
||||
权限:超管 / 部门主管 / **本组组长**。组长给自己加组会被唯一约束挡住
|
||||
(他本来就在组里),所以这里不构成提权。
|
||||
|
||||
语义:
|
||||
· 已在组内的静默跳过(返回在 skipped 里),不报错 ——
|
||||
多选时难免选中已在组里的人,为此整批失败体验很差。
|
||||
· 只要有一个是超管就整批拒绝并指名道姓,避免"部分成功"这种难解释的状态。
|
||||
"""
|
||||
await _get_group_or_404(db, group_id)
|
||||
if not await _can_manage_members(db, current_user, group_id):
|
||||
@ -582,35 +588,48 @@ async def add_member(
|
||||
status.HTTP_403_FORBIDDEN, "只有超级管理员、主管或本组组长可以添加成员"
|
||||
)
|
||||
|
||||
# 去重 + 去空白,保持用户选择的顺序
|
||||
wanted = list(dict.fromkeys(u.strip() for u in payload.user_ids if u and u.strip()))
|
||||
if not wanted:
|
||||
raise HTTPException(status.HTTP_400_BAD_REQUEST, "请至少选择一名成员")
|
||||
|
||||
# 超管不进分组:他的范围是硬编码全厂,分组对他不生效。
|
||||
# 放进来的话界面会暗示「他受这个组约束」,与事实不符。
|
||||
if await _is_super_admin_account(payload.user_id):
|
||||
supers = [u for u in wanted if await _is_super_admin_account(u)]
|
||||
if supers:
|
||||
raise HTTPException(
|
||||
status.HTTP_400_BAD_REQUEST,
|
||||
"超级管理员不受业务分组约束(数据范围恒为全厂),无需加入分组",
|
||||
f"以下账号是超级管理员,业务分组对其不生效:{'、'.join(supers)}",
|
||||
)
|
||||
|
||||
exists = await db.scalar(
|
||||
select(BusinessGroupMember.id).where(
|
||||
already = set((await db.execute(
|
||||
select(BusinessGroupMember.user_id).where(
|
||||
BusinessGroupMember.group_id == group_id,
|
||||
BusinessGroupMember.user_id == payload.user_id,
|
||||
BusinessGroupMember.user_id.in_(tuple(wanted)),
|
||||
)
|
||||
)
|
||||
if exists:
|
||||
raise HTTPException(status.HTTP_409_CONFLICT, "该成员已在此分组中")
|
||||
)).scalars().all())
|
||||
|
||||
member = BusinessGroupMember(
|
||||
group_id=group_id, user_id=payload.user_id, is_leader=payload.is_leader,
|
||||
)
|
||||
db.add(member)
|
||||
to_add = [u for u in wanted if u not in already]
|
||||
for u in to_add:
|
||||
db.add(BusinessGroupMember(
|
||||
group_id=group_id, user_id=u, is_leader=payload.is_leader,
|
||||
))
|
||||
await db.commit()
|
||||
|
||||
from app.services.mom_cache import get_display_names
|
||||
name_map = get_display_names([payload.user_id])
|
||||
return GroupMemberOut(
|
||||
user_id=payload.user_id,
|
||||
display_name=name_map.get(payload.user_id) or payload.user_id,
|
||||
is_leader=payload.is_leader,
|
||||
all_names = get_display_names(wanted)
|
||||
skipped = [u for u in wanted if u in already]
|
||||
return GroupMembersAddResult(
|
||||
added=[
|
||||
GroupMemberOut(
|
||||
user_id=u,
|
||||
display_name=all_names.get(u) or u,
|
||||
is_leader=payload.is_leader,
|
||||
)
|
||||
for u in to_add
|
||||
],
|
||||
skipped=skipped,
|
||||
skipped_names=[all_names.get(u) or u for u in skipped],
|
||||
)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user