diff --git a/package.json b/package.json index efddadc..5224fc0 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "antd": "^2.5.0", "classnames": "^2.2.5", "dva": "^1.1.0", + "dva-loading": "^0.2.0", "js-cookie": "^2.1.3", "qs": "^6.2.0", "react": "^15.4.1", @@ -39,7 +40,7 @@ }, "scripts": { "start": "dora --plugins \"proxy,webpack,webpack-hmr\"", - "dev": "dora --plugins \"webpack,webpack-hmr\"", + "dev": "dora --plugins \"webpack,webpack-hmr,disableNpmInstall\"", "lint": "eslint --fix --ext .js,.jsx src/components/layout", "build": "atool-build" }, diff --git a/src/components/layout/main.less b/src/components/layout/main.less index 0584580..fc72a34 100644 --- a/src/components/layout/main.less +++ b/src/components/layout/main.less @@ -3,7 +3,6 @@ .layout { position: relative; height: 100vh; - min-width: 1200px; &.fold{ .sider{ diff --git a/src/index.html b/src/index.html index b1e6b7c..3deb68c 100644 --- a/src/index.html +++ b/src/index.html @@ -2,9 +2,15 @@ + + Ant Design Admin + diff --git a/yarn.lock b/yarn.lock index c60f7f2..2f8d1bc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1735,6 +1735,12 @@ draft-js@^0.9.1, draft-js@~0.9.1: immutable "~3.7.4" object-assign "^4.1.0" +dva-loading: + version "0.2.0" + resolved "http://registry.npm.taobao.org/dva-loading/download/dva-loading-0.2.0.tgz#ea6936ba12fa530b851aca1ba536ff463d249626" + dependencies: + babel-runtime "^6.11.6" + dva@^1.1.0: version "1.1.0" resolved "http://registry.npm.taobao.org/dva/download/dva-1.1.0.tgz#18756b3689c038ea81b15ab70e23cf97866de555" @@ -2336,16 +2342,6 @@ hawk@~3.1.3: hoek "2.x.x" sntp "1.x.x" -history: - version "4.5.0" - resolved "http://registry.npm.taobao.org/history/download/history-4.5.0.tgz#7313388109333bf5796fff7407cee1850e8c5061" - dependencies: - invariant "^2.2.1" - loose-envify "^1.2.0" - resolve-pathname "^2.0.0" - value-equal "^0.2.0" - warning "^3.0.0" - history@^2.1.2: version "2.1.2" resolved "http://registry.npm.taobao.org/history/download/history-2.1.2.tgz#4aa2de897a0e4867e4539843be6ecdb2986bfdec" @@ -4605,10 +4601,6 @@ resolve-path@^1.3.1: http-errors "~1.5.0" path-is-absolute "1.0.1" -resolve-pathname@^2.0.0: - version "2.0.2" - resolved "http://registry.npm.taobao.org/resolve-pathname/download/resolve-pathname-2.0.2.tgz#e55c016eb2e9df1de98e85002282bfb38c630436" - resolve@^1.1.6, resolve@~1.1.6: version "1.1.7" resolved "http://registry.npm.taobao.org/resolve/download/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" @@ -5084,10 +5076,6 @@ uuid@^3.0.0: version "3.0.1" resolved "http://registry.npm.taobao.org/uuid/download/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" -value-equal@^0.2.0: - version "0.2.0" - resolved "http://registry.npm.taobao.org/value-equal/download/value-equal-0.2.0.tgz#4f41c60a3fc011139a2ec3d3340a8998ae8b69c0" - vary@^1.0.0, vary@~1.1.0: version "1.1.0" resolved "http://registry.npm.taobao.org/vary/download/vary-1.1.0.tgz#e1e5affbbd16ae768dd2674394b9ad3022653140"