diff --git a/packages/flat-components/src/components/EditRoomPage/EditRoomBody/renderPeriodicForm.tsx b/packages/flat-components/src/components/EditRoomPage/EditRoomBody/renderPeriodicForm.tsx index 45d953859a0..3c98244c4c2 100644 --- a/packages/flat-components/src/components/EditRoomPage/EditRoomBody/renderPeriodicForm.tsx +++ b/packages/flat-components/src/components/EditRoomPage/EditRoomBody/renderPeriodicForm.tsx @@ -61,23 +61,29 @@ export const renderPeriodicForm = (t: FlatI18nTFunction, lang: string) => form.getFieldsValue(["periodic", "type"]); return (
- {periodic.weeks.length > 0 ? ( -
- {t("every-frequency", { freq: getWeekNames(periodic.weeks, lang) })} +
+ {t("time")} + +
+ {periodic.weeks.length > 0 + ? t("every-frequency", { freq: getWeekNames(periodic.weeks, lang) }) + : t("no-frequency-selected")}
- ) : ( -
{t("no-frequency-selected")}
- )} -
- {t("room-type")} - {t("colon")} - {t(`class-room-type.${roomType}`)}
-
- {t("periodic-room-tip", { - date: formatISODayWeekiii(periodic.endTime, lang), - rate: periodic.rate, - })} +
+ {t("type")} + +
{t(`class-room-type.${roomType}`)}
+
+
+ {t("periodic")} + +
+ {t("periodic-room-tip", { + date: formatISODayWeekiii(periodic.endTime, lang), + rate: periodic.rate, + })} +
); diff --git a/packages/flat-components/src/components/EditRoomPage/EditRoomBody/style.less b/packages/flat-components/src/components/EditRoomPage/EditRoomBody/style.less index 0fd442598aa..f3878d55cfb 100644 --- a/packages/flat-components/src/components/EditRoomPage/EditRoomBody/style.less +++ b/packages/flat-components/src/components/EditRoomPage/EditRoomBody/style.less @@ -123,23 +123,16 @@ } .edit-room-tips { - background-color: var(--grey-0); + padding: 8px 16px; border-radius: 8px; - padding: 12px; -} - -.edit-room-tips-title { - color: #3381ff; -} - -.edit-room-tips-type { - color: #7a7b7c; - margin-top: 8px; - margin-bottom: 8px; -} + background-color: #f6f6f6; -.edit-room-tips-inner { - color: #7a7b7c; + >div { + display: flex; + justify-content: space-between; + padding-top: 8px; + padding-bottom: 8px; + } } .edit-room-docs { diff --git a/packages/flat-components/src/utils/room.ts b/packages/flat-components/src/utils/room.ts index 86542392dbb..eb463281632 100644 --- a/packages/flat-components/src/utils/room.ts +++ b/packages/flat-components/src/utils/room.ts @@ -14,7 +14,7 @@ export function getWeekName(week: Week, lang?: string): string { } export function formatISODayWeekiii(date: Date, lang?: string): string { - return format(date, "yyyy/MM/dd iii", { locale: lang?.startsWith("zh") ? zhCN : enUS }); + return format(date, "yyyy/MM/dd (iii)", { locale: lang?.startsWith("zh") ? zhCN : enUS }); } /** diff --git a/packages/flat-i18n/locales/zh-CN.json b/packages/flat-i18n/locales/zh-CN.json index bb5d0d9800e..31664a883d0 100644 --- a/packages/flat-i18n/locales/zh-CN.json +++ b/packages/flat-i18n/locales/zh-CN.json @@ -183,7 +183,7 @@ "frequency": "重复频率", "end-series": "结束重复", "no-frequency-selected": "暂未选择频率", - "every-frequency": "每 {{freq}}", + "every-frequency": "每{{freq}}", "colon": ":", "no-less-than-one-room": "不能少于 1 个房间", "maximum-of-50-rooms-allowed": "最多允许预定 50 个房间",