test/amis2
1
0
Fork 0
mirror of https://gitee.com/baidu/amis.git synced 2024-11-30 11:07:52 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

datepicker 透传 utc 配置

Browse Source
This commit is contained in:
liaoxuezhi 2019-09-05 11:12:15 +08:00
parent 626d7440f9
commit 66b6e8c94c
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scss/components/form/_date.scss
View File

@ -82,11 +82,19 @@
display: flex;
}
.#{$ns}DatePicker-rangers {
.#{$ns}DatePicker-shortcuts {
margin: $gap-sm $gap-md (-$gap-sm) $gap-md;
padding: 0;
list-style: none;
}
.#{$ns}DatePicker-shortcut {
display: inline-block;
margin-right: $gap-sm;
a {
cursor: pointer;
}
}
// override third-party styles
.rdt {

9
src/components/DatePicker.tsx
View File

@ -695,6 +695,7 @@ export interface DateProps {
maxTime?: moment.Moment;
clearable?: boolean;
defaultValue?: any;
utc?: boolean;
onChange: (value: any) => void;
value: any;
shortcuts: string;
@ -715,7 +716,7 @@ export class DatePicker extends React.Component<DateProps, DatePickerState> {
state: DatePickerState = {
isOpened: false,
isFocused: false,
value: this.props.value ? moment(this.props.value, this.props.format) : undefined,
value: this.props.value ? (this.props.utc ? moment.utc : moment)(this.props.value, this.props.format) : undefined,
};
constructor(props: DateProps) {
super(props);
@ -740,7 +741,7 @@ export class DatePicker extends React.Component<DateProps, DatePickerState> {
componentWillReceiveProps(nextProps: DateProps) {
if (this.props.value !== nextProps.value) {
this.setState({
value: nextProps.value ? moment(nextProps.value, nextProps.format) : undefined,
value: nextProps.value ? (nextProps.utc ? moment.utc : moment)(nextProps.value, nextProps.format) : undefined,
});
}
}
@ -868,7 +869,8 @@ export class DatePicker extends React.Component<DateProps, DatePickerState> {
timeConstraints,
popOverContainer,
clearable,
shortcuts
shortcuts,
utc
} = this.props;
const isOpened = this.state.isOpened;
@ -954,6 +956,7 @@ export class DatePicker extends React.Component<DateProps, DatePickerState> {
timeConstraints={timeConstraints}
input={false}
onClose={this.close}
utc={utc}
/>
</PopOver>
</Overlay>