Skip to content

Commit 84042b7

Browse files
committed
added timeZone & timeRange entity
1 parent 0b77a49 commit 84042b7

File tree

2 files changed

+38
-19
lines changed

2 files changed

+38
-19
lines changed

client/packages/lowcoder-comps/src/comps/calendarComp/calendarComp.tsx

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -479,24 +479,11 @@ let CalendarBasicComp = (function () {
479479
backgroundColor:props?.modalStyle?.background,
480480
animationStyle:props?.animationStyle,
481481
},
482-
width: "450px",
482+
width: "500px",
483483
content: (
484484
<Tabs defaultActiveKey="1">
485-
<Tabs.TabPane tab={trans("calendar.general")} key="1">
485+
<Tabs.TabPane tab={trans("calendar.general")} key="1">
486486
<FormWrapper form={form} $modalStyle={modalStyle}>
487-
<Form.Item
488-
label={
489-
<Tooltip title={trans("calendar.eventIdTooltip")}>
490-
{trans("calendar.eventId")}
491-
</Tooltip>
492-
}
493-
name="id"
494-
rules={[
495-
{ required: true, message: trans("calendar.eventIdRequire") },
496-
]}
497-
>
498-
<Input />
499-
</Form.Item>
500487
<Form.Item
501488
label={trans("calendar.eventName")}
502489
name="label"
@@ -512,6 +499,35 @@ let CalendarBasicComp = (function () {
512499
>
513500
<Input />
514501
</Form.Item>
502+
<Form.Item
503+
label={trans("calendar.timeZone")}
504+
name="timeZone"
505+
>
506+
<Input />
507+
</Form.Item>
508+
<Form.Item
509+
label={trans("calendar.timeRange")}
510+
name="timeRange"
511+
>
512+
<Input />
513+
</Form.Item>
514+
</FormWrapper>
515+
</Tabs.TabPane>
516+
<Tabs.TabPane tab={trans("calendar.advanced")} key="2">
517+
<FormWrapper form={form} $modalStyle={modalStyle}>
518+
<Form.Item
519+
label={
520+
<Tooltip title={trans("calendar.eventIdTooltip")}>
521+
{trans("calendar.eventId")}
522+
</Tooltip>
523+
}
524+
name="id"
525+
rules={[
526+
{ required: true, message: trans("calendar.eventIdRequire") },
527+
]}
528+
>
529+
<Input />
530+
</Form.Item>
515531
<Form.Item
516532
label={trans("calendar.eventGroupId")}
517533
name="groupId"
@@ -526,7 +542,7 @@ let CalendarBasicComp = (function () {
526542
</Form.Item>
527543
</FormWrapper>
528544
</Tabs.TabPane>
529-
<Tabs.TabPane tab={trans("calendar.colorStyles")} key="2">
545+
<Tabs.TabPane tab={trans("calendar.colorStyles")} key="3">
530546
<FormWrapper form={form} $modalStyle={modalStyle}>
531547
<Form.Item
532548
label={trans("calendar.eventTitleColor")}
@@ -582,7 +598,7 @@ let CalendarBasicComp = (function () {
582598
</Form.Item>
583599
</FormWrapper>
584600
</Tabs.TabPane>
585-
<Tabs.TabPane tab={trans("calendar.fontStyles")} key="3">
601+
<Tabs.TabPane tab={trans("calendar.fontStyles")} key="4">
586602
<FormWrapper form={form} $modalStyle={modalStyle}>
587603
<Form.Item
588604
label={trans("calendar.eventTitleFontWeight")}
@@ -610,7 +626,7 @@ let CalendarBasicComp = (function () {
610626
</Form.Item>
611627
</FormWrapper>
612628
</Tabs.TabPane>
613-
<Tabs.TabPane tab={trans("calendar.animations")} key="4">
629+
<Tabs.TabPane tab={trans("calendar.animations")} key="5">
614630
<FormWrapper form={form} $modalStyle={modalStyle}>
615631
<Form.Item
616632
label={trans("calendar.animationType")}

client/packages/lowcoder-comps/src/i18n/comps/locales/en.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,7 @@ export const en = {
335335
eventResourceId: "Resource ID",
336336
dragDropEventHandlers: "Drag/Drop Event Handlers",
337337
general: "General",
338+
advanced: "Advanced",
338339
colorStyles:"Color Styles",
339340
fontStyles:"Font Styles",
340341
animations:"Animations",
@@ -345,7 +346,9 @@ export const en = {
345346
animationType:"Type",
346347
animationDelay:"Delay",
347348
animationDuration:"Duration",
348-
animationIterationCount:"IterationCount"
349+
animationIterationCount:"IterationCount",
350+
timeZone:"Time Zone",
351+
timeRange:"Time Range",
349352
},
350353
};
351354

0 commit comments

Comments
 (0)