Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wanjj_1210
ant-design
提交
ac900e29
A
ant-design
项目概览
wanjj_1210
/
ant-design
与 Fork 源项目一致
从无法访问的项目Fork
通知
10
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
ant-design
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ac900e29
编写于
11月 10, 2015
作者:
Y
yiminghe
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update datepicker
上级
cf503260
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
36 deletion
+14
-36
components/datepicker/index.jsx
components/datepicker/index.jsx
+13
-34
components/datepicker/locale.js
components/datepicker/locale.js
+1
-2
未找到文件。
components/datepicker/index.jsx
浏览文件 @
ac900e29
...
...
@@ -7,27 +7,6 @@ import defaultLocale from './locale';
import
CalendarLocale
from
'
rc-calendar/lib/locale/zh_CN
'
;
import
DateTimeFormat
from
'
gregorian-calendar-format
'
;
import
objectAssign
from
'
object-assign
'
;
const
localeFields
=
[
'
eras
'
,
'
months
'
,
'
shortMonths
'
,
'
weekdays
'
,
'
shortWeekdays
'
,
'
veryShortWeekdays
'
,
'
ampms
'
,
'
datePatterns
'
,
'
timePatterns
'
,
'
dateTimePattern
'
];
// 转换 locale 为 rc-calender 接收的格式
function
getCalendarLocale
(
locale
)
{
locale
.
format
=
locale
.
format
||
{};
localeFields
.
forEach
(
function
(
key
)
{
locale
.
format
[
key
]
=
locale
[
key
];
});
return
locale
;
}
function
createPicker
(
TheCalendar
)
{
return
React
.
createClass
({
...
...
@@ -75,13 +54,13 @@ function createPicker(TheCalendar) {
if
(
formats
[
format
])
{
return
formats
[
format
];
}
formats
[
format
]
=
new
DateTimeFormat
(
format
);
formats
[
format
]
=
new
DateTimeFormat
(
format
,
this
.
getLocale
().
lang
.
format
);
return
formats
[
format
];
},
parseDateFromValue
(
value
)
{
if
(
value
)
{
if
(
typeof
value
===
'
string
'
)
{
return
new
DateTimeFormat
(
this
.
props
.
format
).
parse
(
value
,
this
.
getLocale
());
return
this
.
getFormatter
(
).
parse
(
value
,
this
.
getLocale
());
}
else
if
(
value
instanceof
Date
)
{
let
date
=
new
GregorianCalendar
(
this
.
getLocale
());
date
.
setTime
(
value
);
...
...
@@ -114,7 +93,7 @@ function createPicker(TheCalendar) {
<
TheCalendar
style
=
{
this
.
props
.
calendarStyle
}
disabledDate
=
{
this
.
props
.
disabledDate
}
locale
=
{
getCalendarLocale
(
this
.
getLocale
().
lang
)
}
locale
=
{
this
.
getLocale
().
lang
}
defaultValue
=
{
defaultCalendarValue
}
dateInputPlaceholder
=
{
this
.
props
.
placeholder
}
showTime
=
{
this
.
props
.
showTime
}
...
...
@@ -140,17 +119,17 @@ function createPicker(TheCalendar) {
align
=
{
this
.
props
.
align
}
onChange
=
{
this
.
handleChange
}
>
{
({
value
})
=>
{
return
<
span
>
<
input
disabled
=
{
this
.
props
.
disabled
}
onChange
=
{
this
.
handleInputChange
}
value
=
{
value
&&
this
.
getFormatter
().
format
(
value
)
}
placeholder
=
{
this
.
props
.
placeholder
}
className
=
{
'
ant-calendar-picker-input ant-input
'
+
sizeClass
}
/>
<
span
className
=
"ant-calendar-picker-icon"
/>
</
span
>;
({
value
})
=>
{
return
<
span
>
<
input
disabled
=
{
this
.
props
.
disabled
}
onChange
=
{
this
.
handleInputChange
}
value
=
{
value
&&
this
.
getFormatter
().
format
(
value
)
}
placeholder
=
{
this
.
props
.
placeholder
}
className
=
{
'
ant-calendar-picker-input ant-input
'
+
sizeClass
}
/>
<
span
className
=
"ant-calendar-picker-icon"
/>
</
span
>;
}
}
}
</
Datepicker
>
</
span
>;
}
...
...
components/datepicker/locale.js
浏览文件 @
ac900e29
import
objectAssign
from
'
object-assign
'
;
import
GregorianCalendarLocale
from
'
gregorian-calendar/lib/locale/zh_CN
'
;
import
CalendarLocale
from
'
rc-calendar/lib/locale/zh_CN
'
;
import
GregorianCalendarFormatLocale
from
'
gregorian-calendar-format/lib/locale/zh_CN
'
;
// 统一合并为完整的 Locale
let
locale
=
objectAssign
({},
GregorianCalendarLocale
);
locale
.
lang
=
objectAssign
({},
CalendarLocale
,
GregorianCalendarFormatLocale
);
locale
.
lang
=
objectAssign
({},
CalendarLocale
);
// All settings at:
// https://github.com/ant-design/ant-design/issues/424
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录