From 1e940183cd204eed39c0aa56a9144118ed54a6db Mon Sep 17 00:00:00 2001 From: lix Date: Mon, 7 Jul 2025 16:40:14 +0800 Subject: [PATCH] umi-tablayout --- config/NeiPai/router_neipai.ts | 8 +- config/config.UAT.ts | 2 +- config/config.dev.ts | 2 +- config/config.prod.ts | 2 +- config/config.sim.ts | 2 +- config/config.ts | 22 +++- config/proxy.ts | 8 +- mock/user.ts | 2 - package.json | 50 ++++----- src/app.less | 47 ++++++++ src/app.tsx | 101 ++++++++++++++++++ src/assets/close.tsx | 11 ++ src/assets/collapse.svg | 1 + src/assets/dashboard.tsx | 11 ++ src/assets/home-tab.svg | 1 + src/assets/ld_style.less | 2 - src/assets/lq_style.less | 3 - src/assets/xsy_style.less | 2 - src/baseStyle.less | 31 ++++-- src/components/Authorized/AuthorizedRoute.tsx | 2 +- src/components/Authorized/PromiseRender.tsx | 3 +- src/components/Authorized/Secured.tsx | 3 +- .../BiddingRoom/components/InstantMessage.js | 2 +- src/components/BiddingRoom/index.js | 4 +- .../GlobalHeader/AvatarDropdown.tsx | 2 +- .../GlobalHeader/NoticeIconView.tsx | 2 +- src/components/GlobalHeader/RightContent.tsx | 8 +- src/components/GlobalHeader/index.less | 2 +- src/components/HeaderDropdown/index.less | 2 +- src/components/HeaderSearch/index.less | 2 +- src/components/LayLeftMenu/index.tsx | 2 +- src/components/NoticeIcon/NoticeList.less | 2 +- src/components/NoticeIcon/index.less | 2 +- src/components/Promenu/index.tsx | 2 +- src/components/RiskModal/index.tsx | 2 +- src/global.less | 5 + src/global.tsx | 2 +- src/layouts/BasicLayout.tsx | 22 ++-- src/layouts/BlankLayout.tsx | 3 +- src/layouts/CosMenTabLsLayout.tsx | 10 +- src/layouts/CosMenTabsLayout.tsx | 9 +- src/layouts/CosMenuLayout.tsx | 9 +- src/layouts/RoomLayout.tsx | 6 +- src/layouts/SecurityLayout.tsx | 8 +- src/layouts/TopLayout.tsx | 8 +- src/layouts/UserLayout.less | 2 +- src/layouts/UserLayout.tsx | 31 +++--- src/models/global.ts | 2 +- src/models/setting.ts | 2 +- src/models/user.ts | 28 ++++- src/pages/401.tsx | 2 +- src/pages/404.tsx | 2 +- .../components/AuctionProjectBidding.tsx | 2 +- .../components/AuctionAnnouncementData.tsx | 4 +- .../components/AuctionInfoManage.tsx | 4 +- .../components/AuctionManagerProject.tsx | 2 +- .../components/AuctionProjectSuspension.tsx | 2 +- .../components/AuctionAnnouncementData.tsx | 4 +- .../Auction/Notice/components/AuctionList.tsx | 2 +- .../Auction/NoticeModal/noticeModalStyle.less | 2 +- .../BiddingAnnouncement/components/style.less | 2 +- .../structure/BiddingAnnoStructureForm.tsx | 2 +- src/pages/Bid/CostConfig/indexStyles.less | 2 +- src/pages/Bid/NoticeFileStruct/index.tsx | 2 +- .../Config/components/detailedStyles.less | 2 +- .../Config/components/firstStyles.less | 2 +- src/pages/Bid/ReviewConfig/Config/style.less | 2 +- .../ReviewConfig/FileConfig/indexStyles.less | 2 +- src/pages/Bid/ReviewConfig/List/index.tsx | 2 +- .../Bid/ReviewConfig/List/indexStyles.less | 2 +- src/pages/BidEvaluation/manager.js | 2 +- src/pages/Contract/ContractList.tsx | 2 +- src/pages/Contract/StepOne.tsx | 2 +- .../ManuPlatformManage/index.tsx | 2 +- .../ElecEvaluation/Monitor/Home/index.tsx | 2 +- src/pages/ElecEvaluation/Monitor/style.less | 2 +- .../MonitorScreen/Home/index.tsx | 2 +- .../MonitorScreen/Home/style.less | 2 +- .../MonitorScreen/MonitorRoom/style.less | 2 +- .../ProjectMonitorRoom/style.less | 2 +- .../PlaceAreasManage/components/Areas.tsx | 2 +- .../PlaceAreasManage/components/Place.tsx | 2 +- .../Online/components/OnlineSupervision.tsx | 2 +- .../Online/components/ReservedItems.tsx | 2 +- .../VideoMonitor/Post/index.tsx | 2 +- .../BiddingDocumentsDecrypt/index.less | 2 +- .../projectManager/FlowConfig/index.tsx | 2 +- src/pages/FormList/index.tsx | 2 +- .../HighQualityOperation/ClassroomList.tsx | 2 +- src/pages/HighQualityOperation/Detail.tsx | 2 +- .../HighQualityOperation/Home/index.less | 2 +- .../HighQualityOperation/JobStyleList.tsx | 2 +- .../HighQualityOperation/MarkProjectList.tsx | 2 +- .../HighQualityOperation/NewsStyleDetail.tsx | 2 +- .../PartyBranch/index.tsx | 2 +- .../PartyBranches/index.tsx | 2 +- .../PersonInfor/index.tsx | 2 +- .../HighQualityOperation/ProjectDetail.tsx | 2 +- src/pages/HighQualityOperation/style.less | 10 +- src/pages/HighQualityOperation/utils.ts | 2 +- src/pages/Loading/index.tsx | 2 +- .../LoadingPage/MiddleLoading/ChoiceLogin.tsx | 2 +- .../MiddleLoading/CommonApproval.tsx | 2 +- .../MiddleLoading/ToAppointment.tsx | 2 +- .../MiddleLoading/ToFindBusiness.tsx | 2 +- .../LoadingPage/MiddleLoading/ToHomePage.tsx | 2 +- .../LoadingPage/MiddleLoading/XunJia.tsx | 2 +- src/pages/LoadingPage/index.tsx | 2 +- src/pages/Login/index.tsx | 2 +- src/pages/Login/internal.tsx | 2 +- src/pages/MainPage/ProjectManager/Jury.js | 6 +- .../ProjectManager/disposalManager.js | 4 +- src/pages/MainPage/ProjectManager/index.less | 7 +- src/pages/MainPage/ProjectManager/manager.js | 4 +- .../MainPage/ProjectManager/managerAdmin.js | 4 +- .../ProjectManager/managerSubAdmin.js | 4 +- .../MainPage/ProjectManager/participants.js | 4 +- .../ProjectManager/purchaseManager.js | 4 +- src/pages/MainPage/ProjectManager/supplier.js | 4 +- .../ProjectManager/OpenList/openList.less | 2 +- .../ProjectManager/OpenList/vroom.less | 2 +- .../Opening/ProjectManager/Room/index.less | 2 +- .../PartyMemberTopic/ActivityStyle/index.tsx | 2 +- .../PartyMemberTopic/HardDetail/index.tsx | 2 +- src/pages/PartyMemberTopic/Home/index.less | 2 +- .../PartyMemberTopic/NewsDetail/index.tsx | 2 +- .../PartyMemberTopic/OverDifficult/index.tsx | 2 +- .../PartyMemberTopic/PartyBranch/index.tsx | 2 +- .../PartyMemberTopic/PartyBranches/index.tsx | 2 +- .../PartyMemberTopic/PersonInfor/index.tsx | 2 +- .../PartyMemberTopic/Style/ld_style.less | 2 +- src/pages/ProfileBasic/index.tsx | 2 +- src/pages/ProfileBasic/model.ts | 2 +- src/pages/ProfileBasic/style.less | 2 +- .../Project/EntrustAssign/manager/styles.less | 2 +- .../EntrustAssign/operator/styles.less | 2 +- src/pages/Project/EntrustWithdraw/styles.less | 2 +- .../Examination/components/ProjectManage.tsx | 2 +- .../components/ProjectDocumentation.tsx | 2 +- .../ProjectInformationManagement/index.tsx | 2 +- .../components/PurchasingManagerEnquiries.tsx | 2 +- .../Supervision/components/FavoritesList.tsx | 2 +- .../Supervision/components/ProjectManage.tsx | 2 +- src/pages/ProjectFiles/file.tsx | 3 +- src/pages/ProjectFiles/index.tsx | 2 +- src/pages/ProjectFiles/service.ts | 2 +- src/pages/ProjectFiles/style.less | 2 +- src/pages/Questionnaire/questionAdd/index.tsx | 2 +- .../Questionnaire/questionList/index.tsx | 2 +- src/pages/System/Department/service.ts | 2 +- src/pages/System/User/service.ts | 2 +- .../message/components/approvalDetail.tsx | 2 +- .../message/components/messageDetail.tsx | 2 +- .../message/components/pageDetail.tsx | 2 +- .../JudgingPanel/List/judgList.less | 2 +- src/pages/Tender/ProjectsInvolved/index.tsx | 2 +- .../IParticipate/components/IParticipate.tsx | 2 +- .../components/InvitationLetter.tsx | 3 +- .../LookingForBusinessOpportunitiesList.tsx | 3 +- src/pages/Welcome.less | 2 +- .../Config/FirstLimited/detailedStyles.less | 2 +- .../Config/Offer/indexStyles.less | 2 +- .../Config/Offer/BiddingOpenList.tsx | 2 +- .../EditResponseFormat/EditResponseFormat.tsx | 2 +- .../ZTanPan/RoomConfig/Config/Talk/index.tsx | 2 +- .../RoomConfig/View/Manager/Sing/index.less | 2 +- src/pages/ZZhaoMu/JudgingPanel/index.tsx | 2 +- src/pages/ZZhaoMu/JudgingPanel/judgList.less | 2 +- .../IParticipate/components/IParticipate.tsx | 2 +- src/pages/newList/index.tsx | 2 +- src/pages/newList/newTable.tsx | 2 +- .../login/components/Login/index.less | 2 +- src/pages/usercloud/login/index.tsx | 2 +- src/pages/usercloud/login/style.less | 2 +- .../login/components/Login/index.less | 2 +- src/pages/usercooper/login/index.tsx | 2 +- src/pages/usercooper/login/style.less | 2 +- .../login/components/Login/index.less | 2 +- src/pages/userexpert/login/index.tsx | 2 +- src/pages/userexpert/login/style.less | 2 +- src/pages/userformal/login/index.tsx | 2 +- src/pages/userformal/login/style.less | 2 +- src/utils/IParticipateIn.tsx | 2 +- src/utils/lq.style.less | 2 +- src/utils/request.ts | 2 +- src/utils/useGoHome.ts | 12 +++ 186 files changed, 525 insertions(+), 294 deletions(-) create mode 100644 src/app.less create mode 100644 src/app.tsx create mode 100644 src/assets/close.tsx create mode 100644 src/assets/collapse.svg create mode 100644 src/assets/dashboard.tsx create mode 100644 src/assets/home-tab.svg create mode 100644 src/utils/useGoHome.ts diff --git a/config/NeiPai/router_neipai.ts b/config/NeiPai/router_neipai.ts index afebd25..b234ede 100644 --- a/config/NeiPai/router_neipai.ts +++ b/config/NeiPai/router_neipai.ts @@ -5,10 +5,10 @@ export default [ component: './Auction/AuctionProjectSuspension/components/AuctionProjectSuspension' }, //竞拍结果有人出价 - { - path: '/Auction/AuctionResults', - component: './Auction/AuctionResults/components/AuctionResults' - }, + // { + // path: '/Auction/AuctionResults', + // component: './Auction/AuctionResults/components/AuctionResults' + // }, //项目竞拍 { path: '/ProjectLayout/Auction/AuctionProjectBidding', diff --git a/config/config.UAT.ts b/config/config.UAT.ts index 6e23f3e..0b2a25a 100644 --- a/config/config.UAT.ts +++ b/config/config.UAT.ts @@ -1,4 +1,4 @@ -import { defineConfig } from 'umi'; +import { defineConfig } from '@umijs/max'; import proxy from './proxy'; export default defineConfig({ proxy: proxy['UAT'], diff --git a/config/config.dev.ts b/config/config.dev.ts index 06c4372..162e4fc 100644 --- a/config/config.dev.ts +++ b/config/config.dev.ts @@ -1,4 +1,4 @@ -import { defineConfig } from 'umi'; +import { defineConfig } from '@umijs/max'; import proxy from './proxy'; export default defineConfig({ proxy: proxy['dev'], diff --git a/config/config.prod.ts b/config/config.prod.ts index 5fbd4a6..3278b77 100644 --- a/config/config.prod.ts +++ b/config/config.prod.ts @@ -1,4 +1,4 @@ -import { defineConfig } from 'umi'; +import { defineConfig } from '@umijs/max'; import proxy from './proxy'; export default defineConfig({ proxy: proxy['prod'], diff --git a/config/config.sim.ts b/config/config.sim.ts index ebda6bf..86b5299 100644 --- a/config/config.sim.ts +++ b/config/config.sim.ts @@ -1,4 +1,4 @@ -import { defineConfig } from 'umi'; +import { defineConfig } from '@umijs/max'; import proxy from './proxy'; export default defineConfig({ proxy: proxy['sim'], diff --git a/config/config.ts b/config/config.ts index a9a52e6..317a28c 100644 --- a/config/config.ts +++ b/config/config.ts @@ -1,4 +1,4 @@ -import { defineConfig } from 'umi'; +import { defineConfig } from '@umijs/max'; import defaultSettings from './defaultSettings'; // import proxy from './proxy'; import PageRoutes from './router.config' @@ -9,8 +9,15 @@ const { REACT_APP_ENV } = process.env; export default defineConfig({ hash: true, antd: {}, - dva: { - hmr: true, + dva: {}, + plugins: [ + require.resolve('@alita/plugins/dist/keepalive'), + require.resolve('@alita/plugins/dist/tabs-layout'), + ], + keepalive: [/./], + tabsLayout: { + hasDropdown: false, + hasCustomTabs: true, }, locale: { default: 'zh-CN', @@ -30,10 +37,15 @@ export default defineConfig({ }, // umi routes: https://umijs.org/docs/routing routes: PageRoutes, + title: '招投标系统', + favicons: ['/favicon.ico'], + headScripts: [ + '/officecontrol/ntkobackground.min.20220624.js', + '/screen/jsencrypt.min.js', + '/screen/jsWebControl-1.0.0.min.js', + ], // Theme for antd: https://ant.design/docs/react/customize-theme-cn theme, - // @ts-ignore - title: false, ignoreMomentLocale: true, manifest: { basePath: '/', diff --git a/config/proxy.ts b/config/proxy.ts index e6b02da..d811250 100644 --- a/config/proxy.ts +++ b/config/proxy.ts @@ -5,7 +5,7 @@ export default { // changeOrigin: true, // pathRewrite: { '^': '' }, // }, - '/api/*': { + '/api': { // target: 'http://10.242.37.148:18022',//连接天宫的ng target: 'http://192.168.110.46:18030/',//连接天宫的ng changeOrigin: true, @@ -29,12 +29,12 @@ export default { pathRewrite: { '/api/biz-service-ebtp-extend': '' }, }, '/api/biz-service-ebtp-project': { - target: 'http://localhost:18012', + target: 'http://192.168.110.22:18012', changeOrigin: true, pathRewrite: { '/api/biz-service-ebtp-project': '' }, }, '/api/biz-service-ebtp-process': { - target: 'http://localhost:18011', + target: 'http://192.168.110.22:18011', changeOrigin: true, pathRewrite: { '/api/biz-service-ebtp-process': '' }, }, @@ -44,7 +44,7 @@ export default { // pathRewrite: { '/api/sys-manager-ebtp-project': '' }, // }, '/api/biz-service-ebtp-rsms': { - target: 'http://localhost:18014', + target: 'http://192.168.110.22:18014', changeOrigin: true, pathRewrite: { '/api/biz-service-ebtp-rsms': '' }, }, diff --git a/mock/user.ts b/mock/user.ts index 0a7f305..0bd9460 100644 --- a/mock/user.ts +++ b/mock/user.ts @@ -149,6 +149,4 @@ export default { path: '/base/category/list', }); }, - - 'GET /api/login/captcha': getFakeCaptcha, }; diff --git a/package.json b/package.json index f39e61a..6c56a81 100644 --- a/package.json +++ b/package.json @@ -4,16 +4,16 @@ "private": true, "description": "An out-of-box UI solution for enterprise applications", "scripts": { - "start-dev": "set NODE_OPTIONS=--openssl-legacy-provider & cross-env UMI_UI=none UMI_ENV=dev LOGIN_PATH=ebtp-frontend umi dev --port=3000", - "start-UAT": "set NODE_OPTIONS=--openssl-legacy-provider & cross-env UMI_UI=none UMI_ENV=UAT LOGIN_PATH=ebtp-frontend umi dev --port=3000", - "start-sim": "set NODE_OPTIONS=--openssl-legacy-provider & cross-env UMI_UI=none UMI_ENV=sim LOGIN_PATH=ebtp-frontend umi dev --port=3000", - "start-prod": "cross-env UMI_UI=none UMI_ENV=prod LOGIN_PATH=prod/ebtp-frontend umi dev --port=3000", - "build-dev": "cross-env UMI_ENV=dev LOGIN_PATH=ebtp-frontend umi build", - "build-UAT": "cross-env UMI_ENV=UAT LOGIN_PATH=ebtp-frontend umi build", - "build-sim": "cross-env UMI_ENV=sim LOGIN_PATH=ebtp-frontend umi build", - "build-prod": "cross-env UMI_ENV=prod LOGIN_PATH=prod/ebtp-frontend umi build", - "analyze": "cross-env ANALYZE=1 umi build", - "build": "umi build", + "start-dev": "set NODE_OPTIONS=--openssl-legacy-provider & cross-env UMI_UI=none UMI_ENV=dev LOGIN_PATH=ebtp-frontend PORT=3000 max dev", + "start-UAT": "set NODE_OPTIONS=--openssl-legacy-provider & cross-env UMI_UI=none UMI_ENV=UAT LOGIN_PATH=ebtp-frontend PORT=3000 max dev", + "start-sim": "set NODE_OPTIONS=--openssl-legacy-provider & cross-env UMI_UI=none UMI_ENV=sim LOGIN_PATH=ebtp-frontend PORT=3000 max dev", + "start-prod": "cross-env UMI_UI=none UMI_ENV=prod LOGIN_PATH=prod/ebtp-frontend PORT=3000 max dev", + "build-dev": "cross-env UMI_ENV=dev LOGIN_PATH=ebtp-frontend max build", + "build-UAT": "cross-env UMI_ENV=UAT LOGIN_PATH=ebtp-frontend max build", + "build-sim": "cross-env UMI_ENV=sim LOGIN_PATH=ebtp-frontend max build", + "build-prod": "cross-env UMI_ENV=prod LOGIN_PATH=prod/ebtp-frontend max build", + "analyze": "cross-env ANALYZE=1 max build", + "build": "max build", "deploy": "npm run site && npm run gh-pages", "dev": "npm run start:dev", "docker-hub:build": "docker build -f Dockerfile.hub -t ant-design-pro ./", @@ -26,8 +26,8 @@ "fetch:blocks": "pro fetch-blocks && npm run prettier", "gh-pages": "gh-pages -d dist", "i18n-remove": "pro i18n-remove --locale=zh-CN --write", - "postinstall": "umi g tmp", - "lint": "umi g tmp && npm run lint:js && npm run lint:style && npm run lint:prettier", + "postinstall": "max setup", + "lint": "max setup && npm run lint:js && npm run lint:style && npm run lint:prettier", "lint-staged:js": "eslint --ext .js,.jsx,.ts,.tsx ", "lint:fix": "eslint --fix --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src && npm run lint:style", "lint:js": "eslint --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src", @@ -35,15 +35,15 @@ "lint:style": "stylelint --fix \"src/**/*.less\" --syntax less", "prettier": "prettier -c --write \"src/**/*\"", "site": "npm run fetch:blocks && npm run build", - "start:dev": "cross-env REACT_APP_ENV=dev MOCK=none umi dev", - "start:no-mock": "cross-env MOCK=none umi dev", - "start:no-ui": "cross-env UMI_UI=none umi dev", - "start:pre": "cross-env REACT_APP_ENV=pre umi dev", - "start:test": "cross-env REACT_APP_ENV=test MOCK=none umi dev", + "start:dev": "cross-env REACT_APP_ENV=dev MOCK=none max dev", + "start:no-mock": "cross-env MOCK=none max dev", + "start:no-ui": "cross-env UMI_UI=none max dev", + "start:pre": "cross-env REACT_APP_ENV=pre max dev", + "start:test": "cross-env REACT_APP_ENV=test MOCK=none max dev", "pretest": "node ./tests/beforeTest", - "test": "umi test", + "test": "max test", "test:all": "node ./tests/run-tests.js", - "test:component": "umi test ./src/components", + "test:component": "max test ./src/components", "tsc": "tsc --noEmit" }, "lint-staged": { @@ -86,18 +86,17 @@ "react-cookies": "0.1.1", "react-dom": "16.14.0", "react-fast-marquee": "1.3.2", - "react-helmet-async": "^1.0.9", "react-player": "^2.12.0", "react-signature-canvas": "^1.0.3", "react-sortable-hoc": "^1.11.0", "sm-crypto": "0.2.5", - "umi": "^3.4.8", + "@umijs/max": "^4.0.0", "umi-request": "^1.3.5", "use-merge-value": "1.0.2", "wangeditor": "4.7.5" }, "devDependencies": { - "@ant-design/pro-cli": "^1.0.18", + "@alita/plugins": "^3.5.5", "@types/classnames": "^2.2.7", "@types/express": "^4.17.0", "@types/history": "^4.7.2", @@ -108,12 +107,7 @@ "@types/react-dom": "^16.8.4", "@types/react-helmet": "^6.1.0", "@types/react-signature-canvas": "^1.0.2", - "@umijs/fabric": "^2.2.0", - "@umijs/plugin-blocks": "^2.0.5", - "@umijs/preset-ant-design-pro": "^1.2.0", - "@umijs/preset-react": "^1.4.8", - "@umijs/preset-ui": "^2.0.9", - "@umijs/yorkie": "^2.0.3", + "@umijs/lint": "^4.0.0", "carlo": "^0.9.46", "chalk": "^4.0.0", "cross-env": "^7.0.3", diff --git a/src/app.less b/src/app.less new file mode 100644 index 0000000..8900933 --- /dev/null +++ b/src/app.less @@ -0,0 +1,47 @@ +.rumtime-keep-alive-tabs-layout { + .custom-tab-bar-wrapper { + display: flex; + align-items: center; + flex-direction: row; + height: 34px; + margin-bottom: 14px; + + .custom-tab-bar-wrapper-left { + margin-right: 14px; + + .icon { + cursor: pointer; + } + } + + .custom-tab-bar { + &::before { + display: none; + } + + :global { + .ant-tabs-nav-wrap { + .ant-tabs-tab { + padding: 5px 14px 5px 12px; + border: 1px solid #EEEEEE; + border-radius: 4px !important; + color: @text-color; + background-color: #fff; + + &[data-node-key="/dashboard"] { + display: none; + } + + &.ant-tabs-tab-active { + background-color: @primary-color; + + .ant-tabs-tab-btn { + color: #fff; + } + } + } + } + } + } + } +} \ No newline at end of file diff --git a/src/app.tsx b/src/app.tsx new file mode 100644 index 0000000..bbc867b --- /dev/null +++ b/src/app.tsx @@ -0,0 +1,101 @@ +import React from 'react'; +import { Tabs, TabsProps } from 'antd'; +import { connect, Dispatch } from '@umijs/max'; +import { ConnectState } from '@/models/connect'; +import styles from './app.less'; +import CloseIcon from '@/assets/close'; +import collapseIcon from '@/assets/collapse.svg'; +import homeTabIcon from '@/assets/home-tab.svg'; +import useGoHome from '@/utils/useGoHome'; + +export function tabsLayout() { + return { + }; +} + +// 创建高阶函数来包装 renderTabBar 逻辑 +const createRenderTabBar = (dispatch: Dispatch, collapsed: boolean, goHome: () => void): TabsProps['renderTabBar'] => { + return (props, DefaultTabBar) => { + const handleCollapse = () => { + dispatch({ + type: 'global/changeLayoutCollapsed', + payload: !collapsed, + }); + } + + return ( +
+
+ collapse + home goHome()} /> +
+ +
+ ) + } +} + +function TabLayout({ + dispatch, + pathKeyMap, + collapsed, + isKeep, + keepElements, + navigate, + dropByCacheKey, + activeKey, +}: any) { + const goHome = useGoHome() + const activeKeyLowerCase = activeKey.toLowerCase(); + const items = Object.entries(keepElements.current).map( + ([pathname]: any) => { + const pathnameLowerCase = pathname.toLowerCase(); + const label = pathKeyMap.get(pathnameLowerCase)?.name || 'Unknown'; + const active = pathnameLowerCase === activeKeyLowerCase; + return ({ label, key: pathnameLowerCase, closeIcon: }) + }, + ) + + return ( + + ); +} + +export const getCustomTabs = () => { + return connect(({ user, global }: ConnectState) => ({ + pathKeyMap: user.pathKeyMap, + collapsed: global.collapsed, + }))(TabLayout); +}; \ No newline at end of file diff --git a/src/assets/close.tsx b/src/assets/close.tsx new file mode 100644 index 0000000..582df8a --- /dev/null +++ b/src/assets/close.tsx @@ -0,0 +1,11 @@ +import React from 'react'; +import Icon from '@ant-design/icons'; +import type { CustomIconComponentProps } from '@ant-design/icons/lib/components/Icon'; + +const CloseSvg = () => () + +const CloseIcon = (props: Partial) => ( + +); + +export default CloseIcon; \ No newline at end of file diff --git a/src/assets/collapse.svg b/src/assets/collapse.svg new file mode 100644 index 0000000..ef69d7a --- /dev/null +++ b/src/assets/collapse.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/dashboard.tsx b/src/assets/dashboard.tsx new file mode 100644 index 0000000..e8d5b58 --- /dev/null +++ b/src/assets/dashboard.tsx @@ -0,0 +1,11 @@ +import React from 'react'; +import Icon from '@ant-design/icons'; +import type { CustomIconComponentProps } from '@ant-design/icons/lib/components/Icon'; + +const DashboardSvg = () => () + +const DashboardIcon = (props: Partial) => ( + +); + +export default DashboardIcon; \ No newline at end of file diff --git a/src/assets/home-tab.svg b/src/assets/home-tab.svg new file mode 100644 index 0000000..8b75e8c --- /dev/null +++ b/src/assets/home-tab.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/ld_style.less b/src/assets/ld_style.less index 4450022..ffbc51a 100644 --- a/src/assets/ld_style.less +++ b/src/assets/ld_style.less @@ -1,5 +1,3 @@ -@import '~antd/es/style/themes/default.less'; - .bidContent{ padding: 0 24px; background: #fff; diff --git a/src/assets/lq_style.less b/src/assets/lq_style.less index 0f1f439..6fa40e6 100644 --- a/src/assets/lq_style.less +++ b/src/assets/lq_style.less @@ -1,6 +1,3 @@ -@import '~antd/es/style/themes/default.less'; - - .form-style .ant-select-selection-placeholder{ color: #333; } \ No newline at end of file diff --git a/src/assets/xsy_style.less b/src/assets/xsy_style.less index 977e3bc..8f2f152 100644 --- a/src/assets/xsy_style.less +++ b/src/assets/xsy_style.less @@ -1,5 +1,3 @@ -@import '~antd/es/style/themes/default.less'; - .bgCWhite{ background-color: white; } diff --git a/src/baseStyle.less b/src/baseStyle.less index 2a9643f..c4f8cdf 100644 --- a/src/baseStyle.less +++ b/src/baseStyle.less @@ -24,7 +24,6 @@ } .ant-menu { margin-top: 6px; - padding-top: 6px !important; } #root .ant-layout-sider { z-index: 0; @@ -167,10 +166,6 @@ color: #ffffff; } -.ant-tabs-tab { - margin: 0px 48px 0 0 !important; -} - .ant-pro-sider.ant-layout-sider.ant-pro-sider-fixed { box-shadow: none; } @@ -316,14 +311,38 @@ input::-webkit-outer-spin-button, .ant-menu.ant-menu-sub.ant-menu-inline { background-color: @menu-list-bg; + .ant-menu-item { + &.ant-menu-item-only-child { + padding-left: 40px !important; + height: 56px; + margin: 0; + padding-top: 16px; + padding-bottom: 16px; + } + } .ant-menu-item-selected { background-color: @menu-item-selected-bg; + border-right: 1px solid @primary-color; + &.ant-menu-item-only-child { + &::after { + display: none; + } + } } .ant-menu-item-selected a { - color: @primary-color; + color: #00508E; font-weight: bold; } } +.ant-pro-sider-menu>.ant-menu-submenu>.ant-menu-submenu-title>.ant-menu-title-content>.ant-pro-menu-item { + color: black; +} +.ant-pro-sider-menu .ant-menu-submenu-open.ant-menu-submenu-selected .ant-menu.ant-menu-sub.ant-menu-inline { + border-right: 3px solid @primary-color; +} +.ant-pro-sider-links { + display: none; +} // 修改全局分页器样式 .pagination-container { diff --git a/src/components/Authorized/AuthorizedRoute.tsx b/src/components/Authorized/AuthorizedRoute.tsx index c2eb08e..5304659 100644 --- a/src/components/Authorized/AuthorizedRoute.tsx +++ b/src/components/Authorized/AuthorizedRoute.tsx @@ -1,4 +1,4 @@ -import { Redirect, Route } from 'umi'; +import { Redirect, Route } from '@umijs/max'; import React from 'react'; import Authorized from './Authorized'; diff --git a/src/components/Authorized/PromiseRender.tsx b/src/components/Authorized/PromiseRender.tsx index 25f2597..62ecf72 100644 --- a/src/components/Authorized/PromiseRender.tsx +++ b/src/components/Authorized/PromiseRender.tsx @@ -2,6 +2,7 @@ import React from 'react'; import { Spin } from 'antd'; import isEqual from 'lodash/isEqual'; import { isComponentClass } from './Secured'; +import { Outlet } from '@umijs/max'; // eslint-disable-next-line import/no-cycle interface PromiseRenderProps { @@ -65,7 +66,7 @@ export default class PromiseRender extends React.Component< return (props: any) => ; } if (React.isValidElement(target)) { - return (props: any) => React.cloneElement(target, props); + return (props: any) => ; } return () => target as React.ReactNode & null; }; diff --git a/src/components/Authorized/Secured.tsx b/src/components/Authorized/Secured.tsx index 0bdbbe4..07cd48e 100644 --- a/src/components/Authorized/Secured.tsx +++ b/src/components/Authorized/Secured.tsx @@ -1,4 +1,5 @@ import React from 'react'; +import { Outlet } from '@umijs/max'; import CheckPermissions from './CheckPermissions'; /** @@ -24,7 +25,7 @@ const checkIsInstantiation = (target: React.ComponentClass | React.ReactNode) => return (props: any) => ; } if (React.isValidElement(target)) { - return (props: any) => React.cloneElement(target, props); + return (props: any) => ; } return () => target; }; diff --git a/src/components/BiddingRoom/components/InstantMessage.js b/src/components/BiddingRoom/components/InstantMessage.js index 70c7397..8f158db 100644 --- a/src/components/BiddingRoom/components/InstantMessage.js +++ b/src/components/BiddingRoom/components/InstantMessage.js @@ -1,7 +1,7 @@ import React, { useEffect, useRef, useState } from 'react'; import ReactDOM from 'react-dom'; import { Modal, Input, Button, Tabs, message, Form, Upload, Image, Card, Tooltip } from 'antd'; -import { useIntl } from 'umi'; +import { useIntl } from '@umijs/max'; import { getGroupList, getChartList, getChartList01, upDataChartCont, upLoad } from '../service'; import '../index.less'; import { isRegExp } from 'lodash'; diff --git a/src/components/BiddingRoom/index.js b/src/components/BiddingRoom/index.js index fdda94c..70fd995 100644 --- a/src/components/BiddingRoom/index.js +++ b/src/components/BiddingRoom/index.js @@ -1,5 +1,5 @@ -import { Divider, Button, Form, Card, Tabs, Table, Tooltip, Input, Select, Row, Col, message, Modal, Avatar, Tag } from 'antd'; -import { Link, history } from 'umi'; +import { Divider, Button, Form, Card, Tabs, Table, Tooltip, Input, Select, Row, Col, message, Modal, Avatar, Tag, } from 'antd'; +import { Link, history } from '@umijs/max'; import './index.less'; import styles from './index.less'; import { connect } from "dva"; diff --git a/src/components/GlobalHeader/AvatarDropdown.tsx b/src/components/GlobalHeader/AvatarDropdown.tsx index dd88b53..9c15031 100644 --- a/src/components/GlobalHeader/AvatarDropdown.tsx +++ b/src/components/GlobalHeader/AvatarDropdown.tsx @@ -1,7 +1,7 @@ import { LogoutOutlined, SettingOutlined, UserOutlined } from '@ant-design/icons'; import { Avatar, Menu, Spin } from 'antd'; import React from 'react'; -import { history, ConnectProps, connect } from 'umi'; +import { history, ConnectProps, connect } from '@umijs/max'; import { ConnectState } from '@/models/connect'; import { CurrentUser } from '@/models/user'; import HeaderDropdown from '../HeaderDropdown'; diff --git a/src/components/GlobalHeader/NoticeIconView.tsx b/src/components/GlobalHeader/NoticeIconView.tsx index 825d308..b5109f1 100644 --- a/src/components/GlobalHeader/NoticeIconView.tsx +++ b/src/components/GlobalHeader/NoticeIconView.tsx @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import { connect, ConnectProps } from 'umi'; +import { connect, ConnectProps } from '@umijs/max'; import { Tag, message } from 'antd'; import groupBy from 'lodash/groupBy'; import moment from 'moment'; diff --git a/src/components/GlobalHeader/RightContent.tsx b/src/components/GlobalHeader/RightContent.tsx index 9aafb44..073fabe 100644 --- a/src/components/GlobalHeader/RightContent.tsx +++ b/src/components/GlobalHeader/RightContent.tsx @@ -2,7 +2,7 @@ import { Avatar, Dropdown, Menu, message, Modal } from 'antd'; import { DownOutlined, UserOutlined, UserSwitchOutlined, CarryOutOutlined, HomeOutlined, ImportOutlined } from '@ant-design/icons'; import React, { useEffect, useRef } from 'react'; import moment from 'moment' -import { connect, history } from 'umi'; +import { connect, history, KeepAliveContext } from '@umijs/max'; import { ConnectState } from '@/models/connect'; import logo from '@/assets/logo.svg'; import './index.less'; @@ -15,6 +15,7 @@ import shutdownIcon from '@/assets/shutdown.svg'; import { logout } from './services'; import cookie from 'react-cookies'; import divider from '@/assets/divider.png'; +import useGoHome from '@/utils/useGoHome'; const theme = JSON.parse(PROJECT_THEME); @@ -24,6 +25,7 @@ const GlobalHeaderRight: React.FC<{}> = (props) => { const roleData = getSessionRoleData(); const [dataMenu, setDataMenu] = React.useState([]); const urlRef = useRef(null); + const goHome = useGoHome() const handelRole = (item: any) => { sessionStorage.setItem('roleData', JSON.stringify(item)); sessionStorage.setItem('roleAuthority', JSON.stringify([item.roleCode])); @@ -132,7 +134,9 @@ const GlobalHeaderRight: React.FC<{}> = (props) => {
  • - dashboard history.push('/Dashboard')}/> + dashboard { + goHome() + }} />
  • shutdown toLogout()}/> diff --git a/src/components/GlobalHeader/index.less b/src/components/GlobalHeader/index.less index 29fe6cb..b9bdc02 100644 --- a/src/components/GlobalHeader/index.less +++ b/src/components/GlobalHeader/index.less @@ -1,4 +1,4 @@ -@import '~antd/es/style/themes/default.less'; + .top-menu { .left-logo { diff --git a/src/components/HeaderDropdown/index.less b/src/components/HeaderDropdown/index.less index 7c5ad71..bd9adb9 100644 --- a/src/components/HeaderDropdown/index.less +++ b/src/components/HeaderDropdown/index.less @@ -1,4 +1,4 @@ -@import '~antd/es/style/themes/default.less'; + .container > * { background-color: @popover-bg; diff --git a/src/components/HeaderSearch/index.less b/src/components/HeaderSearch/index.less index 9af69d5..594d580 100644 --- a/src/components/HeaderSearch/index.less +++ b/src/components/HeaderSearch/index.less @@ -1,4 +1,4 @@ -@import '~antd/es/style/themes/default.less'; + .headerSearch { .input { diff --git a/src/components/LayLeftMenu/index.tsx b/src/components/LayLeftMenu/index.tsx index ef6e4e5..11306ee 100644 --- a/src/components/LayLeftMenu/index.tsx +++ b/src/components/LayLeftMenu/index.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect } from 'react'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import { getLeftMenu, getBtnText, diff --git a/src/components/NoticeIcon/NoticeList.less b/src/components/NoticeIcon/NoticeList.less index 65e0c40..ae2169d 100644 --- a/src/components/NoticeIcon/NoticeList.less +++ b/src/components/NoticeIcon/NoticeList.less @@ -1,4 +1,4 @@ -@import '~antd/es/style/themes/default.less'; + .list { max-height: 400px; diff --git a/src/components/NoticeIcon/index.less b/src/components/NoticeIcon/index.less index 45251cd..c2e82fc 100644 --- a/src/components/NoticeIcon/index.less +++ b/src/components/NoticeIcon/index.less @@ -1,4 +1,4 @@ -@import '~antd/es/style/themes/default.less'; + .popover { position: relative; diff --git a/src/components/Promenu/index.tsx b/src/components/Promenu/index.tsx index df22467..54d85d9 100644 --- a/src/components/Promenu/index.tsx +++ b/src/components/Promenu/index.tsx @@ -3,7 +3,7 @@ import { makeStyles, Theme } from '@material-ui/core/styles'; import AppBar from '@material-ui/core/AppBar'; import Tabs from '@material-ui/core/Tabs'; import { PageHeader, Button, message, Steps, Space, Card, Dropdown, Menu } from 'antd'; -import { Link, history } from 'umi'; +import { Link, history } from '@umijs/max'; import './index.less'; import { getReadInfo, menuList, updateReadStatus } from './service/service'; import { getProName, getSessionRoleData, getProTypeCode, getDefId, getPurchaseCanOperate, getReturnURL, getProId, getProMethod } from '@/utils/session'; diff --git a/src/components/RiskModal/index.tsx b/src/components/RiskModal/index.tsx index fd91b8f..8d2ccb4 100644 --- a/src/components/RiskModal/index.tsx +++ b/src/components/RiskModal/index.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { Button, Modal } from 'antd'; -import { history } from 'umi'; +import { history } from '@umijs/max'; interface RiskModalProps { modalVisible: boolean; diff --git a/src/global.less b/src/global.less index 8ce7662..d6565db 100644 --- a/src/global.less +++ b/src/global.less @@ -37,6 +37,11 @@ html body { text-rendering: optimizeLegibility; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; + background-color: #F5F7FA; +} + +.ant-pro-basicLayout > section.ant-layout>.ant-layout { + background: #F5F7FA; } ul, diff --git a/src/global.tsx b/src/global.tsx index 5e35503..a8c502a 100644 --- a/src/global.tsx +++ b/src/global.tsx @@ -1,7 +1,7 @@ import { Button, message, notification } from 'antd'; import React from 'react'; -import { useIntl } from 'umi'; +import { useIntl } from '@umijs/max'; import defaultSettings from '../config/defaultSettings'; const { pwa } = defaultSettings; diff --git a/src/layouts/BasicLayout.tsx b/src/layouts/BasicLayout.tsx index 5c8337b..1dd6416 100644 --- a/src/layouts/BasicLayout.tsx +++ b/src/layouts/BasicLayout.tsx @@ -4,7 +4,7 @@ import ProLayout, { Settings, } from '@ant-design/pro-layout'; import React, { useEffect, useMemo, useRef, useState } from 'react'; -import { Link, useIntl, connect, Dispatch, history } from 'umi'; +import { Link, connect, Dispatch, history, Outlet, useLocation, useKeepOutlets } from '@umijs/max'; import { Result, Button, message } from 'antd'; import Authorized from '@/utils/Authorized'; import RightContent from '@/components/GlobalHeader/RightContent'; @@ -96,17 +96,15 @@ const menuDataRender = (menuList: MenuDataItem[]): MenuDataItem[] => const BasicLayout: React.FC = (props) => { const { dispatch, - children, settings, - location = { - pathname: '/', - }, } = props; + const location = useLocation() const [menuData, setMenuData] = React.useState(); const [menuShow, setmenuShow] = React.useState(false); const menuDataRef = useRef([]); const mall3_token: any = sessionStorage.getItem('Authorization');//当前登录token const userData: any = getSessionUserData();//当前登录人信息 + const children = useKeepOutlets(); useEffect(() => { if (getSessionRoleData()?.roleId) { // let params = { @@ -429,7 +427,13 @@ const BasicLayout: React.FC = (props) => { } ] } - setMenuData( res.data || []) + setMenuData(res.data || []) + if (dispatch) { + dispatch({ + type: 'user/saveMenuData', + payload: res.data || [], + }); + } setmenuShow(true) // getMenu(params).then(res => { // if (res.code == 1) { @@ -463,7 +467,6 @@ const BasicLayout: React.FC = (props) => { }, [location.pathname], ); - const { formatMessage } = useIntl(); return menuShow ? ( menuICon(menuData)} logo={logo} @@ -492,7 +495,7 @@ const BasicLayout: React.FC = (props) => { breadcrumbRender={(routers = []) => [ { path: '/', - breadcrumbName: formatMessage({ id: 'menu.home' }), + breadcrumbName: '首页', }, ...routers, ]} @@ -509,6 +512,9 @@ const BasicLayout: React.FC = (props) => { menuDataRef.current = menuData || []; return menuData || []; }} + contentStyle={{ + backgroundColor: '#F5F7FA', + }} {...props} {...settings} > diff --git a/src/layouts/BlankLayout.tsx b/src/layouts/BlankLayout.tsx index cdc55b0..1c069a7 100644 --- a/src/layouts/BlankLayout.tsx +++ b/src/layouts/BlankLayout.tsx @@ -1,5 +1,6 @@ import React from 'react'; +import { Outlet } from '@umijs/max'; -const Layout: React.FC = ({ children }) => <>{children}; +const Layout: React.FC = () => ; export default Layout; diff --git a/src/layouts/CosMenTabLsLayout.tsx b/src/layouts/CosMenTabLsLayout.tsx index bf966f3..71b3389 100644 --- a/src/layouts/CosMenTabLsLayout.tsx +++ b/src/layouts/CosMenTabLsLayout.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useMemo, useRef } from 'react'; -import { Link } from 'umi'; +import { Link, Outlet, useLocation } from '@umijs/max'; import { Result, Button } from 'antd'; import Authorized from '@/utils/Authorized'; import { getMatchMenu } from '@umijs/route-utils'; @@ -32,12 +32,8 @@ const menuDataRender = (menuList: MenuDataItem[]): MenuDataItem[] => const CosMenTabLsLayout: React.FC = (props) => { const { dispatch, - children, - location = { - pathname: '/', - }, } = props; - + const location = useLocation() const menuDataRef = useRef([]); // useEffect(() => { @@ -63,7 +59,7 @@ const CosMenTabLsLayout: React.FC = (props) => {
    {/*
    */} - {children} +
    diff --git a/src/layouts/CosMenTabsLayout.tsx b/src/layouts/CosMenTabsLayout.tsx index ab4c963..b39bbf1 100644 --- a/src/layouts/CosMenTabsLayout.tsx +++ b/src/layouts/CosMenTabsLayout.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useMemo, useRef } from 'react'; -import { Link } from 'umi'; +import { Link, Outlet, useLocation } from '@umijs/max'; import { Result, Button } from 'antd'; import Authorized from '@/utils/Authorized'; import { getMatchMenu } from '@umijs/route-utils'; @@ -33,11 +33,8 @@ const menuDataRender = (menuList: MenuDataItem[]): MenuDataItem[] => const CosMenTabsLayout: React.FC = (props) => { const { dispatch, - children, - location = { - pathname: '/', - }, } = props; + const location = useLocation() const menuDataRef = useRef([]); @@ -62,7 +59,7 @@ const CosMenTabsLayout: React.FC = (props) => { - {children} + ); diff --git a/src/layouts/CosMenuLayout.tsx b/src/layouts/CosMenuLayout.tsx index b425000..a47655c 100644 --- a/src/layouts/CosMenuLayout.tsx +++ b/src/layouts/CosMenuLayout.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useMemo, useRef } from 'react'; -import { Link } from 'umi'; +import { Link, Outlet, useLocation } from '@umijs/max'; import { Result, Button } from 'antd'; import Authorized from '@/utils/Authorized'; import { getMatchMenu } from '@umijs/route-utils'; @@ -32,11 +32,8 @@ const menuDataRender = (menuList: MenuDataItem[]): MenuDataItem[] => const CosMenuLayout: React.FC = (props) => { const { dispatch, - children, - location = { - pathname: '/', - }, } = props; + const location = useLocation() const menuDataRef = useRef([]); @@ -60,7 +57,7 @@ const CosMenuLayout: React.FC = (props) => {
    - {children} +
    ); diff --git a/src/layouts/RoomLayout.tsx b/src/layouts/RoomLayout.tsx index 8cacd82..26f099d 100644 --- a/src/layouts/RoomLayout.tsx +++ b/src/layouts/RoomLayout.tsx @@ -1,5 +1,5 @@ import { MenuDataItem, getMenuData, getPageTitle } from '@ant-design/pro-layout'; -import { useIntl, ConnectProps, connect } from 'umi'; +import { useIntl, ConnectProps, connect, Outlet } from '@umijs/max'; import React from 'react'; import { ConnectState } from '@/models/connect'; import { Layout } from 'antd'; @@ -18,7 +18,7 @@ const RoomLayout: React.FC = (props) => { // } = props; // const { routes = [] } = route; const { - children, + // children, // location = { // pathname: '', // }, @@ -34,7 +34,7 @@ const RoomLayout: React.FC = (props) => { const { Content } = Layout; return ( - {children} + ); }; diff --git a/src/layouts/SecurityLayout.tsx b/src/layouts/SecurityLayout.tsx index fe351ba..8aca3fe 100644 --- a/src/layouts/SecurityLayout.tsx +++ b/src/layouts/SecurityLayout.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { PageLoading } from '@ant-design/pro-layout'; -import { Redirect, connect, ConnectProps } from 'umi'; +import { Navigate, connect, ConnectProps, Outlet } from '@umijs/max'; import { stringify } from 'querystring'; import { ConnectState } from '@/models/connect'; import { CurrentUser } from '@/models/user'; @@ -33,7 +33,7 @@ class SecurityLayout extends React.Component; } if (!isLogin && window.location.pathname !== '/user/login') { - return ; + return ; } - return children; + return ; } } diff --git a/src/layouts/TopLayout.tsx b/src/layouts/TopLayout.tsx index f3144ee..f9ffad6 100644 --- a/src/layouts/TopLayout.tsx +++ b/src/layouts/TopLayout.tsx @@ -1,5 +1,5 @@ import React, { useMemo, useRef } from 'react'; -import { Link } from 'umi'; +import { Link, Outlet, useLocation } from '@umijs/max'; import { Result, Button, Layout, Avatar } from 'antd'; import Authorized from '@/utils/Authorized'; import { getMatchMenu } from '@umijs/route-utils'; @@ -22,9 +22,7 @@ const noMatch = ( ); const TopLayout: React.FC<{}> = (props) => { - const { - children, - } = props; + const location = useLocation() const { Header, Content } = Layout; @@ -62,7 +60,7 @@ const TopLayout: React.FC<{}> = (props) => { - {children} + diff --git a/src/layouts/UserLayout.less b/src/layouts/UserLayout.less index cdc207e..cf7d2bb 100644 --- a/src/layouts/UserLayout.less +++ b/src/layouts/UserLayout.less @@ -1,4 +1,4 @@ -@import '~antd/es/style/themes/default.less'; + .container { display: flex; diff --git a/src/layouts/UserLayout.tsx b/src/layouts/UserLayout.tsx index 508933e..fb159a0 100644 --- a/src/layouts/UserLayout.tsx +++ b/src/layouts/UserLayout.tsx @@ -1,6 +1,15 @@ import { MenuDataItem, getMenuData, getPageTitle } from '@ant-design/pro-layout'; -import { Helmet, HelmetProvider } from 'react-helmet-async'; -import { SelectLang, useIntl, ConnectProps, connect } from 'umi'; +import { + SelectLang, + useIntl, + ConnectProps, + connect, + Outlet, + useAppData, + useLocation, + Helmet, + HelmetProvider +} from '@umijs/max'; import React from 'react'; import { ConnectState } from '@/models/connect'; import styles from './UserLayout.less'; @@ -12,20 +21,10 @@ export interface UserLayoutProps extends Partial { } const UserLayout: React.FC = (props) => { - const { - route = { - routes: [], - }, - } = props; - const { routes = [] } = route; - const { - children, - location = { - pathname: '', - }, - } = props; + const { clientRoutes } = useAppData(); + const location = useLocation(); const { formatMessage } = useIntl(); - const { breadcrumb } = getMenuData(routes); + const { breadcrumb } = getMenuData(clientRoutes); const title = getPageTitle({ pathname: location.pathname, formatMessage, @@ -50,7 +49,7 @@ const UserLayout: React.FC = (props) => { 中国联通电子招投标系统-开发 */} - {children} + diff --git a/src/models/global.ts b/src/models/global.ts index 5d4c4e4..b4fe590 100644 --- a/src/models/global.ts +++ b/src/models/global.ts @@ -1,4 +1,4 @@ -import { Subscription, Reducer, Effect } from 'umi'; +import { Subscription, Reducer, Effect } from '@umijs/max'; import { NoticeIconData } from '@/components/NoticeIcon'; import { queryNotices } from '@/services/user'; diff --git a/src/models/setting.ts b/src/models/setting.ts index 37a4ea7..e861b17 100644 --- a/src/models/setting.ts +++ b/src/models/setting.ts @@ -1,4 +1,4 @@ -import { Reducer } from 'umi'; +import { Reducer } from '@umijs/max'; import defaultSettings, { DefaultSettings } from '../../config/defaultSettings'; export interface SettingModelType { diff --git a/src/models/user.ts b/src/models/user.ts index ff5160d..5e802c8 100644 --- a/src/models/user.ts +++ b/src/models/user.ts @@ -1,4 +1,4 @@ -import { Effect, Reducer } from 'umi'; +import { Effect, Reducer } from '@umijs/max'; import { queryCurrent, query as queryUsers } from '@/services/user'; @@ -18,6 +18,8 @@ export interface CurrentUser { export interface UserModelState { currentUser?: CurrentUser; + menuData?: any[]; + pathKeyMap?: Map; } export interface UserModelType { @@ -30,6 +32,7 @@ export interface UserModelType { reducers: { saveCurrentUser: Reducer; changeNotifyCount: Reducer; + saveMenuData: Reducer; }; } @@ -38,6 +41,8 @@ const UserModel: UserModelType = { state: { currentUser: {}, + menuData: [], + pathKeyMap: new Map(), }, effects: { @@ -64,6 +69,27 @@ const UserModel: UserModelType = { currentUser: action.payload || {}, }; }, + saveMenuData(state, action) { + const menuData = action.payload || []; + const pathKeyMap = new Map(); + // 将menuData转换为pathKeyMap 递归处理 + const convertToPathKeyMap = (menuData: any[]) => { + menuData.forEach((item: any) => { + const path = item.path ? item.path.toLowerCase() : ''; + pathKeyMap.set(path, {name: item.name, icon: item.icon}); + if (item.children) { + convertToPathKeyMap(item.children); + } + }); + }; + convertToPathKeyMap(menuData); + pathKeyMap.set('/dashboard', { name: '首页' }); + return { + ...state, + menuData: action.payload || [], + pathKeyMap, + }; + }, changeNotifyCount( state = { currentUser: {}, diff --git a/src/pages/401.tsx b/src/pages/401.tsx index 9810220..af4c87d 100644 --- a/src/pages/401.tsx +++ b/src/pages/401.tsx @@ -3,7 +3,7 @@ import { getURLInformation, isNotEmpty } from '@/utils/CommonUtils'; import { getSessionRoleData } from '@/utils/session'; import { Button, Result, Typography } from 'antd'; import React, { useEffect, useState } from 'react'; -import { history } from 'umi'; +import { history } from '@umijs/max'; const messageMap = { 401: '您的用户信息有误，请联系管理员', diff --git a/src/pages/404.tsx b/src/pages/404.tsx index 7a11e17..7498301 100644 --- a/src/pages/404.tsx +++ b/src/pages/404.tsx @@ -1,6 +1,6 @@ import { Button, Result } from 'antd'; import React from 'react'; -import { history } from 'umi'; +import { history } from '@umijs/max'; const NoFoundPage: React.FC<{}> = () => ( = () => { diff --git a/src/pages/Auction/NoticeModal/noticeModalStyle.less b/src/pages/Auction/NoticeModal/noticeModalStyle.less index be852df..8cb7cb9 100644 --- a/src/pages/Auction/NoticeModal/noticeModalStyle.less +++ b/src/pages/Auction/NoticeModal/noticeModalStyle.less @@ -1,2 +1,2 @@ -@import '~antd/lib/style/themes/default.less'; + diff --git a/src/pages/Bid/BiddingAnnouncement/components/style.less b/src/pages/Bid/BiddingAnnouncement/components/style.less index 72ffe27..8f0075c 100644 --- a/src/pages/Bid/BiddingAnnouncement/components/style.less +++ b/src/pages/Bid/BiddingAnnouncement/components/style.less @@ -1,4 +1,4 @@ -@import '~antd/lib/style/themes/default.less'; + .card-onmouse { // margin:auto; diff --git a/src/pages/Bid/BiddingAnnouncement/structure/BiddingAnnoStructureForm.tsx b/src/pages/Bid/BiddingAnnouncement/structure/BiddingAnnoStructureForm.tsx index 4f0e5ed..e045668 100644 --- a/src/pages/Bid/BiddingAnnouncement/structure/BiddingAnnoStructureForm.tsx +++ b/src/pages/Bid/BiddingAnnouncement/structure/BiddingAnnoStructureForm.tsx @@ -15,7 +15,7 @@ import { UploadProps } from "antd/lib/upload/interface"; import { EditableProTable, ProColumns } from '@ant-design/pro-table'; import ExtendUpload from '@/utils/ExtendUpload'; import { SnowflakeID } from '@/services/untilService'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import Medias from './Medias'; const { Panel } = Collapse; const formLayout = { labelCol: { span: 8 }, wrapperCol: { span: 16 }, }; diff --git a/src/pages/Bid/CostConfig/indexStyles.less b/src/pages/Bid/CostConfig/indexStyles.less index b141b01..924c149 100644 --- a/src/pages/Bid/CostConfig/indexStyles.less +++ b/src/pages/Bid/CostConfig/indexStyles.less @@ -1,4 +1,4 @@ -@import '~antd/lib/style/themes/default.less'; + .headerStyle { border-bottom: solid; diff --git a/src/pages/Bid/NoticeFileStruct/index.tsx b/src/pages/Bid/NoticeFileStruct/index.tsx index f737cb3..15494c4 100644 --- a/src/pages/Bid/NoticeFileStruct/index.tsx +++ b/src/pages/Bid/NoticeFileStruct/index.tsx @@ -9,7 +9,7 @@ import Qfb from '@/images/notice/qfb.jpg'; import { getDicData, getSessionProjectData } from '@/utils/session'; import { returnDictVal } from '@/utils/CommonUtils'; import moment from 'moment'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import { btnAuthority } from '@/utils/authority'; import Medias from '../BiddingAnnouncement/components/Medias'; const NoticeFileStruct: React.FC<{}> = () => { diff --git a/src/pages/Bid/ReviewConfig/Config/components/detailedStyles.less b/src/pages/Bid/ReviewConfig/Config/components/detailedStyles.less index 989e9af..ba43973 100644 --- a/src/pages/Bid/ReviewConfig/Config/components/detailedStyles.less +++ b/src/pages/Bid/ReviewConfig/Config/components/detailedStyles.less @@ -1,4 +1,4 @@ -@import '~antd/lib/style/themes/default.less'; + .headerStyle { border-bottom: solid; diff --git a/src/pages/Bid/ReviewConfig/Config/components/firstStyles.less b/src/pages/Bid/ReviewConfig/Config/components/firstStyles.less index 8920328..40b00d6 100644 --- a/src/pages/Bid/ReviewConfig/Config/components/firstStyles.less +++ b/src/pages/Bid/ReviewConfig/Config/components/firstStyles.less @@ -1,4 +1,4 @@ -@import '~antd/lib/style/themes/default.less'; + .headerStyle { border-bottom: solid; diff --git a/src/pages/Bid/ReviewConfig/Config/style.less b/src/pages/Bid/ReviewConfig/Config/style.less index a194375..21a4448 100644 --- a/src/pages/Bid/ReviewConfig/Config/style.less +++ b/src/pages/Bid/ReviewConfig/Config/style.less @@ -1,4 +1,4 @@ -@import '~antd/lib/style/themes/default.less'; + .configDiv{ background-color:white ; diff --git a/src/pages/Bid/ReviewConfig/FileConfig/indexStyles.less b/src/pages/Bid/ReviewConfig/FileConfig/indexStyles.less index 94de583..2afbf87 100644 --- a/src/pages/Bid/ReviewConfig/FileConfig/indexStyles.less +++ b/src/pages/Bid/ReviewConfig/FileConfig/indexStyles.less @@ -1,4 +1,4 @@ -@import '~antd/lib/style/themes/default.less'; + .headerStyle { border-bottom: solid; diff --git a/src/pages/Bid/ReviewConfig/List/index.tsx b/src/pages/Bid/ReviewConfig/List/index.tsx index 330b2d9..03d1b27 100644 --- a/src/pages/Bid/ReviewConfig/List/index.tsx +++ b/src/pages/Bid/ReviewConfig/List/index.tsx @@ -3,7 +3,7 @@ import { Modal, Button, Form, Row, Col, Checkbox, message, Radio, Popconfirm, Sp import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table'; import tableProps from '@/utils/tableProps'; import { addItem, getPage, delOne, getSections, useConfig, usePage } from './services'; -import { Link } from 'umi'; +import { Link } from '@umijs/max'; import { getProId, getProMethod } from '@/utils/session'; import { getURLInformation } from '@/utils/CommonUtils' import './indexStyles.less' diff --git a/src/pages/Bid/ReviewConfig/List/indexStyles.less b/src/pages/Bid/ReviewConfig/List/indexStyles.less index ec2e31c..77db9c5 100644 --- a/src/pages/Bid/ReviewConfig/List/indexStyles.less +++ b/src/pages/Bid/ReviewConfig/List/indexStyles.less @@ -1,4 +1,4 @@ -@import '~antd/lib/style/themes/default.less'; + .headerStyle { border-bottom: solid; diff --git a/src/pages/BidEvaluation/manager.js b/src/pages/BidEvaluation/manager.js index 15f38bd..fcfdfc5 100644 --- a/src/pages/BidEvaluation/manager.js +++ b/src/pages/BidEvaluation/manager.js @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; import { Divider, Button, Form, Card, Tabs, Table, Tooltip, Input, Select, Row, Col, message, Modal, Popconfirm, Tag, InputNumber } from 'antd'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import ProTable from '@ant-design/pro-table'; import tableProps from '@/utils/tableProps'; import { getDictBidMethodDict, getProMethod, getRoomId, getDefId, getQuotationMethodById } from '@/utils/session'; diff --git a/src/pages/Contract/ContractList.tsx b/src/pages/Contract/ContractList.tsx index dd6ed37..2996e8e 100644 --- a/src/pages/Contract/ContractList.tsx +++ b/src/pages/Contract/ContractList.tsx @@ -1,5 +1,5 @@ import React, {useState, useRef} from 'react'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import {Input, Button, Modal, Form, Select, message, DatePicker} from 'antd'; import { SearchOutlined , UndoOutlined} from '@ant-design/icons'; import ProTable, {ActionType, ProColumns} from '@ant-design/pro-table'; diff --git a/src/pages/Contract/StepOne.tsx b/src/pages/Contract/StepOne.tsx index bbf8844..3647b85 100644 --- a/src/pages/Contract/StepOne.tsx +++ b/src/pages/Contract/StepOne.tsx @@ -1,7 +1,7 @@ import React, {useState} from 'react'; import { Form, Input, Select, Button, Spin, message } from 'antd'; const { Option } = Select; -import { useLocation } from 'umi'; +import { useLocation } from '@umijs/max'; import {createContract, updateContract} from "./ContractService"; import {history} from "@@/core/history"; diff --git a/src/pages/ElecEvaluation/ManuPlatformManage/index.tsx b/src/pages/ElecEvaluation/ManuPlatformManage/index.tsx index c98620a..ab42245 100644 --- a/src/pages/ElecEvaluation/ManuPlatformManage/index.tsx +++ b/src/pages/ElecEvaluation/ManuPlatformManage/index.tsx @@ -2,7 +2,7 @@ import { isNotEmpty } from '@/utils/CommonUtils'; import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table'; import { Button, Spin, message, Popconfirm } from 'antd'; import React, { useRef, useState } from 'react'; -import { useHistory } from 'umi'; +import { useHistory } from '@umijs/max'; import ManuPlatformModal from './modal/ManuPlatformModal'; import { getManuPlatformList, deleteManuPlatformInfo } from './service'; diff --git a/src/pages/ElecEvaluation/Monitor/Home/index.tsx b/src/pages/ElecEvaluation/Monitor/Home/index.tsx index 0a94a47..baed70a 100644 --- a/src/pages/ElecEvaluation/Monitor/Home/index.tsx +++ b/src/pages/ElecEvaluation/Monitor/Home/index.tsx @@ -21,7 +21,7 @@ import { getActiveSupplierAPI, getAnnoCountAPI, getAnnualAndTenderAgentAPI, getE import moment from 'moment'; import { isEmpty, isNotEmpty } from '@/utils/CommonUtils'; import { getDicData, getSessionUserData } from '@/utils/session'; -import { history } from 'umi'; +import { history } from '@umijs/max'; export const onCell = () => ({ className: "monitor-table-content" }); export const onHeaderCell = () => ({ className: "monitor-table-header", }); diff --git a/src/pages/ElecEvaluation/Monitor/style.less b/src/pages/ElecEvaluation/Monitor/style.less index 054a985..e586f2f 100644 --- a/src/pages/ElecEvaluation/Monitor/style.less +++ b/src/pages/ElecEvaluation/Monitor/style.less @@ -1,4 +1,4 @@ -@import '~antd/lib/style/themes/default.less'; + .flex-center { display: flex; diff --git a/src/pages/ElecEvaluation/MonitorScreen/Home/index.tsx b/src/pages/ElecEvaluation/MonitorScreen/Home/index.tsx index d587b47..c4eb10e 100644 --- a/src/pages/ElecEvaluation/MonitorScreen/Home/index.tsx +++ b/src/pages/ElecEvaluation/MonitorScreen/Home/index.tsx @@ -13,7 +13,7 @@ import moment from 'moment'; import { getApplicationData, getMonitorSample, getRoomProjectData, getTodayExpert, getTotalMapData, getWarnData } from './service'; import { debounce } from 'lodash'; import { RightCircleOutlined } from '@ant-design/icons'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import ScreenVideoPlay from '@/components/ElecBidEvaluation/ScreenVideoPlay'; export const onCell = (_: any, rowIndex: any) => ({ className: rowIndex % 2 == 0 ? "screen-table-odd-content" : "screen-table-even-content", }); diff --git a/src/pages/ElecEvaluation/MonitorScreen/Home/style.less b/src/pages/ElecEvaluation/MonitorScreen/Home/style.less index f9ddcef..b02ba7f 100644 --- a/src/pages/ElecEvaluation/MonitorScreen/Home/style.less +++ b/src/pages/ElecEvaluation/MonitorScreen/Home/style.less @@ -1,4 +1,4 @@ -@import '~antd/lib/style/themes/default.less'; + @screen-img-url: "~@/assets/screen"; @screen-color: #041a6d; diff --git a/src/pages/ElecEvaluation/MonitorScreen/MonitorRoom/style.less b/src/pages/ElecEvaluation/MonitorScreen/MonitorRoom/style.less index f2474dc..6846130 100644 --- a/src/pages/ElecEvaluation/MonitorScreen/MonitorRoom/style.less +++ b/src/pages/ElecEvaluation/MonitorScreen/MonitorRoom/style.less @@ -1,4 +1,4 @@ -@import '~antd/lib/style/themes/default.less'; + @screen-img-url: "~@/assets/screen"; .btn-common-s { diff --git a/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/style.less b/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/style.less index 480fb85..3fa295e 100644 --- a/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/style.less +++ b/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/style.less @@ -1,4 +1,4 @@ -@import '~antd/lib/style/themes/default.less'; + @screen-img-url: "~@/assets/screen"; .screen-flex-center { diff --git a/src/pages/ElecEvaluation/PlaceAreasManage/components/Areas.tsx b/src/pages/ElecEvaluation/PlaceAreasManage/components/Areas.tsx index 6be37b4..ee2033d 100644 --- a/src/pages/ElecEvaluation/PlaceAreasManage/components/Areas.tsx +++ b/src/pages/ElecEvaluation/PlaceAreasManage/components/Areas.tsx @@ -3,7 +3,7 @@ import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table'; import tableProps from '@/utils/tableProps'; import { Button, Spin, message, Popconfirm } from 'antd'; import React, { useRef, useState } from 'react'; -import { useHistory } from 'umi'; +import { useHistory } from '@umijs/max'; import AreasModal from './modal/AreasModal'; import { getAreasPage, deleteAreasInfo } from '../service'; diff --git a/src/pages/ElecEvaluation/PlaceAreasManage/components/Place.tsx b/src/pages/ElecEvaluation/PlaceAreasManage/components/Place.tsx index 2aa55b6..9b1842e 100644 --- a/src/pages/ElecEvaluation/PlaceAreasManage/components/Place.tsx +++ b/src/pages/ElecEvaluation/PlaceAreasManage/components/Place.tsx @@ -3,7 +3,7 @@ import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table'; import tableProps from '@/utils/tableProps'; import { Button, Spin, message, Popconfirm } from 'antd'; import React, { useRef, useState } from 'react'; -import { useHistory } from 'umi'; +import { useHistory } from '@umijs/max'; import PlaceModal from './modal/PlaceModal'; import { getPlacePage, deletePlaceInfo } from '../service'; import PcaSelect from './PcaSelect'; diff --git a/src/pages/ElecEvaluation/VideoMonitor/Online/components/OnlineSupervision.tsx b/src/pages/ElecEvaluation/VideoMonitor/Online/components/OnlineSupervision.tsx index 8181e6c..80c7a48 100644 --- a/src/pages/ElecEvaluation/VideoMonitor/Online/components/OnlineSupervision.tsx +++ b/src/pages/ElecEvaluation/VideoMonitor/Online/components/OnlineSupervision.tsx @@ -3,7 +3,7 @@ import ProTable, { ProColumns } from '@ant-design/pro-table'; import tableProps from '@/utils/tableProps'; import { Button, Spin, message } from 'antd'; import React, { useRef, useState } from 'react'; -import { useHistory } from 'umi'; +import { useHistory } from '@umijs/max'; import ViewModal from '../../ViewModal'; import { getPage } from '../../service'; import { btnAuthority } from '@/utils/authority'; diff --git a/src/pages/ElecEvaluation/VideoMonitor/Online/components/ReservedItems.tsx b/src/pages/ElecEvaluation/VideoMonitor/Online/components/ReservedItems.tsx index a837717..e282a23 100644 --- a/src/pages/ElecEvaluation/VideoMonitor/Online/components/ReservedItems.tsx +++ b/src/pages/ElecEvaluation/VideoMonitor/Online/components/ReservedItems.tsx @@ -3,7 +3,7 @@ import ProTable, { ProColumns } from '@ant-design/pro-table'; import tableProps from '@/utils/tableProps'; import { Button, Spin } from 'antd'; import React, { useRef, useState } from 'react'; -import { useHistory } from 'umi'; +import { useHistory } from '@umijs/max'; import ViewModal from '../../ViewModal'; import { getPage } from '../../service'; import { btnAuthority } from '@/utils/authority'; diff --git a/src/pages/ElecEvaluation/VideoMonitor/Post/index.tsx b/src/pages/ElecEvaluation/VideoMonitor/Post/index.tsx index 2f4ad26..06af078 100644 --- a/src/pages/ElecEvaluation/VideoMonitor/Post/index.tsx +++ b/src/pages/ElecEvaluation/VideoMonitor/Post/index.tsx @@ -3,7 +3,7 @@ import ProTable, { ProColumns } from '@ant-design/pro-table'; import tableProps from '@/utils/tableProps'; import { Button, Spin, message, Card } from 'antd'; import React, { useRef, useState } from 'react'; -import { useHistory } from 'umi'; +import { useHistory } from '@umijs/max'; import ViewModal from '../ViewModal'; import { getPage } from '../service'; import { btnAuthority } from '@/utils/authority'; diff --git a/src/pages/Evaluation/BiddingDocumentsDecrypt/index.less b/src/pages/Evaluation/BiddingDocumentsDecrypt/index.less index 2219456..9c3e82d 100644 --- a/src/pages/Evaluation/BiddingDocumentsDecrypt/index.less +++ b/src/pages/Evaluation/BiddingDocumentsDecrypt/index.less @@ -1,4 +1,4 @@ -@import '~antd/lib/style/themes/default.less'; + .header { background-color: rgb(170, 0, 0); diff --git a/src/pages/Evaluation/projectManager/FlowConfig/index.tsx b/src/pages/Evaluation/projectManager/FlowConfig/index.tsx index 4f0c564..0c701ab 100644 --- a/src/pages/Evaluation/projectManager/FlowConfig/index.tsx +++ b/src/pages/Evaluation/projectManager/FlowConfig/index.tsx @@ -3,7 +3,7 @@ import { Button, Table, Modal, Popconfirm, message, Spin, Form, Input, Select } import { getConfigList, deleteNode, deleteTurn, getMaxTurn, addTurn, addNode, getNodeList, getAssessRoom } from './service'; import '@/assets/ld_style.less'; import { getRoomId, getProMethod, getRoomReturnURL } from '@/utils/session'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import { ActionType } from '@ant-design/pro-table'; import { btnAuthority } from '@/utils/authority'; diff --git a/src/pages/FormList/index.tsx b/src/pages/FormList/index.tsx index 7b306f1..8019435 100644 --- a/src/pages/FormList/index.tsx +++ b/src/pages/FormList/index.tsx @@ -3,7 +3,7 @@ import { makeStyles, Theme } from '@material-ui/core/styles'; import AppBar from '@material-ui/core/AppBar'; import Tabs from '@material-ui/core/Tabs'; import { PageHeader, Button } from 'antd'; -import { Link } from 'umi'; +import { Link } from '@umijs/max'; import './index.less'; import { menuList } from './service/service'; diff --git a/src/pages/HighQualityOperation/ClassroomList.tsx b/src/pages/HighQualityOperation/ClassroomList.tsx index e561b3b..37c1879 100644 --- a/src/pages/HighQualityOperation/ClassroomList.tsx +++ b/src/pages/HighQualityOperation/ClassroomList.tsx @@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react'; import './style.less'; import { Input, List, Spin } from 'antd'; import { formatTime } from './utils'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import { getClassroomList } from './Home/service'; const { Search } = Input; diff --git a/src/pages/HighQualityOperation/Detail.tsx b/src/pages/HighQualityOperation/Detail.tsx index a4273d8..25c2bcc 100644 --- a/src/pages/HighQualityOperation/Detail.tsx +++ b/src/pages/HighQualityOperation/Detail.tsx @@ -4,7 +4,7 @@ import project_banner from '@/assets/highQuality/project_banner.jpg' import news_banner from '@/assets/highQuality/news_banner.jpg' import classroom_banner from '@/assets/highQuality/classroom_banner.jpg' import { formatCreateTime, formatTime, getDetailData, isNotEmpty } from './utils'; -import { history } from 'umi' +import { history } from '@umijs/max' import ReactPlayer from 'react-player'; import { LikeFilled, LikeOutlined, MessageOutlined, SyncOutlined } from '@ant-design/icons'; import { clickLikes, downloadVideo, getCommentsCount, getCommentsList, getLikesCount, isUserLike, saveComment } from './Home/service'; diff --git a/src/pages/HighQualityOperation/Home/index.less b/src/pages/HighQualityOperation/Home/index.less index c9a8d3c..e9c1626 100644 --- a/src/pages/HighQualityOperation/Home/index.less +++ b/src/pages/HighQualityOperation/Home/index.less @@ -1,4 +1,4 @@ -@import '~antd/es/style/themes/default.less'; + .h-topic-global { width: 100%; diff --git a/src/pages/HighQualityOperation/JobStyleList.tsx b/src/pages/HighQualityOperation/JobStyleList.tsx index 9edf665..38b7938 100644 --- a/src/pages/HighQualityOperation/JobStyleList.tsx +++ b/src/pages/HighQualityOperation/JobStyleList.tsx @@ -4,7 +4,7 @@ import { Input, List, Spin } from 'antd'; import topic_activity_default from '@/assets/topic/topic_activity_default.jpg' import time_icon from '@/assets/topic/timeIcon.png' import { getImageUrl } from './utils'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import { getHomeGraceful } from './Home/service'; const { Search } = Input; diff --git a/src/pages/HighQualityOperation/MarkProjectList.tsx b/src/pages/HighQualityOperation/MarkProjectList.tsx index db2e31c..0a613e4 100644 --- a/src/pages/HighQualityOperation/MarkProjectList.tsx +++ b/src/pages/HighQualityOperation/MarkProjectList.tsx @@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react'; import './style.less'; import { Input, List, Spin } from 'antd'; import { formatTime } from './utils'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import { getHomeProject } from './Home/service'; const { Search } = Input; diff --git a/src/pages/HighQualityOperation/NewsStyleDetail.tsx b/src/pages/HighQualityOperation/NewsStyleDetail.tsx index 7e0adf7..56aed92 100644 --- a/src/pages/HighQualityOperation/NewsStyleDetail.tsx +++ b/src/pages/HighQualityOperation/NewsStyleDetail.tsx @@ -2,7 +2,7 @@ import React from 'react'; import './style.less'; import news_banner from '@/assets/highQuality/news_banner.jpg' import { formatTime, getDetailData } from './utils'; -import { history } from 'umi'; +import { history } from '@umijs/max'; const NewsStyleDetail: React.FC<{}> = () => { //session detailData diff --git a/src/pages/HighQualityOperation/PartyBranch/index.tsx b/src/pages/HighQualityOperation/PartyBranch/index.tsx index bb7002c..33bc8c5 100644 --- a/src/pages/HighQualityOperation/PartyBranch/index.tsx +++ b/src/pages/HighQualityOperation/PartyBranch/index.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react'; import '../style.less'; import { Input, List } from 'antd'; -import { history } from 'umi' +import { history } from '@umijs/max' import { getBranchList, getMemberAndBranch } from '../Home/service'; import person from '@/assets/topic/person.png' import branch from '@/assets/topic/branch.png' diff --git a/src/pages/HighQualityOperation/PartyBranches/index.tsx b/src/pages/HighQualityOperation/PartyBranches/index.tsx index 96a515e..18a2281 100644 --- a/src/pages/HighQualityOperation/PartyBranches/index.tsx +++ b/src/pages/HighQualityOperation/PartyBranches/index.tsx @@ -3,7 +3,7 @@ import '../style.less'; import { Input, List, Spin } from 'antd'; import { getBranchesList } from '../Home/service'; import person from '@/assets/topic/person.png' -import { history } from 'umi'; +import { history } from '@umijs/max'; const { Search } = Input; diff --git a/src/pages/HighQualityOperation/PersonInfor/index.tsx b/src/pages/HighQualityOperation/PersonInfor/index.tsx index 8c29dfa..596105b 100644 --- a/src/pages/HighQualityOperation/PersonInfor/index.tsx +++ b/src/pages/HighQualityOperation/PersonInfor/index.tsx @@ -4,7 +4,7 @@ import { Input, List, Spin } from 'antd'; import { getMemberList, memberListSearch } from '../Home/service'; import { isEmpty, isNotEmpty } from '../utils'; import emblem from '@/assets/topic/emblem.png' -import { history } from 'umi'; +import { history } from '@umijs/max'; const { Search } = Input; diff --git a/src/pages/HighQualityOperation/ProjectDetail.tsx b/src/pages/HighQualityOperation/ProjectDetail.tsx index 37efdb8..2855aef 100644 --- a/src/pages/HighQualityOperation/ProjectDetail.tsx +++ b/src/pages/HighQualityOperation/ProjectDetail.tsx @@ -1,7 +1,7 @@ import React from 'react'; import './style.less'; import project_banner from '@/assets/highQuality/project_banner.jpg' -import { history } from 'umi' +import { history } from '@umijs/max' import { getDetailData } from './utils'; const ProjectDetail: React.FC<{}> = () => { diff --git a/src/pages/HighQualityOperation/style.less b/src/pages/HighQualityOperation/style.less index 6a861d9..91b1755 100644 --- a/src/pages/HighQualityOperation/style.less +++ b/src/pages/HighQualityOperation/style.less @@ -1,4 +1,4 @@ -@import '~antd/es/style/themes/default.less'; + .h-page-container { width: 1460px; @@ -631,8 +631,8 @@ /* code 样式 */ code { display: inline-block; - *display: inline; - *zoom: 1; + + background-color: #f1f1f1; border-radius: 3px; padding: 3px 5px; @@ -719,8 +719,8 @@ /* code 样式 */ code { display: inline-block; - *display: inline; - *zoom: 1; + + background-color: #f1f1f1; border-radius: 3px; padding: 3px 5px; diff --git a/src/pages/HighQualityOperation/utils.ts b/src/pages/HighQualityOperation/utils.ts index 5e7039e..ff2a2fd 100644 --- a/src/pages/HighQualityOperation/utils.ts +++ b/src/pages/HighQualityOperation/utils.ts @@ -1,7 +1,7 @@ import { pictureDisplayPath } from "@/utils/DownloadUtils"; import { getSessionUserData } from "@/utils/session"; import moment from "moment"; -import { history } from 'umi'; +import { history } from '@umijs/max'; /** * 图片路径拼接 * @param filePath 图片路径 diff --git a/src/pages/Loading/index.tsx b/src/pages/Loading/index.tsx index a5ba3f4..6067b64 100644 --- a/src/pages/Loading/index.tsx +++ b/src/pages/Loading/index.tsx @@ -1,6 +1,6 @@ import React, { useEffect } from 'react'; import { message, Spin } from 'antd'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import { fgetUserMsg } from './service'; import { getDictionaries } from './BasDicData'; const Loading: React.FC<{}> = () => { diff --git a/src/pages/LoadingPage/MiddleLoading/ChoiceLogin.tsx b/src/pages/LoadingPage/MiddleLoading/ChoiceLogin.tsx index 7ebce87..0c051f5 100644 --- a/src/pages/LoadingPage/MiddleLoading/ChoiceLogin.tsx +++ b/src/pages/LoadingPage/MiddleLoading/ChoiceLogin.tsx @@ -2,7 +2,7 @@ import React, { useEffect, useRef } from 'react'; import '@/assets/zjl_style.less'; import chionceLoginPic01 from '@/assets/choiceLogin/chionceLoginPic01.png'; import chionceLoginPic02 from '@/assets/choiceLogin/chionceLoginPic02.png'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import { getToSecondUrl } from '../service'; import { Spin } from 'antd'; diff --git a/src/pages/LoadingPage/MiddleLoading/CommonApproval.tsx b/src/pages/LoadingPage/MiddleLoading/CommonApproval.tsx index f7e6a98..7767048 100644 --- a/src/pages/LoadingPage/MiddleLoading/CommonApproval.tsx +++ b/src/pages/LoadingPage/MiddleLoading/CommonApproval.tsx @@ -1,7 +1,7 @@ import React, { useEffect } from 'react'; import { message, Spin } from 'antd'; import { getURLInformation, isEmpty } from '@/utils/CommonUtils'; -import { history } from 'umi'; +import { history } from '@umijs/max'; const approvalMap = { '019': '/ExamineAndApprove/Announcement',//公告 diff --git a/src/pages/LoadingPage/MiddleLoading/ToAppointment.tsx b/src/pages/LoadingPage/MiddleLoading/ToAppointment.tsx index 9dc0ff5..47eb1ac 100644 --- a/src/pages/LoadingPage/MiddleLoading/ToAppointment.tsx +++ b/src/pages/LoadingPage/MiddleLoading/ToAppointment.tsx @@ -1,7 +1,7 @@ import React, { useEffect } from 'react'; import { Spin } from 'antd'; import { getSessionUserData } from '@/utils/session'; -import { history } from 'umi'; +import { history } from '@umijs/max'; const Loading: React.FC<{}> = () => { /** diff --git a/src/pages/LoadingPage/MiddleLoading/ToFindBusiness.tsx b/src/pages/LoadingPage/MiddleLoading/ToFindBusiness.tsx index 08f185f..cd11b38 100644 --- a/src/pages/LoadingPage/MiddleLoading/ToFindBusiness.tsx +++ b/src/pages/LoadingPage/MiddleLoading/ToFindBusiness.tsx @@ -1,7 +1,7 @@ import React, { useEffect } from 'react'; import { message, Spin } from 'antd'; import { getURLInformation, isEmpty } from '@/utils/CommonUtils'; -import { history } from 'umi'; +import { history } from '@umijs/max'; const Loading: React.FC<{}> = () => { /** * 寻找商机中转页 diff --git a/src/pages/LoadingPage/MiddleLoading/ToHomePage.tsx b/src/pages/LoadingPage/MiddleLoading/ToHomePage.tsx index 208e832..291b718 100644 --- a/src/pages/LoadingPage/MiddleLoading/ToHomePage.tsx +++ b/src/pages/LoadingPage/MiddleLoading/ToHomePage.tsx @@ -2,7 +2,7 @@ import React, { useEffect } from 'react'; import { message, Spin } from 'antd'; import { getURLInformation, isEmpty } from '@/utils/CommonUtils'; import { followUpAProjectManager, followUpAProjectSupplier, getSessionRoleData } from '@/utils/session'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import { getProjectById } from '../service'; const Loading: React.FC<{}> = () => { /** diff --git a/src/pages/LoadingPage/MiddleLoading/XunJia.tsx b/src/pages/LoadingPage/MiddleLoading/XunJia.tsx index d5506e7..d620ee6 100644 --- a/src/pages/LoadingPage/MiddleLoading/XunJia.tsx +++ b/src/pages/LoadingPage/MiddleLoading/XunJia.tsx @@ -3,7 +3,7 @@ import { message, Spin } from 'antd'; import { getURLInformation } from '@/utils/CommonUtils'; import { getProjectByInquiryId } from '../service'; import { followUpAProjectManager, followUpAProjectSupplier, getSessionRoleData } from '@/utils/session'; -import { history } from 'umi'; +import { history } from '@umijs/max'; const Loading: React.FC<{}> = () => { /** * 询价单查看（进入询价项目的首页） diff --git a/src/pages/LoadingPage/index.tsx b/src/pages/LoadingPage/index.tsx index b1aa6c7..b299ada 100644 --- a/src/pages/LoadingPage/index.tsx +++ b/src/pages/LoadingPage/index.tsx @@ -1,6 +1,6 @@ import React, { useEffect } from 'react'; import { message, Spin } from 'antd'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import { cloudReloadToken, cooperReloadToken, fgetUserMsg, getDictionaries, getTokenByCode } from './service'; import { getTotalURLInformation, getURLInformation, isNotEmpty } from '@/utils/CommonUtils'; import { refreshTokenApi } from '@/services/login'; diff --git a/src/pages/Login/index.tsx b/src/pages/Login/index.tsx index 8b464f7..93fb1b0 100644 --- a/src/pages/Login/index.tsx +++ b/src/pages/Login/index.tsx @@ -4,7 +4,7 @@ import { getUserList } from './service'; import { CooperfakeAccountLogin, ZjfakeAccountLogin,CloudfakeAccountLogin,testLogin } from '@/services/login'; import { setAuthority } from '@/utils/authority'; -import { history } from 'umi'; +import { history } from '@umijs/max'; const Index: React.FC<{}> = () => { // const [dateList, setDateList] = useState([]); const columns = [ diff --git a/src/pages/Login/internal.tsx b/src/pages/Login/internal.tsx index 66a9550..cf21d21 100644 --- a/src/pages/Login/internal.tsx +++ b/src/pages/Login/internal.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useRef, useState } from 'react'; import { Form, Input, Button, Checkbox, Card, Typography } from 'antd'; import { UserOutlined, LockOutlined, EyeInvisibleOutlined, EyeTwoTone } from '@ant-design/icons'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import cookie from 'react-cookies'; import CaptchaInput from '@/components/CaptchaInput'; import styles from './internal.less'; diff --git a/src/pages/MainPage/ProjectManager/Jury.js b/src/pages/MainPage/ProjectManager/Jury.js index a1a0322..bafe110 100644 --- a/src/pages/MainPage/ProjectManager/Jury.js +++ b/src/pages/MainPage/ProjectManager/Jury.js @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; import { Row, Col, Tooltip, Card, List, DatePicker, Button, Statistic, Modal } from 'antd'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import { connect } from 'dva'; import './index.less'; import talkPng from '@/images/talk/talk.png'; @@ -118,9 +118,9 @@ class Jury extends PureComponent { return ( <> {/* this.initChatUI()}>咨询服务︵8:30|12:3013:00|17:00︶ */} -
    +
    -
    }> +
    }> {Juryuplist != "" && Juryuplist.map((item) => { let routerPath = '' // if (item.key == '公开招标') { diff --git a/src/pages/MainPage/ProjectManager/disposalManager.js b/src/pages/MainPage/ProjectManager/disposalManager.js index f11effa..e8ba953 100644 --- a/src/pages/MainPage/ProjectManager/disposalManager.js +++ b/src/pages/MainPage/ProjectManager/disposalManager.js @@ -1,5 +1,5 @@ import React, { PureComponent } from 'react'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import { Row, Col, Tooltip, Card, List, DatePicker, Button, Statistic, Spin, Empty, message,Popconfirm } from 'antd'; import { connect } from 'dva'; import './index.less'; @@ -185,7 +185,7 @@ class manager extends PureComponent { > 平台操作咨询︵8:30|12:3013:00|17:00︶ -
    +
    history.push('/SystemMessage/message')}>更多
    }> {trelist != [] && trelist.map((item, index) => { diff --git a/src/pages/MainPage/ProjectManager/index.less b/src/pages/MainPage/ProjectManager/index.less index 21bbb4a..742a75b 100644 --- a/src/pages/MainPage/ProjectManager/index.less +++ b/src/pages/MainPage/ProjectManager/index.less @@ -1,15 +1,15 @@ -@import '~antd/es/style/themes/default.less'; + .dashboard{ width:100%; - height:calc(~"100% - 80px"); + height: 100%; min-width: 1090px; min-height: 775px; .topt{ width:100%; height:43%; background:#F0F2F5; - padding:10px 10px 10px 10px; + padding:0 0 10px 0; margin-bottom: 10px; border-radius: 5px; overflow-y:hidden; @@ -17,6 +17,7 @@ color:@primary-color; font-size:12px; cursor: pointer; + line-height: 32px; } .cardtresupplier{ height:100%; diff --git a/src/pages/MainPage/ProjectManager/manager.js b/src/pages/MainPage/ProjectManager/manager.js index 41bad5b..11c25ea 100644 --- a/src/pages/MainPage/ProjectManager/manager.js +++ b/src/pages/MainPage/ProjectManager/manager.js @@ -1,5 +1,5 @@ import React, { PureComponent } from 'react'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import { Row, Col, Tooltip, Card, List, DatePicker, Button, Statistic, Spin, Empty, message, Modal,Popconfirm, Space } from 'antd'; // import PageHeaderWrapper from '@/components/PageHeaderWrapper'; import { connect } from 'dva'; @@ -230,7 +230,7 @@ class manager extends PureComponent { kefuTip: true }) }}>平台操作咨询︵8:30|12:3013:00|17:00︶ -
    +
    { history.push('/SystemMessage/message') diff --git a/src/pages/MainPage/ProjectManager/managerAdmin.js b/src/pages/MainPage/ProjectManager/managerAdmin.js index 1ab882c..fb907e9 100644 --- a/src/pages/MainPage/ProjectManager/managerAdmin.js +++ b/src/pages/MainPage/ProjectManager/managerAdmin.js @@ -1,5 +1,5 @@ import React, { PureComponent } from 'react'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import { Row, Col, Tooltip, Card, List, DatePicker, Button, Statistic, Spin, Empty, message } from 'antd'; import { connect } from 'dva'; import './index.less'; @@ -52,7 +52,7 @@ class manager extends PureComponent { return ( <> {/* this.initChatUI()}>咨询服务︵8:30|12:3013:00|17:00︶ */} -
    +
    history.push('/notice/noticeList')}>更多
    }> {tlist != [] && tlist.map((item, index) => { diff --git a/src/pages/MainPage/ProjectManager/managerSubAdmin.js b/src/pages/MainPage/ProjectManager/managerSubAdmin.js index 59a5c00..e31d5b4 100644 --- a/src/pages/MainPage/ProjectManager/managerSubAdmin.js +++ b/src/pages/MainPage/ProjectManager/managerSubAdmin.js @@ -1,5 +1,5 @@ import React, { PureComponent } from 'react'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import { Row, Col, Tooltip, Card, List, DatePicker, Button, Statistic, Spin, Empty, message } from 'antd'; import { connect } from 'dva'; import './index.less'; @@ -51,7 +51,7 @@ class manager extends PureComponent { return ( <> {/* this.initChatUI()}>咨询服务︵8:30|12:3013:00|17:00︶ */} -
    +
    history.push('/notice/noticeList')}>更多
    }> {tlist != [] && tlist.map((item, index) => { diff --git a/src/pages/MainPage/ProjectManager/participants.js b/src/pages/MainPage/ProjectManager/participants.js index c7a1eb4..b1d8f47 100644 --- a/src/pages/MainPage/ProjectManager/participants.js +++ b/src/pages/MainPage/ProjectManager/participants.js @@ -1,5 +1,5 @@ import React, { PureComponent } from 'react'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import { Row, Col, Tooltip, Card, List, DatePicker, Button, Statistic, Spin, Empty, message, Popconfirm, Space } from 'antd'; import { connect } from 'dva'; import './index.less'; @@ -205,7 +205,7 @@ class manager extends PureComponent { kefuTip: true }) }}>平台操作咨询︵8:30|12:3013:00|17:00︶ -
    +
    history.push('/SystemMessage/message')}>更多
    }> {trelist != [] && trelist.map((item, index) => { diff --git a/src/pages/MainPage/ProjectManager/purchaseManager.js b/src/pages/MainPage/ProjectManager/purchaseManager.js index 917713f..47af8ac 100644 --- a/src/pages/MainPage/ProjectManager/purchaseManager.js +++ b/src/pages/MainPage/ProjectManager/purchaseManager.js @@ -1,5 +1,5 @@ import React, {PureComponent, useRef} from 'react'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import { Row, Col, @@ -318,7 +318,7 @@ class manager extends PureComponent { kefuTip: true }) }}>平台操作咨询︵8:30|12:3013:00|17:00︶ -
    +
    history.push('/SystemMessage/message')}>更多
    }> {trelist != [] && trelist.map((item, index) => { diff --git a/src/pages/MainPage/ProjectManager/supplier.js b/src/pages/MainPage/ProjectManager/supplier.js index c03512a..97b8f7f 100644 --- a/src/pages/MainPage/ProjectManager/supplier.js +++ b/src/pages/MainPage/ProjectManager/supplier.js @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; import { Row, Col, Tooltip, Card, List, DatePicker, Button, Statistic,Popconfirm, Space } from 'antd'; -import { history } from 'umi'; +import { history } from '@umijs/max'; // import PageHeaderWrapper from '@/components/PageHeaderWrapper'; import { connect } from 'dva'; import './index.less'; @@ -240,7 +240,7 @@ class supplier extends PureComponent { kefuTip: true }) }}>平台操作咨询︵8:30|12:3013:00|17:00︶ -
    +
    history.push('/SystemMessage/message')}>更多
    }> {trelist != [] && trelist.slice(0, 6).map((item, index) => { diff --git a/src/pages/Opening/ProjectManager/OpenList/openList.less b/src/pages/Opening/ProjectManager/OpenList/openList.less index de0ed73..ce3f955 100644 --- a/src/pages/Opening/ProjectManager/OpenList/openList.less +++ b/src/pages/Opening/ProjectManager/OpenList/openList.less @@ -1,4 +1,4 @@ -@import '~antd/lib/style/themes/default.less'; + .header { background-color: rgb(227, 0, 0); diff --git a/src/pages/Opening/ProjectManager/OpenList/vroom.less b/src/pages/Opening/ProjectManager/OpenList/vroom.less index 9747aa4..c1e6ce6 100644 --- a/src/pages/Opening/ProjectManager/OpenList/vroom.less +++ b/src/pages/Opening/ProjectManager/OpenList/vroom.less @@ -1,4 +1,4 @@ -@import '~antd/lib/style/themes/default.less'; + @media screen and (max-width: 1980px) { .backgroundt{ diff --git a/src/pages/Opening/ProjectManager/Room/index.less b/src/pages/Opening/ProjectManager/Room/index.less index dda2278..dba56e1 100644 --- a/src/pages/Opening/ProjectManager/Room/index.less +++ b/src/pages/Opening/ProjectManager/Room/index.less @@ -1,4 +1,4 @@ -@import '~antd/lib/style/themes/default.less'; + .header { background-color: #b30000; diff --git a/src/pages/PartyMemberTopic/ActivityStyle/index.tsx b/src/pages/PartyMemberTopic/ActivityStyle/index.tsx index 87cc0d5..d2aa0ba 100644 --- a/src/pages/PartyMemberTopic/ActivityStyle/index.tsx +++ b/src/pages/PartyMemberTopic/ActivityStyle/index.tsx @@ -5,7 +5,7 @@ import topic_activity_default from '@/assets/topic/topic_activity_default.jpg' import time_icon from '@/assets/topic/timeIcon.png' import { getGracefulList } from './service'; import { getImageUrl } from '../utils'; -import { history } from 'umi'; +import { history } from '@umijs/max'; const { Search } = Input; diff --git a/src/pages/PartyMemberTopic/HardDetail/index.tsx b/src/pages/PartyMemberTopic/HardDetail/index.tsx index 11e0276..9a32668 100644 --- a/src/pages/PartyMemberTopic/HardDetail/index.tsx +++ b/src/pages/PartyMemberTopic/HardDetail/index.tsx @@ -1,7 +1,7 @@ import React from 'react'; import '../Style/detailStyle.less'; import bannerProjectPic from '@/assets/topic/bannerProjectPic.jpg' -import { history } from 'umi' +import { history } from '@umijs/max' import { getDetailData } from '../utils'; const HardDetail: React.FC<{}> = () => { diff --git a/src/pages/PartyMemberTopic/Home/index.less b/src/pages/PartyMemberTopic/Home/index.less index 1ffaefb..a3f2366e 100644 --- a/src/pages/PartyMemberTopic/Home/index.less +++ b/src/pages/PartyMemberTopic/Home/index.less @@ -1,4 +1,4 @@ -@import '~antd/es/style/themes/default.less'; + .topic-global { width: 100%; diff --git a/src/pages/PartyMemberTopic/NewsDetail/index.tsx b/src/pages/PartyMemberTopic/NewsDetail/index.tsx index 5533ecc..348d30f 100644 --- a/src/pages/PartyMemberTopic/NewsDetail/index.tsx +++ b/src/pages/PartyMemberTopic/NewsDetail/index.tsx @@ -2,7 +2,7 @@ import React from 'react'; import '../Style/detailStyle.less'; import bannerPic from '@/assets/topic/bannerPic.jpg' import { formatTime, getDetailData } from '../utils'; -import { history } from 'umi'; +import { history } from '@umijs/max'; const NewsDetail: React.FC<{}> = () => { //session detailData diff --git a/src/pages/PartyMemberTopic/OverDifficult/index.tsx b/src/pages/PartyMemberTopic/OverDifficult/index.tsx index da576f3..c98a92b 100644 --- a/src/pages/PartyMemberTopic/OverDifficult/index.tsx +++ b/src/pages/PartyMemberTopic/OverDifficult/index.tsx @@ -3,7 +3,7 @@ import '../Style/ld_style.less'; import { Input, List, Spin } from 'antd'; import { getProjectList } from './service'; import { formatTime } from '../utils'; -import { history } from 'umi'; +import { history } from '@umijs/max'; const { Search } = Input; diff --git a/src/pages/PartyMemberTopic/PartyBranch/index.tsx b/src/pages/PartyMemberTopic/PartyBranch/index.tsx index 646dab4..5bcac2b 100644 --- a/src/pages/PartyMemberTopic/PartyBranch/index.tsx +++ b/src/pages/PartyMemberTopic/PartyBranch/index.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react'; import '../Style/ld_style.less'; import { Input, List } from 'antd'; -import { history } from 'umi' +import { history } from '@umijs/max' import { getBranchList, getMemberAndBranch } from './service'; import person from '@/assets/topic/person.png' import branch from '@/assets/topic/branch.png' diff --git a/src/pages/PartyMemberTopic/PartyBranches/index.tsx b/src/pages/PartyMemberTopic/PartyBranches/index.tsx index 32d8bb2..535982f 100644 --- a/src/pages/PartyMemberTopic/PartyBranches/index.tsx +++ b/src/pages/PartyMemberTopic/PartyBranches/index.tsx @@ -3,7 +3,7 @@ import '../Style/ld_style.less'; import { Input, List, Spin } from 'antd'; import { getBranchesList } from './service'; import person from '@/assets/topic/person.png' -import { history } from 'umi'; +import { history } from '@umijs/max'; const { Search } = Input; diff --git a/src/pages/PartyMemberTopic/PersonInfor/index.tsx b/src/pages/PartyMemberTopic/PersonInfor/index.tsx index 984c411..bde1a63 100644 --- a/src/pages/PartyMemberTopic/PersonInfor/index.tsx +++ b/src/pages/PartyMemberTopic/PersonInfor/index.tsx @@ -4,7 +4,7 @@ import { Input, List, Spin } from 'antd'; import { getMemberList, memberListSearch } from './service'; import { isEmpty, isNotEmpty } from '../utils'; import emblem from '@/assets/topic/emblem.png' -import { history } from 'umi'; +import { history } from '@umijs/max'; const { Search } = Input; diff --git a/src/pages/PartyMemberTopic/Style/ld_style.less b/src/pages/PartyMemberTopic/Style/ld_style.less index 3b654ef..f950227 100644 --- a/src/pages/PartyMemberTopic/Style/ld_style.less +++ b/src/pages/PartyMemberTopic/Style/ld_style.less @@ -1,4 +1,4 @@ -@import '~antd/es/style/themes/default.less'; + .page-container { width: 1460px; diff --git a/src/pages/ProfileBasic/index.tsx b/src/pages/ProfileBasic/index.tsx index 5c97ca6..602eb3a 100644 --- a/src/pages/ProfileBasic/index.tsx +++ b/src/pages/ProfileBasic/index.tsx @@ -2,7 +2,7 @@ import { Badge, Card, Descriptions, Divider, Table } from 'antd'; import React, { Component } from 'react'; import { PageContainer } from '@ant-design/pro-layout'; -import { connect, Dispatch } from 'umi'; +import { connect, Dispatch } from '@umijs/max'; import { BasicProfileDataType } from './data.d'; import styles from './style.less'; diff --git a/src/pages/ProfileBasic/model.ts b/src/pages/ProfileBasic/model.ts index ad30e75..0bba210 100644 --- a/src/pages/ProfileBasic/model.ts +++ b/src/pages/ProfileBasic/model.ts @@ -1,4 +1,4 @@ -import { Effect, Reducer } from 'umi'; +import { Effect, Reducer } from '@umijs/max'; import { BasicGood } from './data.d'; import { queryBasicProfile } from './service'; diff --git a/src/pages/ProfileBasic/style.less b/src/pages/ProfileBasic/style.less index 68f3c93..7b9ea6b 100644 --- a/src/pages/ProfileBasic/style.less +++ b/src/pages/ProfileBasic/style.less @@ -1,4 +1,4 @@ -@import '~antd/es/style/themes/default.less'; + .title { margin-bottom: 16px; diff --git a/src/pages/Project/EntrustAssign/manager/styles.less b/src/pages/Project/EntrustAssign/manager/styles.less index 76e3e2a..70ccd4d 100644 --- a/src/pages/Project/EntrustAssign/manager/styles.less +++ b/src/pages/Project/EntrustAssign/manager/styles.less @@ -1,4 +1,4 @@ -@import '~antd/lib/style/themes/default.less'; + .tableSearch{ .ant-col-5{ diff --git a/src/pages/Project/EntrustAssign/operator/styles.less b/src/pages/Project/EntrustAssign/operator/styles.less index 76e3e2a..70ccd4d 100644 --- a/src/pages/Project/EntrustAssign/operator/styles.less +++ b/src/pages/Project/EntrustAssign/operator/styles.less @@ -1,4 +1,4 @@ -@import '~antd/lib/style/themes/default.less'; + .tableSearch{ .ant-col-5{ diff --git a/src/pages/Project/EntrustWithdraw/styles.less b/src/pages/Project/EntrustWithdraw/styles.less index 76e3e2a..70ccd4d 100644 --- a/src/pages/Project/EntrustWithdraw/styles.less +++ b/src/pages/Project/EntrustWithdraw/styles.less @@ -1,4 +1,4 @@ -@import '~antd/lib/style/themes/default.less'; + .tableSearch{ .ant-col-5{ diff --git a/src/pages/Project/ProjectManage/Examination/components/ProjectManage.tsx b/src/pages/Project/ProjectManage/Examination/components/ProjectManage.tsx index 0269cf4..819a7d7 100644 --- a/src/pages/Project/ProjectManage/Examination/components/ProjectManage.tsx +++ b/src/pages/Project/ProjectManage/Examination/components/ProjectManage.tsx @@ -4,7 +4,7 @@ import ProTable, { ProColumns } from '@ant-design/pro-table'; import tableProps from '@/utils/tableProps'; import { Button, Spin } from 'antd'; import React, { useState } from 'react'; -import { useHistory } from 'umi'; +import { useHistory } from '@umijs/max'; import { getPage } from '../service'; interface ProjectManageProps { diff --git a/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ProjectDocumentation.tsx b/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ProjectDocumentation.tsx index 98ce7ee..e12df56 100644 --- a/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ProjectDocumentation.tsx +++ b/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ProjectDocumentation.tsx @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import { queryingPagingData } from '@/utils/PageUtils'; import { getDictNameByVal, getProjectTypeCode, getURLInformation, getUrlParam, getUrlRelativePath, isEmpty, isNotEmpty, multipleTypeTransform, proTableValueEnum, proTableValueEnumOther } from '@/utils/CommonUtils'; -import { useHistory } from 'umi'; +import { useHistory } from '@umijs/max'; import { followUpAProjectManager, getDicData, projectDataItem, getSessionUserData } from '@/utils/session'; import ExceptionHandling from './ExceptionHandling/ExceptionHandling'; import { Button, Card, Col, Popover, Progress, Row, Tag, message } from 'antd'; diff --git a/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/index.tsx b/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/index.tsx index 871abf1..7d58633 100644 --- a/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/index.tsx +++ b/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/index.tsx @@ -12,7 +12,7 @@ import ProcurementMethod8 from './components/ProcurementMethod8'; import ProcurementMethod9 from './components/ProcurementMethod9'; import PackageDivided from '@/pages/Project/ProjectManage/PackageDivided'; import { getId, getProjectIsUpdate, submitProject } from './service'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import { getProMethod, followUpAProjectManager, getSessionProjectData } from '@/utils/session'; import { CustomerServiceTwoTone } from '@ant-design/icons'; const { TabPane } = Tabs; diff --git a/src/pages/Project/ProjectManage/ProjectManager/PurchasingManagerEnquiries/components/PurchasingManagerEnquiries.tsx b/src/pages/Project/ProjectManage/ProjectManager/PurchasingManagerEnquiries/components/PurchasingManagerEnquiries.tsx index 2f4e87a..aa3e3d6 100644 --- a/src/pages/Project/ProjectManage/ProjectManager/PurchasingManagerEnquiries/components/PurchasingManagerEnquiries.tsx +++ b/src/pages/Project/ProjectManage/ProjectManager/PurchasingManagerEnquiries/components/PurchasingManagerEnquiries.tsx @@ -14,7 +14,7 @@ import ProTable, { ProColumns } from '@ant-design/pro-table'; import tableProps from '@/utils/tableProps'; import { Button, Card, PageHeader } from 'antd'; import React, { useState } from 'react'; -import { useHistory } from 'umi'; +import { useHistory } from '@umijs/max'; import kefu from '@/assets/img/kefu.png' //智慧客服 import { submitHiddenForm, createHiddenForm } from '@/utils/CustomerService' //智慧客服 const PurchasingManagerEnquiries: React.FC = () => { diff --git a/src/pages/Project/ProjectManage/Supervision/components/FavoritesList.tsx b/src/pages/Project/ProjectManage/Supervision/components/FavoritesList.tsx index 195f53e..857e34f 100644 --- a/src/pages/Project/ProjectManage/Supervision/components/FavoritesList.tsx +++ b/src/pages/Project/ProjectManage/Supervision/components/FavoritesList.tsx @@ -4,7 +4,7 @@ import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table'; import tableProps from '@/utils/tableProps'; import { Button, message, Popconfirm, Spin, Space, Tag } from 'antd'; import React, { useRef, useState } from 'react'; -import { useHistory } from 'umi'; +import { useHistory } from '@umijs/max'; import { getFavoritesList, removePublic, toPublic, updateReadStatus } from '../service'; interface FavoritesListProps { diff --git a/src/pages/Project/ProjectManage/Supervision/components/ProjectManage.tsx b/src/pages/Project/ProjectManage/Supervision/components/ProjectManage.tsx index 77fe988..d5bd4d4 100644 --- a/src/pages/Project/ProjectManage/Supervision/components/ProjectManage.tsx +++ b/src/pages/Project/ProjectManage/Supervision/components/ProjectManage.tsx @@ -4,7 +4,7 @@ import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table'; import tableProps from '@/utils/tableProps'; import { Button, message, Space, Spin, Tag } from 'antd'; import React, { useRef, useState } from 'react'; -import { useHistory } from 'umi'; +import { useHistory } from '@umijs/max'; import { getPage, removePublic, toPublic } from '../service'; interface ProjectManageProps { diff --git a/src/pages/ProjectFiles/file.tsx b/src/pages/ProjectFiles/file.tsx index 1ffcbc6..e3d0828 100644 --- a/src/pages/ProjectFiles/file.tsx +++ b/src/pages/ProjectFiles/file.tsx @@ -1,7 +1,8 @@ import { CloseCircleOutlined, MinusCircleOutlined, PlusOutlined } from '@ant-design/icons'; import {Button, Card, Col, Form, Popover, Row, message, Divider, Select, Input, Upload, Modal, Table} from 'antd'; import type { FormInstance } from 'antd'; -import { history, useLocation } from 'umi'; +import { history, useLocation } from '@umijs/max'; +import type { Location } from '@umijs/max'; import React, {useState, Fragment, useRef} from 'react'; import ProForm, { diff --git a/src/pages/ProjectFiles/index.tsx b/src/pages/ProjectFiles/index.tsx index 7279aec..bfe6cf9 100644 --- a/src/pages/ProjectFiles/index.tsx +++ b/src/pages/ProjectFiles/index.tsx @@ -1,6 +1,6 @@ import {Button, message, Modal, Table} from 'antd'; import React, {useEffect, useRef, useState} from 'react'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import { PageContainer } from '@ant-design/pro-layout'; import type { ProColumns, ActionType } from '@ant-design/pro-table'; import ProTable from '@ant-design/pro-table'; diff --git a/src/pages/ProjectFiles/service.ts b/src/pages/ProjectFiles/service.ts index d11e840..b1dfb9c 100644 --- a/src/pages/ProjectFiles/service.ts +++ b/src/pages/ProjectFiles/service.ts @@ -1,6 +1,6 @@ // @ts-ignore /* eslint-disable */ -import { request } from 'umi'; +import { request } from '@umijs/max'; // import { TableListItem } from './data'; const prefix = '/api/biz-service-ebtp-project/'; diff --git a/src/pages/ProjectFiles/style.less b/src/pages/ProjectFiles/style.less index 92835fe..d3627b5 100644 --- a/src/pages/ProjectFiles/style.less +++ b/src/pages/ProjectFiles/style.less @@ -1,4 +1,4 @@ -@import '~antd/es/style/themes/default.less'; + .card { margin-bottom: 24px; diff --git a/src/pages/Questionnaire/questionAdd/index.tsx b/src/pages/Questionnaire/questionAdd/index.tsx index 2bb8b36..c24cf5e 100644 --- a/src/pages/Questionnaire/questionAdd/index.tsx +++ b/src/pages/Questionnaire/questionAdd/index.tsx @@ -4,7 +4,7 @@ import { Button, Card, Checkbox, Col, DatePicker, Drawer, Form, Input, message, import '@/assets/ld_style.less' import { DeleteOutlined, DeleteTwoTone, EditTwoTone, ExclamationCircleOutlined } from '@ant-design/icons'; import { getURLInformation } from '@/utils/CommonUtils'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import moment from 'moment'; import { values } from 'lodash'; diff --git a/src/pages/Questionnaire/questionList/index.tsx b/src/pages/Questionnaire/questionList/index.tsx index 3123614..b008c2b 100644 --- a/src/pages/Questionnaire/questionList/index.tsx +++ b/src/pages/Questionnaire/questionList/index.tsx @@ -4,7 +4,7 @@ import tableProps from '@/utils/tableProps'; import { getList, publishQuestForm, stopQuestForm, recallQuestForm, deleteQuestForm } from './service'; import { Button, Card, message, Modal, Popconfirm, Spin, Table, Tabs } from 'antd'; import TabPane from '@ant-design/pro-card/lib/components/TabPane'; -import { history } from 'umi'; +import { history } from '@umijs/max'; const Index: React.FC<{}> = () => { const actionRef = useRef(); diff --git a/src/pages/System/Department/service.ts b/src/pages/System/Department/service.ts index 95e01b5..eaa2e4d 100644 --- a/src/pages/System/Department/service.ts +++ b/src/pages/System/Department/service.ts @@ -1,4 +1,4 @@ -import { request } from 'umi'; +import { request } from '@umijs/max'; export async function fetchAllDepartment(params: any) { return request(`/api/sys-manager-ebtp-project/v1/sysorg/queryAll`, { diff --git a/src/pages/System/User/service.ts b/src/pages/System/User/service.ts index c0c6d65..8ebb00d 100644 --- a/src/pages/System/User/service.ts +++ b/src/pages/System/User/service.ts @@ -1,4 +1,4 @@ -import { request } from 'umi'; +import { request } from '@umijs/max'; // 分页查询角色 export async function getPage(params: any) { diff --git a/src/pages/SystemMessage/message/components/approvalDetail.tsx b/src/pages/SystemMessage/message/components/approvalDetail.tsx index 6b360f7..1645fec 100644 --- a/src/pages/SystemMessage/message/components/approvalDetail.tsx +++ b/src/pages/SystemMessage/message/components/approvalDetail.tsx @@ -2,7 +2,7 @@ import { Button, Form, Input, Modal } from "antd" import React, { useEffect, useState } from "react" import { describeSiteMsgDetail, getProjectById, selectMsgRead } from '../service' import '@/assets/ld_style.less' -import { history } from 'umi'; +import { history } from '@umijs/max'; import { followUpAProjectManager, getDefId } from '@/utils/session'; const { TextArea } = Input; diff --git a/src/pages/SystemMessage/message/components/messageDetail.tsx b/src/pages/SystemMessage/message/components/messageDetail.tsx index b78ed42..54fff5b 100644 --- a/src/pages/SystemMessage/message/components/messageDetail.tsx +++ b/src/pages/SystemMessage/message/components/messageDetail.tsx @@ -2,7 +2,7 @@ import { followUpAProjectManager, followUpAProjectSupplier, getDefId, getSession import { Button, Form, Input, Modal } from "antd" import React, { useEffect, useState } from "react" import { describeSiteMsgDetail, selectMsgRead, getProjectById } from '../service' -import { history } from 'umi'; +import { history } from '@umijs/max'; const { TextArea } = Input; diff --git a/src/pages/SystemMessage/message/components/pageDetail.tsx b/src/pages/SystemMessage/message/components/pageDetail.tsx index 52f9491..d920b85 100644 --- a/src/pages/SystemMessage/message/components/pageDetail.tsx +++ b/src/pages/SystemMessage/message/components/pageDetail.tsx @@ -3,7 +3,7 @@ import { Color } from "chalk"; import React, { useEffect, useState } from "react" import { describeSiteMsgDetail, getProjectById, selectMsgRead } from '../service' import '@/assets/ld_style.less' -import { history } from 'umi'; +import { history } from '@umijs/max'; import { followUpAProjectSupplier } from '@/utils/session'; const { TextArea } = Input; diff --git a/src/pages/Tender/ProjectManager/JudgingPanel/List/judgList.less b/src/pages/Tender/ProjectManager/JudgingPanel/List/judgList.less index 3aafd3f..9619223 100644 --- a/src/pages/Tender/ProjectManager/JudgingPanel/List/judgList.less +++ b/src/pages/Tender/ProjectManager/JudgingPanel/List/judgList.less @@ -1,4 +1,4 @@ -@import '~antd/lib/style/themes/default.less'; + .headerDiv { // padding: 16px 24px 0px 0px; diff --git a/src/pages/Tender/ProjectsInvolved/index.tsx b/src/pages/Tender/ProjectsInvolved/index.tsx index 9428bc7..a0f9d23 100644 --- a/src/pages/Tender/ProjectsInvolved/index.tsx +++ b/src/pages/Tender/ProjectsInvolved/index.tsx @@ -6,7 +6,7 @@ import { getSection, exitProject, getProject, getOther, supplierRegister, exitPr import { getSupplierUserByUserInfo } from '@/utils/SupplierList/service' import { getProMethod, getSessionUserData } from '@/utils/session'; import '@/assets/ld_style.less'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import { followUpAProjectSupplier, getDicData } from '@/utils/session'; import { getDictName, getProjectTypeCode, getURLInformation, getUrlParam, getUrlRelativePath, isEmpty, isNotEmpty, multipleTypeTransform, proTableValueEnum, proTableValueEnumOther } from '@/utils/CommonUtils'; import { btnAuthority } from '@/utils/authority'; diff --git a/src/pages/Tender/supplier/IParticipate/components/IParticipate.tsx b/src/pages/Tender/supplier/IParticipate/components/IParticipate.tsx index 31ccf5d..226d4db 100644 --- a/src/pages/Tender/supplier/IParticipate/components/IParticipate.tsx +++ b/src/pages/Tender/supplier/IParticipate/components/IParticipate.tsx @@ -11,7 +11,7 @@ import { isEmpty } from 'lodash'; import { getAllFlowName, getAllFlowNameByRoomType, getbidQualification, moduleName } from '@/utils/FlowUtils'; import { btnAuthority } from '@/utils/authority'; import { DoubleRightOutlined, ExclamationCircleOutlined } from '@ant-design/icons'; -import { history } from 'umi'; +import { history } from '@umijs/max'; const fontColor = { color: 'red' diff --git a/src/pages/Tender/supplier/InvitationLetter/components/InvitationLetter.tsx b/src/pages/Tender/supplier/InvitationLetter/components/InvitationLetter.tsx index 788376b..1d15591 100644 --- a/src/pages/Tender/supplier/InvitationLetter/components/InvitationLetter.tsx +++ b/src/pages/Tender/supplier/InvitationLetter/components/InvitationLetter.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useRef, useState } from 'react'; import ProTable from '@ant-design/pro-table'; import tableProps from '@/utils/tableProps'; -import { useHistory } from 'umi'; +import { history } from '@umijs/max'; import { Button, Card, Checkbox, Form, Input, message, Modal, Spin, Tabs } from 'antd'; import { lookingForBussinessResp, participationSave } from '../service'; import '@/utils/lq.style.less'; @@ -57,7 +57,6 @@ const LookingForBusinessOpportunitiesList: React.FC = () => { //获取字典 const getDict: any = getDicData(); const dictData = JSON.parse(getDict); - const history = useHistory(); //弹出层标识 const [visible, setVisible] = useState(false); diff --git a/src/pages/Tender/supplier/LookingForBusinessOpportunities/components/LookingForBusinessOpportunitiesList.tsx b/src/pages/Tender/supplier/LookingForBusinessOpportunities/components/LookingForBusinessOpportunitiesList.tsx index 807419f..3c51451 100644 --- a/src/pages/Tender/supplier/LookingForBusinessOpportunities/components/LookingForBusinessOpportunitiesList.tsx +++ b/src/pages/Tender/supplier/LookingForBusinessOpportunities/components/LookingForBusinessOpportunitiesList.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useRef, useState } from 'react'; import ProTable from '@ant-design/pro-table'; +import { history } from '@umijs/max'; import tableProps from '@/utils/tableProps'; -import { useHistory } from 'umi'; import { Button, Card, Checkbox, Form, Input, message, Modal, PageHeader, Spin, Tabs } from 'antd'; import { getNoticeInfo, @@ -64,7 +64,6 @@ const LookingForBusinessOpportunitiesList: React.FC<{}> = () => { const dictData = JSON.parse(getDict); const [form] = Form.useForm(); - const history = useHistory(); //弹出层标识 const [visible, setVisible] = useState(false); diff --git a/src/pages/Welcome.less b/src/pages/Welcome.less index 914c40d..9327fb5 100644 --- a/src/pages/Welcome.less +++ b/src/pages/Welcome.less @@ -1,4 +1,4 @@ -@import '~antd/lib/style/themes/default.less'; + .pre { margin: 12px 0; diff --git a/src/pages/ZBiXuan/EvaluationRoom/Config/FirstLimited/detailedStyles.less b/src/pages/ZBiXuan/EvaluationRoom/Config/FirstLimited/detailedStyles.less index 917187b..9766ed0 100644 --- a/src/pages/ZBiXuan/EvaluationRoom/Config/FirstLimited/detailedStyles.less +++ b/src/pages/ZBiXuan/EvaluationRoom/Config/FirstLimited/detailedStyles.less @@ -1,4 +1,4 @@ -@import '~antd/lib/style/themes/default.less'; + .headerStyle { border-bottom: solid; diff --git a/src/pages/ZBiXuan/EvaluationRoom/Config/Offer/indexStyles.less b/src/pages/ZBiXuan/EvaluationRoom/Config/Offer/indexStyles.less index 344f2ac..f77f601 100644 --- a/src/pages/ZBiXuan/EvaluationRoom/Config/Offer/indexStyles.less +++ b/src/pages/ZBiXuan/EvaluationRoom/Config/Offer/indexStyles.less @@ -1,4 +1,4 @@ -@import '~antd/lib/style/themes/default.less'; + .headerStyle { border-bottom: solid; diff --git a/src/pages/ZTanPan/RoomConfig/Config/Offer/BiddingOpenList.tsx b/src/pages/ZTanPan/RoomConfig/Config/Offer/BiddingOpenList.tsx index 3c6bf75..5a7d69e 100644 --- a/src/pages/ZTanPan/RoomConfig/Config/Offer/BiddingOpenList.tsx +++ b/src/pages/ZTanPan/RoomConfig/Config/Offer/BiddingOpenList.tsx @@ -33,7 +33,7 @@ import React, { useEffect, useRef, useState } from 'react'; import { SortableContainer, SortableElement, SortableHandle } from 'react-sortable-hoc'; import { getTdocId } from '../Other/service'; import ItemizedQuotationList from './ItemizedQuotationList'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import style from './style.less'; import moment from 'moment'; import { deleteMenuList, getLastConf, getQuotationAttachment, saveResponseTime } from './service'; diff --git a/src/pages/ZTanPan/RoomConfig/Config/Other/EditResponseFormat/EditResponseFormat.tsx b/src/pages/ZTanPan/RoomConfig/Config/Other/EditResponseFormat/EditResponseFormat.tsx index f191595..4b535e8 100644 --- a/src/pages/ZTanPan/RoomConfig/Config/Other/EditResponseFormat/EditResponseFormat.tsx +++ b/src/pages/ZTanPan/RoomConfig/Config/Other/EditResponseFormat/EditResponseFormat.tsx @@ -6,7 +6,7 @@ import { getAllMenuList, getLastConf, getTdocId, saveResponseTime } from '../ser import MenuList from './components/MenuList'; import OrdinaryList from './components/OrdinaryList'; import StructuredList from './components/StructuredList'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import { echoDateTimeFormatter, saveDateTimeFormatter } from '@/utils/DateUtils'; import { getURLInformation } from '@/utils/CommonUtils'; import moment from 'moment'; diff --git a/src/pages/ZTanPan/RoomConfig/Config/Talk/index.tsx b/src/pages/ZTanPan/RoomConfig/Config/Talk/index.tsx index bebe48c..a214c17 100644 --- a/src/pages/ZTanPan/RoomConfig/Config/Talk/index.tsx +++ b/src/pages/ZTanPan/RoomConfig/Config/Talk/index.tsx @@ -1,7 +1,7 @@ import { Button } from 'antd'; import Title from 'antd/lib/typography/Title'; import React from 'react'; -import { history } from 'umi'; +import { history } from '@umijs/max'; const Index: React.FC<{}> = () => { const goBackPage = () => { diff --git a/src/pages/ZTanPan/RoomConfig/View/Manager/Sing/index.less b/src/pages/ZTanPan/RoomConfig/View/Manager/Sing/index.less index 8636ab9..28ed69f 100644 --- a/src/pages/ZTanPan/RoomConfig/View/Manager/Sing/index.less +++ b/src/pages/ZTanPan/RoomConfig/View/Manager/Sing/index.less @@ -1,4 +1,4 @@ -@import '~antd/lib/style/themes/default.less'; + .header { background-color: #b30000; diff --git a/src/pages/ZZhaoMu/JudgingPanel/index.tsx b/src/pages/ZZhaoMu/JudgingPanel/index.tsx index 90a4930..0965b35 100644 --- a/src/pages/ZZhaoMu/JudgingPanel/index.tsx +++ b/src/pages/ZZhaoMu/JudgingPanel/index.tsx @@ -11,7 +11,7 @@ import FileDown from '@/utils/Download'; import { DownOutlined, EllipsisOutlined, QuestionCircleOutlined, UploadOutlined } from '@ant-design/icons'; import { btnAuthority } from '@/utils/authority'; import RiskPrevention from '@/utils/RiskPrevention'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import { downloadPath } from '@/utils/DownloadUtils'; import ExpertPhotoUpload from '@/components/ElecBidEvaluation/ExpertPhotoUpload'; import { getUserPhoto, unlockAccount } from '@/pages/Tender/ProjectManager/JudgingPanel/List/service'; diff --git a/src/pages/ZZhaoMu/JudgingPanel/judgList.less b/src/pages/ZZhaoMu/JudgingPanel/judgList.less index 3aafd3f..9619223 100644 --- a/src/pages/ZZhaoMu/JudgingPanel/judgList.less +++ b/src/pages/ZZhaoMu/JudgingPanel/judgList.less @@ -1,4 +1,4 @@ -@import '~antd/lib/style/themes/default.less'; + .headerDiv { // padding: 16px 24px 0px 0px; diff --git a/src/pages/ZZhaoMu/Tender/supplier/IParticipate/components/IParticipate.tsx b/src/pages/ZZhaoMu/Tender/supplier/IParticipate/components/IParticipate.tsx index d226714..4f9eee2 100644 --- a/src/pages/ZZhaoMu/Tender/supplier/IParticipate/components/IParticipate.tsx +++ b/src/pages/ZZhaoMu/Tender/supplier/IParticipate/components/IParticipate.tsx @@ -10,7 +10,7 @@ import { getSessionProjectData } from '@/utils/session'; import { isEmpty } from 'lodash'; import { btnAuthority } from '@/utils/authority'; import { ExclamationCircleOutlined, DoubleRightOutlined } from '@ant-design/icons'; -import { history } from 'umi'; +import { history } from '@umijs/max'; const fontColor = { diff --git a/src/pages/newList/index.tsx b/src/pages/newList/index.tsx index 180dccf..3fb29af 100644 --- a/src/pages/newList/index.tsx +++ b/src/pages/newList/index.tsx @@ -9,7 +9,7 @@ import { PlusOutlined } from '@ant-design/icons'; import { addRule, queryRule, removeRule, updateRule } from './service'; import CreateForm from './components/CreateForm'; import UpdateForm, { FormValueType } from './components/UpdateForm'; -import { Link } from 'umi'; +import { Link } from '@umijs/max'; // interface EditableCellProps extends React.HTMLAttributes {//表格参数 diff --git a/src/pages/newList/newTable.tsx b/src/pages/newList/newTable.tsx index 591c87b..7b2187b 100644 --- a/src/pages/newList/newTable.tsx +++ b/src/pages/newList/newTable.tsx @@ -1,6 +1,6 @@ import React, { useState } from 'react'; import { Table, Input, InputNumber, Popconfirm, Form, Button } from 'antd'; -import { Link } from 'umi'; +import { Link } from '@umijs/max'; interface Item {//定义不向外暴露的接口，用来保存表单参数 key: string; diff --git a/src/pages/usercloud/login/components/Login/index.less b/src/pages/usercloud/login/components/Login/index.less index dc16aab..878f4db 100644 --- a/src/pages/usercloud/login/components/Login/index.less +++ b/src/pages/usercloud/login/components/Login/index.less @@ -1,4 +1,4 @@ -@import '~antd/es/style/themes/default.less'; + .login { :global { diff --git a/src/pages/usercloud/login/index.tsx b/src/pages/usercloud/login/index.tsx index f673ec6..9c5d138 100644 --- a/src/pages/usercloud/login/index.tsx +++ b/src/pages/usercloud/login/index.tsx @@ -1,6 +1,6 @@ import { Alert, Col, Form, Input, Row, Image, message } from 'antd'; import React, { useEffect, useState } from 'react'; -import { connect, Dispatch, history } from 'umi'; +import { connect, Dispatch, history } from '@umijs/max'; import { CloudfakeAccountLogin, refreshTokenApi, getPassword } from '@/services/login'; import LoginForm from './components/Login'; import styles from './style.less'; diff --git a/src/pages/usercloud/login/style.less b/src/pages/usercloud/login/style.less index d9bbbf3..5006988 100644 --- a/src/pages/usercloud/login/style.less +++ b/src/pages/usercloud/login/style.less @@ -1,4 +1,4 @@ -@import '~antd/es/style/themes/default.less'; + .main { width: 368px; diff --git a/src/pages/usercooper/login/components/Login/index.less b/src/pages/usercooper/login/components/Login/index.less index dc16aab..878f4db 100644 --- a/src/pages/usercooper/login/components/Login/index.less +++ b/src/pages/usercooper/login/components/Login/index.less @@ -1,4 +1,4 @@ -@import '~antd/es/style/themes/default.less'; + .login { :global { diff --git a/src/pages/usercooper/login/index.tsx b/src/pages/usercooper/login/index.tsx index e7da4d0..bd75a94 100644 --- a/src/pages/usercooper/login/index.tsx +++ b/src/pages/usercooper/login/index.tsx @@ -1,6 +1,6 @@ import { Alert, Col, Form, Input, Row, Image, message } from 'antd'; import React, { useEffect, useState } from 'react'; -import { connect, Dispatch, history } from 'umi'; +import { connect, Dispatch, history } from '@umijs/max'; import { CooperfakeAccountLogin, refreshTokenApi, getPassword } from '@/services/login'; import LoginForm from './components/Login'; import styles from './style.less'; diff --git a/src/pages/usercooper/login/style.less b/src/pages/usercooper/login/style.less index d9bbbf3..5006988 100644 --- a/src/pages/usercooper/login/style.less +++ b/src/pages/usercooper/login/style.less @@ -1,4 +1,4 @@ -@import '~antd/es/style/themes/default.less'; + .main { width: 368px; diff --git a/src/pages/userexpert/login/components/Login/index.less b/src/pages/userexpert/login/components/Login/index.less index dc16aab..878f4db 100644 --- a/src/pages/userexpert/login/components/Login/index.less +++ b/src/pages/userexpert/login/components/Login/index.less @@ -1,4 +1,4 @@ -@import '~antd/es/style/themes/default.less'; + .login { :global { diff --git a/src/pages/userexpert/login/index.tsx b/src/pages/userexpert/login/index.tsx index 7afd2e2..42f8da1 100644 --- a/src/pages/userexpert/login/index.tsx +++ b/src/pages/userexpert/login/index.tsx @@ -1,6 +1,6 @@ import { Alert, Col, Form, Input, Row, Image, message } from 'antd'; import React, { useEffect, useState } from 'react'; -import { connect, Dispatch, history } from 'umi'; +import { connect, Dispatch, history } from '@umijs/max'; import { refreshTokenApi, ZjfakeAccountLogin, getPassword } from '@/services/login'; import LoginForm from './components/Login'; import styles from './style.less'; diff --git a/src/pages/userexpert/login/style.less b/src/pages/userexpert/login/style.less index d9bbbf3..5006988 100644 --- a/src/pages/userexpert/login/style.less +++ b/src/pages/userexpert/login/style.less @@ -1,4 +1,4 @@ -@import '~antd/es/style/themes/default.less'; + .main { width: 368px; diff --git a/src/pages/userformal/login/index.tsx b/src/pages/userformal/login/index.tsx index 5b3016e..fa57c66 100644 --- a/src/pages/userformal/login/index.tsx +++ b/src/pages/userformal/login/index.tsx @@ -5,7 +5,7 @@ import './style.less'; import { changePass, showFaceTab } from './service'; import logo from '@/images/login/logoPic.png'; import { refreshTokenApi, ZjfakeAccountLogin, ZjfakeFaceLogin } from '@/services/login'; -import { history } from 'umi'; +import { history } from '@umijs/max'; import cookie from 'react-cookies'; import moment from 'moment'; import FrameFaceLogin from '../faceLogin/FrameFaceLogin'; diff --git a/src/pages/userformal/login/style.less b/src/pages/userformal/login/style.less index 471145a..fb2525c 100644 --- a/src/pages/userformal/login/style.less +++ b/src/pages/userformal/login/style.less @@ -1,4 +1,4 @@ -@import '~antd/es/style/themes/default.less'; + .login-box{ height: 100vh; diff --git a/src/utils/IParticipateIn.tsx b/src/utils/IParticipateIn.tsx index 49c01e8..7b19126 100644 --- a/src/utils/IParticipateIn.tsx +++ b/src/utils/IParticipateIn.tsx @@ -11,7 +11,7 @@ import ProTable from '@ant-design/pro-table'; import tableProps from '@/utils/tableProps'; import { Button, Card, Checkbox, Form, Input, message, Modal } from 'antd'; import React, { useEffect, useState } from 'react'; -import { useHistory } from 'umi'; +import { useHistory } from '@umijs/max'; import { getBidMethodDictTypeCode, getProTypeCodeByBidMethodDict, isNotEmpty } from './CommonUtils'; import { queryingPagingData } from './PageUtils'; diff --git a/src/utils/lq.style.less b/src/utils/lq.style.less index 38c6c45..64dd3b2 100644 --- a/src/utils/lq.style.less +++ b/src/utils/lq.style.less @@ -6,7 +6,7 @@ * @Description: In User Settings Edit * @FilePath: \ebtp-cloud-frontend\src\utils\lq.style.less */ -@import '~antd/es/style/themes/default.less'; + @themeColors:#cb0000; @buttonColors:#1890ff; diff --git a/src/utils/request.ts b/src/utils/request.ts index db5c5b9..99b1e59 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -5,7 +5,7 @@ import { extend } from 'umi-request'; import { message } from 'antd'; import { getSessionRoleData, getUserToken } from '@/utils/session'; -import { history } from 'umi'; +import { history } from '@umijs/max'; const codeMessage = { 200: '服务器成功返回请求的数据。', diff --git a/src/utils/useGoHome.ts b/src/utils/useGoHome.ts new file mode 100644 index 0000000..5725382 --- /dev/null +++ b/src/utils/useGoHome.ts @@ -0,0 +1,12 @@ +import { useContext } from 'react'; +import { KeepAliveContext, history } from '@umijs/max'; + +export default function useGoHome() { + const { dropOtherTabs } = useContext(KeepAliveContext) + return () => { + history.replace('/Dashboard') + setTimeout(() => { + dropOtherTabs('/dashboard') + }, 1000); + } +} \ No newline at end of file