chore: 250619 수정 요청 사항 반영

This commit is contained in:
2025-06-20 13:37:08 +09:00
parent 3f9951c635
commit 49fa2030fd
2 changed files with 23 additions and 11 deletions
+20 -8
View File
@@ -56,7 +56,7 @@ function RecentPage() {
pageSize: 10,
});
const [rowSelection, setRowSelection] = useState<RowSelectionState>({});
const [recentPostParams, setRecentPostParams] = useState<RecentPostParams>({
const [recentPostQuery, setRecentPostQuery] = useState<RecentPostParams>({
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<HTMLFormElement>) => {
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() {
<div className="card card-border">
<form onSubmit={handleSubmit} className="flex items-center gap-2 p-2">
<Label className="mr-2">날짜</Label>
<DateRangePicker value={dateRange} onValueChange={setDateRange}>
<DateRangePicker
value={dateRange}
onValueChange={handleDateRangeChange}
>
<div className="card card-border flex items-center gap-2">
<Select onValueChange={handlePresetDateRange}>
<SelectTrigger>
@@ -251,7 +263,7 @@ function RecentPage() {
<Label className="ml-4 mr-2 text-label">검색</Label>
<Select
value={recentPostParams.keywordType}
value={recentPostQuery.keywordType}
onValueChange={handleRecentPostParamsChange("keywordType")}
>
<SelectTrigger className="h-[3.2rem] w-[10rem]">
@@ -264,7 +276,7 @@ function RecentPage() {
</SelectContent>
</Select>
<Input
value={recentPostParams.keyword}
value={recentPostQuery.keyword}
onChange={(e) =>
handleRecentPostParamsChange("keyword")(e.target.value)
}
@@ -101,7 +101,7 @@ function ScheduleForm<T extends ScheduleFormData | ScheduleUpdateFormData>({
? 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<T>,
)}
@@ -120,7 +120,7 @@ function ScheduleForm<T extends ScheduleFormData | ScheduleUpdateFormData>({
? 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<T>,
)}
@@ -230,7 +230,7 @@ function ScheduleForm<T extends ScheduleFormData | ScheduleUpdateFormData>({
) as PathValue<T, Path<T>>,
);
}}
className="w-auto px-4"
className="!w-auto px-4"
placeholder="반복 종료일 선택"
disabled={form.watch("reptYn" as Path<T>) === "N"}
/>