Merge commit '90fda952ad0efb22e8c0018cb7d8291118f51d8c' into iipbs/wr/gisPopup

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

@@ -31,6 +31,7 @@ function Gis({
 	setIsOpen,
 	setFeatureData,
 	featureData,
+	imgVisble = false,
 	searchView: SearchView,
 	detailView: DetailView,
 	onFeatureSelect,
@@ -387,6 +388,7 @@ function Gis({
 							};
 							onFeatureSelect(dummyFeature);
 						}}
+						imageVisible={imgVisble}
 					/>
 
 					{/* <GisContent onFeatureSelect={handleFeatureSelect} isSearch={isSearch} isSearchModalOpen={isSearchModalOpen} setIsSearchModalOpen={setIsSearchModalOpen} /> */}

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

@@ -10,7 +10,7 @@ import { DndProvider } from "react-dnd";
 import { useGisContext } from './Gis';
 import GisApp from './lib/gis.core';
 
-export default React.memo(function GisTree({ checkedNodes = [], setCheckedNodes = () => { }, visible, setVisible, onCheckedChange, onLayerIconClick }) {
+export default React.memo(function GisTree({ checkedNodes = [], setCheckedNodes = () => { }, visible, setVisible, onCheckedChange, onLayerIconClick,imageVisible=false }) {
 	const { gisCore, treeData } = useGisContext();
 	const [checked, setChecked] = useState([]);
 	const [expanded, setExpanded] = useState([]);
@@ -188,9 +188,9 @@ export default React.memo(function GisTree({ checkedNodes = [], setCheckedNodes
 		image.src = canvas.toDataURL('image/png');
 		return image;
 	};
-	const handleLayerImgClick = (nodeNm) => {
-		console.log('click!', nodeNm)
-		onLayerIconClick(nodeNm)
+	const handleLayerImgClick = (nodeNm, nodeId) => {
+		if(!checked.includes(nodeId)) alert('시설을 선택해주세요')
+		else onLayerIconClick(nodeNm)
 	}
 	if (!treeData || treeData.length === 0) return null;
 
@@ -224,7 +224,7 @@ export default React.memo(function GisTree({ checkedNodes = [], setCheckedNodes
 									<input type="checkbox" checked={checked.includes(node.id)} onChange={() => handleCheck(node.id)} className="cursor-pointer" />
 									{node.icon && <span>{node.icon}</span>}
 									<span className="text-[1.3rem] font-medium text-label">{node.text}</span>
-									{depth > 0 && <span><img className="cursor-pointer w-5 h-5" src='/images/map/layericon/Layer_Select_BTN.png' onClick={()=>{handleLayerImgClick(node.text)}} alt={node.text}></img></span>}
+									{imageVisible ? depth > 0 && <span><img className="cursor-pointer w-5 h-5" src='/images/map/layericon/Layer_Select_BTN.png' onClick={()=>{handleLayerImgClick(node.text, node.id)}} alt={node.text}></img></span> : null}
 								</div>
 							)}
 							sort={(a, b) => {