mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 16:36:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: date formatting

Browse Source
This commit is contained in:
chenos 2021-08-04 20:11:49 +08:00
parent 02890f550d
commit e41926e2b9
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/client/src/schemas/date-picker/index.tsx
View File

@ -1,5 +1,5 @@
import moment from 'moment' import moment from 'moment'
import { connect, mapProps, mapReadPretty } from '@formily/react' import { connect, mapProps, mapReadPretty, useField, useFieldSchema } from '@formily/react'
import { DatePicker as AntdDatePicker } from 'antd' import { DatePicker as AntdDatePicker } from 'antd'
import { import {
DatePickerProps as AntdDatePickerProps, DatePickerProps as AntdDatePickerProps,
@ -34,6 +34,8 @@ const mapDateFormat = function () {
return props['showTime'] ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD' return props['showTime'] ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD'
} }
return (props: any) => { return (props: any) => {
const field = useField();
const fieldSchema = useFieldSchema();
const format = props['format'] || getDefaultFormat(props) const format = props['format'] || getDefaultFormat(props)
const onChange = props.onChange const onChange = props.onChange
return { return {

14
packages/client/src/schemas/display/index.tsx
View File

@ -15,6 +15,7 @@ import { Tag, Space, Popover } from 'antd'
import cls from 'classnames' import cls from 'classnames'
import { formatMomentValue, usePrefixCls } from '@formily/antd/esm/__builtins__' import { formatMomentValue, usePrefixCls } from '@formily/antd/esm/__builtins__'
import { FullscreenOutlined } from '@ant-design/icons'; import { FullscreenOutlined } from '@ant-design/icons';
import moment from 'moment';
const PlaceholderContext = createContext<string>('N/A') const PlaceholderContext = createContext<string>('N/A')
@ -287,11 +288,20 @@ const Cascader: React.FC<CascaderProps> = observer((props) => {
) )
}) })
const DatePicker: React.FC<DatePickerProps> = (props) => { const DatePicker: React.FC<DatePickerProps> = (props: any) => {
const placeholder = usePlaceholder() const placeholder = usePlaceholder()
const prefixCls = usePrefixCls('description-text', props) const prefixCls = usePrefixCls('description-text', props)
const getDefaultFormat = () => {
const { dateFormat, showTime, timeFormat } = props;
let format = dateFormat;
if (showTime) {
format += ` ${timeFormat}`;
}
return format || props.format;
}
const getLabels = () => { const getLabels = () => {
const labels = formatMomentValue(props.value, props.format, placeholder) const d = moment(props.value);
const labels = formatMomentValue(d.isValid() ? d : null, getDefaultFormat(), placeholder)
return isArr(labels) ? labels.join('~') : labels return isArr(labels) ? labels.join('~') : labels
} }
return <div className={cls(prefixCls, props.className)}>{getLabels()}</div> return <div className={cls(prefixCls, props.className)}>{getLabels()}</div>