diff --git a/package.json b/package.json index 322e7fd2..9315040f 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "dependencies": { "@ant-design/icons": "^6.1.0", "@ant-design/plots": "^2.6.0", - "@ant-design/pro-components": "3.1.2-0", + "@ant-design/pro-components": "^3.1.12-0", "@antv/l7": "^2.22.7", "@antv/l7-react": "^2.4.3", "@rc-component/util": "^1.9.0", @@ -55,9 +55,10 @@ "@biomejs/biome": "^2.1.1", "@commitlint/cli": "^20.1.0", "@commitlint/config-conventional": "^20.0.0", + "@tailwindcss/postcss": "^4", "@testing-library/dom": "^10.4.0", "@testing-library/react": "^16.3.0", - "@types/express": "^5.0.3", + "@types/express": "^4.17.25", "@types/jest": "^30.0.0", "@types/node": "^25.0.3", "@types/numeral": "^2.0.5", @@ -67,7 +68,7 @@ "@umijs/lint": "^4.6.13", "@umijs/max": "^4.6.25", "cross-env": "^10.1.0", - "express": "^5.2.0", + "express": "^4.22.1", "gh-pages": "^6.1.1", "husky": "^9.1.7", "jest": "^30.0.4", @@ -75,7 +76,6 @@ "lint-staged": "^16.1.2", "mockjs": "^1.1.0", "tailwindcss": "^4", - "@tailwindcss/postcss": "^4", "ts-node": "^10.9.2", "typescript": "^6.0.2", "umi-presets-pro": "^2.0.3", diff --git a/src/pages/account/settings/style.style.ts b/src/pages/account/settings/style.style.ts index 8ff05765..4fd9639a 100644 --- a/src/pages/account/settings/style.style.ts +++ b/src/pages/account/settings/style.style.ts @@ -19,19 +19,19 @@ const useStyles = createStyles(({ token }) => { }, leftMenu: { width: '224px', - borderRight: `${token.lineWidth}px solid ${token.colorSplit}`, '.ant-menu-inline': { border: 'none' }, '.ant-menu-horizontal': { fontWeight: 'bold' }, [`@media screen and (max-width: ${token.screenMD}px)`]: { width: '100%', - border: 'none', }, }, right: { flex: '1', padding: '8px 40px', + borderInlineStart: `${token.lineWidth}px solid ${token.colorSplit}`, [`@media screen and (max-width: ${token.screenMD}px)`]: { padding: '40px', + border: 'none', }, }, title: { diff --git a/src/pages/list/basic-list/components/OperationModal.tsx b/src/pages/list/basic-list/components/OperationModal.tsx index ebb2e082..2fd5663c 100644 --- a/src/pages/list/basic-list/components/OperationModal.tsx +++ b/src/pages/list/basic-list/components/OperationModal.tsx @@ -16,7 +16,7 @@ type OperationModalProps = { current: Partial | undefined; onDone: () => void; onSubmit: (values: BasicListItemDataType) => void; - children?: React.ReactNode; + children?: React.ReactElement; }; const OperationModal: FC = (props) => { const { styles } = useStyles(); diff --git a/src/pages/user/login/__snapshots__/login.test.tsx.snap b/src/pages/user/login/__snapshots__/login.test.tsx.snap index 8cc10ba8..7b3bc2eb 100644 --- a/src/pages/user/login/__snapshots__/login.test.tsx.snap +++ b/src/pages/user/login/__snapshots__/login.test.tsx.snap @@ -43,16 +43,16 @@ exports[`Login Page should login success 1`] = ` style="flex: 1 1 0%; padding: 32px 0px;" >