Skip to content

Removed format property from ANTD date and time picker input fields #1152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 10, 2024
Merged

Removed format property from ANTD date and time picker input fields #1152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/packages/lowcoder/src/comps/comps/dateComp/dateRangeUIView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)}
Expand Down
3 changes: 2 additions & 1 deletion client/packages/lowcoder/src/comps/comps/dateComp/dateUIView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%;
Expand Down Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion client/packages/lowcoder/src/comps/comps/dateComp/timeRangeUIView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion client/packages/lowcoder/src/comps/comps/dateComp/timeUIView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%;
Expand Down Expand Up @@ -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)}
Expand Down
Loading