Commit Graph

891 Commits

Author SHA1 Message Date
zhujun24
e8923b5d46 Merge remote-tracking branch 'upstream/0.8.0' into notification 2015-08-17 17:49:27 +08:00
ioldfish
cb2a711ee2 Merge branch '0.8.0' of https://github.com/ant-design/ant-design into 0.8.0 2015-08-17 17:35:27 +08:00
ioldfish
1b78c4fc90 merge from fortree 2015-08-17 17:32:59 +08:00
afc163
662f8889bf fix menu-item link, #139 2015-08-17 17:28:48 +08:00
afc163
fab3280ed2 code style update 2015-08-17 17:03:16 +08:00
afc163
3922656566 RadioGroup defaultValue 2015-08-17 16:54:42 +08:00
afc163
9d5e0a2e58 remove unused state visible 2015-08-17 16:44:38 +08:00
afc163
539ac64998 除了自定义页脚外,点击取消不需要手动设置关闭 2015-08-17 16:42:33 +08:00
zhujun24
bcaa2ed0f5 optimize close function 2015-08-17 15:58:38 +08:00
afc163
4af25dffb2 code style 2015-08-17 15:17:04 +08:00
afc163
b6f34c5dde Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-17 13:59:28 +08:00
afc163
906b30b796 update menu props 2015-08-17 13:58:21 +08:00
偏右
4745c00a8c Merge pull request #135 from zhujun24/color
label htmlFor
2015-08-17 13:23:19 +08:00
zhujun24
d3784423ac label htmlFor 2015-08-17 13:16:36 +08:00
ioldfish
40e998f377 update api 2015-08-17 12:49:19 +08:00
然则
4b705d7c85 up less 2015-08-17 12:17:20 +08:00
然则
bf52026789 up tree and checkbox 2015-08-16 20:04:42 +08:00
然则
61f061b00f up api 2015-08-15 23:45:25 +08:00
afc163
2eecc1071b update eslint and fix indent problems 2015-08-15 15:08:55 +08:00
yiminghe
fea0870a41 update menu 2015-08-15 00:07:40 +08:00
然则
82bf118a73 up iconfont 2015-08-14 23:28:20 +08:00
afc163
de38390271 改进 menu 的样式
参照 ant-design 的视觉稿微调
2015-08-14 18:16:41 +08:00
afc163
edc0f4bbc0 modal custom footer demo 2015-08-14 14:35:15 +08:00
afc163
ce5d7b9d9c update rc-upload to 1.3.0, modify onError arguments 2015-08-14 14:17:22 +08:00
yiminghe
b3af79ab24 upgrade. Fixes #127 2015-08-13 16:39:51 +08:00
chencheng (云谦)
39701f89da typo fix 2015-08-13 16:19:37 +08:00
zhujun24
94b2afc1ff Merge remote-tracking branch 'upstream/0.8.0' into notification 2015-08-12 16:50:32 +08:00
jljsj
c6787592e3 Merge branches '0.8.0' and '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-12 14:58:40 +08:00
jljsj
5b47891c52 更新enterAnimation版本与demo 2015-08-12 14:57:45 +08:00
afc163
f6aaefa43f remove useless code for sorter className 2015-08-12 13:04:13 +08:00
afc163
d1b581be06 fix table dataSource propTypes 2015-08-12 12:51:33 +08:00
afc163
dfff7ef86b fix sort and filter 2015-08-12 12:47:04 +08:00
yiminghe
d95d4e4aea fix sort 2015-08-12 11:50:07 +08:00
yiminghe
e24850f42d disabled prop modify 2015-08-12 11:26:36 +08:00
yiminghe
222545b771 Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-11 23:33:29 +08:00
yiminghe
79e54f03f5 upgrade menu 2015-08-11 23:32:49 +08:00
afc163
137e40acae bordered table 2015-08-11 20:05:52 +08:00
afc163
3be09f62f5 disable tree link 2015-08-11 17:10:06 +08:00
afc163
f5afbf16aa Improve table ajax dataSource
1. Add ajax data params support
2. improve dataSource.clone for new config
2015-08-11 16:57:17 +08:00
然则
6da7db4ec2 up rc-tree version 2015-08-10 20:23:18 +08:00
yiminghe
6bba4f755c Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-10 17:57:52 +08:00
yiminghe
eef1da7ed6 upgrade menu 2015-08-10 17:57:28 +08:00
zhujun24
b3651a4be4 Merge remote-tracking branch 'upstream/0.8.0' into notification 2015-08-10 16:52:43 +08:00
afc163
ebf0168ece update select size in form 2015-08-10 16:24:15 +08:00
afc163
804da578de Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-10 16:21:21 +08:00
偏右
df8ccf6d46 Merge pull request #121 from zhujun24/input-size
Input size
2015-08-10 16:21:00 +08:00
zhujun24
dee35bd833 optimize code style 2015-08-10 15:39:50 +08:00
afc163
caa86aa185 typo 2015-08-10 15:33:46 +08:00
afc163
3acb9d4eba update datepicker demo 2015-08-10 15:14:47 +08:00
zhujun24
f85248726d form input large size 2015-08-10 14:34:25 +08:00
zhujun24
ea3f38a58a unify size api name 2015-08-10 13:22:50 +08:00
afc163
9f1b188f87 fix remove logic in upload 2015-08-09 18:23:18 +08:00
afc163
f9157ab8c4 code style 2015-08-09 18:13:46 +08:00
afc163
dae05a55c4 merge 2015-08-09 18:05:50 +08:00
afc163
b68ec83e36 优化 upload 实现
1. 使用 Upload.dragger 代替 type
2. 将拖拽上传的内容区域交给用户自己实现
3. 改进 uploadList 的实现方式, 尽量避免使用 Dom 操作
4. 优化样式展现
2015-08-09 18:00:20 +08:00
玄寂
63cf7bb742 feat: add upload component 2015-08-08 23:37:35 +08:00
zhujun24
e3e17376f0 selece size 2015-08-08 19:11:10 +08:00
zhujun24
7b64e31ea3 inputNumber size 2015-08-08 17:59:57 +08:00
yiminghe
4f381b0301 fix #120 2015-08-07 19:21:02 +08:00
jljsj
e1a6cfc72a updata enterAnimation version 2015-08-07 17:07:19 +08:00
afc163
0d41181c1b update component text 2015-08-07 12:20:30 +08:00
afc163
43dbc2f24b code style fix 2015-08-07 11:10:46 +08:00
afc163
4c8d3994a2 improve code style 2015-08-07 10:58:15 +08:00
afc163
6b72cc2e93 Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-07 10:56:04 +08:00
偏右
cee218be33 Merge pull request #119 from ant-design/datasource
fix datasource
2015-08-07 10:55:40 +08:00
afc163
9b68103643 prefix className for affix 2015-08-07 10:50:52 +08:00
SimaQ
575af92b92 update email validation demo 2015-08-07 09:57:12 +08:00
yiminghe
d60fca4993 fix datasource 2015-08-07 01:03:42 +08:00
zhujun24
72e760d0bd bug still exist 2015-08-06 20:55:30 +08:00
SimaQ
ac1852117b update 2015-08-06 18:58:37 +08:00
zhujun24
ec462fde00 merge 0.8.0 2015-08-06 18:28:48 +08:00
afc163
8a4c6c37be code style 2015-08-06 17:42:13 +08:00
yiminghe
9616341007 Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-06 16:50:20 +08:00
yiminghe
4d203b6e67 add menu 2015-08-06 16:49:54 +08:00
afc163
c2933a8e52 update tabs style 2015-08-06 16:47:01 +08:00
afc163
a22e135a78 Add duration config for notification 2015-08-06 15:32:18 +08:00
afc163
9963c41029 improve code style 2015-08-06 15:19:45 +08:00
afc163
287c9ec5fd remove config global top demo of notification 2015-08-06 15:13:30 +08:00
afc163
d82154825c typo 2015-08-06 14:11:02 +08:00
afc163
3446d87c9c Add defaultValue for datepicker 2015-08-06 12:23:49 +08:00
afc163
67a200ee30 添加联动的选择框, fix #115 2015-08-06 12:06:05 +08:00
ioldfish
817e5ff72a upadte tree style 2015-08-06 09:17:40 +08:00
SimaQ
2bccf59028 correct typo 2015-08-06 08:59:00 +08:00
afc163
8b338e626a fix margin right 2015-08-05 22:03:24 +08:00
afc163
9a200ec782 update text 2015-08-05 21:18:34 +08:00
SimaQ
2e47b732c0 Merge branch '0.8.0' of https://github.com/ant-design/ant-design into 0.8.0 2015-08-05 17:56:26 +08:00
ioldfish
0065270e7f update ant-tree style 2015-08-05 17:38:02 +08:00
SimaQ
76677a2a2a update the interactive method for email validation 2015-08-05 14:47:47 +08:00
afc163
6d2cf352c3 return promise object from fetch 2015-08-05 11:04:00 +08:00
afc163
cfaabbb825 Improve dataSource implementation
1. move advance-ajax to ajax demo
2. remove plain object dataSource support
3. use propTypes over judgement of constructor
2015-08-05 10:58:21 +08:00
afc163
3c95c727b3 Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-05 10:21:35 +08:00
SimaQ
9fcae54f84 format code style and add some words 2015-08-05 10:12:12 +08:00
逸达
b97d01f288 遵循格式要求 2015-08-05 01:44:21 +08:00
逸达
7ba8e08b5a 加入Table 远程模式支持由外界发起请求方法 2015-08-05 01:42:37 +08:00
afc163
6502bc3015 Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-04 20:01:53 +08:00
yiminghe
10ff094b46 typo 2015-08-04 18:44:07 +08:00
yiminghe
0e58688dc2 fix adjustOrientOnCalendarOverflow 2015-08-04 18:42:41 +08:00
zhujun24
3c003cd00a remove top.md add duration.md 2015-08-04 17:43:51 +08:00
afc163
d0e7da6c7c update some demo text 2015-08-04 17:07:31 +08:00
zhujun24
b57f110e2d modify text and style 2015-08-04 16:07:31 +08:00
zhujun24
7e379b8e47 fixed style 2015-08-04 15:48:00 +08:00
yiminghe
dcb0d89f51 fix notice api 2015-08-04 15:20:43 +08:00
yiminghe
807b5530e4 Merge pull request #110 from ant-design/fix-notification
fix notification
2015-08-04 15:18:38 +08:00
yiminghe
ebc4aac58e fix notification 2015-08-04 15:16:10 +08:00
sorrycc
968b640fc2 add resize event for affix 2015-08-04 15:03:00 +08:00
sorrycc
e79150ed39 fix(affix): offset 2015-08-04 14:57:28 +08:00
偏右
2fe97eb8ee Merge pull request #88 from zhujun24/notification
Notification
2015-08-04 11:45:40 +08:00
zhujun24
befde97f70 remove defaultClose 2015-08-03 19:23:25 +08:00
zhujun24
216af6d8df 为什么撤销不掉对closable.md的修改 2015-08-03 18:20:21 +08:00
zhujun24
cb96fc370d remove alert change 2015-08-03 18:14:04 +08:00
zhujun24
f7c7bbe76f config top 2015-08-03 18:00:22 +08:00
sorrycc
cb1ce102ff move style declaractions under .ant-carousel 2015-08-03 17:45:58 +08:00
sorrycc
ebf1c3ed25 add Carousel 2015-08-03 17:43:05 +08:00
afc163
ad2e78ce80 fix #94 2015-08-03 17:39:29 +08:00
sorrycc
eb4f468b49 add Affix 2015-08-03 17:12:50 +08:00
afc163
ee91436840 update datepicker size style 2015-08-03 16:57:03 +08:00
偏右
c87c37329c Merge pull request #108 from zhujun24/input-size
component input size
2015-08-03 16:47:55 +08:00
zhujun24
fc6fe4ecd0 datepicker size lg sm 2015-08-03 16:16:07 +08:00
ioldfish
0cfd895310 Merge branch '0.8.0' of https://github.com/ant-design/ant-design into 0.8.0 2015-08-03 16:13:43 +08:00
ioldfish
936e5e8369 包装rc-tree,样式待修改 2015-08-03 16:11:56 +08:00
ioldfish
c18af7db79 包装rc-tree,样式待修改 2015-08-03 16:07:21 +08:00
jljsj
0673ba9d16 更新转场新增按钮交互与更新motion里的select 2015-08-03 16:04:24 +08:00
zhujun24
0a79201536 merge conflict index.js 2015-08-03 15:22:04 +08:00
zhujun24
4ef0ac9e9b add icon style and top 2015-08-03 15:17:12 +08:00
SimaQ
5f70cf024a feat: add form-validation 2015-08-03 13:39:58 +08:00
zhujun24
47606396c3 remove alert alter 2015-08-03 11:38:55 +08:00
zhujun24
95c098e61f merge 0.8.0 2015-08-03 09:47:59 +08:00
然则
fcd8a7fd3f fix #99 2015-08-01 17:51:55 +08:00
afc163
f62aa38ee8 Add components index.md 2015-08-01 14:08:04 +08:00
afc163
d7af23d93a merge master 2015-08-01 14:04:04 +08:00
zhujun24
a4f6890dec merge 0.8.0 2015-07-31 18:19:36 +08:00
zhujun24
725a2aa7ad remove customClose 2015-07-31 18:13:32 +08:00
afc163
7d0413fbb6 修复本地模式排序头状态失效 2015-07-31 12:41:42 +08:00
afc163
988bdf09bc 空的筛选项应该返回全量数据 2015-07-31 11:54:46 +08:00
afc163
a0d416d4a1 code style 2015-07-31 11:47:00 +08:00
yiminghe
cc58965426 fix table 2015-07-31 10:40:23 +08:00
yiminghe
5aa19b5567 fix message 2015-07-31 00:01:37 +08:00
afc163
e00a562ca9 优化 Tag 关闭的逻辑, #84 2015-07-30 23:52:44 +08:00
yiminghe
19e2c2700a stable 2015-07-30 21:55:16 +08:00
yiminghe
d64c40ffee fix message 2015-07-30 21:32:12 +08:00
zhujun24
3c05b56a2d modify notification #88 2015-07-30 21:04:52 +08:00
afc163
5c0fabe855 update enter animation document 2015-07-30 19:11:39 +08:00
afc163
ded87acbb3 improve layout demo display 2015-07-30 18:44:39 +08:00
afc163
7a670887d8 update progress demo 2015-07-30 18:42:11 +08:00
偏右
9656efd720 Merge pull request #97 from ant-design/progress-bar
增加showInfo配置
2015-07-30 18:20:54 +08:00
夏奈
bbac575112 showInfo 是否显示数值配置 2015-07-30 17:27:41 +08:00
偏右
714c5faa1c Merge pull request #96 from ant-design/progress-bar
Progress bar
2015-07-30 16:12:49 +08:00
夏奈
1bb6711a00 颜色修改 2015-07-30 15:54:08 +08:00
夏奈
5f1fad2a18 progress bar active 2015-07-30 15:14:00 +08:00
夏奈
df16cc2118 progress bar active 2015-07-30 15:07:38 +08:00
夏奈
3299740968 progress bar 和 progress circle api分开 2015-07-30 14:26:41 +08:00
偏右
4135a00e79 Merge pull request #84 from ant-design/components-tag
Components tag
2015-07-30 13:01:09 +08:00
afc163
b607ab32cf support config message top globally 2015-07-30 11:47:46 +08:00
zhujun24
9667b49701 Merge branch 'master' into notification 2015-07-30 11:33:21 +08:00
偏右
e792a7d10b Merge pull request #92 from zhujun24/alert-icon-text
modify icon and text
2015-07-30 11:26:42 +08:00
zhujun24
dcc482aa28 merge from alert-icon-text 2015-07-30 11:26:16 +08:00
zhujun24
e7fd922429 modify icon and text 2015-07-30 11:20:14 +08:00
afc163
43c53f1d8d loading button should be unhandlable 2015-07-30 11:15:03 +08:00
afc163
e067bcd7a5 merge from 0.8.0 2015-07-30 10:52:30 +08:00
zhujun24
26df3480ff Merge branch 'alert' into notification 2015-07-30 10:50:11 +08:00
zhujun24
36473be278 merge new-alert-merge 2015-07-30 10:41:48 +08:00
zhujun24
75032b0322 remodify alert icon ang text 2015-07-30 10:38:40 +08:00
夏奈
fc69971f99 progress bar 和 progress circle api分开 2015-07-29 23:36:27 +08:00
夏奈
ef3f753470 progress bar style 2015-07-29 23:32:24 +08:00
afc163
b8ef693afc button loading animation effect 2015-07-29 22:23:55 +08:00
夏奈
a85586844c progress bar style 2015-07-29 22:20:05 +08:00
zhujun24
718751d063 merge 0.8.0 2015-07-29 21:07:02 +08:00
zhujun24
a7cb87b64d merge from 0.8.0 2015-07-29 20:43:44 +08:00
zhujun24
554d363520 modify icon and text 2015-07-29 20:24:07 +08:00
afc163
3c47cf2039 set event as onClose argument 2015-07-29 20:13:42 +08:00
zhujun24
42024530d0 notification 2015-07-29 20:08:16 +08:00
afc163
35c7b96f26 update alert description 2015-07-29 18:45:56 +08:00
afc163
706caa855f update alert component 2015-07-29 18:44:56 +08:00
偏右
e4b9ce0f6e Merge pull request #86 from zhujun24/alert
fixed three problems
2015-07-29 18:30:28 +08:00
afc163
ee71eb88a8 rm motion from components 2015-07-29 18:28:35 +08:00
zhujun24
a45bcd4d07 fixed closable introduce in index.md 2015-07-29 17:33:28 +08:00
afc163
7276554fd5 修改站点结构,开放设计文档 2015-07-29 17:23:11 +08:00
zhujun24
cdbbc4d34e fixed three problems 2015-07-29 17:22:36 +08:00
afc163
9acba5d4ae change category 2015-07-29 16:30:26 +08:00
偏右
5bc99bbe26 Merge pull request #83 from zhujun24/alert
Alert
2015-07-29 15:38:08 +08:00
afc163
4eb849c783 fix boolean expression always true 2015-07-29 15:29:29 +08:00
zhujun24
2eb253f0ed fixed close style 2015-07-29 15:22:47 +08:00
afc163
3807c2ce31 Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-07-29 15:08:24 +08:00
偏右
16a02f0a99 Merge pull request #81 from ant-design/enter-animation
Enter animation
2015-07-29 15:07:42 +08:00
afc163
d32b9bfeac 修改 enter-animation 文档 2015-07-29 15:02:19 +08:00
jljsj
9fc8e7bb88 updata enter-animaiton index.md 2015-07-29 14:53:02 +08:00
jljsj
a13b5d3b02 updata js 0.1.3 and md 2015-07-29 14:50:00 +08:00
afc163
6f70303e90 Fix table, 当数据量少于每页数量时,直接设置数据 2015-07-29 14:01:15 +08:00
yiminghe
ee10b7c7d8 fix ant-select 2015-07-29 12:50:41 +08:00
jljsj
1559d44c96 updata specs and child node Animation 2015-07-29 12:17:18 +08:00
zhujun24
c494da18aa optimize alert 2015-07-29 10:27:31 +08:00
afc163
65d6f32e18 update radio API document 2015-07-28 20:22:37 +08:00
afc163
09c0bd7c4b update tag demo and document 2015-07-28 20:15:25 +08:00
afc163
2e0be628a7 update tag style 2015-07-28 20:03:10 +08:00
afc163
2b85689477 update animation demo 2015-07-28 18:33:40 +08:00
jljsj
8f1a616b2e add enterAnimation 2015-07-28 17:55:40 +08:00
afc163
6344e9151b Add component tag 2015-07-28 17:08:06 +08:00
jljsj
d8ce9894a8 updata demo 2015-07-28 16:08:52 +08:00
jljsj
fe0ea83ebd updata 2015-07-28 16:06:45 +08:00
jljsj
fbb7a99a9e updata 2015-07-28 15:42:43 +08:00