Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wanjj_1210
ant-design
提交
26c5c8e1
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,发现更多精彩内容 >>
提交
26c5c8e1
编写于
11月 11, 2016
作者:
B
Benjy Cui
提交者:
偏右
11月 11, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: should work with latest rc-time-picker (#3810)
上级
7dc0328c
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
39 addition
and
6 deletion
+39
-6
components/date-picker/wrapPicker.tsx
components/date-picker/wrapPicker.tsx
+18
-2
components/time-picker/demo/disable-options.md
components/time-picker/demo/disable-options.md
+21
-4
未找到文件。
components/date-picker/wrapPicker.tsx
浏览文件 @
26c5c8e1
...
...
@@ -6,6 +6,20 @@ import warning from '../_util/warning';
import
getLocale
from
'
../_util/getLocale
'
;
declare
const
require
:
Function
;
function
getColumns
({
showHour
,
showMinute
,
showSecond
})
{
let
column
=
0
;
if
(
showHour
)
{
column
+=
1
;
}
if
(
showMinute
)
{
column
+=
1
;
}
if
(
showSecond
)
{
column
+=
1
;
}
return
column
;
}
export
default
function
wrapPicker
(
Picker
,
defaultFormat
?)
{
const
PickerWrapper
=
React
.
createClass
({
getDefaultProps
()
{
...
...
@@ -68,11 +82,13 @@ export default function wrapPicker(Picker, defaultFormat?) {
const
rcTimePickerProps
=
{
format
:
timeFormat
,
showSecond
:
timeFormat
.
indexOf
(
'
ss
'
)
>=
0
,
showMinute
:
timeFormat
.
indexOf
(
'
mm
'
)
>=
0
,
showHour
:
timeFormat
.
indexOf
(
'
HH
'
)
>=
0
,
};
const
columns
=
getColumns
(
rcTimePickerProps
);
const
timePickerCls
=
classNames
({
[
`
${
prefixCls
}
-time-picker-1-column`
]:
!
(
rcTimePickerProps
.
showSecond
||
rcTimePickerProps
.
showHour
)
,
[
`
${
prefixCls
}
-time-picker-2-columns`
]:
rcTimePickerProps
.
showSecond
!==
rcTimePickerProps
.
showHour
,
[
`
${
prefixCls
}
-time-picker-1-column`
]:
columns
===
1
,
[
`
${
prefixCls
}
-time-picker-2-columns`
]:
columns
===
2
,
});
const
timePicker
=
props
.
showTime
?
(
<
TimePickerPanel
...
...
components/time-picker/demo/disable-options.md
浏览文件 @
26c5c8e1
...
...
@@ -40,11 +40,28 @@ function disabledMinutes(h) {
ReactDOM
.
render
(
<
div
>
<
em
>
Just Disabled:
</
em
>
<
TimePicker
disabledHours
=
{
disabledHours
}
disabledMinutes
=
{
disabledMinutes
}
/><
br
/>
<
em
>
Hide Directly:
</
em
>
<
TimePicker
disabledHours
=
{
disabledHours
}
disabledMinutes
=
{
disabledMinutes
}
hideDisabledOptions
/>
<
TimePicker
disabledHours
=
{
disabledHours
}
disabledMinutes
=
{
disabledMinutes
}
placeholder
=
"Just Disabled"
/>
<
TimePicker
disabledHours
=
{
disabledHours
}
disabledMinutes
=
{
disabledMinutes
}
hideDisabledOptions
placeholder
=
"Hide Directly"
/>
</
div
>,
mountNode
);
````
<style>
#components-time-picker-demo-disable-options .ant-time-picker {
width: 120px;
}
#components-time-picker-demo-disable-options .ant-time-picker .ant-time-picker-input {
width: 120px;
margin-right: 8px;
}
</style>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录