Merge remote-tracking branch 'origin/iipbs/sn/main' into iipbs/sn/ii

apps/sn/app/(map-layout)/map/components/popupComponent/chart/aplcnYms.ts

@@ -72,7 +72,7 @@ export const getDcTree = async () => {
 };
 
 const getOptionsAplcnYm = (yyyymms: string[]): { text: string; val: string, hidden?: boolean }[] => {
-    let yyyymms1 = yyyymms.map(dateStr => {
+    const yyyymms1 = yyyymms.map(dateStr => {
       const year = dateStr.slice(0, 4);
       const month = dateStr.slice(4, 6);
       return {
@@ -208,12 +208,12 @@ export const selectPplRdiiQty = async(rainInfwtAnlsSn:number, pplMngNo:string) =
   }
 };
 
-export const getOptionsRdiiAnlsInfo = (anlsArr: TRdiiAnls[]): { text: string; val: number }[] => {
+export const getOptionsRdiiAnlsInfo = (anlsArr: TRdiiAnls[]): { text: string; val: number, hidden?: boolean }[] => {
   const options = anlsArr.map(anls => ({
     text: anls.anlsInfo,
     val: anls.rainInfwtAnlsSn,
   }));
-  options.unshift({ val: 0, text: '선택' });
+  options.unshift({ val: 0, text: '선택', hidden: true });
   return options;
 };
 

apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx

@@ -265,7 +265,7 @@ const InfilChart = ({ pplMngNo }: ModalOpenProp) => {
       onOpenChange={setIsModalOpen}
       headerTitle=""
       bodyClass={`
-            h-[50vh]
+            min-h-[50vh]
             w-[50vw]
             max-w-none
             max-h-none

apps/sn/app/(map-layout)/map/components/popupComponent/chart/rdiiChart.tsx

@@ -106,7 +106,9 @@ const RdiiChart = ({ pplMngNo }: ModalOpenProp) => {
     });
     fn.selectPplRdiiQty(rainInfwtAnlsSn, pplMngNo).then((data) => {// 강우유입수량 조회
       setRdiiQty(Math.round(data.rdiih*24)); // cmd: m³/d 단위로 변환
-      setTotalVolume(Math.round(data.rdiih * data.sustaintime)); // 총체적 m³/mm
+      if (data.raintotal && data.rainTotal !== 0) {
+        setTotalVolume(Math.round(data.rdiih * data.sustaintime / data.raintotal)); // 총체적 m³/mm
+      }
     });
     setPopupOpen(false);
   };
@@ -248,7 +250,7 @@ const RdiiChart = ({ pplMngNo }: ModalOpenProp) => {
       onOpenChange={setIsModalOpen}
       headerTitle=""
       bodyClass={`
-            h-[50vh]
+            min-h-[50vh]
             w-[50vw]
             max-w-none
             max-h-none

packages/common/business_components/src/ui/map/lib/gis.core.js

@@ -561,15 +561,17 @@ GisApp.core.prototype = {
 	 */
 	setLayerOnMap: function (layerIds, visible, addQurryFlter) {
 		for (let i in layerIds) {
+			
 			let id = layerIds[i];
 			let layer = this.getLayerById(id);
 			if (layer) {
 				layer.setVisible(visible);
 			} else if (visible) {
 				const layerCode = GisApp.layerCode[id];
+				if(!layerCode.lyrTyNm) continue;
 				const queryFlter = layerCode?.flterSql || '' + ' ' + (addQurryFlter || '');
 				layerCode['flterSql'] = queryFlter;
-				//layer = this.addWmsLayer(layerCode);				
+				//layer = this.addWmsLayer(layerCode);			
 				layer = this.addWfsLayer(layerCode);
 			}
 		}

pnpm-lock.yaml

@@ -580,6 +580,9 @@ importers:
       tailwind-merge:
         specifier: ^3.0.1
         version: 3.0.2
+      tailwindcss-animate:
+        specifier: ^1.0.7
+        version: 1.0.7(tailwindcss@3.4.17)
       xlsx:
         specifier: ^0.18.5
         version: 0.18.5
@@ -2533,7 +2536,7 @@ packages:
       dnd-multi-backend: 8.1.2(dnd-core@16.0.1)
       framer-motion: 11.18.2(react-dom@18.3.1)(react@18.3.1)
       react: 18.3.1
-      react-dnd: 16.0.1(@types/node@22.13.5)(@types/react@18.3.18)(react@18.3.1)
+      react-dnd: 16.0.1(@types/node@22.13.9)(@types/react@18.3.18)(react@18.3.1)
       react-dnd-html5-backend: 16.0.1
       react-dnd-touch-backend: 16.0.1
       react-dom: 18.3.1(react@18.3.1)