diff --git a/src/amis/messageActionEvents.ts b/src/amis/messageActionEvents.ts new file mode 100644 index 0000000..97cd6a7 --- /dev/null +++ b/src/amis/messageActionEvents.ts @@ -0,0 +1,9 @@ +export const OPEN_MESSAGE_DETAIL_EVENT = 'eip4:open-message-detail'; +export const MESSAGE_DETAIL_CHANGED_EVENT = 'eip4:message-detail-changed'; + +export interface MessageDetailRequest { + kind: 'received' | 'sent'; + receiveId?: string; + messageId?: string; + title?: string; +} diff --git a/src/amis/registerMessageAction.test.ts b/src/amis/registerMessageAction.test.ts new file mode 100644 index 0000000..d1fe96f --- /dev/null +++ b/src/amis/registerMessageAction.test.ts @@ -0,0 +1,76 @@ +import { beforeEach, describe, expect, it, vi } from 'vitest'; +import { OPEN_MESSAGE_DETAIL_EVENT } from './messageActionEvents'; +import { registerMessageAction, __resetMessageActionForTest } from './registerMessageAction'; + +interface RunCtx { + run: (action: { args?: Record }, renderer: unknown, event: unknown) => Promise; +} + +describe('registerMessageAction', () => { + beforeEach(() => { + __resetMessageActionForTest(); + }); + + it('amis-core 缺 registerAction 时返回 false', () => { + expect(registerMessageAction(null)).toBe(false); + expect(registerMessageAction({})).toBe(false); + }); + + it('注册 openMessageDetail 动作(幂等)', () => { + const registerAction = vi.fn(); + const core = { registerAction }; + expect(registerMessageAction(core)).toBe(true); + expect(registerAction).toHaveBeenCalledTimes(1); + expect(registerAction.mock.calls[0][0]).toBe('openMessageDetail'); + expect(registerMessageAction(core)).toBe(true); + expect(registerAction).toHaveBeenCalledTimes(1); + }); + + it('received 消息派发 receiveId', async () => { + let captured: RunCtx | null = null; + registerMessageAction({ + registerAction: (_type: string, action: RunCtx) => { + captured = action; + }, + }); + + const seen: unknown[] = []; + const listener = (event: Event) => seen.push((event as CustomEvent).detail); + window.addEventListener(OPEN_MESSAGE_DETAIL_EVENT, listener); + try { + await captured!.run({ + args: { kind: 'received', receiveId: 'recv-1', title: '消息' }, + }, {}, {}); + } finally { + window.removeEventListener(OPEN_MESSAGE_DETAIL_EVENT, listener); + } + + expect(seen).toEqual([{ kind: 'received', receiveId: 'recv-1', messageId: undefined, title: '消息' }]); + }); + + it('sent 消息派发 messageId,缺 id 不派发', async () => { + let captured: RunCtx | null = null; + registerMessageAction({ + registerAction: (_type: string, action: RunCtx) => { + captured = action; + }, + }); + + const listener = vi.fn(); + window.addEventListener(OPEN_MESSAGE_DETAIL_EVENT, listener); + try { + await captured!.run({ args: { kind: 'sent' } }, {}, {}); + await captured!.run({ args: { kind: 'sent', messageId: 'msg-1' } }, {}, {}); + } finally { + window.removeEventListener(OPEN_MESSAGE_DETAIL_EVENT, listener); + } + + expect(listener).toHaveBeenCalledTimes(1); + expect((listener.mock.calls[0][0] as CustomEvent).detail).toEqual({ + kind: 'sent', + receiveId: undefined, + messageId: 'msg-1', + title: undefined, + }); + }); +}); diff --git a/src/amis/registerMessageAction.ts b/src/amis/registerMessageAction.ts new file mode 100644 index 0000000..b271df1 --- /dev/null +++ b/src/amis/registerMessageAction.ts @@ -0,0 +1,65 @@ +import { OPEN_MESSAGE_DETAIL_EVENT, type MessageDetailRequest } from './messageActionEvents'; + +interface OpenMessageActionArg { + args?: { + kind?: unknown; + receiveId?: unknown; + messageId?: unknown; + title?: unknown; + }; + [key: string]: unknown; +} + +interface AmisRenderer { + [key: string]: unknown; +} + +interface AmisEvent { + [key: string]: unknown; +} + +interface AmisCore { + registerAction?: (type: string, action: unknown) => void; +} + +let registered = false; + +function asString(v: unknown): string | undefined { + if (v === null || v === undefined) return undefined; + const s = String(v).trim(); + return s ? s : undefined; +} + +function asKind(v: unknown): MessageDetailRequest['kind'] { + return asString(v) === 'sent' ? 'sent' : 'received'; +} + +export function registerMessageAction(amisCore: AmisCore | undefined | null): boolean { + if (registered) return true; + if (!amisCore || typeof amisCore.registerAction !== 'function') return false; + + amisCore.registerAction('openMessageDetail', { + async run(action: OpenMessageActionArg, _renderer: AmisRenderer, _event: AmisEvent) { + const args = action?.args ?? {}; + const kind = asKind(args.kind); + const receiveId = asString(args.receiveId); + const messageId = asString(args.messageId); + if (kind === 'received' && !receiveId) return; + if (kind === 'sent' && !messageId) return; + + const detail: MessageDetailRequest = { + kind, + receiveId, + messageId, + title: asString(args.title), + }; + window.dispatchEvent(new CustomEvent(OPEN_MESSAGE_DETAIL_EVENT, { detail })); + }, + }); + registered = true; + return true; +} + +export function __resetMessageActionForTest(): void { + registered = false; +} diff --git a/src/amis/registerUserTransferPicker.test.ts b/src/amis/registerUserTransferPicker.test.ts index 7a4ccd5..d72f98f 100644 --- a/src/amis/registerUserTransferPicker.test.ts +++ b/src/amis/registerUserTransferPicker.test.ts @@ -4,7 +4,6 @@ import { registerUserTransferPicker, __resetUserTransferPickerForTest, } from './registerUserTransferPicker'; -import { UserTransferPicker } from '../components/UserTransferPicker'; describe('registerUserTransferPicker', () => { beforeEach(() => { @@ -16,22 +15,6 @@ describe('registerUserTransferPicker', () => { expect(registerUserTransferPicker({})).toBe(false); }); - it('优先按 FormItem 注册,保留 label 和表单值绑定', () => { - const registerFormItem = vi.fn(); - const registerRenderer = vi.fn(); - - expect(registerUserTransferPicker({ registerFormItem, registerRenderer })).toBe(true); - expect(registerFormItem).toHaveBeenCalledTimes(1); - expect(registerRenderer).not.toHaveBeenCalled(); - expect(registerFormItem.mock.calls[0][0]).toMatchObject({ - type: 'user-transfer-picker', - name: 'user-transfer-picker', - component: UserTransferPicker, - strictMode: false, - override: true, - }); - }); - it('注册 schema filter,把老单选用户框改成标准 picker', () => { let filter: ((schema: Record) => Record) | null = null; const addSchemaFilter = vi.fn((fn) => { @@ -57,32 +40,12 @@ describe('registerUserTransferPicker', () => { expect(filter!({ type: 'select', mode: 'multiple' })).toEqual({ type: 'select', mode: 'multiple' }); }); - it('没有 registerFormItem 时退回 renderer 注册(幂等)', () => { - const registerRenderer = vi.fn(); - - expect(registerUserTransferPicker({ registerRenderer })).toBe(true); - expect(registerRenderer).toHaveBeenCalledTimes(1); - expect(registerRenderer.mock.calls[0][0]).toMatchObject({ - type: 'user-transfer-picker', - name: 'user-transfer-picker', - component: UserTransferPicker, - isFormItem: true, - override: true, - }); - - expect(registerUserTransferPicker({ registerRenderer })).toBe(true); - expect(registerRenderer).toHaveBeenCalledTimes(1); - }); - - it('renderer 已注册后仍允许补注册 schema filter', () => { + it('只注册 schema filter,不再注册旧自定义控件', () => { const registerFormItem = vi.fn(); const addSchemaFilter = vi.fn(); - expect(registerUserTransferPicker({ registerFormItem })).toBe(true); - expect(registerFormItem).toHaveBeenCalledTimes(1); - expect(registerUserTransferPicker({ addSchemaFilter, registerFormItem })).toBe(true); - expect(registerFormItem).toHaveBeenCalledTimes(1); + expect(registerFormItem).not.toHaveBeenCalled(); expect(addSchemaFilter).toHaveBeenCalledTimes(1); }); @@ -114,6 +77,10 @@ describe('registerUserTransferPicker', () => { labelField: '_label', valueField: '_id', placeholder: '请点击右侧的图标', + overflowConfig: { + maxTagCount: 1, + displayPosition: ['select'], + }, }, ], }); diff --git a/src/amis/registerUserTransferPicker.ts b/src/amis/registerUserTransferPicker.ts index 17e574c..47f6137 100644 --- a/src/amis/registerUserTransferPicker.ts +++ b/src/amis/registerUserTransferPicker.ts @@ -1,13 +1,7 @@ -import { UserTransferPicker } from '../components/UserTransferPicker'; - type AmisRendererRegistry = { - registerRenderer?: (config: Record) => unknown; - registerFormItem?: (config: Record) => unknown; addSchemaFilter?: (filter: (schema: Record) => Record) => unknown; - getRendererByName?: (name: string) => unknown; }; -let rendererRegistered = false; let schemaFilterRegistered = false; const USER_SELECT_MODES = new Set(['controlled', 'all', 'org', 'attendance']); @@ -35,6 +29,10 @@ function userPickerSchema(schema: Record, mode: string, multipl next.clearable = next.clearable ?? true; if (multiple) { next.multiple = true; + next.overflowConfig = next.overflowConfig ?? { + maxTagCount: 1, + displayPosition: ['select'], + }; } next.source = `/api/picker/${USER_SELECT_DIALOG_IDS_BY_MODE[mode] ?? USER_SELECT_DIALOG_IDS_BY_MODE.controlled}/list`; next.labelField = '_label'; @@ -101,33 +99,9 @@ export function registerUserTransferPicker(amisCore: AmisRendererRegistry | unde schemaFilterRegistered = true; } - if (rendererRegistered) return true; - - if (typeof amisCore.registerFormItem === 'function') { - amisCore.registerFormItem({ - type: 'user-transfer-picker', - name: 'user-transfer-picker', - component: UserTransferPicker, - strictMode: false, - override: true, - }); - rendererRegistered = true; - return true; - } - - if (typeof amisCore.registerRenderer !== 'function') return false; - amisCore.registerRenderer({ - type: 'user-transfer-picker', - name: 'user-transfer-picker', - isFormItem: true, - component: UserTransferPicker, - override: true, - }); - rendererRegistered = true; - return true; + return schemaFilterRegistered; } export function __resetUserTransferPickerForTest(): void { - rendererRegistered = false; schemaFilterRegistered = false; } diff --git a/src/api/notice.ts b/src/api/notice.ts index e63b46b..18d057c 100644 --- a/src/api/notice.ts +++ b/src/api/notice.ts @@ -18,6 +18,23 @@ export interface NoticeListResult { total: number; } +export interface NoticeDetail { + id: string; + receiveId?: string; + title?: string | null; + content?: string | null; + type?: number | string | null; + createTime?: number | string | null; + senderId?: string; + sender?: string | null; + receivers?: string | null; + receiverIds?: string | null; + document?: unknown; + params?: unknown; + received?: boolean; + readChanged?: boolean; +} + /** 获取当前用户消息列表 */ export async function fetchNotices( params: { unreadOnly?: boolean; page?: number; perPage?: number } = {}, @@ -46,3 +63,19 @@ export async function markNoticeRead(id: string): Promise { export async function markAllNoticesRead(): Promise { await http.post('/api/notice/read-all'); } + +/** 按 sys_message_id 加载只读消息详情(已发送/当前用户可访问消息) */ +export async function fetchNoticeDetail(messageId: string): Promise { + const { data } = await http.get<{ status: number; data: NoticeDetail }>( + `/api/notice/${encodeURIComponent(messageId)}/detail`, + ); + return data.data; +} + +/** 按 sys_messageuser_id 打开收到消息详情,并在后端置已读 */ +export async function openReceivedNotice(receiveId: string): Promise { + const { data } = await http.post<{ status: number; data: NoticeDetail }>( + `/api/notice/received/${encodeURIComponent(receiveId)}/open`, + ); + return data.data; +} diff --git a/src/components/AmisRenderer.tsx b/src/components/AmisRenderer.tsx index a35582f..ad2cee9 100644 --- a/src/components/AmisRenderer.tsx +++ b/src/components/AmisRenderer.tsx @@ -12,7 +12,9 @@ import { useEffect, useRef, useState } from 'react'; import { http } from '../api/http'; import { APPROVAL_COMPLETED_EVENT } from '../amis/approvalActionEvents'; +import { MESSAGE_DETAIL_CHANGED_EVENT } from '../amis/messageActionEvents'; import { registerApprovalAction } from '../amis/registerApprovalAction'; +import { registerMessageAction } from '../amis/registerMessageAction'; import { registerReplayAction } from '../amis/registerReplayAction'; import { normalizeUserTransferSchemaTree, registerUserTransferPicker } from '../amis/registerUserTransferPicker'; import { getProfile } from '../auth/token'; @@ -67,7 +69,11 @@ export function AmisRenderer({ schema }: AmisRendererProps) { useEffect(() => { const reload = () => setReloadSeq((n) => n + 1); window.addEventListener(APPROVAL_COMPLETED_EVENT, reload); - return () => window.removeEventListener(APPROVAL_COMPLETED_EVENT, reload); + window.addEventListener(MESSAGE_DETAIL_CHANGED_EVENT, reload); + return () => { + window.removeEventListener(APPROVAL_COMPLETED_EVENT, reload); + window.removeEventListener(MESSAGE_DETAIL_CHANGED_EVENT, reload); + }; }, []); useEffect(() => { @@ -87,6 +93,11 @@ export function AmisRenderer({ schema }: AmisRendererProps) { } catch { // amis-core 未暴露 registerAction 时静默降级(审批抽屉入口不可用,不阻断渲染) } + try { + registerMessageAction(amisRequire('amis')); + } catch { + // amis-core 未暴露 registerAction 时静默降级(消息详情入口不可用,不阻断渲染) + } try { registerUserTransferPicker(amisRequire('amis')) || registerUserTransferPicker(amisRequire('amis-core')); } catch { diff --git a/src/components/MessageDetailDialog.tsx b/src/components/MessageDetailDialog.tsx new file mode 100644 index 0000000..139d1c1 --- /dev/null +++ b/src/components/MessageDetailDialog.tsx @@ -0,0 +1,186 @@ +import { useEffect, useMemo, useState } from 'react'; +import type { MessageDetailRequest } from '../amis/messageActionEvents'; +import { fetchNoticeDetail, openReceivedNotice, type NoticeDetail } from '../api/notice'; +import { Dialog } from './ui/Dialog'; +import { Icon } from './ui/Icon'; + +interface MessageDetailDialogProps { + request: MessageDetailRequest; + onClose: () => void; + onReadChange: () => void; +} + +function fmtTime(value: number | string | null | undefined): string { + if (value === null || value === undefined || value === '') return ''; + let d: Date; + if (typeof value === 'number') { + d = new Date(value < 10_000_000_000 ? value * 1000 : value); + } else { + const n = Number(value); + d = Number.isFinite(n) ? new Date(n < 10_000_000_000 ? n * 1000 : n) : new Date(value); + } + if (Number.isNaN(d.getTime())) return String(value); + const pad = (n: number) => String(n).padStart(2, '0'); + return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ` + + `${pad(d.getHours())}:${pad(d.getMinutes())}`; +} + +function stringValue(value: unknown): string { + if (value === null || value === undefined) return ''; + return String(value).trim(); +} + +function documentLabels(value: unknown): string[] { + if (!value) return []; + if (Array.isArray(value)) { + return value.map((item, index) => { + if (item && typeof item === 'object') { + const record = item as Record; + return stringValue(record.name) + || stringValue(record.fileName) + || stringValue(record.filename) + || stringValue(record.originalName) + || stringValue(record.title) + || `附件 ${index + 1}`; + } + return stringValue(item) || `附件 ${index + 1}`; + }); + } + if (typeof value === 'string') { + return value.trim() ? [value.trim()] : []; + } + return ['有附件']; +} + +function Field({ label, value }: { label: string; value: unknown }) { + return ( +
+
{label}
+
{stringValue(value) || '-'}
+
+ ); +} + +export function MessageDetailDialog({ request, onClose, onReadChange }: MessageDetailDialogProps) { + const [detail, setDetail] = useState(null); + const [loading, setLoading] = useState(true); + const [error, setError] = useState(''); + + useEffect(() => { + let alive = true; + setLoading(true); + setError(''); + setDetail(null); + + const run = request.kind === 'received' + ? openReceivedNotice(request.receiveId ?? '') + : fetchNoticeDetail(request.messageId ?? ''); + + run + .then((data) => { + if (!alive) return; + setDetail(data); + if (request.kind === 'received') { + onReadChange(); + } + }) + .catch((err: unknown) => { + if (!alive) return; + const message = (err as { response?: { data?: { message?: string } } }).response?.data?.message; + setError(message || '消息详情加载失败'); + }) + .finally(() => { + if (alive) setLoading(false); + }); + + return () => { + alive = false; + }; + }, [request, onReadChange]); + + const attachments = useMemo(() => documentLabels(detail?.document), [detail?.document]); + const title = detail?.title || request.title || '查看'; + + return ( + 关闭} + > + {loading ? ( +
加载中…
+ ) : error ? ( +
{error}
+ ) : detail ? ( +
+
+ +
+
+ {title} +
+
+ {request.kind === 'sent' ? '已发送消息' : '收到的消息'} +
+
+
+ +
+ + + + +
+ +
+
内容
+
+ {stringValue(detail.content) || '-'} +
+
+ +
+
附件
+ {attachments.length ? ( +
+ {attachments.map((item) => ( +
+ + {item} +
+ ))} +
+ ) : ( +
无附件
+ )} +
+
+ ) : null} +
+ ); +} diff --git a/src/shell/AppShell.tsx b/src/shell/AppShell.tsx index 5d45d39..646abb8 100644 --- a/src/shell/AppShell.tsx +++ b/src/shell/AppShell.tsx @@ -19,7 +19,13 @@ import { OPEN_APPROVAL_DRAWER_EVENT, type ApprovalDrawerRequest, } from '../amis/approvalActionEvents'; +import { + MESSAGE_DETAIL_CHANGED_EVENT, + OPEN_MESSAGE_DETAIL_EVENT, + type MessageDetailRequest, +} from '../amis/messageActionEvents'; import { ApprovalDrawer } from '../components/ApprovalDrawer'; +import { MessageDetailDialog } from '../components/MessageDetailDialog'; import { ToastHost } from '../components/ui/Toast'; import { Topbar } from './Topbar'; import { SideMenu } from './SideMenu'; @@ -79,6 +85,7 @@ export function AppShell() { const [noticeBadge, setNoticeBadge] = useState(undefined); const [showNotice, setShowNotice] = useState(false); const [approvalRequest, setApprovalRequest] = useState(null); + const [messageRequest, setMessageRequest] = useState(null); const pollTimer = useRef | null>(null); const noticePollTimer = useRef | null>(null); @@ -183,6 +190,19 @@ export function AppShell() { return () => window.removeEventListener(OPEN_APPROVAL_DRAWER_EVENT, openApprovalDrawer); }, []); + // 转换页 amis action → 全局消息详情弹窗。收到消息打开时由弹窗调用后端置已读。 + useEffect(() => { + const openMessageDetail = (event: Event) => { + const detail = (event as CustomEvent).detail; + if (!detail) return; + if (detail.kind === 'received' && !detail.receiveId) return; + if (detail.kind === 'sent' && !detail.messageId) return; + setMessageRequest(detail); + }; + window.addEventListener(OPEN_MESSAGE_DETAIL_EVENT, openMessageDetail); + return () => window.removeEventListener(OPEN_MESSAGE_DETAIL_EVENT, openMessageDetail); + }, []); + const handleApprovalCompleted = useCallback(() => { const detail = approvalRequest; setApprovalRequest(null); @@ -196,6 +216,15 @@ export function AppShell() { }, 0); }, [approvalRequest]); + const handleMessageReadChange = useCallback(() => { + fetchUnreadCount() + .then((n) => setNoticeBadge(n > 0 ? n : undefined)) + .catch(() => setNoticeBadge(undefined)); + window.setTimeout(() => { + window.dispatchEvent(new CustomEvent(MESSAGE_DETAIL_CHANGED_EVENT)); + }, 0); + }, []); + // F2-13:回填 Tab 标题(PageRenderPage 拿到 schema title 后调用) const updateTabTitle = useCallback((path: string, title: string) => { setTabs((prev) => @@ -337,6 +366,14 @@ export function AppShell() { onCompleted={handleApprovalCompleted} /> ) : null} + + {messageRequest ? ( + setMessageRequest(null)} + onReadChange={handleMessageReadChange} + /> + ) : null} ); }