Commit Graph

430 Commits

Author SHA1 Message Date
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
afc163
278ae9b9c7 Fix upload ci 2017-10-11 10:18:02 +08:00
afc163
064afd9b85 fix upload ci 2017-10-11 09:54:13 +08:00
afc163
163366deeb Merge branch 'master' into antd-3.0 2017-10-10 21:52:48 +08:00
偏右
2b7a60224b Fix upload ci (#7849)
* Fix upload test case

* update delay time for uploading status
2017-10-10 21:48:21 +08:00
afc163
fd7c90fb5a update upload snap file 2017-10-10 20:02:35 +08:00
afc163
8feaf83003 fix upload test 2017-10-10 19:54:52 +08:00
afc163
190bebd65f Fix upload snapshot 2017-10-10 19:54:38 +08:00
afc163
5a5bb9c3a0 Fix upload snapshot 2017-10-10 19:54:05 +08:00
afc163
87ec78ce2e Merge branch 'master' into antd-3.0 2017-10-10 17:11:26 +08:00
afc163
b437233467 Fix upload picture loading style 2017-10-10 16:23:25 +08:00
afc163
c3f1d0bba6 Add test case for upload 2017-10-10 15:59:13 +08:00
Wei Zhu
0d572c72a9 Add test for 9a5894c
9a5894c46e
2017-10-10 14:45:18 +08:00
afc163
d3b98d311a Merge branch 'master' into antd-3.0 2017-10-10 14:09:03 +08:00
afc163
9a5894c46e data should be call when beforeUpload promise resolved, close #7833 2017-10-09 19:41:52 +08:00
Wei Zhu
c5487ad1eb React 16 + Enzyme 3 2017-10-09 19:18:04 +08:00
afc163
4eb9d5ef56 Merge branch 'master' into antd-3.0 2017-10-09 13:33:59 +08:00
afc163
475e4ff23d upgrade eslint-config-airbnb 2017-10-09 13:27:35 +08:00
afc163
7a8a1a8ee3 Merge branch 'master' into antd-3.0 2017-09-30 21:31:29 +08:00
niko
9dc4102cdd fix: should trigger onChange before beforeUpload 2017-09-29 03:52:16 -05:00
偏右
2bced36f0c New component styles (#7731)
* Tweak button padding

* upgrade input and button size

* update form controls size

* update components size

* Add lemon color and update rate color

* Add new icons

* update layout style

* breadcrumb and dropdown

* update menu arrow width

* update layout and menu

* update steps

* fix var name

* update cascasder style

* Update DatePicker

* update InputNumber and Mention

* radio and switch

* select and transfer

* TimePicker & Upload

* more components

* calendar and list

* Tree Timeline Popover Tag

* divider modal popover

* update search input

* update card style

* update switch disabled opacity

* update shoadow and mask

* Add v2-compatible-reset.less

* Fix undefined className

* update snahshotssssssssssssssssss 👻
2017-09-27 22:32:49 +08:00
Benjy Cui
829b5f87bf feat: make default locale to enUS (#7553)
* feat: make default locale to enUS

* test: fix CI

* docs: update getting started
2017-09-26 23:12:47 +08:00
ChaXinyu
14e2a56b75 export components interface (#7654)
* export components interface

* export specific props

* fix formItem missed import
2017-09-25 22:14:49 +08:00
afc163
2ebf70013b Merge branch 'master' into antd-3.0 2017-09-25 20:03:40 +08:00
thegatheringstorm
10f6907da4 Fix: Upload Use object destructuring instead of creating temporary references for onRemove. (#7726) 2017-09-25 18:15:36 +08:00
偏右
759b0bb821 seperate reset styles (#7682)
* seperate reset styles

* not reset ul/ol/p/heading

* revert reset.less idea

* move label style into ant-form-item, #5851

* revert reset.less idea

* update base.less

* Better typography from bootstrap@4

use reboot replace normalize

ref:
b4d84b9cdf/scss/_reboot.scss

close #6162
2017-09-22 18:33:29 +08:00
Wei Zhu
047f62e9b4 Mark refs to private (#7600) 2017-09-17 15:48:44 +08:00
Wei Zhu
250c7a9c68 Revert "Mock rc-trigger"
This reverts commit 9d2c91598b.
2017-09-15 16:42:25 +08:00
Wei Zhu
9d2c91598b Mock rc-trigger
Ref #5522
2017-09-15 16:14:26 +08:00
afc163
7bee69a9df Merge from master 2017-09-08 16:49:58 +08:00
Wei Zhu
8c0c6ecf6e refactor: upload string refs to callback (#7496) 2017-09-08 09:46:22 +08:00
WingGao
ace985afce Update upload/interface.tsx (#7507)
`response` should be `any`
2017-09-07 15:12:13 +08:00
afc163
0d26b4c972 doc: update Upload API description 2017-08-24 18:37:26 +08:00
afc163
84e561b237 Fix removing wrong item when uid is 0, close #7269 2017-08-20 15:39:25 +08:00
Zheeeng
754966991b Rename File interface to UploadFile (#7183)
* Fix doc missing info

* Rename File interface to UploadFile
2017-08-12 13:56:57 +08:00
Xiaohan Lee
c23c0a6b16 Update docs for Table.render and Upload.onChange (#7180)
* Docs: fix invalid link in docs of Table.render

* Docs: add link for "onChange" in docs of Upload.onChange
2017-08-11 17:05:58 +08:00
Zheeeng
fdc8d357ef Fix doc missing info (#7175) 2017-08-11 12:39:26 +08:00
afc163
a329d3d39b Fix file.response type checking, ref #6818 2017-08-08 17:18:55 +08:00
afc163
d339e628ed Fix upload default error message, close #6818 2017-08-08 13:34:24 +08:00
Ruslan P
0cdcdfba7b Update picture-style.md (#7051) 2017-08-01 18:22:55 +08:00
afc163
98faa4378c Make action of Upload optional, close #6890 2017-07-19 20:28:18 +08:00
Benjy Cui
2413c6af61 fix: make loading work with icon only button in button group, close: #6822 2017-07-14 15:26:55 +08:00
Wei Zhu
4960f711c3 docs: Add manual upload demo (#6823) 2017-07-14 15:00:14 +08:00
paranoidjk
ba168b826f refactor: use spread operator replace object-assign (#6677) 2017-07-03 16:57:11 +08:00
peiming
426a35c248 docs: fix Upload[beforeUpload] 2017-06-06 21:51:27 +08:00
Graeme Yeates
d8d17a6401 Seperate @active-item-bg into 2 variables 2017-05-03 10:57:14 -04:00
Graeme Yeates
4eb2855871 Add @active-item-bg to control hover and active states 2017-05-02 11:05:28 -04:00
shlice
38a7a87690 feat: enhance handleRemove in Upload (#5974)
onRemove will be executed when removing file button is clicked, remove event will be prevented when return value is false.
But, if we want't to popup a confirm dialog, it can't block the execution of onRemove.
So, I add Promise support for onRemove. The return value of onRemove now can be a Promise, and the handleRemove function in Upload can wait for the non-blocking confirm dialog.
2017-05-02 16:31:39 +08:00
afc163
224c46ded9 fix typo 2017-04-30 18:47:15 +08:00
afc163
dbbf09ae95 fix createClass in test 2017-04-27 21:12:23 +08:00
afc163
335eb0c246 Fix style prop of Upload.Dragger 2017-04-13 17:33:08 +08:00
Manjit Kumar
4e055ed5d0 use PropTypes from 'prop-types' mdoule instead of React
- as React.PropTypes is being deprecated
 - Warning: Accessing PropTypes via the main React package is deprecated. Use the prop-types package from npm instead.
 - Solution: https://facebook.github.io/react/blog/2017/04/07/react-v15.5.0.html#migrating-from-react.proptypes
2017-04-12 02:22:05 +05:30
偏右
674255bd14 [WIP] upgrade deps (#5455)
* upgrade deps

* autofix some tslint problems

* Fix tslint problems manually
2017-03-23 21:15:49 +08:00
jiang
1be1d41cc9 update upload (#5401) 2017-03-20 16:44:29 +08:00
natergj
c2cb111f7b fix: Upload should work with LocaleProvider (#5388) 2017-03-20 15:20:15 +08:00
Wei Zhu
f6b1e942e3 Jest 19 (#5361)
* Upgeade to jest 19

* Use jest.spyOn
2017-03-17 18:56:30 +08:00
Benjy Cui
983474f81c fix: rename uploadList to UploadList 2017-03-17 12:07:26 +08:00
Benjy Cui
be13831d92 Fix upload (#5358)
* docs: add demo to re-produce bug

* fix: dragger should work with form decorator, close: #5334

* test: update snapshot
2017-03-17 11:47:05 +08:00
afc163
b271a94e0a Fix Upload progress not showing, close #5323 2017-03-16 13:30:09 +08:00
afc163
89ace33480 Upload onChang(file) argument should be immutable, close #5280 2017-03-14 14:21:01 +08:00
afc163
7290e1070b update code style 2017-03-14 14:04:40 +08:00
afc163
f44220d91b Fix upload mask style, close #5275 2017-03-13 11:16:22 +08:00
Minwe LUO
bbe294e96c feat: allow override onProgress on Upload (#5260)
@see https://github.com/react-component/upload/issues/33#issuecomment-284644039
2017-03-10 19:18:05 +08:00
afc163
23415a062f fix upload progressTimer 2017-03-10 15:14:37 +08:00
jiang
8ca2bfd12a upload (#5210)
* fix upload firefox delete anim, update list animate

* update picture cssName

* remove note

* update animate Name

* refactor upload animation code

* refactor upload dom structure

* update upload demo snapshots
2017-03-08 18:02:15 +08:00
afc163
35642ec2a9 update upload demo 2017-03-08 14:42:34 +08:00
afc163
29adc0a85e fix upload snapshot 2017-03-08 12:20:16 +08:00
afc163
d502f089dd use jsonplaceholder, close #5202 2017-03-08 12:17:46 +08:00
afc163
0a35197a35 Fix long name of upload item style 2017-03-08 12:11:31 +08:00
Wei Zhu
67bbae9ea8 Merge branch 'feature-2.8' 2017-03-05 21:34:57 +08:00
afc163
a82ab5fc4b Fix setState on unmounted Upload, close #5162 2017-03-03 20:19:56 +08:00
Wei Zhu
6eca8b4ad1 Add locale support to Upload (#5094) 2017-02-28 18:43:22 +08:00
afc163
c64cf9f086 fix upload error item name color 2017-02-27 14:18:00 +08:00
feng zhi hao
88100a29a3 chore: fix ts definition of Upload (#5041) 2017-02-24 16:06:57 +08:00
afc163
61a3d66a02 Add test case for upload 2017-02-22 16:07:31 +08:00
bang
a4acf1f66e docs: Rewrite Upload demos to ES6 component 2017-02-19 20:50:06 +07:00
afc163
90daeb9a2b Adjust upload demo 2017-02-19 01:39:41 +08:00
afc163
5603fa0088 Fix upload error file style, close #4810 2017-02-15 20:58:40 +08:00
Benjy Cui
200b88246f docs: update docs format 2017-02-13 10:55:53 +08:00
偏右
75a4b06e44 Unified border radius, close #4772 (#4773) 2017-02-08 14:21:29 +08:00
afc163
0eb5c689a3 remove type="ghost" from demo 2017-02-04 22:35:33 +08:00
Graeme Yeates
1006015ef0 Add border customization variables (#4734)
* Add border customization variables (#4712)

* Make border styles customizable (fixes #4712)
2017-01-31 16:05:10 +08:00
afc163
f2bb4afd4d Merge from master 2017-01-27 17:23:51 +08:00
afc163
f4021d5255 Fix default locale in Upload, close #4697 2017-01-24 15:02:54 +08:00
afc163
a81bf8f73e use file.thumbUrl for <img /> in priority, close #4653 2017-01-24 14:59:39 +08:00
Wei Zhu
77b78a9389 docs: Unify type naming (#4636)
* Unify name of ReactNode type in document

* Lowser all string type name

* Lowercase all number type name

* Lowercase all boolean type name

* Unify array type

* Lowercase all object type name

* Unify mutilple types
2017-01-20 20:10:50 +08:00
afc163
35523be6e9 Merge from master 2017-01-20 18:28:09 +08:00
Benjy Cui
3e17551b7e site: improve build speed 2017-01-19 15:22:53 +08:00
偏右
aa89addcc2 Improve upload list (#4516)
* support prevent removing when return value is false, close #4456

* Add showRemoveIcon & showPreviewIcon into showUploadList

close #4384 & #4351

* fix typo
2017-01-10 20:15:02 +08:00
afc163
024e398ad0 Fix lint for latest eslint-config-airbnb 2017-01-09 11:51:56 +08:00
偏右
d811ebee5c New color system (#4426)
* Add new color patterns algorithm

* Add color palettes

* update other colors

* fix gray color

* update more tint/shade to colorPalette

* new font color

* Update doc for new color system

* improve doc style
2017-01-01 22:20:06 +08:00
Wei Zhu
07103b9fb6 Don't ignore test files. 2016-12-14 14:48:09 +08:00
Wei Zhu
17a0a33283 Restructure tests. 2016-12-14 14:41:39 +08:00
afc163
dba6b70e38 update upload API, #863 2016-12-13 18:48:11 +08:00
Benjy Cui
a985c15872 deps: upgrade rc-upload 2016-12-12 12:08:15 +08:00
Zack Craig
f62fa38ebd Re-word description of upload component (#4085)
Just a little bit of rewording for english speakers, same stuff, just sounds better.
2016-11-30 22:31:30 +08:00
Andrey G
a307a7acf7 refactor: remove unnecessary computed props for classNames (#4055)
* remove unnecessary computed props for classNames

* rollback autocomplete optimization for possible css style order issue

* update snapshots

* remove more unnecessary computed props at Input
2016-11-30 10:20:23 +08:00
Benjy Cui
59e0c6a4c1 docs: update demo for upload 2016-11-25 15:00:28 +08:00
Wei Zhu
bd55d21f83 style: Fix jsx-no-multiline-js (#3994)
* Fix jsx-no-multiline-js

* TimePicker addon test

* Transfer search test
2016-11-25 12:03:39 +08:00
Benjy Cui
f5cc937c8f fix: Upload should work without children 2016-11-24 17:44:40 +08:00
Wei Zhu
ccbebe60cc style: Fix jsx alignment, #3966 (#3967) 2016-11-23 17:53:10 +08:00
afc163
e62dc08d2c improve preview icon display logic, #3644 2016-11-22 14:44:16 +08:00
afc163
e552880c32 update upload detail 2016-11-22 14:29:07 +08:00
afc163
f77d568322 fix upload prefixCls 2016-11-22 14:29:07 +08:00
Wei Zhu
d20572bdab test: demo snapshot testing (#3916)
* Run snapshot testing against all demos

* Split demo tests

* ignore coverage folder

* Upgrade antd-demo-jest

* enable cache

* intergate with coveralls.io

* Add node test

* Set worker to 2

https://github.com/facebook/jest/issues/1742

* config coverage

* Set default supportServerRender to true
2016-11-22 13:43:53 +08:00
Bruce Mitchener
36508ffabd Typo fixes. 2016-11-16 20:33:37 +07:00
ddcat1115
0baef0627e docs: 调整组件导航结构 (#3758)
- Layout 更名为 Grid
2016-11-09 14:43:32 +08:00
afc163
0ec4276eab @font-size-lg (#1752) 2016-11-08 21:07:01 +08:00
afc163
e4974ac72a use @font-size-base (#1752) 2016-11-08 20:57:07 +08:00
afc163
0a48c62dcb use @text-color 2016-11-08 20:50:59 +08:00
afc163
9b81fe86d9 clear less variables and add @text-color-secondary 2016-11-08 20:48:03 +08:00
denzw
5fb01c8300 修复上传组件卡片样式时,新增加上传图片不能预览的问题 (#3706) 2016-11-03 13:43:34 +08:00
Benjy Cui
27708b702c docs: update docs for upload, ref: #3651 2016-10-31 13:44:13 +08:00
edgji
ea4e98d5f7 docs: add documentation and reference for customRequest (#3651) 2016-10-31 13:36:40 +08:00
Benjy Cui
08e21e0a2f refactor: close: #3490 2016-10-24 16:30:38 +08:00
afc163
1e5264bad7 fix tslint 2016-10-20 22:10:46 +08:00
yiminghe
c2d3f16dfb update tslint 2016-10-20 19:19:16 +08:00
Benjy Cui
3112b0d7ca site: support debug mode for demo, close: #3506 2016-10-20 17:45:38 +08:00
Benjy Cui
9ac21d010b docs: add demo for show image in-place, close: #3319 2016-10-18 15:16:25 +08:00
Albert Zheng
23dd825afd 【Please review】Fixes for supporting TypeScript 2.0.3 (#3439)
* Fixes for supporting TypeScript 2.0.3

* Fixes for supporting TypeScript 2.0.3. Issue is #3358
2016-10-18 11:55:00 +08:00
afc163
e0a986ed71 Update upload document 2016-10-11 15:23:18 +08:00
偏右
8bf99b7773 Fix Upload onRemove and style (#3331)
* fix onRemove prevent origin behavious, close #3317

* remove onPreview if

* improve upload render props code style

* Fix upload trigger click area, close #3316
2016-10-10 22:38:11 +08:00
Benjy Cui
a40a8e914f docs: add ref for upload, close: #3171 2016-09-29 15:37:32 +08:00
Benjy Cui
50e978de53 fix: should show all the uploaded files, close: #3113 (#3117) 2016-09-22 11:54:36 +08:00
Benjy Cui
bd7e9f00c0 style: update code style 2016-09-21 11:54:53 +08:00
Benjy Cui
3f67fd3f9f docs: update docs details 2016-09-21 11:28:38 +08:00
Benjy Cui
f04b65b25e fix: should pass style to upload correctly, close: #3072 2016-09-20 15:11:30 +08:00
Benjy Cui
d1b9db9f97 fix: should use rc-calendar@7.1.0 2016-09-19 15:23:49 +08:00
afc163
3d8c63b821 Merge branch 'master' of github.com:ant-design/ant-design 2016-09-19 11:08:00 +08:00
afc163
701425250f fix demo markdown 2016-09-19 11:01:58 +08:00
feng zhi hao
cad2d19be2 fix: complete loss declaration (#3068)
* complete loss declaration

* fix error in ts-lint

* fix Icon name error
2016-09-19 10:17:07 +08:00
afc163
697b6c7b19 update upload demos 2016-09-18 11:08:54 +08:00
afc163
9e5061acdc Merge branch "1.x-stable" 2016-09-15 01:25:28 +08:00
马斯特
a25ec29fb8 refactor: 保证所有的tsx和less都正确使用prefix (#3024)
* refactor: extract prefix cls as less variable

* refactor: apply ant icon prefix cls in less files

* refactor: all components support prefixCls props
2016-09-14 16:18:33 +08:00
Benjy Cui
cbfc181fa4 fix: should not wrap upload list 2016-09-14 10:21:26 +08:00
Marius Ileana
39a11f00a0 docs: upload, alert, tooltip - translations of remaining demos (#3035)
* upload - translations of two remaining demos

* alert & tooltip - remaining demo translations

* Prompt typo
2016-09-14 09:52:14 +08:00