st: fix: 그리드 mergeCell sort 오류 & ESLint 에러 수정

This commit is contained in:
2026-02-25 16:13:48 +09:00
parent 93e652a557
commit 5600ce01bd
19 changed files with 897 additions and 889 deletions
@@ -63,8 +63,8 @@ const SeweragePenetrationRateInp = () => {
const [footerFromApi, setFooterFromApi] = useState<{ totalPopl?: number; poplSm?: number; frgnrPoplSm?: number; refArea?: number } | null>(null);
const getGridDataRef = useRef<(() => Record<string, string | number>[]) | null>(null);
const footerFieldNames = ['totalPopl', 'poplSm', 'frgnrPoplSm', 'refArea'] as const;
const footerWithApiDefault = (fieldName: (typeof footerFieldNames)[number], numberFormat: string) => ({
const _footerFieldNames = ['totalPopl', 'poplSm', 'frgnrPoplSm', 'refArea'] as const;
const footerWithApiDefault = (fieldName: (typeof _footerFieldNames)[number], numberFormat: string) => ({
expression: 'sum' as const,
numberFormat,
valueCallback: (grid: Parameters<typeof getFooterSummary>[0], column: Parameters<typeof getFooterSummary>[1]) =>
@@ -16,7 +16,7 @@ import { toGridRows } from "@/components/util/grid/gridFunction";
// 하수도 통계 검토 05.중계펌프장
const PumpingStationRvw = () => {
const { setMessage: alert } = useAlertStore((state) => state);
const [rowData, setRowData] = useState<any[]>([]);
const [rowData, setRowData] = useState<Record<string, string | number>[]>([]);
const [isLoading, setIsLoading] = useState<boolean>(false);
const columnInfo = useMemo(() => {
@@ -55,28 +55,28 @@ const SewagePipeMaintainRvw = () => {
setIsLoading(true);
const searchParam: SewerPipeMtcRequestParams = {
statsYr: values.year,
sewerBzmnCd: values.bsnmCd,
ctpvNm: values.sido,
sggNm: values.gugun === 'ALL' ? '' : values.gugun
};
statsYr: values.year,
sewerBzmnCd: values.bsnmCd,
ctpvNm: values.sido,
sggNm: values.gugun === 'ALL' ? '' : values.gugun
};
searchParamRef.current = searchParam;
const response = await statisticsManagementApi.getSewerPipeMtcList(searchParam);
if (response?.status === 'success' && response.data) {
const newRowDataMap = new Map<string, Record<string, string | number>[]>();
const listData = Array.isArray(response.data)
? response.data
const listData = Array.isArray(response.data)
? response.data
: (response.data.mtcStatusList || []);
newRowDataMap.set('ST00030001', toGridRows(listData as object[]));
setRowDataMap(newRowDataMap);
} else {
alert(response?.message || "데이터가 없습니다.");
}
} catch (error) {
} catch {
alert('데이터 조회 중 오류가 발생했습니다.');
} finally {
setIsLoading(false);
@@ -100,18 +100,18 @@ const SewagePipeMaintainRvw = () => {
if (tabKey === 'ST00030001') {
response = await statisticsManagementApi.getSewerPipeMtcList(searchParamRef.current);
}else if (tabKey === 'ST00030002') {
} else if (tabKey === 'ST00030002') {
// response = await statisticsManagementApi.getSewerPipeDrdgList(searchParamRef.current);
}
if (response?.status === 'success' && response.data) {
setRowDataMap(prev => {
const next = new Map(prev);
const listData = Array.isArray(response.data)
? response.data
const listData = Array.isArray(response.data)
? response.data
: (response.data.mtcStatusList || []);
next.set(tabKey, toGridRows(listData as object[]));
return next;
});
@@ -128,7 +128,7 @@ const SewagePipeMaintainRvw = () => {
return (
<div className="relative">
<SearchForm onSubmit={handleSearch} onReset={handleReset}/>
<SearchForm onSubmit={handleSearch} onReset={handleReset} />
<div className="card !py-0">
<div className="flex justify-end items-center gap-[0.6rem] m-[0.6rem]">
@@ -71,7 +71,7 @@ const SewagePipeRvw = () => {
} else {
alert(response?.message || "데이터가 없습니다.");
}
} catch (error) {
} catch {
alert('데이터 조회 중 오류가 발생했습니다.');
} finally {
setIsLoading(false);
@@ -75,7 +75,7 @@ const SewageReservoirPumpRvw = () => {
} else {
alert(response?.message || "데이터가 없습니다.");
}
} catch (error) {
} catch {
alert('데이터 조회 중 오류가 발생했습니다.');
} finally {
setIsLoading(false);
@@ -5,7 +5,7 @@ import SaveButton from "@/components/button/SaveButton";
import ApproveButton from "@/components/button/ApproveButton";
import ReviewOpinionButton from "@/components/button/ReviewOpinionButton";
import ReturnButton from "@/components/button/ReturnButton";
import { LoadingWithAnimation } from "@common/components";
import { LoadingWithAnimation } from "@common/components";
import { useAlertStore } from "@/shared/lib";
import { SeweragePenetrationRateInfoList } from "@/components/util/column/review/SeweragePenetrationRateRvwColumn";
@@ -17,8 +17,8 @@ import { toGridRows } from "@/components/util/grid/gridFunction";
// 하수도 통계 검토 01.하수도 보급률
const SeweragePenetrationRateRvw = () => {
const { setMessage: alert } = useAlertStore((state) => state);
const [rowData, setRowData] = useState<any[]>([]);
const [isLoading, setIsLoading] = useState<boolean>(false);
const [rowData, setRowData] = useState<Record<string, string | number>[]>([]);
const [isLoading, setIsLoading] = useState<boolean>(false);
const columnInfo = useMemo(() => {
const { columns, columnLayout, fixedColumns, rowStartNum } = SeweragePenetrationRateInfoList;
@@ -49,17 +49,17 @@ const SeweragePenetrationRateRvw = () => {
setIsLoading(true);
const response = await statisticsManagementApi.getSewerageSupplyRateReviewList({
ctpvNm: values.sido,
sggNm: values.gugun === 'ALL' ? '' : values.gugun,
sewerBzmnCd: values.bsnmCd,
statsYr: values.year,
ctpvNm: values.sido,
sggNm: values.gugun === 'ALL' ? '' : values.gugun,
sewerBzmnCd: values.bsnmCd,
statsYr: values.year,
});
if (response.status === 'success' && response.data) {
const rawList = response.data.sewerageSupplyRateList;
const convertedData: SewerageSupplyRateReviewItem[] = rawList.map((item) => ({
const convertedData: SewerageSupplyRateReviewItem[] = rawList.map((item) => ({
...item,
spcCtpnRgnCn: !item.spcCtpnRgnCn ? '해당없음' : item.spcCtpnRgnCn,
}));
@@ -72,7 +72,7 @@ const SeweragePenetrationRateRvw = () => {
console.error("조회 중 에러 발생:", error);
alert('데이터 조회 중 오류가 발생했습니다.');
} finally {
setIsLoading(false);
setIsLoading(false);
}
};
@@ -82,9 +82,9 @@ const SeweragePenetrationRateRvw = () => {
const returnFunc = () => console.log('returnFunc');
return (
<div className="relative">
<div className="relative">
<SearchForm onSubmit={handleSearch} onReset={handleReset} />
<div className="card !py-0">
<div className="flex justify-end items-center gap-[0.6rem] m-[0.6rem]">
<ReviewOpinionButton reviewOpinionFunc={reviewOpinionFunc} />
@@ -11,12 +11,13 @@ import { useAlertStore } from "@/shared/lib";
import { StatsInputStatusInfoList } from "@/components/util/column/review/StatsInputStatusRvwColumn";
import { statisticsManagementApi } from "@/entities/statistics/api/statistics-management-service";
import type { StatsInputStatusReviewItem } from "@/entities/statistics/model/statistics-input-review-interface";
import { toGridRows } from "@/components/util/grid/gridFunction";
import { toGridRows } from "@/components/util/grid/gridFunction";
import type { SearchFormValues } from "@/components/type/SearchForm.type";
// 하수도 통계 검토 00. 통계 입력 현황
const StatsInputStatusRvw = () => {
const { setMessage: alert } = useAlertStore((state) => state);
const [rowData, setRowData] = useState<any[]>([]);
const [rowData, setRowData] = useState<Record<string, string | number>[]>([]);
const [isLoading, setIsLoading] = useState<boolean>(false);
const columnInfo = useMemo(() => {
@@ -34,7 +35,7 @@ const StatsInputStatusRvw = () => {
setRowData([]);
};
const handleSearch = async (values: any) => {
const handleSearch = async (values: SearchFormValues) => {
if (!values.sido || values.sido === 'ALL') {
alert('시도를 선택해주세요.');
return;
@@ -46,14 +47,13 @@ const StatsInputStatusRvw = () => {
const response = await statisticsManagementApi.getStatsInputStatusList({
sido: values.sido,
gugun: values.gugun === 'ALL' ? '' : values.gugun,
yr: values.year || values.yr,
yr: values.year,
bsnmCd: values.bsnmCd
});
if (response.status === 'success' && response.data) {
const rawList = response.data.sewerageSupplyRateList || response.data;
const convertedData: StatsInputStatusReviewItem[] = rawList.map((item: any) => ({
const rawList = response.data.sewerageSupplyRateList ?? [];
const convertedData: StatsInputStatusReviewItem[] = rawList.map((item: StatsInputStatusReviewItem) => ({
...item,
status: item.status || '미확인',
}));