Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend

apps/fo/app/layout.tsx

@@ -1,5 +1,4 @@
 "use client"
-import Base from "./base";
 import "./globals.css";
 import { StoreProvider } from "./store";
 
@@ -12,7 +11,7 @@ export default function RootLayout({
     <html lang="en">
       <body>
         <StoreProvider>
-          <Base>{children}</Base>
+         {children}
         </StoreProvider>
       </body>
     </html>

apps/fo/app/pages/(map-layout)/layout.tsx

@@ -0,0 +1,10 @@
+
+export default function RootLayout({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) {
+  return (
+    <div>{children}</div>    
+  );
+}

apps/fo/app/pages/(map-layout)/map/page.tsx

@@ -3,7 +3,7 @@
 import Gis from "@common/business_components/ui/map/Gis";
 import GisApp from "@common/business_components/ui/map/lib/gis.core";
 import { useEffect, useRef, useState } from "react";
-import { SearchBar } from "./searchBar/searchBar";
+import { SearchBar } from "../../map/searchBar/searchBar";
 
 interface FeatureData {
   fid?: string;

apps/fo/app/pages/(with-layout)/dashboardMain/page.tsx

@@ -1,7 +1,7 @@
 "use client"
 import { useFoStore } from "@/app/store";
 import { useEffect, useState } from "react";
-import SearchInput from "../../components/common/SearchInput";
+import SearchInput from "../../../components/common/SearchInput";
 
 export default function DashBoardFclty({ onFacilityChange, sidoSigun, facilityNm,  }: { onFacilityChange?: (facility: { bscFctCd: string, bscFctNm: string, fcltyCpc: number | '', trtFrfNm: string | '', efflWqltStndrdNm: string | '' }) => void, sidoSigun?: string, facilityNm?: string }) {
   // 입력값 상태 관리

apps/fo/app/pages/(with-layout)/facilityWaterQlty/modal/page.tsx

@@ -4,8 +4,8 @@ import type { FacilityWaterQltyProps, modalExcelType } from "@/app/store/facilit
 import { downloadExcel, UITab, UiTable } from "@common/business_components/ui";
 import { Button, TabsContent } from "@common/components/ui";
 import { useCallback, useEffect, useRef, useState } from "react";
-import type { ReturnType } from "../../../components/common/FacilityTermModalHeader";
-import FacilityTermModalHeader from "../../../components/common/FacilityTermModalHeader";
+import type { ReturnType } from "../../../../components/common/FacilityTermModalHeader";
+import FacilityTermModalHeader from "../../../../components/common/FacilityTermModalHeader";
 import { HeadMakeColSpan } from "../HeadMakeColSpan";
 
 type ModalProps ={

apps/fo/app/pages/(with-layout)/flowRate/modal/page.tsx

@@ -5,7 +5,7 @@ import type { FlowRateModalInterface, modalExcelType } from "@/app/store/flowRat
 import { downloadExcel, UITab, UiTable } from "@common/business_components/ui";
 import { Button, TabsContent } from "@common/components/ui";
 import { useCallback, useEffect, useRef, useState } from "react";
-import type { ReturnType } from "../../../components/common/FacilityTermModalHeader";
+import type { ReturnType } from "../../../../components/common/FacilityTermModalHeader";
 
 const tabList = [
   { value: 'tab_term_year', label: '연간' },

apps/fo/app/pages/(with-layout)/layout.tsx

@@ -0,0 +1,13 @@
+"use client"
+
+import Base from "@/app/base";
+
+export default function RootLayout({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) {
+  return (
+          <Base>{children}</Base>
+  );
+}

apps/fo/app/pages/(with-layout)/processArea/HeadMakeColSpan.tsx

@@ -1,5 +1,5 @@
+import type { TableUpperProps } from "@/app/store/common";
 import { TableHead, TableRow } from "@common/components/ui";
-import type { TableUpperProps } from "../../store/dashboard";
 
 const HeadMakeColSpan = ({ upHeadList, layoutNum }: { upHeadList: TableUpperProps[], layoutNum: number }) => {
     return (

apps/sn/app/(map-layout)/layout.tsx

@@ -3,7 +3,7 @@
 import React, { useEffect } from 'react';
 import { usePathname, useRouter } from "next/navigation";
 import { useQueryClient } from "@tanstack/react-query";
-import { BaseLayout } from "@common/components";
+import { NoFooterLayout } from "@common/components";
 import type { MenuItem } from "@/entities/menu";
 import { useMenuStore } from "@/shared/lib";
 import useStore from '../store/useStore';
@@ -33,12 +33,12 @@ export default function MapLayout({
   };
 
   return (
-    <BaseLayout
+    <NoFooterLayout
       queryClient={queryClient}
       currentPath={pathname ?? ""}
       handleMenuClick={handleMenuClick}
     >
       {children}
-    </BaseLayout>
+    </NoFooterLayout>
   );
 }

apps/wr/app/(popUp-layout)/mapDetailPopUp/page.tsx

@@ -1,12 +1,12 @@
 "use client";
 
-import { CoSttnMap } from "@/components/ui/map/LayerPopUp/CoSttnMap/coSttnMap";
-import { HasuFacility } from "@/components/ui/map/LayerPopUp/HasuFacilty/hasuFacility";
-import { HtdflFacility } from "@/components/ui/map/LayerPopUp/HedfFacilty/htdfFacilty";
-import { LdrmntCoMap } from "@/components/ui/map/LayerPopUp/LdrmntCoMap/ldrmntCoMap";
-import { RainFacility } from "@/components/ui/map/LayerPopUp/RainFacility/rainFacility";
-import { RswtFacility } from "@/components/ui/map/LayerPopUp/RswtFacilty/rswtFacilty";
-import { RuseFacility } from "@/components/ui/map/LayerPopUp/RuseFacilty/ruseFacility";
+import { CoSttnMap } from "@/components/ui/map/LayerPopUp/CoSttnMap/CoSttnMap";
+import { HasuFacility } from "@/components/ui/map/LayerPopUp/HasuFacilty/HasuFacility";
+import { HtdflFacility } from "@/components/ui/map/LayerPopUp/HedfFacilty/HtdfFacilty";
+import { LdrmntCoMap } from "@/components/ui/map/LayerPopUp/LdrmntCoMap/LdrmntCoMap";
+import { RainFacility } from "@/components/ui/map/LayerPopUp/RainFacility/RainFacility";
+import { RswtFacility } from "@/components/ui/map/LayerPopUp/RswtFacilty/RswtFacilty";
+import { RuseFacility } from "@/components/ui/map/LayerPopUp/RuseFacilty/RuseFacility";
 import { useSearchParams } from "next/navigation";
 
 export default function MapDetailPopUp() {

apps/wr/app/(with-layout)/map/mainMap/page.tsx

@@ -265,6 +265,10 @@ const Map = () => {
     }
   };
 
+  const onOpenPopup = (data:any) => {
+    console.log(data)
+  }
+
   return (
     <div className="bg-container">
       <Gis
@@ -299,6 +303,9 @@ const Map = () => {
           />
         }
         waterDepth={undefined}
+        onOpenPopup={(data:any) =>{
+          onOpenPopup(data)
+        }}
       />
     </div>
   );

packages/common/business_components/src/ui/map/Gis.js

@@ -122,7 +122,9 @@ function Gis({
   targetLayerTypes = [],
   orderedLayers = [],
   checkInterval = 3000,
-  height: height = "h-[calc(100vh-10rem)]",
+  height: height = "h-[calc(100vh-5rem)]",
+  onOpenPopup=(data)=>{}
+
 }) {
   const mapRef = useRef();
   const [mapObject, setMapObject] = useState({});
@@ -351,7 +353,9 @@ function Gis({
                 const dummyFeature = {
                   getProperties: () => ({}), // 최소 구조
                 };
-                onFeatureSelect(dummyFeature);
+                console.log(layerNm)
+                onOpenPopup(layerNm)
+                // onFeatureSelect(dummyFeature);
               }}
               imageVisible={imgVisble}
               isPlaying={isPlaying}

packages/common/business_components/src/ui/map/GisTree.js

@@ -453,8 +453,8 @@ import {
 							src="/images/map/layericon/Layer_Select_BTN.png"
 							onClick={() =>
 							  handleLayerImgClick(
-								node.text,
-								node.id
+								  node.data.lyrTyNm,
+								  node.id
 							  )
 							}
 							alt={node.text}