Commit 0e17b30

authored

Merge pull request #1152 from MenamAfzal/minor-change

Removed format property from ANTD date and time picker input fields

2 parents b2212f7 + df5cf44 commit 0e17b30Copy full SHA for 0e17b30

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ export const DateRangeUIView = (props: DateRangeUIViewProps) => {`
`61`	`61`	`return useUIView(`
`62`	`62`	`<DateRangeMobileUIView {...props} />,`
`63`	`63`	`<RangePickerStyled`
`64`		`- {...omit(props, "onChange")}`
	`64`	`+ {...omit(props, "onChange","format")}`
`65`	`65`	`ref={props.viewRef as any}`
`66`	`66`	`value={[props.start, props.end]}`
`67`	`67`	`disabledDate={(current: any) => disabledDate(current, props.minDate, props.maxDate)}`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ import type { Dayjs } from 'dayjs';`
`13`	`13`	`import { DateParser } from "@lowcoder-ee/util/dateTimeUtils";`
`14`	`14`	`import { timeZoneOptions } from "./timeZone";`
`15`	`15`	`import { default as AntdSelect } from "antd/es/select";`
	`16`	`+import { omit } from "lodash";`
`16`	`17`
`17`	`18`	const DatePickerStyled = styled(DatePicker<Dayjs>)<{ $style: DateTimeStyleType }>`
`18`	`19`	`width: 100%;`
`@@ -52,7 +53,7 @@ export const DateUIView = (props: DataUIViewProps) => {`
`52`	`53`	`return useUIView(`
`53`	`54`	`<DateMobileUIView {...props} />,`
`54`	`55`	`<DatePickerStyled`
`55`		`- {...props}`
	`56`	`+ {...omit(props,"format")}`
`56`	`57`	`multiple={false}`
`57`	`58`	`ref={props.viewRef as any}`
`58`	`59`	`minDate={props.minDate ? dayjs(props.minDate, DateParser) : undefined}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ export const TimeRangeUIView = (props: TimeRangeUIViewProps) => {`
`56`	`56`	`return useUIView(`
`57`	`57`	`<TimeRangeMobileUIView {...props} />,`
`58`	`58`	`<RangePickerStyled`
`59`		`- {...omit(props, "onChange")}`
	`59`	`+ {...omit(props, "onChange","format")}`
`60`	`60`	`value={[props.start, props.end]}`
`61`	`61`	`order={true}`
`62`	`62`	`hideDisabledOptions`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import { EditorContext } from "../../editorState";`
`10`	`10`	`import dayjs from "dayjs"`
`11`	`11`	`import { default as AntdSelect } from "antd/es/select";`
`12`	`12`	`import { timeZoneOptions } from "./timeZone";`
	`13`	`+import { omit } from "lodash";`
`13`	`14`
`14`	`15`	const TimePickerStyled = styled(TimePicker)<{ $style: DateTimeStyleType }>`
`15`	`16`	`width: 100%;`
`@@ -43,7 +44,7 @@ export const TimeUIView = (props: TimeUIViewProps) => {`
`43`	`44`	`return useUIView(`
`44`	`45`	`<TimeMobileUIView {...props} />,`
`45`	`46`	`<TimePickerStyled`
`46`		`- {...props}`
	`47`	`+ {...omit(props,"format")}`
`47`	`48`	`ref={props.viewRef}`
`48`	`49`	`hideDisabledOptions`
`49`	`50`	`inputReadOnly={checkIsMobile(editorState?.getAppSettings().maxWidth)}`

Comments

(0)