Commit Graph

219 Commits

Author SHA1 Message Date
afc163
24d2973c32 Merge branch "1.x-stable" 2016-08-16 17:54:59 +08:00
ddcat1115
a5585bff77 fix #2571 #2518 #2645 增加disabled属性及取消上传时cancel请求 (#2690)
* fix #2571 #2518  use rc-upload@2.x abort
fix #2645  add `disabled`

* fix
2016-08-14 15:20:00 +08:00
Eddie Xie
dc62976b39 docs: Fix typos (#2694) 2016-08-12 14:16:59 +08:00
afc163
77fa03240b Merge branch '1.x-stable' 2016-08-03 11:43:43 +08:00
afc163
4bbe2291ef Fix uploading picture style 2016-08-02 15:05:25 +08:00
afc163
25b3517cc3 Add types for tree-select and upload (#1846) 2016-08-01 16:35:01 +08:00
afc163
10a0709b3a update dragger demo 2016-07-29 14:40:19 +08:00
afc163
ea61aa3cab upload code style 2016-07-19 20:28:56 +08:00
yiminghe
b140856836 add class 2016-07-19 19:08:59 +08:00
yiminghe
3342aae9f3 upgrade 2016-07-19 15:46:00 +08:00
偏右
de359d2cf7 fix tslint problems (#2360) 2016-07-13 11:14:24 +08:00
afc163
4954f5d733 Merge branch '1.x-stable' 2016-07-12 13:59:58 +08:00
afc163
129df7dc2a Fix removed upload item bug, close #2342 2016-07-12 12:09:12 +08:00
afc163
64b2381759 Merge 1.x-stable 2016-07-09 17:43:31 +08:00
afc163
0977a656aa Fix default upload item link, close #2331 2016-07-09 17:22:48 +08:00
afc163
28c470cb37 Merge 1.x-stable 2016-07-09 16:03:47 +08:00
afc163
ec8a0821cd Fix controlled fileList prop, close #2236 2016-07-09 15:08:39 +08:00
yiminghe
94706f1d2c fix ts 2016-07-07 20:25:03 +08:00
afc163
95351bfffa Merge branch '1.x-stable' 2016-06-27 19:31:38 +08:00
afc163
089f1ae512 update components category name 2016-06-27 18:21:12 +08:00
afc163
2ffa087aa1 Merge branch '1.x-stable' 2016-06-24 14:33:37 +08:00
afc163
dc191a321b fix for onPreview works only when file.url existed
close #2163
2016-06-24 13:35:11 +08:00
yiminghe
9a0d751f94 refactor to typescript 2016-06-22 13:19:48 +08:00
afc163
069857a476 update upload style 2016-06-15 19:48:42 +08:00
Benjy Cui
2144349741 style: enable react/jsx-closing-bracket-location 2016-06-06 13:54:10 +08:00
afc163
6f11e1fda0 update upload demo doc 2016-05-25 17:32:59 +08:00
afc163
6c3d00368c improve upload code style 2016-05-24 17:57:31 +08:00
Benjy Cui
8842d9342a site: update components' type 2016-05-16 15:41:55 +08:00
afc163
664bb8ea08 hide upload button when no children in <Upload />
close
https://github.com/ant-design/ant-design/issues/1610#issuecomment-218075160
2016-05-12 17:02:34 +08:00
Benjy Cui
ecaa6c56c3 style: enable comma-dangle 2016-05-11 09:32:33 +08:00
afc163
45921c55e0 upgrade Upload 2016-05-10 17:31:15 +08:00
afc163
4378089b36 Merge branch master into develop-1.0.0 2016-05-05 15:15:59 +08:00
afc163
05b1e5d964 revert update API (#1543) 2016-05-05 15:09:53 +08:00
afc163
93faa0d7b8 update (#1543) 2016-04-29 15:00:41 +08:00
afc163
03cb74ead5 upgrade eslint-config-airbnb version and fix some problems 2016-04-29 12:13:27 +08:00
afc163
0ca6a1c24a css modularize (#1448)
* css modularize

* Add alert style

* Move more component style

* Move iconfont to common style

* Move layout style

* Move more component style

* Move all components

* Fix lots of mixin deps

* remove css-prefix from less

* fix a button icon style bug

* restructure

* fix index

* add dist

* fix jest

* fix some components style

* clean webpack config

* check more components style

* update tabs

* update scripts

* update scripts

* fix form style

* fix more style

* Fix select width

* Fix form and tabs style
2016-04-27 20:44:36 +08:00
Benjy Cui
20e5146657 docs: add missing detail 2016-04-20 10:55:02 +08:00
afc163
8116e775ff upgrade devDeps and fix some eslint problems 2016-04-18 14:58:38 +08:00
afc163
db0c909ccd Merge branch master into develop-1.0.0 2016-04-11 14:34:18 +08:00
afc163
d4cfd369b7 update demo 2016-04-11 14:20:05 +08:00
afc163
95fabf0c00 update demo 2016-04-11 14:03:31 +08:00
Benjy Cui
d9f7a57439 docs: update docs 2016-04-11 11:52:17 +08:00
tom
6614fb9746 fix bug 2016-04-07 11:39:23 +08:00
tom
353f2cb004 this未绑定 2016-04-07 11:18:32 +08:00
afc163
1fd31771b3 fix hidden demo 2016-04-05 13:34:44 +08:00
afc163
b27c6ccc24 rebase and add demo & docs 2016-04-05 12:30:14 +08:00
Benjy Cui
df3ba36720 docs: remove useless newline in documentation 2016-04-01 10:08:19 +08:00
Benjy Cui
794783d1c2 style: enable react/no-multi-comp 2016-03-31 17:46:35 +08:00
Benjy Cui
d5a6932c15 docs: update documentation format 2016-03-31 14:17:09 +08:00
Benjy Cui
03d09b66e8 docs: update demo format 2016-03-31 09:40:55 +08:00
Benjy Cui
fd3406bd03 style: enable react/jsx-no-bind 2016-03-30 17:06:19 +08:00
Bruce Mitchener
0acce38f08 Convert more createClass over to extending Component. 2016-03-29 16:33:37 +07:00
Wei Zhu
4f541794e9 Update rc-upload to 1.9.0 2016-03-28 01:47:39 +08:00
Benjy Cui
5e4786440d deps: remove object-assign 2016-03-25 18:16:48 +08:00
afc163
66179b2760 Merge master into develop-1.0.0 2016-03-23 18:41:58 +08:00
afc163
fff4e01f14 remove JSON format limit, close #1248 2016-03-23 18:36:27 +08:00
Bruce Mitchener
11c0a6a203 Name classes without Ant* prefix.
Where necessary, prefix the classes imported from react-component
with 'Rc' rather than prefixing the Ant classes with 'Ant'.

The prefixing of Ant classes wasn't consistent and isn't necessary
in many cases.
2016-03-21 20:16:38 +07:00
Qiaosen Huang
d584b20dd8 add onPreview onRemove override on upload. 2016-03-21 14:16:22 +08:00
afc163
f66a257ab9 update upload chinese name 2016-03-16 20:17:35 +08:00
z
598a3615e1 修复上传时的状态传递
onstart 时设置的是被封装后的对象的属性,这里直接传 file 的话没有 status/percent 属性.
2016-03-09 17:37:56 +08:00
Benjy Cui
c1659c2ce3 style: update code style to please lint 2016-02-22 10:52:30 +08:00
afc163
5c22e32db8 Add link for uploadItem when file.url is existed, close #1013 2016-02-18 11:43:24 +08:00
Benjy Cui
29825f20c8 style: update code style to please lint 2016-02-17 18:04:42 +08:00
Benjy Cui
9d022ff84c style: update code style to please lint 2016-02-17 15:57:33 +08:00
yiminghe
798d15b4f0 update form 2016-01-30 19:00:56 +08:00
Benjy Cui
68b51e298d style: update code style for space-before-function-paren 2016-01-27 17:00:58 +08:00
Benjy Cui
cd1391e6a2 style: update code style for object-curly-spacing 2016-01-27 17:00:58 +08:00
yiminghe
9c36b900bf fix(upload): fix default name value
do not set value to ''
2016-01-27 16:25:05 +08:00
yiminghe
65b338de2b fix(upload): fix upload when edit
instanceof check error
2016-01-26 19:55:19 +08:00
afc163
66b7ee81ad fix eslint problems, eslint-config-airbnb@4.x 2016-01-23 15:22:16 +08:00
afc163
64d96f071f update picture card upload list style for more expansibility 2016-01-16 16:39:52 +08:00
kasinooya
98627f6d46 Merge branch 'develop-0.12.0' into feature-upload 2016-01-15 16:45:40 +08:00
kasinooya
17ebf07ad3 Add picture-card demo 2016-01-15 16:44:07 +08:00
afc163
5d2d5b2604 Merge branch 'master' into develop-0.12.0 2016-01-15 16:12:40 +08:00
kasinooya
12c792147e Merge develop-0.12.0 into HEAD 2016-01-15 16:11:31 +08:00
kasinooya
a6f68b2d37 fix eslint error 2016-01-15 15:57:41 +08:00
kasinooya
4d0e873c88 Add upload listType: picture-card 2016-01-15 15:56:06 +08:00
afc163
a681ea9eb9 fix fileList demo 2016-01-15 15:41:47 +08:00
afc163
229b0de3c6 upgrade rc-upload to 1.8.0, close #677 2016-01-14 21:15:25 +08:00
Benjy Cui
41ed04e977 style: update code style to please lint 2016-01-14 16:46:38 +08:00
afc163
2e3ccfb345 Merge branch 'master' into develop-0.12.0 2016-01-13 22:48:54 +08:00
afc163
63476680bd Add upload inline item demo, ref #859 2016-01-13 22:44:45 +08:00
afc163
fdcc665c80 merge drag upload demo 2016-01-13 22:39:02 +08:00
afc163
027a69b0f0 hide multiple upload demo 2016-01-13 22:32:42 +08:00
Benjy Cui
632cd36e63 chore: suppress warning 2016-01-11 09:49:31 +08:00
Benjy Cui
b72d18fd44 style: update code style to please the fucking lint 2016-01-11 09:49:30 +08:00
Benjy Cui
209170e813 style: update demo code style to please lint 2016-01-11 09:49:30 +08:00
Benjy Cui
711d2d7413 style: update code style to please lint 2016-01-11 09:49:30 +08:00
afc163
91bd7f22c0 use mountNode replace the long getElementById 2015-12-29 12:08:58 +08:00
Benjy Cui
5699e61fd0 fix: uploadList should under the controll of beforeUpload #757 2015-12-28 14:16:34 +08:00
afc163
5476bf1afe fix previewFile error in uploadList 2015-12-28 13:07:47 +08:00
afc163
b1a136d208 improve uploadList previewFile 2015-12-27 16:00:40 +08:00
afc163
6f42cceb4a use file.url after thumbUrl 2015-12-27 15:43:49 +08:00
afc163
c2cb6ea1b1 fix previewFile, ref #750 2015-12-27 15:37:17 +08:00
afc163
1f98c85e8a support preview picture in upload list, close #750 2015-12-27 15:32:37 +08:00
afc163
0bd2ed9378 update upload style 2015-12-14 11:56:00 +08:00
afc163
721c00e925 fix className 2015-12-14 11:45:35 +08:00
afc163
7288dfbaf9 Add picture style upload list 2015-12-13 17:46:06 +08:00
afc163
6b4d7b3622 remove ref in Icon 2015-12-04 15:06:36 +08:00
afc163
16abf46071 Fix markdown eslint errors, update .eslintrc 2015-11-25 18:10:34 +08:00