From 451d90894a9ca9f9d3427d601d208e97c8b1840b Mon Sep 17 00:00:00 2001
From: mmc <1556375442@qq.com>
Date: Fri, 15 May 2026 16:28:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=A8=E5=B1=80=E6=8F=90?=
=?UTF-8?q?=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/App.tsx | 18 +++++++++++++++++-
src/lib/utils.ts | 28 ++++++++++++++++++++++++++++
src/pages/Profile.tsx | 2 ++
src/pages/WorkOrder.tsx | 4 ++--
4 files changed, 49 insertions(+), 3 deletions(-)
diff --git a/src/App.tsx b/src/App.tsx
index fe37bc5..efdf555 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,8 +1,24 @@
import React from 'react';
import { RouterProvider } from 'react-router-dom';
import { router } from './router';
+import { App as AntdApp } from 'antd';
+import utils from './lib/utils';
+
+// 用于静态注入 message/modal/notification
+const StaticAntd = () => {
+ const { message, modal, notification } = AntdApp.useApp();
+ utils.setMessage(message);
+ utils.setModal(modal);
+ utils.setNotification(notification);
+ return null;
+};
export default function App() {
- return ;
+ return (
+
+
+
+
+ );
}
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index 721678f..b034f04 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -1,6 +1,34 @@
import { type ClassValue, clsx } from 'clsx';
import { twMerge } from 'tailwind-merge';
import Cookies from 'js-cookie'
+import type { MessageInstance } from 'antd/es/message/interface';
+import type { ModalStaticFunctions } from 'antd/es/modal/confirm';
+import type { NotificationInstance } from 'antd/es/notification/interface';
+
+let message: MessageInstance;
+let notification: NotificationInstance;
+let modal: Omit;
+
+export default {
+ get message() {
+ return message;
+ },
+ setMessage(instance: MessageInstance) {
+ message = instance;
+ },
+ get notification() {
+ return notification;
+ },
+ setNotification(instance: NotificationInstance) {
+ notification = instance;
+ },
+ get modal() {
+ return modal;
+ },
+ setModal(instance: Omit) {
+ modal = instance;
+ },
+};
const TokenKey = 'Admin-Token'
const TokenKeyAi = 'ai-Token'
diff --git a/src/pages/Profile.tsx b/src/pages/Profile.tsx
index 73272fc..27eaeeb 100644
--- a/src/pages/Profile.tsx
+++ b/src/pages/Profile.tsx
@@ -31,6 +31,7 @@ import { RootState, useAppDispatch } from '../store';
import { setUserInfo } from '../store/userSlice';
import { getUserProfile, updateUserProfile, updateUserPwd, uploadAvatar } from '../api/user';
import envConfig from '../../env';
+import utils from '../lib/utils';
const { TabPane } = Tabs;
const { Title } = Typography;
@@ -42,6 +43,7 @@ const Profile: React.FC = () => {
const dispatch = useAppDispatch();
const [form] = Form.useForm();
const [pwdForm] = Form.useForm();
+ const message = utils.message; // 使用全局 message
const fetchProfile = async () => {
try {
diff --git a/src/pages/WorkOrder.tsx b/src/pages/WorkOrder.tsx
index b0cf7b2..25143a7 100644
--- a/src/pages/WorkOrder.tsx
+++ b/src/pages/WorkOrder.tsx
@@ -44,6 +44,7 @@ import { orderTypeConfig, sourceTypeMap } from '../constants';
import { useSelector } from 'react-redux';
import { RootState } from '../store';
import { getUser } from '../api/user';
+import utils from '../lib/utils';
const { Option } = Select;
const { Search } = Input;
@@ -92,7 +93,7 @@ const WorkOrderPage = () => {
const [completeModalVisible, setCompleteModalVisible] = useState(false);
const [completeForm] = Form.useForm(); // 完成工单表单
- const [messageApi, contextHolder] = message.useMessage();
+ const messageApi = utils.message; // 使用全局 message
// 获取用户列表 (用于负责人选择)
const fetchUserList = async () => {
@@ -409,7 +410,6 @@ const WorkOrderPage = () => {
return (
- {contextHolder}