diff --git a/package.json b/package.json index a4619aca..4f757293 100644 --- a/package.json +++ b/package.json @@ -42,11 +42,12 @@ "@ant-design/icons": "^5.6.1", "@ant-design/pro-components": "^2.7.19", "antd": "^5.25.4", + "@ant-design/v5-patch-for-react-19": "^1.0.3", "antd-style": "^3.7.0", "classnames": "^2.5.1", "dayjs": "^1.11.13", - "react": "^18.3.1", - "react-dom": "^18.3.1" + "react": "^19.1.0", + "react-dom": "^19.1.0" }, "devDependencies": { "@ant-design/pro-cli": "^3.3.0", @@ -57,8 +58,8 @@ "@types/express": "^4.17.21", "@types/jest": "^29.5.13", "@types/lodash": "^4.17.10", - "@types/react": "^18.3.11", - "@types/react-dom": "^18.3.0", + "@types/react": "^19.1.5", + "@types/react-dom": "^19.1.5", "@types/react-helmet": "^6.1.11", "@umijs/lint": "^4.3.24", "@umijs/max": "^4.3.24", diff --git a/src/app.tsx b/src/app.tsx index 1f6a3cf9..5c5c74c3 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -8,6 +8,7 @@ import { history, Link } from '@umijs/max'; import React from 'react'; import defaultSettings from '../config/defaultSettings'; import { errorConfig } from './requestErrorConfig'; +import '@ant-design/v5-patch-for-react-19'; const isDev = process.env.NODE_ENV === 'development'; const loginPath = '/user/login'; diff --git a/src/global.less b/src/global.less index a9a0c51b..1b5ae780 100644 --- a/src/global.less +++ b/src/global.less @@ -4,9 +4,9 @@ body, height: 100%; margin: 0; padding: 0; - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, - 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', - 'Noto Color Emoji'; + font-family: + -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, 'Noto Sans', + sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'; } .colorWeak { diff --git a/src/pages/TableList/components/UpdateForm.tsx b/src/pages/TableList/components/UpdateForm.tsx index d689c2b9..83aa509d 100644 --- a/src/pages/TableList/components/UpdateForm.tsx +++ b/src/pages/TableList/components/UpdateForm.tsx @@ -41,7 +41,7 @@ const UpdateForm: React.FC = (props) => { padding: '32px 40px 48px', }, }} - destroyOnClose + destroyOnHidden title={intl.formatMessage({ id: 'pages.searchTable.updateForm.ruleConfig', defaultMessage: '规则配置', diff --git a/src/pages/TableList/index.tsx b/src/pages/TableList/index.tsx index 14f526ac..3fe5fea4 100644 --- a/src/pages/TableList/index.tsx +++ b/src/pages/TableList/index.tsx @@ -97,7 +97,7 @@ const TableList: React.FC = () => { const [showDetail, setShowDetail] = useState(false); - const actionRef = useRef(); + const actionRef = useRef(null); const [currentRow, setCurrentRow] = useState(); const [selectedRowsState, setSelectedRows] = useState([]);