From 49fa2030fde00b464f376fbd44ffaa416e8f447a Mon Sep 17 00:00:00 2001 From: bicochan Date: Fri, 20 Jun 2025 13:37:08 +0900 Subject: [PATCH] =?UTF-8?q?chore:=20250619=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=EC=9A=94=EC=B2=AD=20=EC=82=AC=ED=95=AD=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/cs/src/pages/recent/ui/recent-page.tsx | 28 +++++++++++++------ .../src/pages/schedule/ui/schedule-form.tsx | 6 ++-- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/apps/cs/src/pages/recent/ui/recent-page.tsx b/apps/cs/src/pages/recent/ui/recent-page.tsx index efa3f765b..ea9be6569 100644 --- a/apps/cs/src/pages/recent/ui/recent-page.tsx +++ b/apps/cs/src/pages/recent/ui/recent-page.tsx @@ -56,7 +56,7 @@ function RecentPage() { pageSize: 10, }); const [rowSelection, setRowSelection] = useState({}); - const [recentPostParams, setRecentPostParams] = useState({ + const [recentPostQuery, setRecentPostQuery] = useState({ keywordType: "", keyword: "", bbsId: null, @@ -70,7 +70,7 @@ function RecentPage() { queryKey: [ENDPOINT.BOARD_SERVICE.POSTS, pagination], queryFn: () => PostApi.getRecentPostList({ - ...recentPostParams, + ...recentPostQuery, page: pagination.pageIndex, size: pagination.pageSize, }), @@ -119,13 +119,13 @@ function RecentPage() { const handleSubmit = (e: React.FormEvent) => { e.preventDefault(); - setIsDeletePostData(recentPostParams.delYn === "Y"); + setIsDeletePostData(recentPostQuery.delYn === "Y"); query.refetch(); }; const handleRecentPostParamsChange = (key: keyof RecentPostParams) => (value: unknown) => { - setRecentPostParams({ ...recentPostParams, [key]: value }); + setRecentPostQuery({ ...recentPostQuery, [key]: value }); }; const handlePresetDateRange = (value: string) => { @@ -152,7 +152,16 @@ function RecentPage() { default: presetDateRange = undefined; } - setDateRange(presetDateRange); + handleDateRangeChange(presetDateRange); + }; + + const handleDateRangeChange = (value: DateRange | undefined) => { + setDateRange(value); + setRecentPostQuery({ + ...recentPostQuery, + frDateYmd: dayjs(value?.from).format("YYYYMMDD") ?? "", + toDateYmd: dayjs(value?.to).format("YYYYMMDD") ?? "", + }); }; const onSoftDeletePost = async () => { @@ -209,7 +218,10 @@ function RecentPage() {
- +
@@ -264,7 +276,7 @@ function RecentPage() { handleRecentPostParamsChange("keyword")(e.target.value) } diff --git a/apps/cs/src/pages/schedule/ui/schedule-form.tsx b/apps/cs/src/pages/schedule/ui/schedule-form.tsx index 98cfe6c73..4b0fb4f4e 100644 --- a/apps/cs/src/pages/schedule/ui/schedule-form.tsx +++ b/apps/cs/src/pages/schedule/ui/schedule-form.tsx @@ -101,7 +101,7 @@ function ScheduleForm({ ? dayjs(field.value as string).toDate() : undefined } - classes={{ trigger: "w-auto px-4 justify-start" }} + classes={{ trigger: "!w-auto px-4 justify-start" }} onDateChange={handleDateTimeChange( "schdlBgngDt" as Path, )} @@ -120,7 +120,7 @@ function ScheduleForm({ ? dayjs(field.value as string).toDate() : undefined } - classes={{ trigger: "w-auto px-4 justify-start" }} + classes={{ trigger: "!w-auto px-4 justify-start" }} onDateChange={handleDateTimeChange( "schdlEndDt" as Path, )} @@ -230,7 +230,7 @@ function ScheduleForm({ ) as PathValue>, ); }} - className="w-auto px-4" + className="!w-auto px-4" placeholder="반복 종료일 선택" disabled={form.watch("reptYn" as Path) === "N"} />