fix(web): standardize user picker and message detail
This commit is contained in:
@@ -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