diff --git a/apps/st/app/(with-base-layout)/layout.tsx b/apps/st/app/(with-base-layout)/layout.tsx index b6f1e1cf8..3b79033ad 100644 --- a/apps/st/app/(with-base-layout)/layout.tsx +++ b/apps/st/app/(with-base-layout)/layout.tsx @@ -7,6 +7,7 @@ import { useQueryClient, useQuery } from "@tanstack/react-query"; import type { MenuItem } from "@/entities/menu"; import { useMenuStore, useAlertStore } from "@/shared/lib"; import { useTabStore, getTabStoreState } from "@/store/tab-store"; +import { useTabStore as gridTabStore } from "@rsone/components"; import { getConfig } from "@common/config"; import { getCookie } from "@/shared/lib"; import { getMenuList } from "../../../../packages/common/components/src/api"; @@ -33,6 +34,9 @@ export default function WithBaseLayout({ const addTab = useTabStore((state) => state.addTab); const setActiveTab = useTabStore((state) => state.setActiveTab); const setMenuList = useTabStore((state) => state.setMenuList); + const addTabForGrid = gridTabStore((state) => state.addTab); + const setActiveTabForGrid = gridTabStore((state) => state.setActiveTab); + const setMenuListForGrid = gridTabStore((state) => state.setMenuList); const alert = useAlertStore((state) => state.setMessage); const { data: menuListData } = useQuery({ @@ -44,8 +48,9 @@ export default function WithBaseLayout({ useEffect(() => { if (menuListData) { setMenuList(menuListData); + setMenuListForGrid(menuListData); } - }, [menuListData, setMenuList]); + }, [menuListData, setMenuList, setMenuListForGrid]); useEffect(() => { if (!pathname) return; @@ -55,18 +60,24 @@ export default function WithBaseLayout({ const tab = currentTabs.find((t) => t.path === pathname); if (tab) { setActiveTab(tab.id); + setActiveTabForGrid(tab.id); } - }, [pathname, setActiveTab]); + }, [pathname, setActiveTab, setActiveTabForGrid]); const handleMenuClick = useCallback((item: MenuItem) => { setCurrentMenuInfo(item); const addTabResult: boolean = addTab(item); + + // packages/rsone의 스토어에도 동기화 + if (addTabResult) { + addTabForGrid(item); + } if (!addTabResult) { alert(`최대 추가 할 수 있는 화면 수를 초과 하였습니다. 기존 화면을 닫은 후 이용해주세요.`); } - }, [setCurrentMenuInfo, addTab]); + }, [setCurrentMenuInfo, addTab, addTabForGrid]); return ( 07. 분뇨처리시설 -const ExcretaTreatmentFacilityMng = () => { +const ExcretaTreatmentFacilityInp = () => { const submitExceptionFunc = () => { console.log('submit exception'); @@ -47,4 +47,4 @@ const ExcretaTreatmentFacilityMng = () => { ); }; -export default ExcretaTreatmentFacilityMng; \ No newline at end of file +export default ExcretaTreatmentFacilityInp; \ No newline at end of file diff --git a/apps/st/src/components/statistics/management/PrivateSewageFacilityMng.tsx b/apps/st/src/components/statistics/input/PrivateSewageFacilityInp.tsx similarity index 71% rename from apps/st/src/components/statistics/management/PrivateSewageFacilityMng.tsx rename to apps/st/src/components/statistics/input/PrivateSewageFacilityInp.tsx index a55219cdd..6037d0f05 100644 --- a/apps/st/src/components/statistics/management/PrivateSewageFacilityMng.tsx +++ b/apps/st/src/components/statistics/input/PrivateSewageFacilityInp.tsx @@ -1,25 +1,25 @@ import { useState } from "react"; import SearchForm from "@/components/module/SearchForm"; -import TabDataGrid from "@/components/module/TabDataGrid"; +import { TabDataGrid } from "@rsone/components"; import SubmitButton from "@/components/button/SumitButton"; import SaveButton from "@/components/button/SaveButton"; import SubmitExceptionButton from "@/components/button/SubmitExceptionButton"; import LastYearDataButton from "@/components/button/LastYearDataButton"; -import { SewageTreatmentFacilityStatusMngColumn } from "@/components/util/column/management/privateSewageFacility/SewageTreatmentFacilityStatusMngColumn" -import { SepticTankStatusMngColumn } from "@/components/util/column/management/privateSewageFacility/SepticTankStatusMngColumn" -import { PrivateSewageDesignationStatusMngColumn } from "@/components/util/column/management/privateSewageFacility/PrivateSewageDesignationStatusMngColumn" +import { SewageTreatmentFacilityStatusMngColumn } from "@/components/util/column/input/privateSewageFacility/SewageTreatmentFacilityStatusMngColumn" +import { SepticTankStatusMngColumn } from "@/components/util/column/input/privateSewageFacility/SepticTankStatusMngColumn" +import { PrivateSewageDesignationStatusMngColumn } from "@/components/util/column/input/privateSewageFacility/PrivateSewageDesignationStatusMngColumn" // 하수도 통계 관리 > 08. 개인하수처리시설 -const PrivateSewageFacilityMng = () => { +const PrivateSewageFacilityInp = () => { const [rowDataMap, setRowDataMap] = useState[]>>(new Map()); // tab list - const PrivateSewageFacilityMngColumnList = [ - SewageTreatmentFacilityStatusMngColumn, - SepticTankStatusMngColumn, - PrivateSewageDesignationStatusMngColumn - ]; + const PrivateSewageFacilityInpColumnList = [ + SewageTreatmentFacilityStatusMngColumn, + SepticTankStatusMngColumn, + PrivateSewageDesignationStatusMngColumn + ]; const submitExceptionFunc = () => { // TODO: 예외 제출 로직 구현 @@ -51,9 +51,9 @@ const PrivateSewageFacilityMng = () => { - + ); }; -export default PrivateSewageFacilityMng; \ No newline at end of file +export default PrivateSewageFacilityInp; \ No newline at end of file diff --git a/apps/st/src/components/statistics/management/PublicSewageFacilityMng.tsx b/apps/st/src/components/statistics/input/PublicSewageFacilityInp.tsx similarity index 90% rename from apps/st/src/components/statistics/management/PublicSewageFacilityMng.tsx rename to apps/st/src/components/statistics/input/PublicSewageFacilityInp.tsx index 4a2478ef9..39b7ed480 100644 --- a/apps/st/src/components/statistics/management/PublicSewageFacilityMng.tsx +++ b/apps/st/src/components/statistics/input/PublicSewageFacilityInp.tsx @@ -1,15 +1,15 @@ import SearchForm from '@/components/module/SearchForm'; -import DataGrid from '@/components/module/DataGrid'; +import { DataGrid } from '@rsone/components'; import SubmitButton from '@/components/button/SumitButton'; import SaveButton from '@/components/button/SaveButton'; import SubmitExceptionButton from '@/components/button/SubmitExceptionButton'; import OperateDataButton from '@/components/button/OperateDataButton'; import { useState } from 'react'; -import { PublicSewageFacilityMngColumn } from '@/components/util/column/management/PublicSewageFacilityMngColumn'; +import { PublicSewageFacilityMngColumn } from '@/components/util/column/input/PublicSewageFacilityMngColumn'; // 하수도 통계 관리 > 06. 공공하수처리시설 -const PublicSewageFacilityMng = () => { +const PublicSewageFacilityInp = () => { const SubmitExceptionFunc = () => { console.log('submitException'); @@ -47,4 +47,4 @@ const PublicSewageFacilityMng = () => { ); }; -export default PublicSewageFacilityMng; \ No newline at end of file +export default PublicSewageFacilityInp; \ No newline at end of file diff --git a/apps/st/src/components/statistics/management/PumpingStationMng.tsx b/apps/st/src/components/statistics/input/PumpingStationInp.tsx similarity index 91% rename from apps/st/src/components/statistics/management/PumpingStationMng.tsx rename to apps/st/src/components/statistics/input/PumpingStationInp.tsx index 18647218a..e1b846292 100644 --- a/apps/st/src/components/statistics/management/PumpingStationMng.tsx +++ b/apps/st/src/components/statistics/input/PumpingStationInp.tsx @@ -1,14 +1,14 @@ import SearchForm from "@/components/module/SearchForm"; -import DataGrid from "@/components/module/DataGrid"; +import { DataGrid } from '@rsone/components'; import SubmitButton from "@/components/button/SumitButton"; import SaveButton from "@/components/button/SaveButton"; import LastYearDataButton from "@/components/button/LastYearDataButton"; import SubmitExceptionButton from "@/components/button/SubmitExceptionButton"; import { useState } from "react"; -import { PumpingStationMngColumn } from "@/components/util/column/management/PumpingStationMngColumn" +import { PumpingStationMngColumn } from "@/components/util/column/input/PumpingStationMngColumn" // 하수도 통계 관리 > 05. 펌프장 -const PumpingStationMng = () => { +const PumpingStationInp = () => { const SubmitExceptionFunc = () => { console.log('submit exception'); @@ -46,4 +46,4 @@ const PumpingStationMng = () => { ); }; -export default PumpingStationMng; \ No newline at end of file +export default PumpingStationInp; \ No newline at end of file diff --git a/apps/st/src/components/statistics/management/SewageExcretaRelatedMng.tsx b/apps/st/src/components/statistics/input/SewageExcretaRelatedInp.tsx similarity index 72% rename from apps/st/src/components/statistics/management/SewageExcretaRelatedMng.tsx rename to apps/st/src/components/statistics/input/SewageExcretaRelatedInp.tsx index e0d5ab6ba..d0cfa9b83 100644 --- a/apps/st/src/components/statistics/management/SewageExcretaRelatedMng.tsx +++ b/apps/st/src/components/statistics/input/SewageExcretaRelatedInp.tsx @@ -1,7 +1,7 @@ import SearchForm from "@/components/module/SearchForm"; // 하수도 통계 관리 > 12. 하수 및 분뇨관련산업 -const SewageExcretaRelatedMng = () => { +const SewageExcretaRelatedInp = () => { return ( <> @@ -9,4 +9,4 @@ const SewageExcretaRelatedMng = () => { ); }; -export default SewageExcretaRelatedMng; \ No newline at end of file +export default SewageExcretaRelatedInp; \ No newline at end of file diff --git a/apps/st/src/components/statistics/management/SewageExcretaSlurgeMng.tsx b/apps/st/src/components/statistics/input/SewageExcretaSlurgeInp.tsx similarity index 74% rename from apps/st/src/components/statistics/management/SewageExcretaSlurgeMng.tsx rename to apps/st/src/components/statistics/input/SewageExcretaSlurgeInp.tsx index fc3ac670f..4035ea184 100644 --- a/apps/st/src/components/statistics/management/SewageExcretaSlurgeMng.tsx +++ b/apps/st/src/components/statistics/input/SewageExcretaSlurgeInp.tsx @@ -1,7 +1,7 @@ import SearchForm from "@/components/module/SearchForm"; // 하수도 통계 관리 > 11. 하수 및 분뇨찌꺼기(슬러지)처리 -const SewageExcretaSlurgeMng = () => { +const SewageExcretaSlurgeInp = () => { return ( <> @@ -9,4 +9,4 @@ const SewageExcretaSlurgeMng = () => { ); }; -export default SewageExcretaSlurgeMng; \ No newline at end of file +export default SewageExcretaSlurgeInp; \ No newline at end of file diff --git a/apps/st/src/components/statistics/management/SewagePipeMng.tsx b/apps/st/src/components/statistics/input/SewagePipeInp.tsx similarity index 81% rename from apps/st/src/components/statistics/management/SewagePipeMng.tsx rename to apps/st/src/components/statistics/input/SewagePipeInp.tsx index 725717013..7bdd82819 100644 --- a/apps/st/src/components/statistics/management/SewagePipeMng.tsx +++ b/apps/st/src/components/statistics/input/SewagePipeInp.tsx @@ -1,28 +1,28 @@ import { useState } from "react"; import SearchForm from "@/components/module/SearchForm"; -import TabDataGrid from "@/components/module/TabDataGrid"; +import { TabDataGrid } from '@rsone/components'; import SubmitButton from "@/components/button/SumitButton"; import SaveButton from "@/components/button/SaveButton"; import LastYearDataButton from "@/components/button/LastYearDataButton"; import SubmitExceptionButton from "@/components/button/SubmitExceptionButton"; import OperateDateButton from "@/components/button/OperateDataButton"; -import { RegionalFacilityStatusMngColumn } from "@/components/util/column/management/sewagePipe/RegionalFacilityStatusMngColumn"; -import { FacilityInstallStatusMngColumn } from "@/components/util/column/management/sewagePipe/FacilityInstallStatusMngColumn"; -import { PipeTypeStatusMngColumn } from "@/components/util/column/management/sewagePipe/PipeTypeStatusMngColumn"; -import { PipeDiameterStatusMngColumn } from "@/components/util/column/management/sewagePipe/PipeDiameterStatusMngColumn"; -import { ManholeStatusMngColumn } from "@/components/util/column/management/sewagePipe/ManholeStatusMngColumn"; +import { RegionalFacilityStatusMngColumn } from "@/components/util/column/input/sewagePipe/RegionalFacilityStatusMngColumn"; +import { FacilityInstallStatusMngColumn } from "@/components/util/column/input/sewagePipe/FacilityInstallStatusMngColumn"; +import { PipeTypeStatusMngColumn } from "@/components/util/column/input/sewagePipe/PipeTypeStatusMngColumn"; +import { PipeDiameterStatusMngColumn } from "@/components/util/column/input/sewagePipe/PipeDiameterStatusMngColumn"; +import { ManholeStatusMngColumn } from "@/components/util/column/input/sewagePipe/ManholeStatusMngColumn"; import { AdminAreaConnectionMngColumn, TreatmentPlantConnectionMngColumn -} from "@/components/util/column/management/sewagePipe/ConnectionStatusMngColumn"; +} from "@/components/util/column/input/sewagePipe/ConnectionStatusMngColumn"; // 하수도 통계 관리 > 02. 하수관로 -const SewagePipeMng = () => { +const SewagePipeInp = () => { const [rowDataMap, setRowDataMap] = useState[]>>(new Map()); // tab List - const SewagePipeMngColumnList = [ + const SewagePipeInpColumnList = [ RegionalFacilityStatusMngColumn, FacilityInstallStatusMngColumn, PipeTypeStatusMngColumn, @@ -69,9 +69,9 @@ const SewagePipeMng = () => { - + ); }; -export default SewagePipeMng; \ No newline at end of file +export default SewagePipeInp; \ No newline at end of file diff --git a/apps/st/src/components/statistics/management/SewagePipeMaintainMng.tsx b/apps/st/src/components/statistics/input/SewagePipeMaintainInp.tsx similarity index 82% rename from apps/st/src/components/statistics/management/SewagePipeMaintainMng.tsx rename to apps/st/src/components/statistics/input/SewagePipeMaintainInp.tsx index 8e27653f3..1620c26d2 100644 --- a/apps/st/src/components/statistics/management/SewagePipeMaintainMng.tsx +++ b/apps/st/src/components/statistics/input/SewagePipeMaintainInp.tsx @@ -1,21 +1,21 @@ import { useState } from "react"; import SearchForm from "@/components/module/SearchForm"; -import TabDataGrid from "@/components/module/TabDataGrid"; +import { TabDataGrid } from '@rsone/components'; import SubmitButton from "@/components/button/SumitButton"; import SaveButton from "@/components/button/SaveButton"; import LastYearDataButton from "@/components/button/LastYearDataButton"; import SubmitExceptionButton from "@/components/button/SubmitExceptionButton"; -import { RepairStatusMngColumn } from "@/components/util/column/management/sewagePipeMaintain/RepairStatusMngColumn"; -import { PipeDredgingStatusMngColumn } from "@/components/util/column/management/sewagePipeMaintain/PipeDredgingStatusMngColumn"; +import { RepairStatusMngColumn } from "@/components/util/column/input/sewagePipeMaintain/RepairStatusMngColumn"; +import { PipeDredgingStatusMngColumn } from "@/components/util/column/input/sewagePipeMaintain/PipeDredgingStatusMngColumn"; // 하수도 통계 관리 > 03. 하수관로 유지관리 -const SewagePipeMaintainMng = () => { +const SewagePipeMaintainInp = () => { const [rowDataMap, setRowDataMap] = useState[]>>(new Map()); // tab List - const SewagePipeMaintainMngColumnList = [ + const SewagePipeMaintainInpColumnList = [ RepairStatusMngColumn, PipeDredgingStatusMngColumn ]; @@ -51,9 +51,9 @@ const SewagePipeMaintainMng = () => { - + ); }; -export default SewagePipeMaintainMng; \ No newline at end of file +export default SewagePipeMaintainInp; \ No newline at end of file diff --git a/apps/st/src/components/statistics/management/SewageReservoirPumpMng.tsx b/apps/st/src/components/statistics/input/SewageReservoirPumpInp.tsx similarity index 82% rename from apps/st/src/components/statistics/management/SewageReservoirPumpMng.tsx rename to apps/st/src/components/statistics/input/SewageReservoirPumpInp.tsx index 615bf21be..ed8697882 100644 --- a/apps/st/src/components/statistics/management/SewageReservoirPumpMng.tsx +++ b/apps/st/src/components/statistics/input/SewageReservoirPumpInp.tsx @@ -1,20 +1,20 @@ import { useState } from "react"; import SearchForm from "@/components/module/SearchForm"; -import TabDataGrid from "@/components/module/TabDataGrid"; +import { TabDataGrid } from '@rsone/components'; import SubmitButton from "@/components/button/SumitButton"; import SaveButton from "@/components/button/SaveButton"; import LastYearDataButton from "@/components/button/LastYearDataButton"; import SubmitExceptionButton from "@/components/button/SubmitExceptionButton"; -import { SewageReservoirMngColumn } from "@/components/util/column/management/sewageReservoirPump/SewageReservoirMngColumn"; -import { RainfallPumpStationMngColumn } from "@/components/util/column/management/sewageReservoirPump/RainfallPumpStationMngColumn"; +import { SewageReservoirMngColumn } from "@/components/util/column/input/sewageReservoirPump/SewageReservoirMngColumn"; +import { RainfallPumpStationMngColumn } from "@/components/util/column/input/sewageReservoirPump/RainfallPumpStationMngColumn"; // 하수도 통계 관리 > 04. 하수저류 시설 및 빗물 펌프장 -const SewageReservoirPumpMng = () => { +const SewageReservoirPumpInp = () => { const [rowDataMap, setRowDataMap] = useState[]>>(new Map()); // tab List - const SewageReservoirPumpMngColumnList = [ + const SewageReservoirPumpInpColumnList = [ SewageReservoirMngColumn, RainfallPumpStationMngColumn ]; @@ -48,9 +48,9 @@ const SewageReservoirPumpMng = () => { - + ); }; -export default SewageReservoirPumpMng; \ No newline at end of file +export default SewageReservoirPumpInp; \ No newline at end of file diff --git a/apps/st/src/components/statistics/management/SewerageFinanceMng.tsx b/apps/st/src/components/statistics/input/SewerageFinanceInp.tsx similarity index 81% rename from apps/st/src/components/statistics/management/SewerageFinanceMng.tsx rename to apps/st/src/components/statistics/input/SewerageFinanceInp.tsx index 8ea794818..d4120c2f2 100644 --- a/apps/st/src/components/statistics/management/SewerageFinanceMng.tsx +++ b/apps/st/src/components/statistics/input/SewerageFinanceInp.tsx @@ -1,22 +1,22 @@ import { useState } from "react"; import SearchForm from "@/components/module/SearchForm"; -import TabDataGrid from "@/components/module/TabDataGrid"; +import { TabDataGrid } from '@rsone/components'; import SubmitButton from "@/components/button/SumitButton"; import SaveButton from "@/components/button/SaveButton"; import SubmitExceptionButton from "@/components/button/SubmitExceptionButton"; import LastYearDataButton from "@/components/button/LastYearDataButton"; -import { SewerageFinanceSettlementMngColumn } from "@/components/util/column/management/sewerageFinance/SewerageFinanceSettlementMngColumn" -import { SewerageChargeMngColumn } from "@/components/util/column/management/sewerageFinance/SewerageChargeMngColumn" -import { SewerageUsageFeeMngColumn } from "@/components/util/column/management/sewerageFinance/SewerageUsageFeeMngColumn" -import { CauserBurdenMngColumn } from "@/components/util/column/management/sewerageFinance/CauserBurdenMngColumn" +import { SewerageFinanceSettlementMngColumn } from "@/components/util/column/input/sewerageFinance/SewerageFinanceSettlementMngColumn" +import { SewerageChargeMngColumn } from "@/components/util/column/input/sewerageFinance/SewerageChargeMngColumn" +import { SewerageUsageFeeMngColumn } from "@/components/util/column/input/sewerageFinance/SewerageUsageFeeMngColumn" +import { CauserBurdenMngColumn } from "@/components/util/column/input/sewerageFinance/CauserBurdenMngColumn" // 하수도 통계 관리 > 09. 하수도재정 -const SewerageFinanceMng = () => { +const SewerageFinanceInp = () => { const [rowDataMap, setRowDataMap] = useState[]>>(new Map()); // tab list - const SewerageFinanceMngList = [ + const SewerageFinanceInpList = [ SewerageFinanceSettlementMngColumn, SewerageChargeMngColumn, SewerageUsageFeeMngColumn, @@ -54,9 +54,9 @@ const SewerageFinanceMng = () => { - + ); }; -export default SewerageFinanceMng; \ No newline at end of file +export default SewerageFinanceInp; \ No newline at end of file diff --git a/apps/st/src/components/statistics/management/SeweragePenetrationRateMng.tsx b/apps/st/src/components/statistics/input/SeweragePenetrationRateInp.tsx similarity index 92% rename from apps/st/src/components/statistics/management/SeweragePenetrationRateMng.tsx rename to apps/st/src/components/statistics/input/SeweragePenetrationRateInp.tsx index 1db839f81..bed3fa5d4 100644 --- a/apps/st/src/components/statistics/management/SeweragePenetrationRateMng.tsx +++ b/apps/st/src/components/statistics/input/SeweragePenetrationRateInp.tsx @@ -7,10 +7,10 @@ import SubmitExceptionButton from "@/components/button/SubmitExceptionButton"; import { useState } from "react"; -import { SeweragePenetrationRateMngColumn } from "@/components/util/column/management/SeweragePenetrationRateMngColumn"; +import { SeweragePenetrationRateMngColumn } from "@/components/util/column/input/SeweragePenetrationRateMngColumn"; // 하수도 통계 관리 > 01. 하수도 보급률 -const SeweragePenetrationRateMng = () => { +const SeweragePenetrationRateInp = () => { const SubmitExceptionFunc = () => { console.log('submit exception'); @@ -57,4 +57,4 @@ const SeweragePenetrationRateMng = () => { ); }; -export default SeweragePenetrationRateMng; \ No newline at end of file +export default SeweragePenetrationRateInp; \ No newline at end of file diff --git a/apps/st/src/components/statistics/management/SewerageServiceLevelMng.tsx b/apps/st/src/components/statistics/input/SewerageServiceLevelInp.tsx similarity index 71% rename from apps/st/src/components/statistics/management/SewerageServiceLevelMng.tsx rename to apps/st/src/components/statistics/input/SewerageServiceLevelInp.tsx index e7bdc2945..904bb42f6 100644 --- a/apps/st/src/components/statistics/management/SewerageServiceLevelMng.tsx +++ b/apps/st/src/components/statistics/input/SewerageServiceLevelInp.tsx @@ -1,7 +1,7 @@ import SearchForm from "../../module/SearchForm"; // 하수도 통계 관리 > 13. 하수도 서비스 수준 -const SewerageServiceLevelMng = () => { +const SewerageServiceLevelInp = () => { return ( <> @@ -9,4 +9,4 @@ const SewerageServiceLevelMng = () => { ); }; -export default SewerageServiceLevelMng; \ No newline at end of file +export default SewerageServiceLevelInp; \ No newline at end of file diff --git a/apps/st/src/components/statistics/management/StatsInputSatusMng.tsx b/apps/st/src/components/statistics/input/StatsInputSatusInp.tsx similarity index 91% rename from apps/st/src/components/statistics/management/StatsInputSatusMng.tsx rename to apps/st/src/components/statistics/input/StatsInputSatusInp.tsx index c753f23c7..b4fbb367a 100644 --- a/apps/st/src/components/statistics/management/StatsInputSatusMng.tsx +++ b/apps/st/src/components/statistics/input/StatsInputSatusInp.tsx @@ -4,10 +4,10 @@ import ApproveButton from "@/components/button/ApproveButton"; import RejectButton from "@/components/button/RejectButton"; import { useState } from "react"; -import { StatsInputSatusMngColumn } from "@/components/util/column/management/StatsInputSatusMngColumn"; +import { StatsInputSatusMngColumn } from "@/components/util/column/input/StatsInputSatusMngColumn"; // 하수도 통계 관리 > 00. 통계 입력 현황 -const StatsInputSatusMng = () => { +const StatsInputSatusInp = () => { const rejectFunc = () => { console.log('reject'); @@ -35,4 +35,4 @@ const StatsInputSatusMng = () => { ); }; -export default StatsInputSatusMng; \ No newline at end of file +export default StatsInputSatusInp; \ No newline at end of file diff --git a/apps/st/src/components/statistics/management/WaterReuseMng.tsx b/apps/st/src/components/statistics/input/WaterReuseInp.tsx similarity index 78% rename from apps/st/src/components/statistics/management/WaterReuseMng.tsx rename to apps/st/src/components/statistics/input/WaterReuseInp.tsx index 1edfa2ee1..d8a3b8bc3 100644 --- a/apps/st/src/components/statistics/management/WaterReuseMng.tsx +++ b/apps/st/src/components/statistics/input/WaterReuseInp.tsx @@ -1,25 +1,25 @@ import { useState } from "react"; import SearchForm from "@/components/module/SearchForm"; -import TabDataGrid from "@/components/module/TabDataGrid"; +import { TabDataGrid } from '@rsone/components'; import SubmitButton from "@/components/button/SumitButton"; import SaveButton from "@/components/button/SaveButton"; import LastYearDataButton from "@/components/button/LastYearDataButton"; import SubmitExceptionButton from "@/components/button/SubmitExceptionButton"; import OperateDataButton from "@/components/button/OperateDataButton" -import { PublicSewageTreatmentWaterReuseMngColumn } from "@/components/util/column/management/waterReuse/PublicSewageTreatmentWaterReuseMngColumn"; -import { RecycledWaterStatusMngColumn } from "@/components/util/column/management/waterReuse/RecycledWaterStatusMngColumn"; -import { RainfallUtilizationFacilityStatusMngColumn } from "@/components/util/column/management/waterReuse/RainfallUtilizationFacilityStatusMngColumn"; -import { TreatmentWaterReuseDesignConstructionStatusMngColumn } from "@/components/util/column/management/waterReuse/TreatmentWaterReuseDesignConstructionStatusMngColumn"; -import { TreatmentWaterReuseBussinessApprovalStatusMngColumn } from "@/components/util/column/management/waterReuse/TreatmentWaterReuseBussinessApprovalStatusMngColumn"; +import { PublicSewageTreatmentWaterReuseMngColumn } from "@/components/util/column/input/waterReuse/PublicSewageTreatmentWaterReuseMngColumn"; +import { RecycledWaterStatusMngColumn } from "@/components/util/column/input/waterReuse/RecycledWaterStatusMngColumn"; +import { RainfallUtilizationFacilityStatusMngColumn } from "@/components/util/column/input/waterReuse/RainfallUtilizationFacilityStatusMngColumn"; +import { TreatmentWaterReuseDesignConstructionStatusMngColumn } from "@/components/util/column/input/waterReuse/TreatmentWaterReuseDesignConstructionStatusMngColumn"; +import { TreatmentWaterReuseBussinessApprovalStatusMngColumn } from "@/components/util/column/input/waterReuse/TreatmentWaterReuseBussinessApprovalStatusMngColumn"; // 하수도 통계 관리 > 10. 물 재이용 -const WaterReuseMng = () => { +const WaterReuseInp = () => { const [rowDataMap, setRowDataMap] = useState[]>>(new Map()); // tab list - const WaterReuseMngColumnList = [ + const WaterReuseInpColumnList = [ PublicSewageTreatmentWaterReuseMngColumn, RecycledWaterStatusMngColumn, RainfallUtilizationFacilityStatusMngColumn, @@ -63,9 +63,9 @@ const WaterReuseMng = () => { - + ); }; -export default WaterReuseMng; \ No newline at end of file +export default WaterReuseInp; \ No newline at end of file diff --git a/apps/st/src/components/statistics/system/NotEnteredStatus.tsx b/apps/st/src/components/statistics/management/NotEnteredStatus.tsx similarity index 100% rename from apps/st/src/components/statistics/system/NotEnteredStatus.tsx rename to apps/st/src/components/statistics/management/NotEnteredStatus.tsx diff --git a/apps/st/src/components/statistics/system/StatisticsInputManagement.tsx b/apps/st/src/components/statistics/management/StatisticsInputManagement.tsx similarity index 100% rename from apps/st/src/components/statistics/system/StatisticsInputManagement.tsx rename to apps/st/src/components/statistics/management/StatisticsInputManagement.tsx diff --git a/apps/st/src/components/statistics/system/StatisticsPopulationManagement.tsx b/apps/st/src/components/statistics/management/StatisticsPopulationManagement.tsx similarity index 53% rename from apps/st/src/components/statistics/system/StatisticsPopulationManagement.tsx rename to apps/st/src/components/statistics/management/StatisticsPopulationManagement.tsx index 688c15d7e..dabf80854 100644 --- a/apps/st/src/components/statistics/system/StatisticsPopulationManagement.tsx +++ b/apps/st/src/components/statistics/management/StatisticsPopulationManagement.tsx @@ -1,11 +1,9 @@ -import { useState } from "react"; +// import { useState } from "react"; import SearchForm from "@/components/module/SearchForm"; -import DataGrid from "@/components/module/DataGrid"; -import type { ColumnConfig } from "@/components/type/DataGrid.type"; const StatisticsPopulationManagement = () => { - const [rowData, setRowData] = useState[]>([]); + // const [rowData, setRowData] = useState[]>([]); return ( <> diff --git a/apps/st/src/components/statistics/system/StatisticsReviewHistory.tsx b/apps/st/src/components/statistics/management/StatisticsReviewHistory.tsx similarity index 100% rename from apps/st/src/components/statistics/system/StatisticsReviewHistory.tsx rename to apps/st/src/components/statistics/management/StatisticsReviewHistory.tsx diff --git a/apps/st/src/components/util/column/management/ExcretaTreatmentFacilityMngColumn.ts b/apps/st/src/components/util/column/input/ExcretaTreatmentFacilityMngColumn.ts similarity index 100% rename from apps/st/src/components/util/column/management/ExcretaTreatmentFacilityMngColumn.ts rename to apps/st/src/components/util/column/input/ExcretaTreatmentFacilityMngColumn.ts diff --git a/apps/st/src/components/util/column/management/PublicSewageFacilityMngColumn.ts b/apps/st/src/components/util/column/input/PublicSewageFacilityMngColumn.ts similarity index 100% rename from apps/st/src/components/util/column/management/PublicSewageFacilityMngColumn.ts rename to apps/st/src/components/util/column/input/PublicSewageFacilityMngColumn.ts diff --git a/apps/st/src/components/util/column/management/PumpingStationMngColumn.ts b/apps/st/src/components/util/column/input/PumpingStationMngColumn.ts similarity index 100% rename from apps/st/src/components/util/column/management/PumpingStationMngColumn.ts rename to apps/st/src/components/util/column/input/PumpingStationMngColumn.ts diff --git a/apps/st/src/components/util/column/management/SeweragePenetrationRateMngColumn.ts b/apps/st/src/components/util/column/input/SeweragePenetrationRateMngColumn.ts similarity index 100% rename from apps/st/src/components/util/column/management/SeweragePenetrationRateMngColumn.ts rename to apps/st/src/components/util/column/input/SeweragePenetrationRateMngColumn.ts diff --git a/apps/st/src/components/util/column/management/StatsInputSatusMngColumn.ts b/apps/st/src/components/util/column/input/StatsInputSatusMngColumn.ts similarity index 100% rename from apps/st/src/components/util/column/management/StatsInputSatusMngColumn.ts rename to apps/st/src/components/util/column/input/StatsInputSatusMngColumn.ts diff --git a/apps/st/src/components/util/column/management/privateSewageFacility/PrivateSewageDesignationStatusMngColumn.ts b/apps/st/src/components/util/column/input/privateSewageFacility/PrivateSewageDesignationStatusMngColumn.ts similarity index 100% rename from apps/st/src/components/util/column/management/privateSewageFacility/PrivateSewageDesignationStatusMngColumn.ts rename to apps/st/src/components/util/column/input/privateSewageFacility/PrivateSewageDesignationStatusMngColumn.ts diff --git a/apps/st/src/components/util/column/management/privateSewageFacility/SepticTankStatusMngColumn.ts b/apps/st/src/components/util/column/input/privateSewageFacility/SepticTankStatusMngColumn.ts similarity index 100% rename from apps/st/src/components/util/column/management/privateSewageFacility/SepticTankStatusMngColumn.ts rename to apps/st/src/components/util/column/input/privateSewageFacility/SepticTankStatusMngColumn.ts diff --git a/apps/st/src/components/util/column/management/privateSewageFacility/SewageTreatmentFacilityStatusMngColumn.ts b/apps/st/src/components/util/column/input/privateSewageFacility/SewageTreatmentFacilityStatusMngColumn.ts similarity index 100% rename from apps/st/src/components/util/column/management/privateSewageFacility/SewageTreatmentFacilityStatusMngColumn.ts rename to apps/st/src/components/util/column/input/privateSewageFacility/SewageTreatmentFacilityStatusMngColumn.ts diff --git a/apps/st/src/components/util/column/management/sewagePipe/ConnectionStatusMngColumn.ts b/apps/st/src/components/util/column/input/sewagePipe/ConnectionStatusMngColumn.ts similarity index 100% rename from apps/st/src/components/util/column/management/sewagePipe/ConnectionStatusMngColumn.ts rename to apps/st/src/components/util/column/input/sewagePipe/ConnectionStatusMngColumn.ts diff --git a/apps/st/src/components/util/column/management/sewagePipe/FacilityInstallStatusMngColumn.ts b/apps/st/src/components/util/column/input/sewagePipe/FacilityInstallStatusMngColumn.ts similarity index 100% rename from apps/st/src/components/util/column/management/sewagePipe/FacilityInstallStatusMngColumn.ts rename to apps/st/src/components/util/column/input/sewagePipe/FacilityInstallStatusMngColumn.ts diff --git a/apps/st/src/components/util/column/management/sewagePipe/ManholeStatusMngColumn.ts b/apps/st/src/components/util/column/input/sewagePipe/ManholeStatusMngColumn.ts similarity index 100% rename from apps/st/src/components/util/column/management/sewagePipe/ManholeStatusMngColumn.ts rename to apps/st/src/components/util/column/input/sewagePipe/ManholeStatusMngColumn.ts diff --git a/apps/st/src/components/util/column/management/sewagePipe/PipeDiameterStatusMngColumn.ts b/apps/st/src/components/util/column/input/sewagePipe/PipeDiameterStatusMngColumn.ts similarity index 100% rename from apps/st/src/components/util/column/management/sewagePipe/PipeDiameterStatusMngColumn.ts rename to apps/st/src/components/util/column/input/sewagePipe/PipeDiameterStatusMngColumn.ts diff --git a/apps/st/src/components/util/column/management/sewagePipe/PipeTypeStatusMngColumn.ts b/apps/st/src/components/util/column/input/sewagePipe/PipeTypeStatusMngColumn.ts similarity index 100% rename from apps/st/src/components/util/column/management/sewagePipe/PipeTypeStatusMngColumn.ts rename to apps/st/src/components/util/column/input/sewagePipe/PipeTypeStatusMngColumn.ts diff --git a/apps/st/src/components/util/column/management/sewagePipe/RegionalFacilityStatusMngColumn.ts b/apps/st/src/components/util/column/input/sewagePipe/RegionalFacilityStatusMngColumn.ts similarity index 100% rename from apps/st/src/components/util/column/management/sewagePipe/RegionalFacilityStatusMngColumn.ts rename to apps/st/src/components/util/column/input/sewagePipe/RegionalFacilityStatusMngColumn.ts diff --git a/apps/st/src/components/util/column/management/sewagePipeMaintain/PipeDredgingStatusMngColumn.ts b/apps/st/src/components/util/column/input/sewagePipeMaintain/PipeDredgingStatusMngColumn.ts similarity index 100% rename from apps/st/src/components/util/column/management/sewagePipeMaintain/PipeDredgingStatusMngColumn.ts rename to apps/st/src/components/util/column/input/sewagePipeMaintain/PipeDredgingStatusMngColumn.ts diff --git a/apps/st/src/components/util/column/management/sewagePipeMaintain/RepairStatusMngColumn.ts b/apps/st/src/components/util/column/input/sewagePipeMaintain/RepairStatusMngColumn.ts similarity index 100% rename from apps/st/src/components/util/column/management/sewagePipeMaintain/RepairStatusMngColumn.ts rename to apps/st/src/components/util/column/input/sewagePipeMaintain/RepairStatusMngColumn.ts diff --git a/apps/st/src/components/util/column/management/sewageReservoirPump/RainfallPumpStationMngColumn.ts b/apps/st/src/components/util/column/input/sewageReservoirPump/RainfallPumpStationMngColumn.ts similarity index 100% rename from apps/st/src/components/util/column/management/sewageReservoirPump/RainfallPumpStationMngColumn.ts rename to apps/st/src/components/util/column/input/sewageReservoirPump/RainfallPumpStationMngColumn.ts diff --git a/apps/st/src/components/util/column/management/sewageReservoirPump/SewageReservoirMngColumn.ts b/apps/st/src/components/util/column/input/sewageReservoirPump/SewageReservoirMngColumn.ts similarity index 100% rename from apps/st/src/components/util/column/management/sewageReservoirPump/SewageReservoirMngColumn.ts rename to apps/st/src/components/util/column/input/sewageReservoirPump/SewageReservoirMngColumn.ts diff --git a/apps/st/src/components/util/column/management/sewerageFinance/CauserBurdenMngColumn.ts b/apps/st/src/components/util/column/input/sewerageFinance/CauserBurdenMngColumn.ts similarity index 100% rename from apps/st/src/components/util/column/management/sewerageFinance/CauserBurdenMngColumn.ts rename to apps/st/src/components/util/column/input/sewerageFinance/CauserBurdenMngColumn.ts diff --git a/apps/st/src/components/util/column/management/sewerageFinance/SewerageChargeMngColumn.ts b/apps/st/src/components/util/column/input/sewerageFinance/SewerageChargeMngColumn.ts similarity index 100% rename from apps/st/src/components/util/column/management/sewerageFinance/SewerageChargeMngColumn.ts rename to apps/st/src/components/util/column/input/sewerageFinance/SewerageChargeMngColumn.ts diff --git a/apps/st/src/components/util/column/management/sewerageFinance/SewerageFinanceSettlementMngColumn.ts b/apps/st/src/components/util/column/input/sewerageFinance/SewerageFinanceSettlementMngColumn.ts similarity index 100% rename from apps/st/src/components/util/column/management/sewerageFinance/SewerageFinanceSettlementMngColumn.ts rename to apps/st/src/components/util/column/input/sewerageFinance/SewerageFinanceSettlementMngColumn.ts diff --git a/apps/st/src/components/util/column/management/sewerageFinance/SewerageUsageFeeMngColumn.ts b/apps/st/src/components/util/column/input/sewerageFinance/SewerageUsageFeeMngColumn.ts similarity index 100% rename from apps/st/src/components/util/column/management/sewerageFinance/SewerageUsageFeeMngColumn.ts rename to apps/st/src/components/util/column/input/sewerageFinance/SewerageUsageFeeMngColumn.ts diff --git a/apps/st/src/components/util/column/management/waterReuse/PublicSewageTreatmentWaterReuseMngColumn.ts b/apps/st/src/components/util/column/input/waterReuse/PublicSewageTreatmentWaterReuseMngColumn.ts similarity index 100% rename from apps/st/src/components/util/column/management/waterReuse/PublicSewageTreatmentWaterReuseMngColumn.ts rename to apps/st/src/components/util/column/input/waterReuse/PublicSewageTreatmentWaterReuseMngColumn.ts diff --git a/apps/st/src/components/util/column/management/waterReuse/RainfallUtilizationFacilityStatusMngColumn.ts b/apps/st/src/components/util/column/input/waterReuse/RainfallUtilizationFacilityStatusMngColumn.ts similarity index 100% rename from apps/st/src/components/util/column/management/waterReuse/RainfallUtilizationFacilityStatusMngColumn.ts rename to apps/st/src/components/util/column/input/waterReuse/RainfallUtilizationFacilityStatusMngColumn.ts diff --git a/apps/st/src/components/util/column/management/waterReuse/RecycledWaterStatusMngColumn.ts b/apps/st/src/components/util/column/input/waterReuse/RecycledWaterStatusMngColumn.ts similarity index 100% rename from apps/st/src/components/util/column/management/waterReuse/RecycledWaterStatusMngColumn.ts rename to apps/st/src/components/util/column/input/waterReuse/RecycledWaterStatusMngColumn.ts diff --git a/apps/st/src/components/util/column/management/waterReuse/TreatmentWaterReuseBussinessApprovalStatusMngColumn.ts b/apps/st/src/components/util/column/input/waterReuse/TreatmentWaterReuseBussinessApprovalStatusMngColumn.ts similarity index 100% rename from apps/st/src/components/util/column/management/waterReuse/TreatmentWaterReuseBussinessApprovalStatusMngColumn.ts rename to apps/st/src/components/util/column/input/waterReuse/TreatmentWaterReuseBussinessApprovalStatusMngColumn.ts diff --git a/apps/st/src/components/util/column/management/waterReuse/TreatmentWaterReuseDesignConstructionStatusMngColumn.ts b/apps/st/src/components/util/column/input/waterReuse/TreatmentWaterReuseDesignConstructionStatusMngColumn.ts similarity index 100% rename from apps/st/src/components/util/column/management/waterReuse/TreatmentWaterReuseDesignConstructionStatusMngColumn.ts rename to apps/st/src/components/util/column/input/waterReuse/TreatmentWaterReuseDesignConstructionStatusMngColumn.ts diff --git a/apps/st/src/components/util/column/review/PrivateSewageFacilityColumnRvw.ts b/apps/st/src/components/util/column/review/PrivateSewageFacilityColumnRvw.ts index 9e3d2c8ba..e5ade8499 100644 --- a/apps/st/src/components/util/column/review/PrivateSewageFacilityColumnRvw.ts +++ b/apps/st/src/components/util/column/review/PrivateSewageFacilityColumnRvw.ts @@ -1,6 +1,3 @@ -import type { GridView, DataColumn } from "@/components/type/DataGrid.type"; -import { getFooterSummary } from "@/components/util/grid/footerSummary"; - const rawPrivateSewageList = [ { tabKey: 'a', diff --git a/apps/st/src/components/util/column/review/SewageExcretaRelatedColumnRvw.ts b/apps/st/src/components/util/column/review/SewageExcretaRelatedColumnRvw.ts index e9bcfac0d..16f2c6701 100644 --- a/apps/st/src/components/util/column/review/SewageExcretaRelatedColumnRvw.ts +++ b/apps/st/src/components/util/column/review/SewageExcretaRelatedColumnRvw.ts @@ -1,6 +1,3 @@ -import type { GridView, DataColumn } from "@/components/type/DataGrid.type"; -import { getFooterSummary } from "@/components/util/grid/footerSummary"; - const rawExcretaRelatedList = [ { tabKey: 'a', diff --git a/apps/st/src/components/util/column/review/SewageExcretaSlurgeColumnRvw.ts b/apps/st/src/components/util/column/review/SewageExcretaSlurgeColumnRvw.ts index 4cf62583e..856f0582e 100644 --- a/apps/st/src/components/util/column/review/SewageExcretaSlurgeColumnRvw.ts +++ b/apps/st/src/components/util/column/review/SewageExcretaSlurgeColumnRvw.ts @@ -1,6 +1,3 @@ -import type { GridView, DataColumn } from "@/components/type/DataGrid.type"; -import { getFooterSummary } from "@/components/util/grid/footerSummary"; - const rawSludgeList = [ { tabKey: 'a', diff --git a/apps/st/src/components/util/column/review/SewagePipeColumnRvw.ts b/apps/st/src/components/util/column/review/SewagePipeColumnRvw.ts index 1158e32d3..bdeb4d6ce 100644 --- a/apps/st/src/components/util/column/review/SewagePipeColumnRvw.ts +++ b/apps/st/src/components/util/column/review/SewagePipeColumnRvw.ts @@ -1,6 +1,3 @@ -import type { GridView, DataColumn } from "@/components/type/DataGrid.type"; -import { getFooterSummary } from "@/components/util/grid/footerSummary"; - const baseYear = new Date().getFullYear(); const rawList = [ diff --git a/apps/st/src/components/util/column/review/SewageReservoirPumpColumnRvw.ts b/apps/st/src/components/util/column/review/SewageReservoirPumpColumnRvw.ts index 66cc56fd7..be1b6911c 100644 --- a/apps/st/src/components/util/column/review/SewageReservoirPumpColumnRvw.ts +++ b/apps/st/src/components/util/column/review/SewageReservoirPumpColumnRvw.ts @@ -1,7 +1,3 @@ - -import type { GridView, DataColumn } from "@/components/type/DataGrid.type"; -import { getFooterSummary } from "@/components/util/grid/footerSummary"; - const rawReservoirList = [ { tabKey: 'a', diff --git a/apps/st/src/components/util/column/review/SewerageFinanceColumnRvw.ts b/apps/st/src/components/util/column/review/SewerageFinanceColumnRvw.ts index 242c2169b..c98b026c5 100644 --- a/apps/st/src/components/util/column/review/SewerageFinanceColumnRvw.ts +++ b/apps/st/src/components/util/column/review/SewerageFinanceColumnRvw.ts @@ -1,6 +1,3 @@ -import type { GridView, DataColumn } from "@/components/type/DataGrid.type"; -import { getFooterSummary } from "@/components/util/grid/footerSummary"; - const rawFinanceList = [ { tabKey: 'a', diff --git a/apps/st/src/components/util/column/review/SewerageServiceLevelColumnRvw.ts b/apps/st/src/components/util/column/review/SewerageServiceLevelColumnRvw.ts index b762c43f4..36a3fcedd 100644 --- a/apps/st/src/components/util/column/review/SewerageServiceLevelColumnRvw.ts +++ b/apps/st/src/components/util/column/review/SewerageServiceLevelColumnRvw.ts @@ -1,6 +1,3 @@ -import type { GridView, DataColumn } from "@/components/type/DataGrid.type"; -import { getFooterSummary } from "@/components/util/grid/footerSummary"; - const rawServiceLevelList = [ { tabKey: 'a', diff --git a/apps/st/src/components/util/column/review/WaterReuseColumnRvw.ts b/apps/st/src/components/util/column/review/WaterReuseColumnRvw.ts index 0498dd9d6..d23df45c1 100644 --- a/apps/st/src/components/util/column/review/WaterReuseColumnRvw.ts +++ b/apps/st/src/components/util/column/review/WaterReuseColumnRvw.ts @@ -1,6 +1,3 @@ -import type { GridView, DataColumn } from "@/components/type/DataGrid.type"; -import { getFooterSummary } from "@/components/util/grid/footerSummary"; - const rawWaterReuseList = [ { tabKey: 'a', diff --git a/apps/st/src/store/tab-store.ts b/apps/st/src/store/tab-store.ts index cdbaad91f..6c48a5074 100644 --- a/apps/st/src/store/tab-store.ts +++ b/apps/st/src/store/tab-store.ts @@ -39,7 +39,7 @@ const useTabStoreHook = create((set, get) => ({ return true; } - if (tabs.length < 100) { + if (tabs.length < 10) { const newTab: Tab = { id: tabId, label: menuItem.menuKornNm, diff --git a/packages/rsone/components/grid/DataGrid.tsx b/packages/rsone/components/grid/DataGrid.tsx index 4c9a50522..21d921130 100644 --- a/packages/rsone/components/grid/DataGrid.tsx +++ b/packages/rsone/components/grid/DataGrid.tsx @@ -1,7 +1,7 @@ import { useRef, useEffect } from "react" import { ValueType } from "realgrid" -import RealGrid, { GridFitStyle, type DisplayOptions, SortDirection } from "realgrid" +import RealGrid, { GridFitStyle, type DisplayOptions } from "realgrid" import { RealGridReact, RGDataColumn } from "realgrid-react" import type { DataGridProps } from "../type/DataGrid.type" import JSZip from "jszip" diff --git a/packages/rsone/components/grid/TabDataGrid.tsx b/packages/rsone/components/grid/TabDataGrid.tsx index 191ebaea3..f125d0c86 100644 --- a/packages/rsone/components/grid/TabDataGrid.tsx +++ b/packages/rsone/components/grid/TabDataGrid.tsx @@ -1,7 +1,7 @@ import { useRef, useEffect, useState } from "react" import { ValueType } from "realgrid" -import RealGrid, { GridFitStyle, type DisplayOptions } from "realgrid" +import RealGrid, { GridFitStyle } from "realgrid" import { RealGridReact, RGDataColumn } from "realgrid-react" import type { TabDataGridProps } from "../type/DataGrid.type" import JSZip from "jszip"