ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(client): datetime with timezone

Browse Source
This commit is contained in:
chenos 2022-05-31 22:49:05 +08:00
parent a9e1094f8b
commit 94a4d391c7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/core/client/src/schema-component/antd/date-picker/util.ts
View File

@ -1,5 +1,6 @@
import { formatMomentValue, momentable } from '@formily/antd/lib/__builtins__'; import { formatMomentValue } from '@formily/antd/lib/__builtins__';
import type { DatePickerProps } from 'antd/lib/date-picker'; import type { DatePickerProps } from 'antd/lib/date-picker';
import moment from 'moment';
export const getDefaultFormat = (props: DatePickerProps & { dateFormat: string; timeFormat: string }) => { export const getDefaultFormat = (props: DatePickerProps & { dateFormat: string; timeFormat: string }) => {
if (props.format) { if (props.format) {
@ -30,8 +31,8 @@ export const mapDateFormat = function () {
return { return {
...props, ...props,
format: format, format: format,
value: props.value && moment(props.value).isValid() ? moment(props.value) : undefined,
value: momentable(props.value, format === 'YYYY-wo' ? 'YYYY-w' : format), // value: momentable(props.value, format === 'YYYY-wo' ? 'YYYY-w' : format),
onChange: (value: moment.Moment | moment.Moment[]) => { onChange: (value: moment.Moment | moment.Moment[]) => {
if (onChange) { if (onChange) {
onChange(formatMomentValue(value, format)); onChange(formatMomentValue(value, format));