Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management

frontend/components/screen/EditModal.tsx

@@ -63,6 +63,20 @@ export const EditModal: React.FC<EditModalProps> = ({
 
   const dynamicSize = calculateModalSize();
 
+  // EditModal 전용 닫기 이벤트 리스너
+  useEffect(() => {
+    const handleCloseEditModal = () => {
+      console.log("🚪 EditModal: closeEditModal 이벤트 수신");
+      onClose();
+    };
+
+    window.addEventListener("closeEditModal", handleCloseEditModal);
+    
+    return () => {
+      window.removeEventListener("closeEditModal", handleCloseEditModal);
+    };
+  }, [onClose]);
+
   // DialogContent 크기 강제 적용
   useEffect(() => {
     if (isOpen && dynamicSize) {
@@ -271,7 +285,7 @@ export const EditModal: React.FC<EditModalProps> = ({
             <div className="flex h-full items-center justify-center">
               <div className="text-center">
                 <div className="mx-auto mb-4 h-8 w-8 animate-spin rounded-full border-4 border-gray-300 border-t-blue-500"></div>
-                <p className="text-gray-600">화면 로딩 중...</p>
+                <p className="text-muted-foreground">화면 로딩 중...</p>
               </div>
             </div>
           ) : screenData && components.length > 0 ? (