diff --git a/client/packages/lowcoder/src/comps/comps/dateComp/dateRangeUIView.tsx b/client/packages/lowcoder/src/comps/comps/dateComp/dateRangeUIView.tsx index 678bbced5..9b37570d8 100644 --- a/client/packages/lowcoder/src/comps/comps/dateComp/dateRangeUIView.tsx +++ b/client/packages/lowcoder/src/comps/comps/dateComp/dateRangeUIView.tsx @@ -61,7 +61,7 @@ export const DateRangeUIView = (props: DateRangeUIViewProps) => { return useUIView( <DateRangeMobileUIView {...props} />, <RangePickerStyled - {...omit(props, "onChange")} + {...omit(props, "onChange" , "format")} ref={props.viewRef as any} value={[props.start, props.end]} disabledDate={(current: any) => disabledDate(current, props.minDate, props.maxDate)} diff --git a/client/packages/lowcoder/src/comps/comps/dateComp/dateUIView.tsx b/client/packages/lowcoder/src/comps/comps/dateComp/dateUIView.tsx index 2d55bfd1c..bb7e88322 100644 --- a/client/packages/lowcoder/src/comps/comps/dateComp/dateUIView.tsx +++ b/client/packages/lowcoder/src/comps/comps/dateComp/dateUIView.tsx @@ -13,6 +13,7 @@ import type { Dayjs } from 'dayjs'; import { DateParser } from "@lowcoder-ee/util/dateTimeUtils"; import { timeZoneOptions } from "./timeZone"; import { default as AntdSelect } from "antd/es/select"; +import { omit } from "lodash"; const DatePickerStyled = styled(DatePicker<Dayjs>)<{ $style: DateTimeStyleType }>` width: 100%; @@ -52,7 +53,7 @@ export const DateUIView = (props: DataUIViewProps) => { return useUIView( <DateMobileUIView {...props} />, <DatePickerStyled - {...props} + {...omit(props, "format")} multiple={false} ref={props.viewRef as any} minDate={props.minDate ? dayjs(props.minDate, DateParser) : undefined} diff --git a/client/packages/lowcoder/src/comps/comps/dateComp/timeRangeUIView.tsx b/client/packages/lowcoder/src/comps/comps/dateComp/timeRangeUIView.tsx index fd8ce4d69..1127c42e2 100644 --- a/client/packages/lowcoder/src/comps/comps/dateComp/timeRangeUIView.tsx +++ b/client/packages/lowcoder/src/comps/comps/dateComp/timeRangeUIView.tsx @@ -56,7 +56,7 @@ export const TimeRangeUIView = (props: TimeRangeUIViewProps) => { return useUIView( <TimeRangeMobileUIView {...props} />, <RangePickerStyled - {...omit(props, "onChange")} + {...omit(props, "onChange", "format")} value={[props.start, props.end]} order={true} hideDisabledOptions diff --git a/client/packages/lowcoder/src/comps/comps/dateComp/timeUIView.tsx b/client/packages/lowcoder/src/comps/comps/dateComp/timeUIView.tsx index 9e4d414c7..f66011aa8 100644 --- a/client/packages/lowcoder/src/comps/comps/dateComp/timeUIView.tsx +++ b/client/packages/lowcoder/src/comps/comps/dateComp/timeUIView.tsx @@ -10,6 +10,7 @@ import { EditorContext } from "../../editorState"; import dayjs from "dayjs" import { default as AntdSelect } from "antd/es/select"; import { timeZoneOptions } from "./timeZone"; +import { omit } from "lodash"; const TimePickerStyled = styled(TimePicker)<{ $style: DateTimeStyleType }>` width: 100%; @@ -43,7 +44,7 @@ export const TimeUIView = (props: TimeUIViewProps) => { return useUIView( <TimeMobileUIView {...props} />, <TimePickerStyled - {...props} + {...omit(props, "format")} ref={props.viewRef} hideDisabledOptions inputReadOnly={checkIsMobile(editorState?.getAppSettings().maxWidth)}