- |
- {subject.name}
- {subject.department}
+
+
+ |
+ {label}
|
@@ -96,24 +236,24 @@ export function ProductDevelopmentPermissionTable({
onToggle(subject.key, 'view')}
+ label={access.view ? `关闭${label}可见` : `开通${label}可见`}
+ onChange={() => onToggle(subject.key, 'view', [subject.key])}
/>
|
onToggle(subject.key, 'download')}
+ label={access.download ? `关闭${label}下载` : `开通${label}下载`}
+ onChange={() => onToggle(subject.key, 'download', [subject.key])}
/>
|
onToggle(subject.key, 'edit')}
+ label={access.edit ? `关闭${label}操作` : `开通${label}操作`}
+ onChange={() => onToggle(subject.key, 'edit', [subject.key])}
/>
|
@@ -125,41 +265,50 @@ export function ProductDevelopmentPermissionTable({
: '当前仅可查看。'
: '当前已关闭。'}
|
+
+
+ |
+ {expanded ? (
+ usersError ? (
+ | {usersError} |
+ ) : subjectUsers.length > 0 ? (
+ subjectUsers.map((user) => renderUserRow(subject, user))
+ ) : (
+ | 该业务类型暂无运行中账号 |
+ )
+ ) : null}
+
)
}
return (
-
+
- | 对象 |
+ 业务类型 |
权限状态 |
可见 |
下载 |
操作 |
说明 |
+ 人员 |
-
- | 核心对象 |
-
- {CORE_NODE_PERMISSION_SUBJECTS.map(renderSubjectRow)}
-
- |
-
- |
-
- {ordinaryExpanded ? ORDINARY_NODE_PERMISSION_SUBJECTS.map(renderSubjectRow) : null}
+ {PRIMARY_PERMISSION_SUBJECTS.map(renderSubjectRow)}
+ {PURCHASE_PERMISSION_SUBJECTS.map(renderSubjectRow)}
+ {OTHER_PERMISSION_SUBJECTS.map(renderSubjectRow)}
diff --git a/furniture-3d-system/src/app/users/components/SupplyChainPermissionWorkspace.test.tsx b/furniture-3d-system/src/app/users/components/SupplyChainPermissionWorkspace.test.tsx
index 4a319a74..6e6ca7bb 100644
--- a/furniture-3d-system/src/app/users/components/SupplyChainPermissionWorkspace.test.tsx
+++ b/furniture-3d-system/src/app/users/components/SupplyChainPermissionWorkspace.test.tsx
@@ -1,4 +1,4 @@
-import { render, screen, waitFor } from '@testing-library/react'
+import { render, screen, waitFor, within } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import { SupplyChainPermissionWorkspace } from './SupplyChainPermissionWorkspace'
@@ -27,13 +27,36 @@ describe('SupplyChainPermissionWorkspace', () => {
render()
expect(await screen.findByText('已读取当前权限配置')).toBeInTheDocument()
- expect(screen.queryByText('供应商')).not.toBeInTheDocument()
- expect(screen.queryByText('外部录入员')).not.toBeInTheDocument()
+ expect(screen.getByRole('navigation', { name: '供应链入口' })).toBeInTheDocument()
+ expect(screen.getByText('供应商')).toBeInTheDocument()
+ expect(screen.getByText('外部人员')).toBeInTheDocument()
+ expect(screen.getAllByText('固定排除')).toHaveLength(2)
+ expect(screen.queryByText('供应链中心入口与工作台总览')).not.toBeInTheDocument()
+ expect(screen.getAllByText('采购')).toHaveLength(1)
+ expect(screen.getByText('采购-跟单')).toBeInTheDocument()
+ expect(screen.getByText('采购-质检')).toBeInTheDocument()
+ expect(screen.getByText('仓库')).toBeInTheDocument()
- await actor.click(screen.getByRole('button', { name: '开通设计师可见' }))
- await waitFor(() => expect(fetchMock).toHaveBeenCalledTimes(2))
- expect(JSON.parse(String((fetchMock.mock.calls[1] as [string, RequestInit])[1].body))).toEqual({
- overrides: { 'workspace:design:view': true },
+ const table = screen.getByRole('table')
+ expect(table.parentElement).toHaveClass('min-h-0', 'flex-1', 'overflow-auto')
+ expect(table.parentElement?.parentElement).toHaveClass('overflow-hidden')
+
+ const designRow = screen.getByText('设计').closest('tr')
+ expect(designRow).not.toBeNull()
+ await waitFor(() => expect(within(designRow!).getByRole('button', { name: /人/ })).toBeEnabled())
+ await actor.click(within(designRow!).getByRole('button', { name: /人/ }))
+ expect(designRow).toHaveClass('sticky', 'top-[33px]')
+
+ await actor.click(screen.getByRole('button', { name: '数据库' }))
+ expect(screen.getByRole('navigation', { name: '数据库' })).toBeInTheDocument()
+ await actor.click(screen.getByRole('button', { name: '产品全量档案' }))
+ expect(screen.getByRole('navigation', { name: '数据库' })).toBeInTheDocument()
+
+ await actor.click(screen.getByRole('button', { name: '开通设计可见' }))
+ await waitFor(() => expect(fetchMock.mock.calls.some(([, options]) => options?.method === 'PUT')).toBe(true))
+ const [, saveOptions] = fetchMock.mock.calls.find(([, options]) => options?.method === 'PUT') as [string, RequestInit]
+ expect(JSON.parse(String(saveOptions.body))).toEqual({
+ overrides: { 'productArchive:design:view': true },
})
})
})
diff --git a/furniture-3d-system/src/app/users/components/SupplyChainPermissionWorkspace.tsx b/furniture-3d-system/src/app/users/components/SupplyChainPermissionWorkspace.tsx
index 9e957d9f..036d79cd 100644
--- a/furniture-3d-system/src/app/users/components/SupplyChainPermissionWorkspace.tsx
+++ b/furniture-3d-system/src/app/users/components/SupplyChainPermissionWorkspace.tsx
@@ -1,7 +1,7 @@
'use client'
-import { useEffect, useState } from 'react'
-import { Check, ClipboardList, Database, LayoutDashboard, PackagePlus, ShoppingCart, Warehouse, X } from 'lucide-react'
+import { Fragment, useEffect, useMemo, useState } from 'react'
+import { Check, ChevronDown, ClipboardList, Database, LayoutDashboard, PackagePlus, ShoppingCart, Users, Warehouse, X } from 'lucide-react'
import {
SUPPLY_CHAIN_PERMISSION_ACTION_LABELS,
SUPPLY_CHAIN_PERMISSION_CORE_SUBJECTS,
@@ -9,12 +9,16 @@ import {
SUPPLY_CHAIN_PERMISSION_TARGETS,
buildSupplyChainPermissionOverrideKey,
resolveSupplyChainPermissionAccess,
+ resolveSupplyChainPermissionSubjectKeys,
sanitizeSupplyChainPermissionOverrides,
type SupplyChainPermissionAction,
type SupplyChainPermissionOverrideMap,
+ type SupplyChainPermissionPrincipalKey,
type SupplyChainPermissionSubject,
type SupplyChainPermissionTargetKey,
} from '@/lib/supply-chain-permission-settings'
+import { usePermissionManagedUsers, type PermissionManagedUser } from './usePermissionManagedUsers'
+import { PermissionLevelNavigation } from './PermissionLevelNavigation'
const TARGET_ICONS: Record = {
workspace: LayoutDashboard,
@@ -30,6 +34,104 @@ const TARGET_ICONS: Record ['workspace', 'dashboard'].includes(target.key)),
+ },
+ {
+ key: 'database',
+ label: '数据库',
+ description: '产品档案、类目和仓库配置',
+ icon: Database,
+ targets: SUPPLY_CHAIN_PERMISSION_TARGETS.filter((target) => ['productArchive', 'categoryConfig', 'warehouseConfig'].includes(target.key)),
+ },
+ {
+ key: 'new-products',
+ label: '新品开发',
+ description: '新品开发总表与打样进度明细',
+ icon: PackagePlus,
+ targets: SUPPLY_CHAIN_PERMISSION_TARGETS.filter((target) => ['newProductOverview', 'newProductUnifiedTable', 'newProductSampleProgress'].includes(target.key)),
+ },
+ {
+ key: 'purchase',
+ label: '采购协作',
+ description: '日常事项与产品变价',
+ icon: ShoppingCart,
+ targets: SUPPLY_CHAIN_PERMISSION_TARGETS.filter((target) => ['purchaseDailyAffairs', 'purchasePriceChange'].includes(target.key)),
+ },
+ {
+ key: 'audit',
+ label: '审计记录',
+ description: '供应链操作日志',
+ icon: ClipboardList,
+ targets: SUPPLY_CHAIN_PERMISSION_TARGETS.filter((target) => target.key === 'operationLogs'),
+ },
+] as const
+
+type SupplyPermissionSubjectDisplay = {
+ subject: SupplyChainPermissionSubject
+ label: string
+ nested?: boolean
+}
+
+const ALL_SUPPLY_PERMISSION_SUBJECTS = [
+ ...SUPPLY_CHAIN_PERMISSION_CORE_SUBJECTS,
+ ...SUPPLY_CHAIN_PERMISSION_ORDINARY_SUBJECTS,
+]
+
+const SUPPLY_SUBJECT_LABELS: Partial> = {
+ design: '设计',
+ planning: '企划',
+ brandCenter: '策划',
+ purchase: '采购',
+ merchandiser: '采购-跟单',
+ quality: '采购-质检',
+ operation: '运营',
+ warehouse: '仓库',
+ customerService: '客服',
+ management: '经管',
+ viewer: '普通用户',
+}
+
+function createSupplySubjectDisplay(
+ key: SupplyChainPermissionSubject['key'],
+ nested = false,
+): SupplyPermissionSubjectDisplay {
+ const subject = ALL_SUPPLY_PERMISSION_SUBJECTS.find((item) => item.key === key)
+ if (!subject) throw new Error(`未找到供应链权限业务类型：${key}`)
+ return { subject, label: SUPPLY_SUBJECT_LABELS[key] ?? subject.name, nested }
+}
+
+const PRIMARY_SUPPLY_PERMISSION_SUBJECTS = [
+ createSupplySubjectDisplay('design'),
+ createSupplySubjectDisplay('planning'),
+ createSupplySubjectDisplay('brandCenter'),
+]
+
+const PURCHASE_SUPPLY_PERMISSION_SUBJECTS = [
+ createSupplySubjectDisplay('purchase'),
+ createSupplySubjectDisplay('merchandiser'),
+ createSupplySubjectDisplay('quality'),
+]
+
+const OTHER_SUPPLY_PERMISSION_SUBJECTS = [
+ createSupplySubjectDisplay('operation'),
+ createSupplySubjectDisplay('warehouse'),
+ createSupplySubjectDisplay('customerService'),
+ createSupplySubjectDisplay('management'),
+ createSupplySubjectDisplay('viewer'),
+]
+
+const VISIBLE_SUPPLY_PERMISSION_SUBJECTS = [
+ ...PRIMARY_SUPPLY_PERMISSION_SUBJECTS,
+ ...PURCHASE_SUPPLY_PERMISSION_SUBJECTS,
+ ...OTHER_SUPPLY_PERMISSION_SUBJECTS,
+]
+
function Toggle({
checked,
disabled,
@@ -64,11 +166,28 @@ function Toggle({
export function SupplyChainPermissionWorkspace() {
const [activeTargetKey, setActiveTargetKey] = useState('workspace')
const [overrides, setOverrides] = useState({})
+ const [expandedSubjects, setExpandedSubjects] = useState>(new Set())
const [loaded, setLoaded] = useState(false)
const [saving, setSaving] = useState(false)
const [status, setStatus] = useState('正在读取权限配置...')
const activeTarget = SUPPLY_CHAIN_PERMISSION_TARGETS.find((target) => target.key === activeTargetKey) ?? SUPPLY_CHAIN_PERMISSION_TARGETS[0]!
+ const activeGroup = SUPPLY_PERMISSION_GROUPS.find((group) =>
+ group.targets.some((target) => target.key === activeTarget.key),
+ ) ?? SUPPLY_PERMISSION_GROUPS[0]
const disabled = !loaded || saving
+ const managedUsers = usePermissionManagedUsers()
+ const usersBySubject = useMemo(() => {
+ const grouped = new Map()
+ VISIBLE_SUPPLY_PERMISSION_SUBJECTS.forEach(({ subject }) => {
+ grouped.set(
+ subject.key,
+ managedUsers.users.filter((user) =>
+ resolveSupplyChainPermissionSubjectKeys(user).includes(subject.key),
+ ),
+ )
+ })
+ return grouped
+ }, [managedUsers.users])
useEffect(() => {
let cancelled = false
@@ -128,11 +247,21 @@ export function SupplyChainPermissionWorkspace() {
}
}
- function toggle(subject: SupplyChainPermissionSubject, action: SupplyChainPermissionAction) {
+ function toggle(
+ principalKey: SupplyChainPermissionPrincipalKey,
+ subjectKeys: readonly SupplyChainPermissionSubject['key'][],
+ action: SupplyChainPermissionAction,
+ userId?: string,
+ ) {
if (disabled) return
- const access = resolveSupplyChainPermissionAccess(overrides, activeTarget.key, [subject.key])
+ const access = resolveSupplyChainPermissionAccess(
+ overrides,
+ activeTarget.key,
+ subjectKeys,
+ userId,
+ )
const key = (targetAction: SupplyChainPermissionAction) =>
- buildSupplyChainPermissionOverrideKey(activeTarget.key, subject.key, targetAction)
+ buildSupplyChainPermissionOverrideKey(activeTarget.key, principalKey, targetAction)
const nextValue = !access[action]
const next = { ...overrides, [key(action)]: nextValue }
if (action === 'view' && !nextValue) {
@@ -145,14 +274,63 @@ export function SupplyChainPermissionWorkspace() {
void persist(next)
}
- function renderSubject(subject: SupplyChainPermissionSubject) {
+ function toggleExpanded(subjectKey: string) {
+ setExpandedSubjects((current) => {
+ const next = new Set(current)
+ if (next.has(subjectKey)) next.delete(subjectKey)
+ else next.add(subjectKey)
+ return next
+ })
+ }
+
+ function renderUser(subject: SupplyChainPermissionSubject, user: PermissionManagedUser) {
+ const userSubjectKeys = resolveSupplyChainPermissionSubjectKeys(user)
+ const access = resolveSupplyChainPermissionAccess(
+ overrides,
+ activeTarget.key,
+ userSubjectKeys,
+ user.id,
+ )
+ return (
+
+
+
+ {user.name.slice(0, 1)}
+ {user.name}
+ |
+ 个人例外优先于业务类型 |
+ {(['view', 'download', 'edit'] as SupplyChainPermissionAction[]).map((action) => (
+
+ toggle(`user@${user.id}`, userSubjectKeys, action, user.id)}
+ />
+ |
+ ))}
+
+ {access.edit ? '可操作' : access.download ? '可查看、下载' : access.view ? '仅查看' : '未开放'}
+ |
+ |
+
+ )
+ }
+
+ function renderSubject(display: SupplyPermissionSubjectDisplay) {
+ const { subject, label, nested } = display
const access = resolveSupplyChainPermissionAccess(overrides, activeTarget.key, [subject.key])
const state = access.edit ? '可操作' : access.view ? '仅查看' : '未开放'
+ const subjectUsers = usersBySubject.get(subject.key) ?? []
+ const expanded = expandedSubjects.has(subject.key)
return (
-
- |
- {subject.name}
- {subject.department}
+
+
+ |
+ {label}
|
toggle(subject, action)}
+ label={access[action] ? `关闭${label}${SUPPLY_CHAIN_PERMISSION_ACTION_LABELS[action]}` : `开通${label}${SUPPLY_CHAIN_PERMISSION_ACTION_LABELS[action]}`}
+ onClick={() => toggle(subject.key, [subject.key], action)}
/>
|
))}
{access.edit ? '已开通查看和操作。' : access.download ? '已开通查看和下载。' : access.view ? '当前仅可查看。' : '默认不开放。'}
|
+
+
+ |
+
+ {expanded ? (
+ managedUsers.error ? (
+ | {managedUsers.error} |
+ ) : subjectUsers.length > 0 ? (
+ subjectUsers.map((user) => renderUser(subject, user))
+ ) : (
+ | 该业务类型暂无运行中账号 |
+ )
+ ) : null}
+
+ )
+ }
+
+ function renderExcludedSubject(label: string) {
+ return (
+ |
+ | {label} |
+
+ 固定排除
+ |
+ {(['view', 'download', 'edit'] as SupplyChainPermissionAction[]).map((action) => (
+
+ undefined} />
+ |
+ ))}
+ 不进入供应链中心。 |
+ — |
)
}
return (
-
- |