Merge branch 'main' into barcode

frontend/app/(main)/admin/screenMng/popScreenMngList/page.tsx

@@ -13,6 +13,7 @@ import {
   Settings,
   LayoutGrid,
   GitBranch,
+  Upload,
 } from "lucide-react";
 import { PopDesigner } from "@/components/pop/designer";
 import { ScrollToTop } from "@/components/common/ScrollToTop";
@@ -27,6 +28,7 @@ import {
   PopScreenPreview,
   PopScreenFlowView,
   PopScreenSettingModal,
+  PopDeployModal,
 } from "@/components/pop/management";
 import { PopScreenGroup } from "@/lib/api/popScreenGroup";
 
@@ -62,6 +64,10 @@ export default function PopScreenManagementPage() {
   // UI 상태
   const [isCreateOpen, setIsCreateOpen] = useState(false);
   const [isSettingModalOpen, setIsSettingModalOpen] = useState(false);
+  const [isDeployModalOpen, setIsDeployModalOpen] = useState(false);
+  const [deployGroupScreens, setDeployGroupScreens] = useState<ScreenDefinition[]>([]);
+  const [deployGroupName, setDeployGroupName] = useState("");
+  const [deployGroupInfo, setDeployGroupInfo] = useState<any>(undefined);
   const [devicePreview, setDevicePreview] = useState<DevicePreview>("tablet");
   const [rightPanelView, setRightPanelView] = useState<RightPanelView>("preview");
 
@@ -235,6 +241,21 @@ export default function PopScreenManagementPage() {
             <Button variant="outline" size="icon" onClick={loadScreens}>
               <RefreshCw className="h-4 w-4" />
             </Button>
+            {selectedScreen && (
+              <Button
+                variant="outline"
+                onClick={() => {
+                  setDeployGroupScreens([]);
+                  setDeployGroupName("");
+                  setDeployGroupInfo(undefined);
+                  setIsDeployModalOpen(true);
+                }}
+                className="gap-2"
+              >
+                <Upload className="h-4 w-4" />
+                복사
+              </Button>
+            )}
             <Button onClick={() => setIsCreateOpen(true)} className="gap-2">
               <Plus className="h-4 w-4" />
               새 POP 화면
@@ -264,7 +285,7 @@ export default function PopScreenManagementPage() {
       ) : (
         <div className="flex-1 overflow-hidden flex">
           {/* 왼쪽: 카테고리 트리 + 화면 목록 */}
-          <div className="w-[320px] min-w-[280px] max-w-[400px] flex flex-col border-r bg-background">
+          <div className="w-[320px] min-w-[280px] max-w-[400px] flex flex-col border-r bg-background overflow-hidden">
             {/* 검색 */}
             <div className="shrink-0 p-3 border-b">
               <div className="relative">
@@ -290,6 +311,24 @@ export default function PopScreenManagementPage() {
               selectedScreen={selectedScreen}
               onScreenSelect={handleScreenSelect}
               onScreenDesign={handleDesignScreen}
+              onScreenSettings={(screen) => {
+                setSelectedScreen(screen);
+                setIsSettingModalOpen(true);
+              }}
+              onScreenCopy={(screen) => {
+                setSelectedScreen(screen);
+                setDeployGroupScreens([]);
+                setDeployGroupName("");
+                setDeployGroupInfo(undefined);
+                setIsDeployModalOpen(true);
+              }}
+              onGroupCopy={(groupScreensList, groupName, gInfo) => {
+                setSelectedScreen(null);
+                setDeployGroupScreens(groupScreensList);
+                setDeployGroupName(groupName);
+                setDeployGroupInfo(gInfo);
+                setIsDeployModalOpen(true);
+              }}
               onGroupSelect={handleGroupSelect}
               searchTerm={searchTerm}
             />
@@ -383,6 +422,18 @@ export default function PopScreenManagementPage() {
         }}
       />
 
+      {/* POP 화면 배포 모달 */}
+      <PopDeployModal
+        open={isDeployModalOpen}
+        onOpenChange={setIsDeployModalOpen}
+        screen={selectedScreen}
+        groupScreens={deployGroupScreens.length > 0 ? deployGroupScreens : undefined}
+        groupName={deployGroupName || undefined}
+        groupInfo={deployGroupInfo}
+        allScreens={screens}
+        onDeployed={loadScreens}
+      />
+
       {/* Scroll to Top 버튼 */}
       <ScrollToTop />
     </div>

frontend/app/(main)/admin/screenMng/screenMngList/page.tsx

@@ -38,7 +38,7 @@ export default function ScreenManagementPage() {
   const loadScreens = useCallback(async () => {
     try {
       setLoading(true);
-      const result = await screenApi.getScreens({ page: 1, size: 1000, searchTerm: "" });
+      const result = await screenApi.getScreens({ page: 1, size: 1000, searchTerm: "", excludePop: true });
       // screenApi.getScreens는 { data: ScreenDefinition[], total, page, size, totalPages } 형태 반환
       if (result.data && result.data.length > 0) {
         setScreens(result.data);

frontend/app/(pop)/pop/screens/[screenId]/page.tsx

@@ -285,7 +285,7 @@ function PopScreenViewPage() {
             )}
 
             {/* POP 화면 컨텐츠 */}
-            <div className={`flex-1 flex flex-col overflow-auto ${isPreviewMode ? "py-4 items-center" : ""}`}>
+            <div className={`flex-1 flex flex-col overflow-auto ${isPreviewMode ? "py-4 items-center" : "bg-white"}`}>
               {/* 현재 모드 표시 (일반 모드) */}
               {!isPreviewMode && (
                 <div className="absolute top-2 right-2 z-10 bg-black/50 text-white text-xs px-2 py-1 rounded">