Skip to content

Commit

Permalink
docs(DatePicker): usage of timeStamp (alibaba-fusion#1587)
Browse files Browse the repository at this point in the history
* docs(DatePicker): defaultValue add timeStamp
Co-authored-by: aboutblank <[email protected]>
  • Loading branch information
youluna authored Mar 5, 2020
1 parent e00ba42 commit b5dac64
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 0 deletions.
2 changes: 2 additions & 0 deletions docs/date-picker/demo/default.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@ import moment from 'moment';
const { RangePicker, MonthPicker, YearPicker } = DatePicker;
const startValue = moment('2017-11-20', 'YYYY-MM-DD', true);
const endValue = moment('2017-12-15', 'YYYY-MM-DD', true);
const timeStamp = moment(1581938105000);
const onChange = val => console.log(val);

ReactDOM.render(<div>
<DatePicker defaultValue={startValue} onChange={onChange} /><br /><br />
<DatePicker defaultValue={timeStamp} onChange={onChange} /><br /><br />
<MonthPicker defaultValue={startValue} onChange={onChange} /><br /><br />
<YearPicker defaultValue={startValue} onChange={onChange} /><br /><br />
<RangePicker type="year" defaultValue={[startValue, endValue]} onChange={onChange} /><br /><br />
Expand Down
8 changes: 8 additions & 0 deletions docs/date-picker/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ DatePicker 默认情况下接收和返回的数据类型都是 Moment 对象。
<DatePicker defaultValue="2018-01-23" onChange={val => console.log(val)} />
// select 2019-01-23
// >> "2019-01-23"

<DatePicker defaultValue={moment(1581938105000)} onChange={val => console.log(val)} />
// select 2020-02-17
// >> "2020-02-17"
```

标准受控
Expand All @@ -83,6 +87,10 @@ DatePicker 默认情况下接收和返回的数据类型都是 Moment 对象。
<DatePicker value="2018-01-23" onChange={val => console.log(val)} />
// setProps({ value: '2019-01-23' })
// >> "2019-01-23"

<DatePicker value={moment(1581938105000)} onChange={val => console.log(val)} />
// setProps({ value: moment(1581938105000) })
// >> "2020-02-17"
```

## API
Expand Down
10 changes: 10 additions & 0 deletions test/date-picker/index-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const startValue = moment('2017-11-20', 'YYYY-MM-DD', true);
const endValue = moment('2017-12-15', 'YYYY-MM-DD', true);
const defaultTimeValue = moment('09:00:00', 'HH:mm:ss', true);
const defaultTimeValues = [moment('09:00:00', 'HH:mm:ss', true), moment('23:59:59', 'HH:mm:ss', true)];
const timeStamp = 1581938105000;

// 禁止选择 startValue 之前的所有日期
const disabledDate = function(date, view) {
Expand Down Expand Up @@ -46,6 +47,15 @@ describe('DatePicker', () => {
assert(wrapper.find('.next-icon-delete-filling').length === 1);
});

it('should render string unix defaultValue of DatePicker', () => {
wrapper = mount(<DatePicker defaultValue={moment(timeStamp)} />);
assert(
wrapper.find('.next-date-picker-input input').instance()
.value === '2020-02-17'
);
assert(wrapper.find('.next-icon-delete-filling').length === 1);
});

it('should set hasClear to false', () => {
wrapper = mount(
<DatePicker defaultValue={startValue} hasClear={false} />
Expand Down
1 change: 1 addition & 0 deletions types/date-picker/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ export interface MonthPickerProps extends HTMLAttributesWeak, CommonProps {
dateInputAriaLabel?: string;
}


export class MonthPicker extends React.Component<MonthPickerProps, any> {}

interface HTMLAttributesWeak extends React.HTMLAttributes<HTMLElement> {
Expand Down

0 comments on commit b5dac64

Please sign in to comment.