diff --git a/src/app/(pages)/(main)/category/sub-page/CategoryPage.tsx b/src/app/(pages)/(main)/category/sub-page/CategoryPage.tsx index 6072fe1..c8daa04 100644 --- a/src/app/(pages)/(main)/category/sub-page/CategoryPage.tsx +++ b/src/app/(pages)/(main)/category/sub-page/CategoryPage.tsx @@ -33,7 +33,7 @@ const PAGE_COMPONENTS: Partial { const { isTotal, filterValue } = useLayoutFilter(); - const debouncedFilterValue = useDebouncedValue(filterValue as CategoryFilterValue, 500); + const debouncedFilterValue = useDebouncedValue(filterValue as CategoryFilterValue); const { fields, variableIdMap } = useMemo(() => { return buildPageModeConfig(debouncedFilterValue); diff --git a/src/app/(pages)/(main)/category/sub-page/category-page/CategoryDetail.tsx b/src/app/(pages)/(main)/category/sub-page/category-page/CategoryDetail.tsx index 118e5cc..0907183 100644 --- a/src/app/(pages)/(main)/category/sub-page/category-page/CategoryDetail.tsx +++ b/src/app/(pages)/(main)/category/sub-page/category-page/CategoryDetail.tsx @@ -6,7 +6,7 @@ import {useEffect, useMemo} from "react"; import {BannerRow, PageData} from "@/types/lg.types"; import {buildHeader_Banner, exportDashboardExcel, Section} from "@/lib/lg-export-excel"; import {BANNER_GROUP} from "@/const/lg-banner.const"; -import {BANNER_KEY_MAP} from "@/const/lg-schema.const"; +import {BANNER_KEY_MAP, PRODUCT_KEY_MAP} from "@/const/lg-schema.const"; import {QID_SURVEY_TITLE} from "@/const/lg-survey.const"; import {SITE_TITLE, YEARS} from "@/const/lg-common.const"; import {CategoryByData} from "@/components/lge-dashboard"; @@ -18,7 +18,7 @@ const CategoryDetail = ({ fillGreaterThan5 }:CategoryPageProps) => { const {filterValue, registerExcelExporter} = useLayoutFilter(); - const debouncedFilterValue = useDebouncedValue(filterValue as CategoryFilterValue, 500); + const debouncedFilterValue = useDebouncedValue(filterValue as CategoryFilterValue); const tableDataArray = useMemo[]>(() => { const tempTableDataArray = fields.map((f) :PageData => { @@ -46,7 +46,7 @@ const CategoryDetail = ({ useEffect(() => { registerExcelExporter(async () => { - const product = debouncedFilterValue.product; + const product = PRODUCT_KEY_MAP[debouncedFilterValue.product]; const type = debouncedFilterValue.type.label; const target = debouncedFilterValue.target.label.replaceAll('/', '_'); @@ -79,7 +79,7 @@ const CategoryDetail = ({ {tableDataArray.map((tableData) => ( { const { filterValue } = useLayoutFilter(); - const debouncedFilterValue = useDebouncedValue(filterValue as CategoryFilterValue, 500); + const debouncedFilterValue = useDebouncedValue(filterValue as CategoryFilterValue); const profileData = useMemo(() => { if (dataMap === undefined) return []; diff --git a/src/app/(pages)/(main)/total/lg-penetration/page.tsx b/src/app/(pages)/(main)/total/lg-penetration/page.tsx index 1ee5174..2e09d13 100644 --- a/src/app/(pages)/(main)/total/lg-penetration/page.tsx +++ b/src/app/(pages)/(main)/total/lg-penetration/page.tsx @@ -44,7 +44,7 @@ import {useBannerStatisticsQuery, useProductStatisticsQuery} from "@/query/stati const LGPenetrationPage = () => { const {filterValue, registerExcelExporter} = useLayoutFilter(); - const debouncedFilterValue = useDebouncedValue(filterValue as SelectedMap, 500); + const debouncedFilterValue = useDebouncedValue(filterValue as SelectedMap); const req = useMemo(() => { return { diff --git a/src/app/(pages)/(main)/total/lg-purchase/page.tsx b/src/app/(pages)/(main)/total/lg-purchase/page.tsx index b96fa4d..dd23da2 100644 --- a/src/app/(pages)/(main)/total/lg-purchase/page.tsx +++ b/src/app/(pages)/(main)/total/lg-purchase/page.tsx @@ -36,7 +36,7 @@ import {toNumOr0} from "@/lib/utils"; const LGPurchasePage = () => { const { filterValue, registerExcelExporter } = useLayoutFilter(); - const debouncedFilterValue = useDebouncedValue(filterValue as SelectedMap, 500); + const debouncedFilterValue = useDebouncedValue(filterValue as SelectedMap); const req = useMemo(() => { return { diff --git a/src/app/(pages)/(main)/total/penetration/page.tsx b/src/app/(pages)/(main)/total/penetration/page.tsx index c0fadc3..8018777 100644 --- a/src/app/(pages)/(main)/total/penetration/page.tsx +++ b/src/app/(pages)/(main)/total/penetration/page.tsx @@ -36,7 +36,7 @@ import {SelectedMap} from "@/types/common"; const PenetrationPage = () => { const { filterValue, registerExcelExporter } = useLayoutFilter(); - const debouncedFilterValue = useDebouncedValue(filterValue as SelectedMap, 500); + const debouncedFilterValue = useDebouncedValue(filterValue as SelectedMap); const [isBrandShare, setIsBrandShare] = useState(false); const req = useMemo(() => { diff --git a/src/app/(pages)/(main)/total/purchase/page.tsx b/src/app/(pages)/(main)/total/purchase/page.tsx index e1a139c..566d607 100644 --- a/src/app/(pages)/(main)/total/purchase/page.tsx +++ b/src/app/(pages)/(main)/total/purchase/page.tsx @@ -36,7 +36,7 @@ import {useProductStatisticsQuery} from "@/query/statistics"; const PurchasePage = () => { const { filterValue, registerExcelExporter } = useLayoutFilter(); - const debouncedFilterValue = useDebouncedValue(filterValue as SelectedMap, 500); + const debouncedFilterValue = useDebouncedValue(filterValue as SelectedMap); const req = useMemo(() => { return { diff --git a/src/components/layout/MainLayout.tsx b/src/components/layout/MainLayout.tsx index 9318a86..944a9fb 100644 --- a/src/components/layout/MainLayout.tsx +++ b/src/components/layout/MainLayout.tsx @@ -28,7 +28,9 @@ const buildDefaultTotalValue = (): SelectedMap => { totalFilters.forEach((f) => { // "전체"가 있으면 그 value, 없으면 첫 번째 값 const all = f.children.find((c) => c.label === "전체"); - init[f.variable] = all?.value ?? f.children[0]?.value ?? ""; + const initValue = all?.value ?? f.children[0]?.value ?? ""; + + init[f.variable] = [initValue]; }); return init; }; @@ -108,14 +110,14 @@ const MainLayout = ({ children }: MainLayoutProps) => { const isDefaultTotalFilter = useMemo(() => { if(!isTotal) return false; - return Object.values(totalValue).every(value => value === "0"); + return Object.values(totalValue).every(value => value.length === 1 && value[0] === "0"); },[isTotal, totalValue]) - const setDefaletTotalFilter = () => { + const setDefaultTotalFilter = () => { if(isTotal && !isDefaultTotalFilter){ setTotalValue(prev => Object.fromEntries( - Object.keys(prev).map(key => [key, "0"]) + Object.keys(prev).map(key => [key, ["0"]]) ) ); } @@ -181,7 +183,7 @@ const MainLayout = ({ children }: MainLayoutProps) => { <>