ONAANDALL/frontend
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st: 검토 메뉴 grid footer 수정 및 누락 부분 추가

Browse Source
This commit is contained in:
rsone001
2026-02-05 14:47:47 +09:00
parent 56d47ca1d0
commit 4b0b08761c
7 changed files with 97 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/st/src/components/module/DataGrid.tsx
+4 -4
View File
@@ -155,16 +155,16 @@ function updateHeaderSortIndicator(
function createOnSortingHandler(
columns: { fieldName?: string; name: string; mergeCells?: boolean; sortdisable?: boolean; valueType?: ValueType }[],
setRowData: React.Dispatch<React.SetStateAction<Record<string, string | number>[]>>,
sortDirRef: React.MutableRefObject<Record<string, "asc" | "desc" | "none">>,
originalRowsRef: React.MutableRefObject<Record<string, Record<string, string | number>[]>>
sortDirRef: { current: Record<string, "asc" | "desc" | "none"> },
originalRowsRef: { current: Record<string, Record<string, string | number>[]> }
) {
const fieldNames = [...new Set(columns.map((c) => c.fieldName).filter((x): x is string => typeof x === "string"))];
// mergeCells: true인 컬럼 찾기 (시군구 등) - 그룹 필드로 사용
// 시군구를 우선으로 찾고, 없으면 첫 번째 mergeCells 컬럼 사용
const mergeCellCols = columns.filter((c) => c.mergeCells === true && c.fieldName);
const mergeCellCol = mergeCellCols.find((c) => c.fieldName === '시군구') || mergeCellCols[0];
const mergeCellCol = mergeCellCols.find((c) => c.fieldName === 'gugun') || mergeCellCols[0];
const groupField = mergeCellCol?.fieldName || null;
const orderByField = '구분'; // 고정값 또는 설정 가능하게 할 수 있음
const orderByField = 'rgnNm'; // 고정값 또는 설정 가능하게 할 수 있음
const hasMergeCells = mergeCellCols.length > 0;
return function onSorting(g: unknown, fields: unknown[], _directions: unknown[]) {
apps/st/src/components/module/SearchForm.tsx
+13 -1
View File
@@ -118,6 +118,18 @@ const SearchForm = (props: SearchFormProps = {}) => {
}));
};
const handleSggChange = (value: string) => {
const selectedBsnm = value === 'ALL'
? (sidoList?.data.sidoList.find((v) => v.sido === values.sido)?.bsnmCd || '')
: (sggList?.data?.find((v) => v.gugun === value)?.bsnmCd || '');
setValues((prev) => ({
...prev,
gugun: value,
bsnmCd: selectedBsnm,
}));
};
useEffect(() => {
props.onValuesChange?.(values);
}, [values]);
@@ -151,7 +163,7 @@ const SearchForm = (props: SearchFormProps = {}) => {
<Label className="text-label">
시군구
</Label>
<Select value={values.gugun} onValueChange={(value) => setValues({ ...values, gugun: value })}>
<Select value={values.gugun} onValueChange={handleSggChange}>
<SelectTrigger className="w-[12rem]">
<SelectValue placeholder="전체"></SelectValue>
</SelectTrigger>
apps/st/src/components/statistics/review/SeweragePenetrationRateRvw.tsx
+30 -15
View File
@@ -1,5 +1,6 @@
import { useState } from "react";
import { DataGrid } from "@rsone/components";
import { useState, useMemo } from "react";
// import { DataGrid } from "@rsone/components";
import DataGrid from "@/components/module/DataGrid";
import SearchForm from "@/components/module/SearchForm";
import SaveButton from "@/components/button/SaveButton";
import ApproveButton from "@/components/button/ApproveButton";
@@ -12,12 +13,27 @@ import { sewerageSupplyRateReviewApi } from "@/entities/statistics/api/statistic
import type { SewerageSupplyRateReviewItem } from "@/entities/statistics/model/statistics-management-interface";
import { SeweragePenetrationRateInfoList } from "@/components/util/column/review/SeweragePenetrationRateRvwColumn";
import type { SearchFormValues } from "@/components/type/SearchForm.type";
import { toGridRows } from "@/components/util/grid/gridFunction";
// 하수도 통계 검토 01. 하수도 보급률
const SeweragePenetrationRateRvw = () => {
const { setMessage: alert } = useAlertStore((state) => state);
const [rowData, setRowData] = useState<any[]>([]);
const columnInfo = useMemo(() => {
const { columns, columnLayout, fixedColumns, rowStartNum } = SeweragePenetrationRateInfoList;
return {
columnLayout,
fixedColumns,
rowStartNum,
columns: columns.map((col) => ({
...col,
editable: false as const,
styleName: col.styleName ?? ("rg-cell-readonly" as const),
})),
};
}, []);
const [rowData, setRowData] = useState<any[]>([]);
const [isLoading, setIsLoading] = useState<boolean>(false);
const handleReset = () => {
@@ -29,10 +45,10 @@ const [rowData, setRowData] = useState<any[]>([]);
setIsLoading(true);
const response = await sewerageSupplyRateReviewApi.getSewerageSupplyRateReviewList({
sido: "경기도",
gugun: "과천시",
yr: 2024,
bsnmCd: "4129000000"
sido: values.sido,
gugun: values.gugun === 'ALL' ? '' : values.gugun,
bsnmCd: values.bsnmCd,
yr: values.year,
});
console.log("네트워크 응답 전체:", response);
@@ -42,14 +58,13 @@ const [rowData, setRowData] = useState<any[]>([]);
console.log("받아온 리스트:", rawList);
const convertedData: SewerageSupplyRateReviewItem[] = rawList.map((item) => ({
...item,
speclCntrplnAr: !item.speclCntrplnAr ? '해당없음' : item.speclCntrplnAr,
}));
setRowData(convertedData);
setRowData(toGridRows(convertedData));
} else {
setRowData([]);
@@ -80,12 +95,12 @@ const [rowData, setRowData] = useState<any[]>([]);
</div>
</div>
<DataGrid
columnInfo={SeweragePenetrationRateInfoList}
isExcelImport={false}
fixedColumns={SeweragePenetrationRateInfoList.fixedColumns}
rowStartNum={SeweragePenetrationRateInfoList.rowStartNum}
columnInfo={columnInfo}
isExcelImport={true}
fixedColumns={columnInfo.fixedColumns}
rowStartNum={columnInfo.rowStartNum}
rowData={rowData}
setRowData={setRowData}
setRowData={setRowData}
/>
</>
);
apps/st/src/components/util/grid/footerSummary.ts
+34 -50
View File
@@ -48,8 +48,8 @@ export const getFooterAvgSummary = (grid: GridView, column: DataColumn) => {
return Math.floor(avg * 10) / 10;
}
// "구분" 필드의 고유값들을 찾는 함수 (첫 번째, 두 번째)
const getDivisionValues = (grid: GridView, divisionFieldName: string = '구분'): string[] => {
// 구분 필드의 고유값들을 찾는 함수 (첫 번째, 두 번째). 기본 필드명 'rgnNm'
const getDivisionValues = (grid: GridView, divisionFieldName: string = 'rgnNm'): string[] => {
const dataSource = grid.getDataSource();
const rowCount = dataSource.getRowCount();
const uniqueValues = new Set<string>();
@@ -65,13 +65,13 @@ const getDivisionValues = (grid: GridView, divisionFieldName: string = '구분')
return Array.from(uniqueValues);
};
// "구분" 필드 값에 따라 필터링하여 합계 계산하는 함수
// 구분 필드 값에 따라 필터링하여 합계 계산하는 함수. 기본 필드명 'rgnNm'
// divisionIndex: 0 = 첫 번째 고유값, 1 = 두 번째 고유값
export const getFooterSummaryByDivision = (
grid: GridView,
column: DataColumn,
grid: GridView,
column: DataColumn,
divisionIndex: number,
divisionFieldName: string = '구분'
divisionFieldName: string = 'rgnNm'
) => {
const dataSource = grid.getDataSource();
const rowCount = dataSource.getRowCount();
@@ -107,13 +107,13 @@ export const getFooterSummaryByDivision = (
return sum;
};
// "구분" 필드 값에 따라 필터링하여 평균 계산하는 함수
// 구분 필드 값에 따라 필터링하여 평균 계산하는 함수. 기본 필드명 'rgnNm'
// divisionIndex: 0 = 첫 번째 고유값, 1 = 두 번째 고유값
export const getFooterAvgSummaryByDivision = (
grid: GridView,
column: DataColumn,
grid: GridView,
column: DataColumn,
divisionIndex: number,
divisionFieldName: string = '구분'
divisionFieldName: string = 'rgnNm'
) => {
const dataSource = grid.getDataSource();
const rowCount = dataSource.getRowCount();
@@ -173,67 +173,51 @@ const createAvgFooter = (format: string) => ({
},
});
// "구분" 값에 따라 필터링하는 Footer 배열 생성 함수 (2줄)
const createSumFooterArrayByDivision = (format: string) => [
// 구분 값에 따라 필터링하는 Footer 배열 생성 함수 (2줄). 기본 필드명 'rgnNm'
const createSumFooterArrayByDivision = (format: string, divisionFieldName: string = 'rgnNm') => [
{
numberFormat: format,
valueCallback: (
grid: GridView,
column: DataColumn,
footerIndex: number,
columnFooter: unknown,
grid: GridView,
column: DataColumn,
footerIndex: number,
columnFooter: unknown,
value: number | string | undefined
) => {
// footerIndex: 0 = 첫 번째 footer 행 (첫 번째 "구분" 값), 1 = 두 번째 footer 행 (두 번째 "구분" 값)
// footerIndex를 divisionIndex로 사용
return getFooterSummaryByDivision(grid, column, footerIndex);
},
) => getFooterSummaryByDivision(grid, column, footerIndex, divisionFieldName),
},
{
numberFormat: format,
valueCallback: (
grid: GridView,
column: DataColumn,
footerIndex: number,
columnFooter: unknown,
grid: GridView,
column: DataColumn,
footerIndex: number,
columnFooter: unknown,
value: number | string | undefined
) => {
// footerIndex: 0 = 첫 번째 footer 행 (첫 번째 "구분" 값), 1 = 두 번째 footer 행 (두 번째 "구분" 값)
// footerIndex를 divisionIndex로 사용
return getFooterSummaryByDivision(grid, column, footerIndex);
},
) => getFooterSummaryByDivision(grid, column, footerIndex, divisionFieldName),
},
];
// "구분" 값에 따라 필터링하는 평균 Footer 배열 생성 함수 (2줄)
const createAvgFooterArrayByDivision = (format: string) => [
// 구분 값에 따라 필터링하는 평균 Footer 배열 생성 함수 (2줄). 기본 필드명 'rgnNm'
const createAvgFooterArrayByDivision = (format: string, divisionFieldName: string = 'rgnNm') => [
{
numberFormat: format,
valueCallback: (
grid: GridView,
column: DataColumn,
footerIndex: number,
columnFooter: unknown,
grid: GridView,
column: DataColumn,
footerIndex: number,
columnFooter: unknown,
value: number | string | undefined
) => {
// footerIndex: 0 = 첫 번째 footer 행 (첫 번째 "구분" 값), 1 = 두 번째 footer 행 (두 번째 "구분" 값)
// footerIndex를 divisionIndex로 사용
return getFooterAvgSummaryByDivision(grid, column, footerIndex);
},
) => getFooterAvgSummaryByDivision(grid, column, footerIndex, divisionFieldName),
},
{
numberFormat: format,
valueCallback: (
grid: GridView,
column: DataColumn,
footerIndex: number,
columnFooter: unknown,
grid: GridView,
column: DataColumn,
footerIndex: number,
columnFooter: unknown,
value: number | string | undefined
) => {
// footerIndex: 0 = 첫 번째 footer 행 (첫 번째 "구분" 값), 1 = 두 번째 footer 행 (두 번째 "구분" 값)
// footerIndex를 divisionIndex로 사용
return getFooterAvgSummaryByDivision(grid, column, footerIndex);
},
) => getFooterAvgSummaryByDivision(grid, column, footerIndex, divisionFieldName),
},
];
apps/st/src/components/util/grid/gridFunction.ts
+9 -4
View File
@@ -1,10 +1,15 @@
import type { SewerageSupplyRateItem } from "@/entities/statistics/model/statistics-input-interface";
export function toGridRows(items: SewerageSupplyRateItem[]): Record<string, string | number>[] {
/**
* 객체 배열을 그리드 row 형식으로 변환 (null/undefined → "").
* 어떤 엔티티 타입이든 공통 사용 가능.
*/
export function toGridRows<T extends object>(
items: T[]
): Record<string, string | number>[] {
return items.map((item) => {
const row: Record<string, string | number> = {};
for (const [key, value] of Object.entries(item)) {
row[key] = value === null || value === undefined ? "" : value;
row[key] =
value === null || value === undefined ? "" : (value as string | number);
}
return row;
});
apps/st/src/entities/statistics/model/statistics-interface.ts
+6 -1
View File
@@ -4,6 +4,11 @@ export interface Sido {
bsnmCd: string;
}
export interface SearchCondition {
yearList: string[];
sidoList: Sido[];
}
export interface Sgg {
adstDstrCd: string;
gugun: string;
@@ -17,6 +22,6 @@ export interface ApiResponse<T> {
}
export interface StatisticsService {
getSidoList(): Promise<ApiResponse<Sido[]>>;
getSidoList(): Promise<ApiResponse<SearchCondition>>;
getSggList(sidoName: string): Promise<ApiResponse<Sgg[]>>;
}
apps/st/src/entities/statistics/model/statistics-management-interface.ts
+1 -1
View File
@@ -83,7 +83,7 @@ export type SewerageSupplyRateReviewApiResponse = ApiResponse<SewerageSupplyRate
export interface SewerageSupplyRateReviewRequestParams {
sido?: string;
gugun?: string;
yr?: number;
yr?: string;
bsnmCd?: string;
}