Commit Graph

465 Commits

Author SHA1 Message Date
HeskeyBaozi
74798b8911 upgdate test snapshot 2018-09-02 20:59:37 +08:00
HeskeyBaozi
d6131fe18d update test snapshot 2018-09-02 20:59:37 +08:00
afc163
207bad7b47 Merge branch 'master' into feature-3.9.0 2018-09-01 13:22:06 +08:00
偏右
6bf42db2ed
Fix abnormal picture card position of Upload list, close #11183 (#11931) 2018-08-29 00:21:46 +08:00
HeskeyBaozi
0c9465aaf9 upgrade icons library 2018-08-27 20:40:11 +08:00
afc163
be78706364 Merge branch 'master' into feature-3.9.0 2018-08-25 18:55:32 +08:00
HeskeyBaozi
d9b38aee4b Merge branch 'feature-3.9.0' of https://github.com/ant-design/ant-design into feature/svg-icon
# Conflicts:
#	package.json
2018-08-25 13:24:44 +08:00
afc163
612c5d5c55 Fix Upload.Dragger drag area, close #11869 2018-08-24 20:44:43 +08:00
HeskeyBaozi
ee1d2469a8 upgrade test snapshot 2018-08-24 18:36:08 +08:00
苏秦
3ffc7f6ac2 Upload: remove necessary signatures 2018-08-22 20:00:42 +08:00
HeskeyBaozi
65600c8a95 upgrade to 3.8.2 2018-08-20 14:00:51 +08:00
HeskeyBaozi
f275f3090a update Icon api 2018-08-16 11:41:37 +08:00
HeskeyBaozi
796de6390b update test snapshot 2018-08-14 15:32:29 +08:00
HeskeyBaozi
35974d67b2 update test snap shot 2018-08-13 20:51:01 +08:00
HeskeyBaozi
0a8f964935 update test snap shot 2018-08-13 14:46:55 +08:00
HeskeyBaozi
3baec95628 Merge branch 'feature-3.9.0' of https://github.com/ant-design/ant-design into feature/svg-icon 2018-08-13 09:26:33 +08:00
董天成
6203298f32 Fix typescript compile error (#11709) 2018-08-10 22:03:59 +08:00
张聪
8a9fbcb5e4 Migrate lifecycle method: Upload, CheckboxGroup, Layout.Sider, Tooltip, Popconfirm (#11682)
* Upload lifecycle method migrate

* CheckboxGroup lifecycle method migrate

* Layout.Sider lifecycle method migrate

* Tooltip lifecycle method migrate

* Popconfirm lifecycle method migrate

* test Spin as a controlled component
2018-08-10 17:04:40 +08:00
afc163
f2ce60cb6c fix test case failed often 2018-08-09 21:03:14 +08:00
JamesYin
583abe8dbb compatible with thumbnail which url has no extension (#11684)
* compatible with thumbnail which url has no extension

* restore newline #11684
2018-08-09 20:30:02 +08:00
afc163
7f78cc9753 Fix detete x missing in Upload, close #10454 2018-08-08 20:00:26 +08:00
Dmitriy Mironov
a270597d63 Fix a typo 2018-08-08 10:36:07 +08:00
HeskeyBaozi
b2ab727c89 resolve conflicts 2018-08-06 15:06:06 +08:00
Benoît Latinier
2b72149a50 Add strokeLinecap attribute to progress component 2018-08-04 16:58:50 +08:00
afc163
aa2b1a4352 Merge branch 'master' into feature-3.8.0 2018-08-03 23:16:08 +08:00
Wu Haotian
57646f24db fix: correct typing of RcFile. close #10331 2018-08-02 18:05:31 +08:00
HeskeyBaozi
cc180e2605 resolve conflict. 2018-08-02 18:02:31 +08:00
afc163
2f81349c21 fix error in typescript@3.x 2018-08-01 15:43:47 +08:00
HeskeyBaozi
6c42d711e8 Merge branch 'feature-3.8.0' of https://github.com/ant-design/ant-design into feature/svg-icon 2018-07-31 15:36:23 +08:00
Ilan Hasanov
6cecc9a0ea 💬 fixing upload component typos and capitalization consistency for en-US 2018-07-29 01:15:02 +08:00
HeskeyBaozi
ee16585b6d update test cases 2018-07-25 11:51:19 +08:00
HeskeyBaozi
4a553a2006 upgrade test cases 2018-07-19 20:37:47 +08:00
HeskeyBaozi
8df086f022 update test cases 2018-07-18 13:39:02 +08:00
HeskeyBaozi
9338f33c1c update test cases 2018-07-18 10:33:54 +08:00
afc163
0c4d356e54 Merge branch 'master' into feature-3.7.0 2018-07-03 19:54:48 +08:00
afc163
7d038d1aee revert 4d5d3c142e 2018-06-30 19:05:09 +08:00
afc163
763d32ac68 Fix tslint 2018-06-30 18:49:43 +08:00
afc163
4d5d3c142e fix fileList in onChange when uid is 0, close #11089 2018-06-29 13:57:47 +08:00
zelongc
27c3093487 Typo fix in the upload component demo.
Change 'reponse' to 'response'.
2018-06-29 12:47:01 +08:00
afc163
0981ef06a4 fix demo lint 2018-06-27 16:14:47 +08:00
afc163
56020cda39 Merge branch 'master' into feature-3.7.0 2018-06-27 16:14:14 +08:00
afc163
009ed08580 upgrade eslint-config-airbnb 2018-06-27 16:09:58 +08:00
Wei Zhu
b374297ca6 Merge branch 'master' into feature-3.7.0 2018-06-25 11:44:35 +08:00
愚道
653ec40b30 update test snapshot 2018-06-23 11:31:42 +08:00
afc163
9f16d066af Fix lint problems from eslint-config-airbnb@17 2018-06-22 21:05:13 +08:00
afc163
e7fa6ca7eb Merge branch 'master' into feature-3.7.0 2018-06-19 15:31:53 +08:00
sliwey
450a497412 fix: upload preview can't show image when the image file use uppercase extension
1.fix: upload preview can't show image when the image file use uppercase extension.
	2.improve: remove unnecessary escape character.
2018-06-15 13:52:14 +08:00
afc163
fd96967c87 upgrade rc-upload to 2.5
- support `directory` close #7315
- action can be a function return Promise
2018-06-12 16:07:06 +08:00
Junbin Huang
e1ba74e5fc
fix: still keep order when upload fails (#10794) 2018-06-06 12:13:06 +08:00
Wei Zhu
87163dfcd6 tests: mock xhr request
Close #10342
2018-05-31 22:37:09 +08:00
afc163
89ed0dcb35 fix autoUpdateProgress percent and add test case 2018-05-22 23:29:09 +08:00
afc163
0fc5a0ece5 site: add alt to images 2018-05-21 23:47:22 +08:00
afc163
70a42545e3 fix fileToObject, close #10319 2018-05-02 13:56:54 +08:00
Daniel Gomez
3a5fce7256 Fix UploadFile's lastModifiedDate property name (#10315) 2018-05-01 00:11:18 +08:00
afc163
e97977b891 Fix upload onChange arg type when beforeUpload return false, close #10293 2018-04-28 11:06:32 +08:00
Wu Haotian
7eb2792072 fix typing for Upload.beforeUpload (#10059)
* fix typing for `Upload.beforeUpload`
fix #9775

* add RcFile interface, fix tests

* fix typing of `Upload.onStart`
2018-04-19 11:54:28 +08:00
刘红
ee4f788ae0 添加BMP的支持 (#10110) 2018-04-17 14:44:43 +08:00
afc163
3b00cf8971 Fix image when file.url has query or hash
close #10102
2018-04-17 13:49:03 +08:00
Ed Moore
31e50e50b6 Fix types (#10063)
* Fix types

Fix https://github.com/ant-design/ant-design/issues/8796

* Fix exported types
2018-04-16 10:58:17 +08:00
afc163
e1a5063daf test: fix ci warning 2018-04-15 15:10:25 +08:00
偏右
a9376ef1ca
Fix image url display with non-image extention in Upload (#9936)
now we treat url following below rules:

1. `data:image..` => image
2. `http://xxx.com/xxxx.(webp|svg|png|gif|jpg|jpeg)` => image
3. `http://xxx.com/xxx.zip` other extensions => non-image
4. `data:application..` other minetypes in base64 text => non-image
5. `http://xxx.com/xxx` without any extensions => image

close #9835

close #9681

ref #9621
2018-04-04 17:17:01 +08:00
afc163
e6b3490a8e fix test case 2018-04-04 15:50:08 +08:00
Wei Zhu
5336bd688f Fix type error 2018-04-04 14:49:14 +08:00
Wei Zhu
5ab1c4ce53 Revert "Convert file object"
This reverts commit ee0bf41672.
2018-03-25 11:40:51 +08:00
Wei Zhu
ee0bf41672 Convert file object
Close #9775
2018-03-23 11:23:47 +08:00
王集鹄
decb6d8390 Compatible with non-image format file preview in UploadList (#9621)
* Compatible with non-image format file preview in UploadList

* Add unit test about Upload List should non-image format file preview
2018-03-11 22:24:09 +08:00
afc163
e071002fae use lodash 2018-03-08 14:46:47 +08:00
afc163
15e69d09ca Fix test cases 2018-03-06 21:47:05 +08:00
偏右
8226ede38e
Fix test case for new jsdom (#9527)
* Fix test case for new jsdom

* use setTimeout as raf in jest jsdom

* Fix cancelAnimationFrame

* Add comment for facebook/jest#5147

* longer timeout

* fix snap

* upgrade antd-tools
2018-03-06 21:21:01 +08:00
afc163
626ebf2063 Fix upload list update logic when beforeUpload return false
close #8020 #8779 #9248 #9191

ref #8036
2018-02-11 16:11:13 +08:00
afc163
c9b2efc9e8 Add more test cases for Upload 2017-12-04 15:59:39 +08:00
Wei Zhu
01f4b4e713 Merge branch 'master' into antd-3.0 2017-12-01 11:50:07 +08:00
Wei Zhu
179528af50
Don't change fileList when beforeUpload returns false (#8299)
Close #8036
2017-11-29 20:28:19 +08:00
Wei Zhu
cbaf54415e style: Use single quote 2017-11-20 16:53:56 +08:00
Wei Zhu
03e4411589 Improve upload type definition 2017-11-20 16:43:25 +08:00
Wei Zhu
45135e4ec8 Improve upload type definition. 2017-11-20 16:31:41 +08:00
Wei Zhu
479a5cb743
Remove allowSyntheticDefaultImports (#8218) 2017-11-17 14:38:54 +08:00
afc163
a4faaad810 Merge branch 'master' into antd-3.0 2017-11-13 10:24:58 +08:00
Wei Zhu
0c7ce9db17 Use props
Related #7706
2017-11-10 09:48:07 +08:00
afc163
856ecd4ae3 Merge branch 'master' into antd-3.0 2017-11-09 19:45:06 +08:00
afc163
d30e398859 Fix upload.test.js 2017-11-09 19:34:48 +08:00
afc163
e2bff100bd Fix upload style 2017-10-26 11:59:18 +08:00
Benjy Cui
e5699aff68 fix: should not import moment while useless, close: #8013 2017-10-26 10:50:18 +08:00
Wei Zhu
bbb1a3a828 Merge branch 'master' into antd-3.0 2017-10-25 10:27:38 +08:00
Wei Zhu
36227a10db docs: sort api table 2017-10-25 10:25:44 +08:00
afc163
3f57d5f56d Merge branch 'master' into antd-3.0 2017-10-23 10:41:51 +08:00
ddcat1115
c9bc8d7095 fix Upload ci 2017-10-22 23:36:27 +08:00
Benjy Cui
7ea572bfc8 refactor: extract common locale logic (#7915) 2017-10-20 14:54:38 +08:00
afc163
4ab7c648ce Fix upload loading 2017-10-18 21:30:48 +08:00
niko
70491fe4ad fixed https://github.com/ant-design/ant-design/pull/7733 (#7914) 2017-10-18 00:05:10 +08:00
afc163
ad4d5ce18a Fix dragger background 2017-10-17 20:56:29 +08:00
afc163
c5ffc3b4f0 Fix upload and badge styles 2017-10-17 15:01:21 +08:00
afc163
dfb3b4136b Fix snap 2017-10-16 21:15:53 +08:00
afc163
00bfa49031 Merge branch 'master' into antd-3.0 2017-10-16 20:45:25 +08:00
afc163
26e416c364 Tweak style 2017-10-16 19:56:04 +08:00
Wei Zhu
e6b1ba6a28 Mock requests 2017-10-15 17:34:03 +08:00
afc163
94c6c910ff Merge branch 'master' into antd-3.0 2017-10-12 20:07:31 +08:00
偏右
43362de756 Fix beforeUpload will stop uploading when return (#7870)
value is undefined

it should be same as rc-upload
2017-10-12 14:48:35 +08:00
偏右
b77cc6392e Improve upload status test case (#7869)
* Add some companies

* test: generate snapshot in upload onChange

* change action

* upgrade travis node version

* fix ci
2017-10-12 14:09:17 +08:00
偏右
9053192ae9 Fix component style (#7848)
* fix components style

* fix snapshot

* update travis node version

* change upload action in ci
2017-10-11 12:01:27 +08:00