diff --git a/package.json b/package.json index 78e1bcea52450410bfb6c9df78a829ca558a1924..a76b52f8c697380f73e5655e574b101327d478e8 100755 --- a/package.json +++ b/package.json @@ -53,6 +53,7 @@ "@types/react": "^16.4.11", "@types/react-dom": "^16.0.6", "antd-pro-merge-less": "^0.0.6", + "merge-umi-mock-data": "^0.0.2", "antd-theme-webpack-plugin": "^1.0.8", "babel-eslint": "^8.2.6", "babel-runtime": "^6.9.2", diff --git a/scripts/generateMock.js b/scripts/generateMock.js index 54c7d6d624fcefd98cec3600538284a5056910a7..1f1fbbf8d94aa0f8560a0e2097c1be8b208fb0e2 100644 --- a/scripts/generateMock.js +++ b/scripts/generateMock.js @@ -1,3 +1,4 @@ const generateMock = require('merge-umi-mock-data'); const path = require('path'); +console.log(path.join(__dirname, '../mock'), path.join(__dirname, '../functions/mock/index.js')); generateMock(path.join(__dirname, '../mock'), path.join(__dirname, '../functions/mock/index.js')); diff --git a/src/components/GlobalHeader/RightContent.js b/src/components/GlobalHeader/RightContent.js index 9cc347fe4242f4736ac81f8422c40ae4da8453fc..3c882b9f36b40c51d13bbcf36124a7313b63ec3e 100644 --- a/src/components/GlobalHeader/RightContent.js +++ b/src/components/GlobalHeader/RightContent.js @@ -73,7 +73,8 @@ export default class GlobalHeaderRight extends PureComponent {