From 8de5317d280a53990f6008b6c690d7e170a5d373 Mon Sep 17 00:00:00 2001 From: rsone001 Date: Mon, 5 Jan 2026 10:04:20 +0900 Subject: [PATCH] =?UTF-8?q?st:=20refactor:=20=EA=B7=B8=EB=A6=AC=EB=93=9C?= =?UTF-8?q?=20merge=20rule=20=EB=A1=9C=EC=A7=81=20=EB=B3=80=EA=B2=BD=20/?= =?UTF-8?q?=20=EC=BB=AC=EB=9F=BC=20sort=20=EC=97=AC=EB=B6=80=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/st/src/components/module/DataGrid.tsx | 26 +++---------------- apps/st/src/components/module/TabDataGrid.tsx | 20 ++------------ .../review/SeweragePenetrationRateRvw.tsx | 8 +++--- apps/st/src/components/type/DataGrid.type.ts | 3 ++- 4 files changed, 11 insertions(+), 46 deletions(-) diff --git a/apps/st/src/components/module/DataGrid.tsx b/apps/st/src/components/module/DataGrid.tsx index d433573b8..cac0f3164 100644 --- a/apps/st/src/components/module/DataGrid.tsx +++ b/apps/st/src/components/module/DataGrid.tsx @@ -1,7 +1,7 @@ import { useRef, useEffect } from "react" import { ValueType } from "realgrid" -import RealGrid, { GridFitStyle, type DisplayOptions } from "realgrid" +import RealGrid, { GridFitStyle, type DisplayOptions, SortDirection } from "realgrid" import { RealGridReact, RGDataColumn } from "realgrid-react" import type { DataGridProps } from "../type/DataGrid.type" import JSZip from "jszip" @@ -175,7 +175,6 @@ const DataGrid = ({ columnInfo, rowStartNum, isExcelImport = true, fixedColumns, dataRows.push(rowData); } } - setRowData(dataRows); } catch (error) { console.error('엑셀 파일 파싱 오류:', error); @@ -266,7 +265,6 @@ const DataGrid = ({ columnInfo, rowStartNum, isExcelImport = true, fixedColumns, // 헤더 체크박스 표시 여부 설정 gridView.setOptions({ checkBar: { visible: showHeaderCheckbox }, - rowIndicator: { visible: false }, }); // footer가 있는 컬럼이 있으면 footer 높이 설정 @@ -296,25 +294,6 @@ const DataGrid = ({ columnInfo, rowStartNum, isExcelImport = true, fixedColumns, } }); - - // mergeCells가 true인 컬럼에 대해 2개씩 병합하는 mergeRule 설정 - columns.forEach(col => { - if (col.mergeCells === true) { - try { - const column = gridView.columnByName(col.name); - if (column) { - // mergeRule: 2개 행씩 병합 (row div 2) - (column as { mergeRule?: { criteria: string; breakMergeOnEmpty?: boolean } }).mergeRule = { - criteria: 'row div 2', - breakMergeOnEmpty: false - }; - } - } catch (error) { - console.warn(`Failed to set mergeRule for column ${col.name}:`, error); - } - } - }); - }, [columns, columnLayout, fixedColumns, rowData, showHeaderCheckbox]); return ( @@ -359,7 +338,8 @@ const DataGrid = ({ columnInfo, rowStartNum, isExcelImport = true, fixedColumns, expression: column.footer.expression, numberFormat: column.footer.numberFormat, } : undefined} - // autoFilter={true} + mergeRule={column.mergeCells ? { criteria: 'value' } : undefined} + sortable={!column.sortdisable} /> ))} diff --git a/apps/st/src/components/module/TabDataGrid.tsx b/apps/st/src/components/module/TabDataGrid.tsx index 9de1fe297..40779e68c 100644 --- a/apps/st/src/components/module/TabDataGrid.tsx +++ b/apps/st/src/components/module/TabDataGrid.tsx @@ -365,24 +365,6 @@ const TabDataGrid = ({ columnInfo, isExcelImport = true, rows = [], showHeaderCh } }); - // mergeCells가 true인 컬럼에 대해 2개씩 병합하는 mergeRule 설정 - currentInfo.columns.forEach(col => { - if (col.mergeCells === true) { - try { - const column = gridView.columnByName(col.name); - if (column) { - // mergeRule: 2개 행씩 병합 (row div 2) - (column as { mergeRule?: { criteria: string; breakMergeOnEmpty?: boolean } }).mergeRule = { - criteria: 'row div 2', - breakMergeOnEmpty: false - }; - } - } catch (error) { - console.warn(`Failed to set mergeRule for column ${col.name}:`, error); - } - } - }); - // 고정 컬럼 설정 if (currentInfo.fixedColumns !== undefined && currentInfo.fixedColumns > 0) { gridView.setFixedOptions({ @@ -468,6 +450,8 @@ const TabDataGrid = ({ columnInfo, isExcelImport = true, rows = [], showHeaderCh expression: column.footer.expression, numberFormat: column.footer.numberFormat, } : undefined} + mergeRule={column.mergeCells ? { criteria: 'row div 2' } : undefined} + sortable={!column.sortdisable} /> ))} diff --git a/apps/st/src/components/statistics/review/SeweragePenetrationRateRvw.tsx b/apps/st/src/components/statistics/review/SeweragePenetrationRateRvw.tsx index a4c1bf5bc..6b8387c08 100644 --- a/apps/st/src/components/statistics/review/SeweragePenetrationRateRvw.tsx +++ b/apps/st/src/components/statistics/review/SeweragePenetrationRateRvw.tsx @@ -13,10 +13,10 @@ import { useState } from "react"; const SeweragePenetrationRateRvw = () => { const columns: ColumnConfig[] = [ - { name: 'sn', fieldName: '순번', header: { text: '순번' }, mergeCells: true, editable: false }, - { name: 'sido', fieldName: '시도', header: { text: '시도' }, mergeCells: true, editable: false }, - { name: 'sgg', fieldName: '시군구', header: { text: '시군구' }, mergeCells: true, editable: false }, - { name: '구분', fieldName: '구분', header: { text: '구분' }, editable: false }, + { name: 'sn', fieldName: '순번', header: { text: '순번' }, mergeCells: true, editable: false, sortdisable: true }, + { name: 'sido', fieldName: '시도', header: { text: '시도' }, mergeCells: true, editable: false, sortdisable: true }, + { name: 'sgg', fieldName: '시군구', header: { text: '시군구' }, mergeCells: true, editable: false, sortdisable: true }, + { name: '구분', fieldName: '구분', header: { text: '구분' }, editable: false, sortdisable: true }, { name: '수계', fieldName: '수계', header: { text: '수계' } }, { name: 'bstrm', fieldName: '지류', header: { text: '지류' } }, { name: 'mdbsn', fieldName: '세부단위유역', header: { text: '세부단위유역' } }, diff --git a/apps/st/src/components/type/DataGrid.type.ts b/apps/st/src/components/type/DataGrid.type.ts index 9877734a7..8b9a3fdb6 100644 --- a/apps/st/src/components/type/DataGrid.type.ts +++ b/apps/st/src/components/type/DataGrid.type.ts @@ -30,7 +30,8 @@ export type ColumnConfig = { fieldName: string; header: { text: string }; editable?: boolean; // 셀 편집 가능 여부 - mergeCells?: boolean; // 같은 값이 연속될 때 셀 병합 여부 + mergeCells?: boolean; + sortdisable?: boolean; valueType?: ValueType; dataFormat?: string; footer?: {