Commit Graph

278 Commits

Author SHA1 Message Date
afc163
45c0a6e38f blank line 2016-07-25 11:28:19 +08:00
afc163
32ab285886 Merge branch '1.x-stable' 2016-07-24 13:49:42 +08:00
afc163
2face80716 Click todayButton should trigger onChange, close #1902 2016-07-22 16:14:50 +08:00
afc163
a2804cbff5 Make clear icon more clear 2016-07-21 20:57:44 +08:00
afc163
92d127d8a5 Fix DatePicker style 2016-07-21 15:20:01 +08:00
afc163
5eb52885d6 @background-color-base 2016-07-21 15:02:24 +08:00
afc163
db4cbabf0c Merge 2016-07-21 14:39:28 +08:00
afc163
42d34a5db3 Merge branch '1.x-stable' 2016-07-21 14:34:37 +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
afc163
e2cc2838fd Fix lesshint 2016-07-18 22:24:53 +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
偏右
de359d2cf7 fix tslint problems (#2360) 2016-07-13 11:14:24 +08:00
yiminghe
94706f1d2c fix ts 2016-07-07 20:25:03 +08:00
afc163
d68d42f69b Merge 1.x-stable 2016-07-07 17:26:16 +08:00
afc163
842b55128f Fix clear icon in RangePicker, close #2252 2016-07-07 16:28:00 +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
a24634f3ec Merge 1.x-stable 2016-06-27 14:36:19 +08:00
afc163
6dcc1bc915 fix clear icon style, close #2182 2016-06-27 14:13:30 +08:00
afc163
c7da69036d revert mistake of DatePicker time changed 2016-06-24 17:48:50 +08:00
afc163
619ceffd7e fix createPicker.tsx 2016-06-24 14:43:46 +08:00
afc163
cc4cab5b1e Merge 1.x-stable 2016-06-23 23:11:14 +08:00
afc163
7f8cb3f5cf improve DatePicker clear icon
close #1707, close #1708

ref #1817
2016-06-23 15:40:42 +08:00
yiminghe
9a0d751f94 refactor to typescript 2016-06-22 13:19:48 +08:00
ddcat1115
88f77f85ca docs: translation-DatePicker (#1932) 2016-06-19 11:17:09 +08:00
afc163
94423f60f2 use readOnly 2016-06-15 17:49:16 +08:00
afc163
bec5d311a0 Improve DatePicker start-end demo expierence 2016-06-15 17:46:59 +08:00
afc163
a2d435aad7 Fix range cell background 2016-06-15 16:14:40 +08:00
Benjy Cui
2144349741 style: enable react/jsx-closing-bracket-location 2016-06-06 13:54:10 +08:00
afc163
81dad0452f fix today link style 2016-06-02 21:20:40 +08:00
afc163
a05b4e6747 remove unused compatibility code, fix #1902 2016-06-02 21:19:28 +08:00
RaoHai
c65f201d51 DatePicker improvement
close #1701
2016-05-23 15:58:10 +08:00
afc163
5960ecab7a fix code style 2016-05-21 21:45:07 +08:00
afc163
2464d2acfc Merge branch 'master' of https://github.com/ecofe/ant-design into ecofe-master 2016-05-21 21:44:01 +08:00
afc163
239eaca72c fix doc, close #1761 2016-05-19 11:19:09 +08:00
kaifei
e3ba415822 add callback toggleOpen 2016-05-18 15:55:50 +08:00
Benjy Cui
8842d9342a site: update components' type 2016-05-16 15:41:55 +08:00
Benjy Cui
dd57b6d707 fix: should pass locale to TimePicker 2016-05-11 14:59:32 +08:00
Benjy Cui
ecaa6c56c3 style: enable comma-dangle 2016-05-11 09:32:33 +08:00
afc163
4a3fe9e102 fix TimePicker style in DatePicker 2016-05-10 15:29:15 +08:00
afc163
fcf3242570 upgrade eslint-config-airbnb and fix lints 2016-05-10 15:15:09 +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
22e35544b6 fix: should not cache formatter, close #1509 2016-04-27 11:15:20 +08:00
Leon Shi
baac12d1c4 fix lint (#1513)
* fix lint `prefer-stateless-function`

* fix lint `arrow-body-style`
2016-04-26 14:09:19 +08:00
afc163
293812098a Merge branch master into develop-1.0.0 2016-04-25 19:34:01 +08:00
afc163
0805d4365d update locale demo 2016-04-25 19:27:02 +08:00
afc163
8a422ba2cd update demo 2016-04-15 23:54:47 +08:00
qubaoming
2d72bc58d2 adjust props position & range-picker add showTime options 2016-04-15 14:47:39 +08:00
qubaoming
94e0488812 adjust props position 2016-04-14 16:48:34 +08:00
qubaoming
fc66d27042 change timepicker options to rctimepicker options 2016-04-14 15:48:16 +08:00
qubaoming
6b3a97b902 change timepicker options to rctimepicker options 2016-04-14 15:42:03 +08:00
qubaoming
a674657287 data-picker extent options 2016-04-14 15:14:17 +08:00
qubaoming
c4bdf93a33 Merge remote-tracking branch 'upstream/develop-1.0.0' into develop-1.0.0 2016-04-14 15:10:43 +08:00
qubaoming
fd57f4c12d date-picker extend options 2016-04-14 12:32:25 +08:00
plandem
9af3e4fc55 ru locale (#1411) 2016-04-14 11:57:59 +08:00
Benjy Cui
0ebf6c2ecc style: enable react/prefer-es6-class 2016-04-13 17:23:14 +08:00
afc163
ec04fcac36 Merge branch master into develop-1.0.0 2016-04-13 15:33:44 +08:00
afc163
f75deafc6e Merge branch 'master' of github.com:ant-design/ant-design 2016-04-13 14:37:33 +08:00
afc163
455d3654b8 Fix dateInput format of DatePicker, close #1403 2016-04-13 14:36:43 +08:00
Benjy Cui
208ecf5081 docs: update docs for MonthPicker 2016-04-13 09:25:29 +08:00
afc163
b155ba15cb fix react@15 warning, ref #1340 2016-04-07 18:07:18 +08:00
afc163
1abf831ae8 Merge branch master into develop-1.0.0 2016-04-07 17:55:06 +08:00
afc163
f726979af9 fix(DatePicker): showTime locale problem
close #1356
2016-04-07 17:44:13 +08:00
afc163
655e4d5a7d Add LocaleProvider support for RangePicker 2016-04-01 13:53:37 +08:00
Benjy Cui
df3ba36720 docs: remove useless newline in documentation 2016-04-01 10:08:19 +08:00
Bruce Mitchener
fa65f25b1e Switch RangePicker to ES6 class. 2016-03-31 20:23:39 +07:00
Bruce Mitchener
50d61eb7de Fix RangePicker handleChange callback.
There was a minor typo in 2e86463a6a
which broke the handleChange callback (this.props was replaced with
props.props rather than just props).
2016-03-31 19:32:43 +07:00
Benjy Cui
2a3febfe4c deps: remove useless dependencies 2016-03-31 16:47:03 +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
Benjy Cui
2e86463a6a refactor: remove mixin 2016-03-30 10:52:15 +08:00
Benjy Cui
6157d21089 refactor: DatePicker 2016-03-30 09:50:44 +08:00
Benjy Cui
193ba74bff style: update code style 2016-03-30 09:41:18 +08:00
afc163
703cf31868 Add dateString to DatePicker & TimePicker onChange
close #1104
2016-03-28 12:18:30 +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
20211d448c Add default width for showTime DatePicker 2016-03-23 15:58:46 +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
Benjy Cui
ebab622add Merge branch 'master' of github.com:ant-design/ant-design into develop-1.0.0 2016-03-15 09:47:55 +08:00
afc163
2482140d2f Change context locale name 2016-03-10 10:32:50 +08:00
afc163
99b58e67ec Add other component for locale 2016-03-10 10:32:49 +08:00
afc163
56fb20b76d Fix date-picker style prop 2016-03-09 11:33:05 +08:00
afc163
8070e05de1 update demo 2016-03-02 15:45:37 +08:00
Benjy Cui
c1659c2ce3 style: update code style to please lint 2016-02-22 10:52:30 +08:00
afc163
812225ea41 Fix DatePicker clear not work when showTime 2016-02-19 17:15:31 +08:00
afc163
c1bd0098d2 update code style 2016-02-19 17:14:53 +08:00
afc163
893248dec7 some style and doc 2016-02-18 21:13:13 +08:00
yiminghe
698ebb13b3 optimize calendar 2016-02-18 19:15:23 +08:00
afc163
72d077be1f rollback time format problem, ref #953 2016-02-18 17:50:29 +08:00
Benjy Cui
29825f20c8 style: update code style to please lint 2016-02-17 18:04:42 +08:00
afc163
411f529242 Add getCalendarContainer prop to DatePicker, close #991 2016-02-03 14:30:58 +08:00
afc163
a92bfa7ac8 update date-picker doc 2016-02-02 17:51:59 +08:00
afc163
11f6582235 Fix date-picker onOk 2016-02-02 17:49:44 +08:00
afc163
21eac259b6 fix dateInput format when contains time-picker, close #953 2016-01-30 16:15:43 +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
Benjy Cui
61df1eb1dc fix: should pass formatter to rc-calendar #917 2016-01-26 10:24:15 +08:00
afc163
5fdb2109f4 fix time-picker demo 2016-01-26 00:28:50 +08:00
afc163
14447cb6ae Merge from master 2016-01-19 18:51:45 +08:00
Benjy Cui
07cfe19095 fix: locale should be passed to timePicker #837 2016-01-19 09:26:24 +08:00
yiminghe
dc3b34510b compatible with rc-form 2016-01-14 19:15:21 +08:00
afc163
a16903009e merge from master 2016-01-13 22:22:33 +08:00
afc163
a479bc8fe3 Fix MonthPicker style, close #848 2016-01-13 17:30:54 +08:00
Benjy Cui
aa5c4f9595 style: update code style to please lint 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
1e001d2d82 upgrade eslint-config-airbnb 2016-01-11 09:48:29 +08:00
yiminghe
a5efd5d028 fix range picker 2016-01-02 17:03:56 +08:00
afc163
98b899d0cc timePicker en-US, ref #771 2015-12-29 22:40:09 +08:00
afc163
91bd7f22c0 use mountNode replace the long getElementById 2015-12-29 12:08:58 +08:00
yiminghe
1f22b567d2 fix parseDateFromValue 2015-12-28 11:43:43 +08:00
afc163
c45c6877f8 fix lint problems 2015-12-27 16:20:59 +08:00
afc163
e0fb571ebc Add dateInputPlaceholder 2015-12-25 18:04:01 +08:00
afc163
8dea7fbe15 Rollback with-time-picker demo but do not show 2015-12-25 15:34:32 +08:00
afc163
82bb807932 update RangePicker style 2015-12-25 15:27:24 +08:00
afc163
2fd64b4997 update date-picker api 2015-12-25 01:52:52 +08:00
afc163
69faeb9145 Fix button text whitespace 2015-12-25 01:44:06 +08:00
afc163
2ea1fb48a4 rm onSelect 2015-12-25 01:21:46 +08:00
afc163
cbf7d27664 improve rangepicker and add showTime prop 2015-12-25 01:21:03 +08:00
Benjy Cui
afa40dd919 feat: add RangePicker 2015-12-24 14:45:22 +08:00
afc163
56336717ab Add hint for name changing 2015-12-23 19:09:31 +08:00
afc163
41660c3814 fix value prop of DatePicker to controlled prop 2015-12-12 13:38:25 +08:00
afc163
d759d1f489 Datepicker => DatePicker, Timepicker => TimePicker 2015-12-10 16:30:18 +08:00