fix(web): standardize user picker and message detail
This commit is contained in:
9
src/amis/messageActionEvents.ts
Normal file
9
src/amis/messageActionEvents.ts
Normal file
@@ -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;
|
||||
}
|
||||
76
src/amis/registerMessageAction.test.ts
Normal file
76
src/amis/registerMessageAction.test.ts
Normal file
@@ -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<string, unknown> }, renderer: unknown, event: unknown) => Promise<void>;
|
||||
}
|
||||
|
||||
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,
|
||||
});
|
||||
});
|
||||
});
|
||||
65
src/amis/registerMessageAction.ts
Normal file
65
src/amis/registerMessageAction.ts
Normal file
@@ -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<MessageDetailRequest>(OPEN_MESSAGE_DETAIL_EVENT, { detail }));
|
||||
},
|
||||
});
|
||||
registered = true;
|
||||
return true;
|
||||
}
|
||||
|
||||
export function __resetMessageActionForTest(): void {
|
||||
registered = false;
|
||||
}
|
||||
@@ -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<string, unknown>) => Record<string, unknown>) | 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'],
|
||||
},
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
@@ -1,13 +1,7 @@
|
||||
import { UserTransferPicker } from '../components/UserTransferPicker';
|
||||
|
||||
type AmisRendererRegistry = {
|
||||
registerRenderer?: (config: Record<string, unknown>) => unknown;
|
||||
registerFormItem?: (config: Record<string, unknown>) => unknown;
|
||||
addSchemaFilter?: (filter: (schema: Record<string, unknown>) => Record<string, unknown>) => 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<string, unknown>, 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;
|
||||
}
|
||||
|
||||
@@ -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<void> {
|
||||
export async function markAllNoticesRead(): Promise<void> {
|
||||
await http.post('/api/notice/read-all');
|
||||
}
|
||||
|
||||
/** 按 sys_message_id 加载只读消息详情(已发送/当前用户可访问消息) */
|
||||
export async function fetchNoticeDetail(messageId: string): Promise<NoticeDetail> {
|
||||
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<NoticeDetail> {
|
||||
const { data } = await http.post<{ status: number; data: NoticeDetail }>(
|
||||
`/api/notice/received/${encodeURIComponent(receiveId)}/open`,
|
||||
);
|
||||
return data.data;
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
186
src/components/MessageDetailDialog.tsx
Normal file
186
src/components/MessageDetailDialog.tsx
Normal file
@@ -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<string, unknown>;
|
||||
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 (
|
||||
<div style={{ display: 'grid', gridTemplateColumns: '88px minmax(0, 1fr)', gap: 12, alignItems: 'start' }}>
|
||||
<div style={{ color: 'var(--text-2)' }}>{label}</div>
|
||||
<div style={{ minWidth: 0, wordBreak: 'break-word' }}>{stringValue(value) || '-'}</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export function MessageDetailDialog({ request, onClose, onReadChange }: MessageDetailDialogProps) {
|
||||
const [detail, setDetail] = useState<NoticeDetail | null>(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 (
|
||||
<Dialog
|
||||
title="查看"
|
||||
width={720}
|
||||
onClose={onClose}
|
||||
foot={<button className="btn btn-pri" onClick={onClose}>关闭</button>}
|
||||
>
|
||||
{loading ? (
|
||||
<div className="empty">加载中…</div>
|
||||
) : error ? (
|
||||
<div className="empty" style={{ color: 'var(--err)' }}>{error}</div>
|
||||
) : detail ? (
|
||||
<div style={{ display: 'flex', flexDirection: 'column', gap: 14, fontSize: 'var(--fs)' }}>
|
||||
<div style={{
|
||||
display: 'flex',
|
||||
gap: 10,
|
||||
alignItems: 'flex-start',
|
||||
paddingBottom: 12,
|
||||
borderBottom: '1px solid var(--line)',
|
||||
}}
|
||||
>
|
||||
<Icon name="doc" size={18} style={{ color: 'var(--brand)', marginTop: 2 }} />
|
||||
<div style={{ minWidth: 0 }}>
|
||||
<div style={{ fontSize: 'var(--fs-lg)', fontWeight: 600, wordBreak: 'break-word' }}>
|
||||
{title}
|
||||
</div>
|
||||
<div style={{ color: 'var(--text-3)', marginTop: 4 }}>
|
||||
{request.kind === 'sent' ? '已发送消息' : '收到的消息'}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div style={{
|
||||
display: 'grid',
|
||||
gridTemplateColumns: '1fr 1fr',
|
||||
gap: '10px 24px',
|
||||
}}
|
||||
>
|
||||
<Field label="发送人" value={detail.sender} />
|
||||
<Field label="发送时间" value={fmtTime(detail.createTime)} />
|
||||
<Field label="消息类型" value={detail.type} />
|
||||
<Field label="接收人" value={detail.receivers} />
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div style={{ color: 'var(--text-2)', marginBottom: 6 }}>内容</div>
|
||||
<div style={{
|
||||
minHeight: 180,
|
||||
maxHeight: 280,
|
||||
overflow: 'auto',
|
||||
border: '1px solid var(--line)',
|
||||
borderRadius: 6,
|
||||
padding: 12,
|
||||
lineHeight: 1.7,
|
||||
whiteSpace: 'pre-wrap',
|
||||
wordBreak: 'break-word',
|
||||
background: 'var(--surface-2)',
|
||||
}}
|
||||
>
|
||||
{stringValue(detail.content) || '-'}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div style={{ color: 'var(--text-2)', marginBottom: 6 }}>附件</div>
|
||||
{attachments.length ? (
|
||||
<div style={{ display: 'flex', flexDirection: 'column', gap: 6 }}>
|
||||
{attachments.map((item) => (
|
||||
<div key={item} style={{ display: 'flex', gap: 8, alignItems: 'center' }}>
|
||||
<Icon name="doc" size={14} style={{ color: 'var(--text-3)' }} />
|
||||
<span>{item}</span>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
) : (
|
||||
<div style={{ color: 'var(--text-3)' }}>无附件</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
) : null}
|
||||
</Dialog>
|
||||
);
|
||||
}
|
||||
@@ -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<number | undefined>(undefined);
|
||||
const [showNotice, setShowNotice] = useState(false);
|
||||
const [approvalRequest, setApprovalRequest] = useState<ApprovalDrawerRequest | null>(null);
|
||||
const [messageRequest, setMessageRequest] = useState<MessageDetailRequest | null>(null);
|
||||
const pollTimer = useRef<ReturnType<typeof setInterval> | null>(null);
|
||||
const noticePollTimer = useRef<ReturnType<typeof setInterval> | 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<MessageDetailRequest>).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 ? (
|
||||
<MessageDetailDialog
|
||||
request={messageRequest}
|
||||
onClose={() => setMessageRequest(null)}
|
||||
onReadChange={handleMessageReadChange}
|
||||
/>
|
||||
) : null}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user