diff --git a/.umirc.js b/.umirc.js index 32d7d26..b0565dd 100644 --- a/.umirc.js +++ b/.umirc.js @@ -5,6 +5,12 @@ const path = require('path') const lessToJs = require('less-vars-to-js') const isDevelopment = process.env.NODE_ENV === 'development' +const { theme } = require('antd/lib') +const { convertLegacyToken } = require('@ant-design/compatible/lib') + +const mapToken = theme.defaultAlgorithm(theme.defaultSeed) +const v4Token = convertLegacyToken(mapToken) + // how to speed compile: https://umijs.org/guide/boost-compile-speed export default { // IMPORTANT! change next line to yours or delete. And hide in dev @@ -63,9 +69,12 @@ export default { }, // Theme for antd // https://ant.design/docs/react/customize-theme - theme: lessToJs( + theme: { + ...v4Token, + ...lessToJs( fs.readFileSync(path.join(__dirname, './src/themes/default.less'), 'utf8') - ), + ) + }, webpack5: {}, mfsu: {}, chainWebpack: function (config, { webpack }) { diff --git a/package.json b/package.json index 4b1c72b..0cb5bb9 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "dependencies": { "@ant-design/icons": "^4.6.2", "@lingui/react": "^3.8.0", - "antd": "^4.0.0", + "antd": "^5.0.0", "axios": "^0.21.0", "classnames": "^2.2.6", "d3-shape": "^2.1.0", @@ -38,6 +38,7 @@ "store": "^2.0.0" }, "devDependencies": { + "@ant-design/compatible": "^5.1.0", "@babel/preset-react": "^7.12.13", "@lingui/cli": "^3.8.0", "@lingui/macro": "^3.8.0", diff --git a/src/components/GlobalFooter/index.less b/src/components/GlobalFooter/index.less index e4b3dfd..ac43595 100644 --- a/src/components/GlobalFooter/index.less +++ b/src/components/GlobalFooter/index.less @@ -1,4 +1,4 @@ -@import '~antd/lib/style/themes/default.less'; +/* @import '~antd/lib/style/themes/default.less'; */ .globalFooter { margin: 48px 0 24px 0; diff --git a/src/components/Layout/Header.js b/src/components/Layout/Header.js index 3b37540..2ee6af9 100644 --- a/src/components/Layout/Header.js +++ b/src/components/Layout/Header.js @@ -141,6 +141,7 @@ class Header extends PureComponent { [styles.fixed]: fixed, [styles.collapsed]: collapsed, })} + style={{height: 72, backgroundColor: 'white', paddingInline: 0}} id="layoutHeader" >