Commit Graph

2960 Commits

Author SHA1 Message Date
afc163
f862655df5 Merge branch '1.x-stable' of github.com:ant-design/ant-design into 1.x-stable 2016-07-26 19:47:53 +08:00
afc163
75da5a358a fix some site style 2016-07-26 19:45:55 +08:00
lixiaochou077
039b064529 docs: translation timepicker (#2491) 2016-07-26 11:03:44 +08:00
ddcat1115
87a159b18f docs: Switch-translation (#2489) 2016-07-26 09:17:46 +08:00
然则
a7eea77637 up tree-select 2016-07-25 20:17:52 +08:00
afc163
a5eb044d5c update BackTop doc 2016-07-25 19:37:23 +08:00
afc163
47d273669d Merge branch '1.x-stable' of github.com:ant-design/ant-design into 1.x-stable 2016-07-25 19:31:12 +08:00
afc163
3a2fbf9815 modify BackTop chinese name 2016-07-25 19:28:52 +08:00
Benjy Cui
331b2fdf73 chore: fix 2016-07-25 17:54:09 +08:00
陆离
552fa228ee feat: AutoComplete (#2490) 2016-07-25 17:46:45 +08:00
陆离
ac32dd5811 feat: debounce before spinning => debounce after spinning (#2486) 2016-07-25 16:35:00 +08:00
陆离
0f6a8e2ff7 feat: debounce before spinning => debounce after spinning (#2486) 2016-07-25 16:31:59 +08:00
Benjy Cui
11660c128b docs: update demo, close: #1872 2016-07-25 16:08:18 +08:00
afc163
ca57794ae7 better implement for a2804cb 2016-07-25 14:03:56 +08:00
warmhug
408027b95d add tree's tips 2016-07-25 12:15:59 +08:00
warmhug
bc5f5d5ba4 add tree's tips 2016-07-25 12:08:43 +08:00
afc163
5ec1a99dd4 fix transition 2016-07-25 11:57:37 +08:00
afc163
f3f952e40f fix tslint 2016-07-25 11:39:54 +08:00
afc163
7a52a6fafe Fix context types 2016-07-25 11:35:51 +08:00
afc163
3543cdc1cf Merge branch 'master' of github.com:ant-design/ant-design 2016-07-25 11:28:56 +08:00
ddcat1115
a396e3779a Ts rewrite popconfirm (#2472)
* Popconfirm rewrite

* fix`
2016-07-25 11:28:43 +08:00
afc163
45c0a6e38f blank line 2016-07-25 11:28:19 +08:00
afc163
e0c0830a04 Fix TimelineItem custom color, close #2479 2016-07-24 16:19:46 +08:00
yeliex
f12bbdfdd0 修复了select组件placeholder溢出的问题 (#2480) 2016-07-24 15:15:13 +08:00
afc163
1b001c7672 Merge 1.x-stable 2016-07-24 15:07:50 +08:00
然则
77b0952e36 fix #2393 #2459 #2401
Conflicts:
	package.json
2016-07-24 14:26:19 +08:00
afc163
5c52c21435 inline menu does not highlight selected sub-menu 2016-07-24 14:23:41 +08:00
afc163
32ab285886 Merge branch '1.x-stable' 2016-07-24 13:49:42 +08:00
ddcat1115
79ef6a0664 fix #2414 2016-07-22 18:42:47 +08:00
afc163
2face80716 Click todayButton should trigger onChange, close #1902 2016-07-22 16:14:50 +08:00
afc163
1a1ed29717 Add switch :active style 2016-07-22 14:23:59 +08:00
afc163
2a54161e51 fix eslint 2016-07-21 21:19:37 +08:00
afc163
a2804cbff5 Make clear icon more clear 2016-07-21 20:57:44 +08:00
afc163
a72d9ec381 Merge 2016-07-21 18:10:13 +08:00
afc163
dd80613cd1 Merge branch '1.x-stable' of github.com:ant-design/ant-design into 1.x-stable 2016-07-21 18:08:35 +08:00
afc163
db00e94b40 fix links 2016-07-21 18:07:49 +08:00
afc163
a458de0a88 fix prefer-const 2016-07-21 18:05:15 +08:00
afc163
398b8ac708 typo 2016-07-21 15:53:33 +08:00
afc163
497cc1f65a improve FormItem colon (#2311) 2016-07-21 15:51:37 +08:00
afc163
a30f0090b9 update metion doc 2016-07-21 15:41:40 +08:00
afc163
57a34d8f5d fix metion styles 2016-07-21 15:40:13 +08:00
afc163
aa8e02326a update metion docs 2016-07-21 15:23:04 +08:00
afc163
92d127d8a5 Fix DatePicker style 2016-07-21 15:20:01 +08:00
ddcat1115
eba54529ca table-title style (#2452) 2016-07-21 15:14:42 +08:00
afc163
5eb52885d6 @background-color-base 2016-07-21 15:02:24 +08:00
afc163
1138b69c6d Merge branch 'master' of github.com:ant-design/ant-design 2016-07-21 14:40:11 +08:00
afc163
db4cbabf0c Merge 2016-07-21 14:39:28 +08:00
陆离
4ad8b2f96c Merge pull request #2441 from RaoHai/MentionComponent
Mention component fix
2016-07-21 14:37:29 +08:00
afc163
42d34a5db3 Merge branch '1.x-stable' 2016-07-21 14:34:37 +08:00
afc163
44b8f38a3c fix disabled menu item background 2016-07-21 14:30:37 +08:00
afc163
7aad78c508 improve progress style 2016-07-21 14:27:54 +08:00
afc163
54c7192d1e Update code style of Steps demos 2016-07-21 14:20:49 +08:00
afc163
a26c2e8888 Fix breadcrume style detail, close #2434 2016-07-21 11:48:56 +08:00
Benjy Cui
5bee7d2088 docs: fix translation 2016-07-21 10:15:00 +08:00
却痕
e202c7d2b3 docs: translation of Rate && Radio (#2440) 2016-07-21 10:10:04 +08:00
Leon Shi
3d070b8d85 docs: translate Cascader's documentation to English (#2433) 2016-07-21 10:09:01 +08:00
ddcat1115
2b20ac0456 docs: steps translation (#2430) 2016-07-21 10:07:30 +08:00
Gray Choi
b0bf2a5c0e docs: translate tree component (#2395) 2016-07-21 09:52:39 +08:00
陆离
49e164d09d docs: translation of Spin and Slider (#2378) 2016-07-21 09:51:04 +08:00
RaoHai
1ccfad13f7 Mention Component fix
- 现在只输入一个 @ 符号,dropdown 也会弹出。
 - 输入框失去焦点后,dropdown 会消失。
 - 添加受控模式示例
 - 添加 `getMentions(editorState: EditorState): Array<String>` Api,
   可以获取当前提到的人。
 - 添加了校验样式
 - 其他样式修正
2016-07-20 19:01:11 +08:00
yiminghe
12b531efb3 Merge pull request #2416 from RaoHai/improvementOfDatePicker
DatePicker 组件优化
2016-07-20 11:17:35 +08:00
yiminghe
6158b39335 Merge pull request #2259 from RaoHai/MentionComponent
Mention Component
2016-07-20 11:17: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
RaoHai
8c739abeb5 style lint 2016-07-19 16:00:19 +08:00
RaoHai
7dd4a019d5 DatePicker 组件优化
+ DatePicker showTime: 面板上的日期展示输入框统一为一个,格式和外面的输入框同步,并且支持手动修改。
 面板上的 TimePicker
 + DatePicker showTime: 输入框不再展示,改造为『选择时间』,点击后不再展开浮层,直接盖住日期区域。
 + RangePicker showTime : 只选中开始日期,“确定”和“选择时间”灰置。 如未选择日期直接选择时间,开始日期和结束日期默认选中当天。
 + RangePicker showTime : 点击框外和确定均为确定操作。
 + RangePicker showTime : 在时间页面,开始时间的默认状态为当前时间,结束时间的默认状态跟随开始时间。
 + RangePicker showTime : 开始时间的选择范围没有限制,结束时间的选择范围必须大于等于开始时间。
 + RangePicker showTime : 当开始时间选择了结束时间之后的时间(发生冲突),结束时间则自动切换到与开始时间相同的时间。
2016-07-19 16:00:19 +08:00
yiminghe
3342aae9f3 upgrade 2016-07-19 15:46:00 +08:00
RaoHai
3095f58be8 export toEditorState of Mention 2016-07-19 13:39:05 +08:00
RaoHai
3fe36f4584 export toString of Mention 2016-07-19 12:31:03 +08:00
afc163
e2cc2838fd Fix lesshint 2016-07-18 22:24:53 +08:00
RaoHai
23df8f7504 tslint fix 2016-07-18 17:58:55 +08:00
RaoHai
69da207f3c support value props and controllred mode 2016-07-18 16:58:52 +08:00
RaoHai
f547a97020 lesslint fix 2016-07-18 16:58:52 +08:00
RaoHai
595938f5f2 Mention Component 2016-07-18 16:58:52 +08:00
RaoHai
8e3d2b823a improvement after review 2016-07-18 16:58:52 +08:00
RaoHai
1fd4837d25 lesslint fix 2016-07-18 16:58:52 +08:00
RaoHai
01fabac77a Mention Component 2016-07-18 16:58:52 +08:00
afc163
765150f17d fix cascader props warning (#2258) 2016-07-16 15:50:27 +08:00
afc163
f0995bd1e3 Merge 1.x-stable 2016-07-15 16:42:58 +08:00
afc163
43d8c0a4a2 Fix DatePicker onChange and onOk when showTime
onChange should be triggered at clicking ok button
when showTime is true. You can use onChange replace onOk
anytime.

This commit revert a05b4e6, which break the behavious above.

close #2399, also fix #2120
2016-07-15 16:26:14 +08:00
afc163
e7f6f4b869 Fix Transfer search and check all behavious, close #2396 2016-07-15 15:07:31 +08:00
afc163
138a7a9c54 fix code style 2016-07-15 14:01:51 +08:00
afc163
a535238d68 fix cascader input style 2016-07-15 12:46:49 +08:00
Infinity
1c68f17b81 为TimePicker增加定制anchor的API (#2390) 2016-07-15 12:38:42 +08:00
afc163
d7defe458b blank line 2016-07-15 12:37:53 +08:00
yiminghe
91037fa78f Merge pull request #2385 from ant-design/add-typings
Add typings
2016-07-15 11:42:30 +08:00
Infinity
5fa89f280a 为TimePicker增加定制anchor的API (#2390) 2016-07-15 11:11:55 +08:00
afc163
730dbc72f7 Add typings 2016-07-14 18:15:59 +08:00
afc163
2e4d09c68e Fix types 2016-07-13 18:04:38 +08:00
afc163
2e41e35cc6 Fix more tslint problems 2016-07-13 17:22:23 +08:00
afc163
aee2b2c5ad Merge branch '1.x-stable' 2016-07-13 16:26:27 +08:00
afc163
8c9af24d72 fix some tree style 2016-07-13 16:12:44 +08:00
afc163
2d0b56a429 update tree demo 2016-07-13 16:08:10 +08:00
偏右
de359d2cf7 fix tslint problems (#2360) 2016-07-13 11:14:24 +08:00
afc163
5e5bd6af9e Merge branch '1.x-stable' 2016-07-12 21:36:23 +08:00
afc163
4b29e40089 Fix overflow current state in Table, close #2301 2016-07-12 18:45:45 +08:00
afc163
1029419e95 improve code style 2016-07-12 18:24:16 +08:00
afc163
ce7e7c77f0 Fix ts error in Affix (#1846) 2016-07-12 16:07:12 +08:00
afc163
4954f5d733 Merge branch '1.x-stable' 2016-07-12 13:59:58 +08:00
afc163
cf978908e8 Fix overflow combobox, close #2353 2016-07-12 12:17:19 +08:00