Skip to content

Commit 15724a8

Browse files
author
chenghao
committed
👽 更新antd版本并修复新版本的问题
1 parent 6649217 commit 15724a8

File tree

3 files changed

+31
-23
lines changed

3 files changed

+31
-23
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"homepage": ".",
55
"private": true,
66
"dependencies": {
7-
"antd": "^2.13.1",
7+
"antd": "^2.13.10",
88
"autoprefixer": "7.1.1",
99
"axios": "^0.16.2",
1010
"babel-core": "6.25.0",

src/App.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ class App extends Component {
4141
console.log(this.props.responsive);
4242
const { auth, router, responsive } = this.props;
4343
return (
44-
<Layout className="ant-layout-has-sider">
44+
<Layout>
4545
{!responsive.data.isMobile && <SiderCustom path={this.props.___location.pathname} collapsed={this.state.collapsed} />}
46-
<Layout>
46+
<Layout style={{flexDirection: 'column'}}>
4747
<HeaderCustom toggle={this.toggle} collapsed={this.state.collapsed} user={auth.data || {}} router={router} path={this.props.___location.pathname} />
4848
<Content style={{ margin: '0 16px', overflow: 'initial' }}>
4949
{this.props.children}

yarn.lock

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,9 @@ ansi-styles@^3.0.0, ansi-styles@^3.1.0:
137137
dependencies:
138138
color-convert "^1.0.0"
139139

140-
antd@^2.13.1:
141-
version "2.13.1"
142-
resolved "http://registry.npm.taobao.org/antd/download/antd-2.13.1.tgz#9c09aedf07a2d1bdd31c0d69822f9e32c9f73386"
140+
antd@^2.13.10:
141+
version "2.13.10"
142+
resolved "http://registry.npm.taobao.org/antd/download/antd-2.13.10.tgz#bfb8cab3405b93b0b98f6a38e2069697017ebcd7"
143143
dependencies:
144144
array-tree-filter "~1.0.0"
145145
babel-runtime "6.x"
@@ -151,7 +151,7 @@ antd@^2.13.1:
151151
moment "^2.18.1"
152152
omit.js "^1.0.0"
153153
prop-types "^15.5.7"
154-
rc-animate "^2.3.6"
154+
rc-animate "^2.4.1"
155155
rc-calendar "~9.0.0"
156156
rc-cascader "~0.11.3"
157157
rc-checkbox "~2.0.3"
@@ -167,19 +167,19 @@ antd@^2.13.1:
167167
rc-progress "~2.2.2"
168168
rc-rate "~2.1.1"
169169
rc-select "~6.9.0"
170-
rc-slider "~8.2.0"
170+
rc-slider "~8.3.0"
171171
rc-steps "~2.5.1"
172172
rc-switch "~1.5.1"
173-
rc-table "~5.6.7"
173+
rc-table "~5.6.9"
174174
rc-tabs "~9.1.2"
175175
rc-time-picker "~2.4.1"
176176
rc-tooltip "~3.4.6"
177177
rc-tree "~1.7.0"
178178
rc-tree-select "~1.10.2"
179179
rc-upload "~2.4.0"
180180
rc-util "^4.0.4"
181-
react-lazy-load "^3.0.10"
182-
react-slick "~0.15.0"
181+
react-lazy-load "^3.0.12"
182+
react-slick "~0.15.4"
183183
shallowequal "^1.0.1"
184184
warning "~3.0.0"
185185

@@ -1691,7 +1691,7 @@ crypto-browserify@^3.11.0:
16911691
public-encrypt "^4.0.0"
16921692
randombytes "^2.0.0"
16931693

1694-
[email protected], css-animation@^1.2.5, css-animation@^1.3.0:
1694+
[email protected], css-animation@^1.2.5, css-animation@^1.3.0, css-animation@^1.3.2:
16951695
version "1.3.2"
16961696
resolved "http://registry.npm.taobao.org/css-animation/download/css-animation-1.3.2.tgz#df515820ef5903733ad2db0999403b3037b8b880"
16971697
dependencies:
@@ -5313,13 +5313,21 @@ [email protected]:
53135313
prop-types "^15.5.8"
53145314
rc-util "4.x"
53155315

5316-
[email protected], rc-animate@^2.0.2, rc-animate@^2.3.0, rc-animate@^2.3.6:
5316+
[email protected], rc-animate@^2.0.2, rc-animate@^2.3.0:
53175317
version "2.3.6"
53185318
resolved "http://registry.npm.taobao.org/rc-animate/download/rc-animate-2.3.6.tgz#4177a2822c67adf4fd5b908ceba7cee8d13c1fac"
53195319
dependencies:
53205320
css-animation "^1.3.0"
53215321
prop-types "^15.5.6"
53225322

5323+
rc-animate@^2.4.1:
5324+
version "2.4.1"
5325+
resolved "http://registry.npm.taobao.org/rc-animate/download/rc-animate-2.4.1.tgz#df3e0f56fe106afe4bf52ff408ced241c5178919"
5326+
dependencies:
5327+
babel-runtime "6.x"
5328+
css-animation "^1.3.2"
5329+
prop-types "15.x"
5330+
53235331
rc-banner-anim@^0.5.13:
53245332
version "0.5.13"
53255333
resolved "http://registry.npm.taobao.org/rc-banner-anim/download/rc-banner-anim-0.5.13.tgz#e751d78a161d5fb4beb9ebc39f73d20d1d7d45e8"
@@ -5509,14 +5517,14 @@ rc-select@~6.9.0:
55095517
rc-util "^4.0.4"
55105518
warning "2.x"
55115519

5512-
rc-slider@~8.2.0:
5513-
version "8.2.0"
5514-
resolved "http://registry.npm.taobao.org/rc-slider/download/rc-slider-8.2.0.tgz#ae37d17144cad60e1da6eac0ee4ffcfea0b0a6e8"
5520+
rc-slider@~8.3.0:
5521+
version "8.3.5"
5522+
resolved "http://registry.npm.taobao.org/rc-slider/download/rc-slider-8.3.5.tgz#41f88ab95debe089139deee7120c6e151260b52d"
55155523
dependencies:
55165524
babel-runtime "6.x"
55175525
classnames "^2.2.5"
55185526
prop-types "^15.5.4"
5519-
rc-tooltip "^3.4.2"
5527+
rc-tooltip "^3.4.3"
55205528
rc-util "^4.0.4"
55215529
shallowequal "^1.0.1"
55225530
warning "^3.0.0"
@@ -5537,9 +5545,9 @@ rc-switch@~1.5.1:
55375545
classnames "^2.2.1"
55385546
prop-types "^15.5.6"
55395547

5540-
rc-table@~5.6.7:
5541-
version "5.6.9"
5542-
resolved "http://registry.npm.taobao.org/rc-table/download/rc-table-5.6.9.tgz#53cd87199257d5e38cf8c5bb5252df102bc668f2"
5548+
rc-table@~5.6.9:
5549+
version "5.6.13"
5550+
resolved "http://registry.npm.taobao.org/rc-table/download/rc-table-5.6.13.tgz#ca73021dc6a3aa0af2846d07ee80c01c713ff0de"
55435551
dependencies:
55445552
babel-runtime "6.x"
55455553
component-classes "^1.2.6"
@@ -5572,7 +5580,7 @@ rc-time-picker@~2.4.1:
55725580
prop-types "^15.5.8"
55735581
rc-trigger "1.x"
55745582

5575-
rc-tooltip@^3.4.2, rc-tooltip@~3.4.6:
5583+
rc-tooltip@^3.4.3, rc-tooltip@~3.4.6:
55765584
version "3.4.6"
55775585
resolved "http://registry.npm.taobao.org/rc-tooltip/download/rc-tooltip-3.4.6.tgz#ed98de2a7b412e527c6bd8a2a97dddf0babd2f21"
55785586
dependencies:
@@ -5732,7 +5740,7 @@ react-hot-loader@^3.1.1:
57325740
redbox-react "^1.3.6"
57335741
source-map "^0.6.1"
57345742

5735-
react-lazy-load@^3.0.10:
5743+
react-lazy-load@^3.0.12:
57365744
version "3.0.12"
57375745
resolved "http://registry.npm.taobao.org/react-lazy-load/download/react-lazy-load-3.0.12.tgz#2b841dfc3227e8119d033189d2c960ce384d0cb9"
57385746
dependencies:
@@ -5775,7 +5783,7 @@ [email protected]:
57755783
loose-envify "^1.2.0"
57765784
warning "^3.0.0"
57775785

5778-
react-slick@~0.15.0:
5786+
react-slick@~0.15.4:
57795787
version "0.15.4"
57805788
resolved "http://registry.npm.taobao.org/react-slick/download/react-slick-0.15.4.tgz#6709c87b06e7640feeacc06711be42cc2066aabe"
57815789
dependencies:

0 commit comments

Comments
 (0)