PLAN.MD

@@ -25,3 +25,4 @@ Digital Twin 에디터(`DigitalTwinEditor.tsx`)에서 발생한 런타임 에러
 ## 진행 상태
 
 - [진행중] 1단계 긴급 버그 수정 완료 후 사용자 피드백 대기 중
+

PROJECT_STATUS_2025_11_20.md

@@ -55,3 +55,4 @@
 - `backend-node/src/routes/digitalTwinRoutes.ts`
 - `db/migrations/042_refactor_digital_twin_hierarchy.sql`
 
+

backend-node/src/app.ts

@@ -57,7 +57,7 @@ import riskAlertRoutes from "./routes/riskAlertRoutes"; // 리스크/알림 관
 import todoRoutes from "./routes/todoRoutes"; // To-Do 관리
 import bookingRoutes from "./routes/bookingRoutes"; // 예약 요청 관리
 import mapDataRoutes from "./routes/mapDataRoutes"; // 지도 데이터 관리
-import yardLayoutRoutes from "./routes/yardLayoutRoutes"; // 야드 관리 3D
+import yardLayoutRoutes from "./routes/yardLayoutRoutes"; // 3D 필드
 //import materialRoutes from "./routes/materialRoutes"; // 자재 관리
 import digitalTwinRoutes from "./routes/digitalTwinRoutes"; // 디지털 트윈 (야드 관제)
 import flowRoutes from "./routes/flowRoutes"; // 플로우 관리
@@ -222,7 +222,7 @@ app.use("/api/risk-alerts", riskAlertRoutes); // 리스크/알림 관리
 app.use("/api/todos", todoRoutes); // To-Do 관리
 app.use("/api/bookings", bookingRoutes); // 예약 요청 관리
 app.use("/api/map-data", mapDataRoutes); // 지도 데이터 조회
-app.use("/api/yard-layouts", yardLayoutRoutes); // 야드 관리 3D
+app.use("/api/yard-layouts", yardLayoutRoutes); // 3D 필드
 // app.use("/api/materials", materialRoutes); // 자재 관리 (임시 주석)
 app.use("/api/digital-twin", digitalTwinRoutes); // 디지털 트윈 (야드 관제)
 app.use("/api/flow-external-db", flowExternalDbConnectionRoutes); // 플로우 전용 외부 DB 연결

backend-node/src/controllers/adminController.ts

@@ -1097,7 +1097,11 @@ export async function saveMenu(
     let requestCompanyCode = menuData.companyCode || menuData.company_code;
 
     // "none"이나 빈 값은 undefined로 처리하여 사용자 회사 코드 사용
-    if (requestCompanyCode === "none" || requestCompanyCode === "" || !requestCompanyCode) {
+    if (
+      requestCompanyCode === "none" ||
+      requestCompanyCode === "" ||
+      !requestCompanyCode
+    ) {
       requestCompanyCode = undefined;
     }
 
@@ -1252,7 +1256,8 @@ export async function updateMenu(
       }
     }
 
-    const requestCompanyCode = menuData.companyCode || menuData.company_code || currentMenu.company_code;
+    const requestCompanyCode =
+      menuData.companyCode || menuData.company_code || currentMenu.company_code;
 
     // company_code 변경 시도하는 경우 권한 체크
     if (requestCompanyCode !== currentMenu.company_code) {
@@ -1268,7 +1273,10 @@ export async function updateMenu(
         }
       }
       // 회사 관리자는 자기 회사로만 변경 가능
-      else if (userCompanyCode !== "*" && requestCompanyCode !== userCompanyCode) {
+      else if (
+        userCompanyCode !== "*" &&
+        requestCompanyCode !== userCompanyCode
+      ) {
         res.status(403).json({
           success: false,
           message: "해당 회사로 변경할 권한이 없습니다.",
@@ -1324,7 +1332,7 @@ export async function updateMenu(
     if (!menuUrl) {
       await query(
         `UPDATE screen_menu_assignments 
-         SET is_active = 'N', updated_date = NOW()
+         SET is_active = 'N'
          WHERE menu_objid = $1 AND company_code = $2`,
         [Number(menuId), companyCode]
       );
@@ -1493,8 +1501,13 @@ export async function deleteMenusBatch(
     );
 
     // 권한 체크: 공통 메뉴 포함 여부 확인
-    const hasCommonMenu = menusToDelete.some((menu: any) => menu.company_code === "*");
-    if (hasCommonMenu && (userCompanyCode !== "*" || userType !== "SUPER_ADMIN")) {
+    const hasCommonMenu = menusToDelete.some(
+      (menu: any) => menu.company_code === "*"
+    );
+    if (
+      hasCommonMenu &&
+      (userCompanyCode !== "*" || userType !== "SUPER_ADMIN")
+    ) {
       res.status(403).json({
         success: false,
         message: "공통 메뉴는 최고 관리자만 삭제할 수 있습니다.",
@@ -1506,7 +1519,8 @@ export async function deleteMenusBatch(
     // 회사 관리자는 자기 회사 메뉴만 삭제 가능
     if (userCompanyCode !== "*") {
       const unauthorizedMenus = menusToDelete.filter(
-        (menu: any) => menu.company_code !== userCompanyCode && menu.company_code !== "*"
+        (menu: any) =>
+          menu.company_code !== userCompanyCode && menu.company_code !== "*"
       );
       if (unauthorizedMenus.length > 0) {
         res.status(403).json({
@@ -2674,7 +2688,10 @@ export const getCompanyByCode = async (
 
     res.status(200).json(response);
   } catch (error) {
-    logger.error("회사 정보 조회 실패", { error, companyCode: req.params.companyCode });
+    logger.error("회사 정보 조회 실패", {
+      error,
+      companyCode: req.params.companyCode,
+    });
     res.status(500).json({
       success: false,
       message: "회사 정보 조회 중 오류가 발생했습니다.",
@@ -2740,7 +2757,9 @@ export const updateCompany = async (
     // 사업자등록번호 중복 체크 및 유효성 검증 (자기 자신 제외)
     if (business_registration_number && business_registration_number.trim()) {
       // 유효성 검증
-      const businessNumberValidation = validateBusinessNumber(business_registration_number.trim());
+      const businessNumberValidation = validateBusinessNumber(
+        business_registration_number.trim()
+      );
       if (!businessNumberValidation.isValid) {
         res.status(400).json({
           success: false,
@@ -3283,7 +3302,9 @@ export async function copyMenu(
 
     // 권한 체크: 최고 관리자만 가능
     if (!isSuperAdmin && userType !== "SUPER_ADMIN") {
-      logger.warn(`권한 없음: ${userId} (userType=${userType}, company_code=${userCompanyCode})`);
+      logger.warn(
+        `권한 없음: ${userId} (userType=${userType}, company_code=${userCompanyCode})`
+      );
       res.status(403).json({
         success: false,
         message: "메뉴 복사는 최고 관리자(SUPER_ADMIN)만 가능합니다",

backend-node/src/controllers/digitalTwinTemplateController.ts

@@ -0,0 +1,163 @@
+import { Response } from "express";
+import { AuthenticatedRequest } from "../types/auth";
+import {
+  DigitalTwinTemplateService,
+  DigitalTwinLayoutTemplate,
+} from "../services/DigitalTwinTemplateService";
+
+export const listMappingTemplates = async (
+  req: AuthenticatedRequest,
+  res: Response,
+): Promise<Response> => {
+  try {
+    const companyCode = req.user?.companyCode;
+    if (!companyCode) {
+      return res.status(401).json({
+        success: false,
+        message: "인증 정보가 없습니다.",
+      });
+    }
+
+    const externalDbConnectionId = req.query.externalDbConnectionId
+      ? Number(req.query.externalDbConnectionId)
+      : undefined;
+    const layoutType =
+      typeof req.query.layoutType === "string"
+        ? req.query.layoutType
+        : undefined;
+
+    const result = await DigitalTwinTemplateService.listTemplates(
+      companyCode,
+      {
+        externalDbConnectionId,
+        layoutType,
+      },
+    );
+
+    if (!result.success) {
+      return res.status(500).json({
+        success: false,
+        message: result.message,
+        error: result.error,
+      });
+    }
+
+    return res.json({
+      success: true,
+      data: result.data as DigitalTwinLayoutTemplate[],
+    });
+  } catch (error: any) {
+    return res.status(500).json({
+      success: false,
+      message: "매핑 템플릿 목록 조회 중 오류가 발생했습니다.",
+      error: error.message,
+    });
+  }
+};
+
+export const getMappingTemplateById = async (
+  req: AuthenticatedRequest,
+  res: Response,
+): Promise<Response> => {
+  try {
+    const companyCode = req.user?.companyCode;
+    const { id } = req.params;
+
+    if (!companyCode) {
+      return res.status(401).json({
+        success: false,
+        message: "인증 정보가 없습니다.",
+      });
+    }
+
+    const result = await DigitalTwinTemplateService.getTemplateById(
+      companyCode,
+      id,
+    );
+
+    if (!result.success) {
+      return res.status(404).json({
+        success: false,
+        message: result.message || "매핑 템플릿을 찾을 수 없습니다.",
+        error: result.error,
+      });
+    }
+
+    return res.json({
+      success: true,
+      data: result.data,
+    });
+  } catch (error: any) {
+    return res.status(500).json({
+      success: false,
+      message: "매핑 템플릿 조회 중 오류가 발생했습니다.",
+      error: error.message,
+    });
+  }
+};
+
+export const createMappingTemplate = async (
+  req: AuthenticatedRequest,
+  res: Response,
+): Promise<Response> => {
+  try {
+    const companyCode = req.user?.companyCode;
+    const userId = req.user?.userId;
+
+    if (!companyCode || !userId) {
+      return res.status(401).json({
+        success: false,
+        message: "인증 정보가 없습니다.",
+      });
+    }
+
+    const {
+      name,
+      description,
+      externalDbConnectionId,
+      layoutType,
+      config,
+    } = req.body;
+
+    if (!name || !externalDbConnectionId || !config) {
+      return res.status(400).json({
+        success: false,
+        message: "필수 필드가 누락되었습니다.",
+      });
+    }
+
+    const result = await DigitalTwinTemplateService.createTemplate(
+      companyCode,
+      userId,
+      {
+        name,
+        description,
+        externalDbConnectionId,
+        layoutType,
+        config,
+      },
+    );
+
+    if (!result.success || !result.data) {
+      return res.status(500).json({
+        success: false,
+        message: result.message || "매핑 템플릿 생성 중 오류가 발생했습니다.",
+        error: result.error,
+      });
+    }
+
+    return res.status(201).json({
+      success: true,
+      data: result.data,
+    });
+  } catch (error: any) {
+    return res.status(500).json({
+      success: false,
+      message: "매핑 템플릿 생성 중 오류가 발생했습니다.",
+      error: error.message,
+    });
+  }
+};
+
+
+

backend-node/src/controllers/screenManagementController.ts

@@ -148,11 +148,11 @@ export const updateScreenInfo = async (
   try {
     const { id } = req.params;
     const { companyCode } = req.user as any;
-    const { screenName, description, isActive } = req.body;
+    const { screenName, tableName, description, isActive } = req.body;
 
     await screenManagementService.updateScreenInfo(
       parseInt(id),
-      { screenName, description, isActive },
+      { screenName, tableName, description, isActive },
       companyCode
     );
     res.json({ success: true, message: "화면 정보가 수정되었습니다." });

backend-node/src/database/MariaDBConnector.ts

@@ -1,7 +1,11 @@
-import { DatabaseConnector, ConnectionConfig, QueryResult } from '../interfaces/DatabaseConnector';
-import { ConnectionTestResult, TableInfo } from '../types/externalDbTypes';
+import {
+  DatabaseConnector,
+  ConnectionConfig,
+  QueryResult,
+} from "../interfaces/DatabaseConnector";
+import { ConnectionTestResult, TableInfo } from "../types/externalDbTypes";
 // @ts-ignore
-import * as mysql from 'mysql2/promise';
+import * as mysql from "mysql2/promise";
 
 export class MariaDBConnector implements DatabaseConnector {
   private connection: mysql.Connection | null = null;
@@ -20,7 +24,7 @@ export class MariaDBConnector implements DatabaseConnector {
         password: this.config.password,
         database: this.config.database,
         connectTimeout: this.config.connectionTimeoutMillis,
-        ssl: typeof this.config.ssl === 'boolean' ? undefined : this.config.ssl,
+        ssl: typeof this.config.ssl === "boolean" ? undefined : this.config.ssl,
       });
     }
   }
@@ -36,7 +40,9 @@ export class MariaDBConnector implements DatabaseConnector {
     const startTime = Date.now();
     try {
       await this.connect();
-      const [rows] = await this.connection!.query("SELECT VERSION() as version");
+      const [rows] = await this.connection!.query(
+        "SELECT VERSION() as version"
+      );
       const version = (rows as any[])[0]?.version || "Unknown";
       const responseTime = Date.now() - startTime;
       await this.disconnect();
@@ -89,15 +95,13 @@ export class MariaDBConnector implements DatabaseConnector {
         ORDER BY TABLE_NAME;
       `);
 
-      const tables: TableInfo[] = [];
-      for (const row of rows as any[]) {
-        const columns = await this.getColumns(row.table_name);
-        tables.push({
-          table_name: row.table_name,
-          description: row.description || null,
-          columns: columns,
-        });
-      }
+      // 테이블 목록만 반환 (컬럼 정보는 getColumns에서 개별 조회)
+      const tables: TableInfo[] = (rows as any[]).map((row) => ({
+        table_name: row.table_name,
+        description: row.description || null,
+        columns: [],
+      }));
+
       await this.disconnect();
       return tables;
     } catch (error: any) {
@@ -111,21 +115,43 @@ export class MariaDBConnector implements DatabaseConnector {
       console.log(`[MariaDBConnector] getColumns 호출: tableName=${tableName}`);
       await this.connect();
       console.log(`[MariaDBConnector] 연결 완료, 쿼리 실행 시작`);
-      
-      const [rows] = await this.connection!.query(`
+
+      const [rows] = await this.connection!.query(
+        `
         SELECT 
-          COLUMN_NAME as column_name,
-          DATA_TYPE as data_type,
-          IS_NULLABLE as is_nullable,
-          COLUMN_DEFAULT as column_default
-        FROM information_schema.COLUMNS
-        WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = ?
-        ORDER BY ORDINAL_POSITION;
-      `, [tableName]);
-      
+          c.COLUMN_NAME  AS column_name,
+          c.DATA_TYPE    AS data_type,
+          c.IS_NULLABLE  AS is_nullable,
+          c.COLUMN_DEFAULT AS column_default,
+          c.COLUMN_COMMENT AS description,
+          CASE 
+            WHEN tc.CONSTRAINT_TYPE = 'PRIMARY KEY' THEN 'YES' 
+            ELSE 'NO' 
+          END AS is_primary_key
+        FROM information_schema.COLUMNS c
+        LEFT JOIN information_schema.KEY_COLUMN_USAGE k
+          ON  c.TABLE_SCHEMA = k.TABLE_SCHEMA
+          AND c.TABLE_NAME  = k.TABLE_NAME
+          AND c.COLUMN_NAME = k.COLUMN_NAME
+        LEFT JOIN information_schema.TABLE_CONSTRAINTS tc
+          ON  k.CONSTRAINT_SCHEMA = tc.CONSTRAINT_SCHEMA
+          AND k.CONSTRAINT_NAME  = tc.CONSTRAINT_NAME
+          AND k.TABLE_SCHEMA     = tc.TABLE_SCHEMA
+          AND k.TABLE_NAME       = tc.TABLE_NAME
+          AND tc.CONSTRAINT_TYPE = 'PRIMARY KEY'
+        WHERE c.TABLE_SCHEMA = DATABASE() 
+          AND c.TABLE_NAME  = ?
+        ORDER BY c.ORDINAL_POSITION;
+      `,
+        [tableName]
+      );
+
       console.log(`[MariaDBConnector] 쿼리 결과:`, rows);
-      console.log(`[MariaDBConnector] 결과 개수:`, Array.isArray(rows) ? rows.length : 'not array');
-      
+      console.log(
+        `[MariaDBConnector] 결과 개수:`,
+        Array.isArray(rows) ? rows.length : "not array"
+      );
+
       await this.disconnect();
       return rows as any[];
     } catch (error: any) {

backend-node/src/database/PostgreSQLConnector.ts

@@ -210,15 +210,33 @@ export class PostgreSQLConnector implements DatabaseConnector {
       const result = await tempClient.query(
         `
         SELECT
-          column_name,
-          data_type,
-          is_nullable,
-          column_default,
-          col_description(c.oid, a.attnum) as column_comment
+          isc.column_name,
+          isc.data_type,
+          isc.is_nullable,
+          isc.column_default,
+          col_description(c.oid, a.attnum) as column_comment,
+          CASE 
+            WHEN tc.constraint_type = 'PRIMARY KEY' THEN 'YES'
+            ELSE 'NO'
+          END AS is_primary_key
         FROM information_schema.columns isc
-        LEFT JOIN pg_class c ON c.relname = isc.table_name
-        LEFT JOIN pg_attribute a ON a.attrelid = c.oid AND a.attname = isc.column_name
-        WHERE isc.table_schema = 'public' AND isc.table_name = $1
+        LEFT JOIN pg_class c 
+          ON c.relname = isc.table_name
+             AND c.relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = isc.table_schema)
+        LEFT JOIN pg_attribute a 
+          ON a.attrelid = c.oid 
+         AND a.attname = isc.column_name
+        LEFT JOIN information_schema.key_column_usage k
+          ON k.table_name = isc.table_name
+         AND k.table_schema = isc.table_schema
+         AND k.column_name = isc.column_name
+        LEFT JOIN information_schema.table_constraints tc
+          ON tc.constraint_name = k.constraint_name
+         AND tc.table_schema    = k.table_schema
+         AND tc.table_name      = k.table_name
+         AND tc.constraint_type = 'PRIMARY KEY'
+        WHERE isc.table_schema = 'public' 
+          AND isc.table_name   = $1
         ORDER BY isc.ordinal_position;
       `,
         [tableName]

backend-node/src/routes/dataflow/node-flows.ts

@@ -7,6 +7,7 @@ import { query, queryOne } from "../../database/db";
 import { logger } from "../../utils/logger";
 import { NodeFlowExecutionService } from "../../services/nodeFlowExecutionService";
 import { AuthenticatedRequest } from "../../types/auth";
+import { authenticateToken } from "../../middleware/authMiddleware";
 
 const router = Router();
 
@@ -217,19 +218,29 @@ router.delete("/:flowId", async (req: Request, res: Response) => {
  * 플로우 실행
  * POST /api/dataflow/node-flows/:flowId/execute
  */
-router.post("/:flowId/execute", async (req: Request, res: Response) => {
+router.post("/:flowId/execute", authenticateToken, async (req: AuthenticatedRequest, res: Response) => {
   try {
     const { flowId } = req.params;
     const contextData = req.body;
 
     logger.info(`🚀 플로우 실행 요청: flowId=${flowId}`, {
       contextDataKeys: Object.keys(contextData),
+      userId: req.user?.userId,
+      companyCode: req.user?.companyCode,
     });
 
+    // 사용자 정보를 contextData에 추가
+    const enrichedContextData = {
+      ...contextData,
+      userId: req.user?.userId,
+      userName: req.user?.userName,
+      companyCode: req.user?.companyCode,
+    };
+
     // 플로우 실행
     const result = await NodeFlowExecutionService.executeFlow(
       parseInt(flowId, 10),
-      contextData
+      enrichedContextData
     );
 
     return res.json({

backend-node/src/routes/digitalTwinRoutes.ts

@@ -9,6 +9,11 @@ import {
   updateLayout,
   deleteLayout,
 } from "../controllers/digitalTwinLayoutController";
+import {
+  listMappingTemplates,
+  getMappingTemplateById,
+  createMappingTemplate,
+} from "../controllers/digitalTwinTemplateController";
 
 // 외부 DB 데이터 조회
 import {
@@ -27,11 +32,16 @@ const router = express.Router();
 router.use(authenticateToken);
 
 // ========== 레이아웃 관리 API ==========
-router.get("/layouts", getLayouts);                    // 레이아웃 목록
-router.get("/layouts/:id", getLayoutById);             // 레이아웃 상세
-router.post("/layouts", createLayout);                 // 레이아웃 생성
-router.put("/layouts/:id", updateLayout);              // 레이아웃 수정
-router.delete("/layouts/:id", deleteLayout);           // 레이아웃 삭제
+router.get("/layouts", getLayouts); // 레이아웃 목록
+router.get("/layouts/:id", getLayoutById); // 레이아웃 상세
+router.post("/layouts", createLayout); // 레이아웃 생성
+router.put("/layouts/:id", updateLayout); // 레이아웃 수정
+router.delete("/layouts/:id", deleteLayout); // 레이아웃 삭제
+
+// ========== 매핑 템플릿 API ==========
+router.get("/mapping-templates", listMappingTemplates);
+router.get("/mapping-templates/:id", getMappingTemplateById);
+router.post("/mapping-templates", createMappingTemplate);
 
 // ========== 외부 DB 데이터 조회 API ==========
 

backend-node/src/services/DigitalTwinTemplateService.ts

@@ -0,0 +1,172 @@
+import { pool } from "../database/db";
+import logger from "../utils/logger";
+
+export interface DigitalTwinLayoutTemplate {
+  id: string;
+  company_code: string;
+  name: string;
+  description?: string | null;
+  external_db_connection_id: number;
+  layout_type: string;
+  config: any;
+  created_by: string;
+  created_at: Date;
+  updated_by: string;
+  updated_at: Date;
+}
+
+interface ServiceResponse<T> {
+  success: boolean;
+  data?: T;
+  message?: string;
+  error?: string;
+}
+
+export class DigitalTwinTemplateService {
+  static async listTemplates(
+    companyCode: string,
+    options: { externalDbConnectionId?: number; layoutType?: string } = {},
+  ): Promise<ServiceResponse<DigitalTwinLayoutTemplate[]>> {
+    try {
+      const params: any[] = [companyCode];
+      let paramIndex = 2;
+
+      let query = `
+        SELECT *
+        FROM digital_twin_layout_template
+        WHERE company_code = $1
+      `;
+
+      if (options.layoutType) {
+        query += ` AND layout_type = $${paramIndex++}`;
+        params.push(options.layoutType);
+      }
+
+      if (options.externalDbConnectionId) {
+        query += ` AND external_db_connection_id = $${paramIndex++}`;
+        params.push(options.externalDbConnectionId);
+      }
+
+      query += `
+        ORDER BY updated_at DESC, name ASC
+      `;
+
+      const result = await pool.query(query, params);
+
+      logger.info("디지털 트윈 매핑 템플릿 목록 조회", {
+        companyCode,
+        count: result.rowCount,
+      });
+
+      return {
+        success: true,
+        data: result.rows as DigitalTwinLayoutTemplate[],
+      };
+    } catch (error: any) {
+      logger.error("디지털 트윈 매핑 템플릿 목록 조회 실패", error);
+      return {
+        success: false,
+        error: error.message,
+        message: "매핑 템플릿 목록 조회 중 오류가 발생했습니다.",
+      };
+    }
+  }
+
+  static async getTemplateById(
+    companyCode: string,
+    id: string,
+  ): Promise<ServiceResponse<DigitalTwinLayoutTemplate>> {
+    try {
+      const query = `
+        SELECT *
+        FROM digital_twin_layout_template
+        WHERE id = $1 AND company_code = $2
+      `;
+
+      const result = await pool.query(query, [id, companyCode]);
+
+      if (result.rowCount === 0) {
+        return {
+          success: false,
+          message: "매핑 템플릿을 찾을 수 없습니다.",
+        };
+      }
+
+      return {
+        success: true,
+        data: result.rows[0] as DigitalTwinLayoutTemplate,
+      };
+    } catch (error: any) {
+      logger.error("디지털 트윈 매핑 템플릿 조회 실패", error);
+      return {
+        success: false,
+        error: error.message,
+        message: "매핑 템플릿 조회 중 오류가 발생했습니다.",
+      };
+    }
+  }
+
+  static async createTemplate(
+    companyCode: string,
+    userId: string,
+    payload: {
+      name: string;
+      description?: string;
+      externalDbConnectionId: number;
+      layoutType?: string;
+      config: any;
+    },
+  ): Promise<ServiceResponse<DigitalTwinLayoutTemplate>> {
+    try {
+      const query = `
+        INSERT INTO digital_twin_layout_template (
+          company_code,
+          name,
+          description,
+          external_db_connection_id,
+          layout_type,
+          config,
+          created_by,
+          created_at,
+          updated_by,
+          updated_at
+        )
+        VALUES ($1, $2, $3, $4, $5, $6, $7, NOW(), $7, NOW())
+        RETURNING *
+      `;
+
+      const values = [
+        companyCode,
+        payload.name,
+        payload.description || null,
+        payload.externalDbConnectionId,
+        payload.layoutType || "yard-3d",
+        JSON.stringify(payload.config),
+        userId,
+      ];
+
+      const result = await pool.query(query, values);
+
+      logger.info("디지털 트윈 매핑 템플릿 생성", {
+        companyCode,
+        templateId: result.rows[0].id,
+        externalDbConnectionId: payload.externalDbConnectionId,
+      });
+
+      return {
+        success: true,
+        data: result.rows[0] as DigitalTwinLayoutTemplate,
+      };
+    } catch (error: any) {
+      logger.error("디지털 트윈 매핑 템플릿 생성 실패", error);
+      return {
+        success: false,
+        error: error.message,
+        message: "매핑 템플릿 생성 중 오류가 발생했습니다.",
+      };
+    }
+  }
+}
+
+
+

backend-node/src/services/dynamicFormService.ts

@@ -496,16 +496,27 @@ export class DynamicFormService {
         for (const repeater of mergedRepeaterData) {
           for (const item of repeater.data) {
             // 헤더 + 품목을 병합
-            const mergedData = { ...dataToInsert, ...item };
+            const rawMergedData = { ...dataToInsert, ...item };
             
-            // 타입 변환
-            Object.keys(mergedData).forEach((columnName) => {
+            // 🆕 실제 테이블 컬럼만 필터링 (조인/계산 컬럼 제외)
+            const validColumnNames = columnInfo.map((col) => col.column_name);
+            const mergedData: Record<string, any> = {};
+            
+            Object.keys(rawMergedData).forEach((columnName) => {
+              // 실제 테이블 컬럼인지 확인
+              if (validColumnNames.includes(columnName)) {
               const column = columnInfo.find((col) => col.column_name === columnName);
               if (column) {
+                  // 타입 변환
                 mergedData[columnName] = this.convertValueForPostgreSQL(
-                  mergedData[columnName],
+                    rawMergedData[columnName],
                   column.data_type
                 );
+                } else {
+                  mergedData[columnName] = rawMergedData[columnName];
+                }
+              } else {
+                console.log(`⚠️ 조인/계산 컬럼 제외: ${columnName} (값: ${rawMergedData[columnName]})`);
               }
             });
             
@@ -800,9 +811,39 @@ export class DynamicFormService {
       const primaryKeyColumn = primaryKeys[0];
       console.log(`🔑 테이블 ${tableName}의 기본키: ${primaryKeyColumn}`);
 
-      // 동적 UPDATE SQL 생성 (변경된 필드만)
+      // 🆕 컬럼 타입 조회 (타입 캐스팅용)
+      const columnTypesQuery = `
+        SELECT column_name, data_type 
+        FROM information_schema.columns 
+        WHERE table_name = $1 AND table_schema = 'public'
+      `;
+      const columnTypesResult = await query<{ column_name: string; data_type: string }>(
+        columnTypesQuery,
+        [tableName]
+      );
+      const columnTypes: Record<string, string> = {};
+      columnTypesResult.forEach((row) => {
+        columnTypes[row.column_name] = row.data_type;
+      });
+
+      console.log("📊 컬럼 타입 정보:", columnTypes);
+
+      // 🆕 동적 UPDATE SQL 생성 (타입 캐스팅 포함)
       const setClause = Object.keys(changedFields)
-        .map((key, index) => `${key} = $${index + 1}`)
+        .map((key, index) => {
+          const dataType = columnTypes[key];
+          // 숫자 타입인 경우 명시적 캐스팅
+          if (dataType === 'integer' || dataType === 'bigint' || dataType === 'smallint') {
+            return `${key} = $${index + 1}::integer`;
+          } else if (dataType === 'numeric' || dataType === 'decimal' || dataType === 'real' || dataType === 'double precision') {
+            return `${key} = $${index + 1}::numeric`;
+          } else if (dataType === 'boolean') {
+            return `${key} = $${index + 1}::boolean`;
+          } else {
+            // 문자열 타입은 캐스팅 불필요
+            return `${key} = $${index + 1}`;
+          }
+        })
         .join(", ");
 
       const values: any[] = Object.values(changedFields);

backend-node/src/services/nodeFlowExecutionService.ts

@@ -938,6 +938,30 @@ export class NodeFlowExecutionService {
           insertedData[mapping.targetField] = value;
         });
 
+        // 🆕 writer와 company_code 자동 추가 (필드 매핑에 없는 경우)
+        const hasWriterMapping = fieldMappings.some((m: any) => m.targetField === "writer");
+        const hasCompanyCodeMapping = fieldMappings.some((m: any) => m.targetField === "company_code");
+
+        // 컨텍스트에서 사용자 정보 추출
+        const userId = context.buttonContext?.userId;
+        const companyCode = context.buttonContext?.companyCode;
+
+        // writer 자동 추가 (매핑에 없고, 컨텍스트에 userId가 있는 경우)
+        if (!hasWriterMapping && userId) {
+          fields.push("writer");
+          values.push(userId);
+          insertedData.writer = userId;
+          console.log(`  🔧 자동 추가: writer = ${userId}`);
+        }
+
+        // company_code 자동 추가 (매핑에 없고, 컨텍스트에 companyCode가 있는 경우)
+        if (!hasCompanyCodeMapping && companyCode && companyCode !== "*") {
+          fields.push("company_code");
+          values.push(companyCode);
+          insertedData.company_code = companyCode;
+          console.log(`  🔧 자동 추가: company_code = ${companyCode}`);
+        }
+
         const sql = `
           INSERT INTO ${targetTable} (${fields.join(", ")})
           VALUES (${fields.map((_, i) => `$${i + 1}`).join(", ")})

backend-node/src/services/screenManagementService.ts

@@ -321,7 +321,7 @@ export class ScreenManagementService {
    */
   async updateScreenInfo(
     screenId: number,
-    updateData: { screenName: string; description?: string; isActive: string },
+    updateData: { screenName: string; tableName?: string; description?: string; isActive: string },
     userCompanyCode: string
   ): Promise<void> {
     // 권한 확인
@@ -343,16 +343,18 @@ export class ScreenManagementService {
       throw new Error("이 화면을 수정할 권한이 없습니다.");
     }
 
-    // 화면 정보 업데이트
+    // 화면 정보 업데이트 (tableName 포함)
     await query(
       `UPDATE screen_definitions
        SET screen_name = $1,
-           description = $2,
-           is_active = $3,
-           updated_date = $4
-       WHERE screen_id = $5`,
+           table_name = $2,
+           description = $3,
+           is_active = $4,
+           updated_date = $5
+       WHERE screen_id = $6`,
       [
         updateData.screenName,
+        updateData.tableName || null,
         updateData.description || null,
         updateData.isActive,
         new Date(),

frontend/app/(main)/main/page.tsx

@@ -9,7 +9,7 @@ import { Badge } from "@/components/ui/badge";
  */
 export default function MainPage() {
   return (
-    <div className="space-y-6 px-4 pt-10">
+    <div className="space-y-6 p-4">
       {/* 메인 컨텐츠 */}
       {/* Welcome Message */}
       <Card>

frontend/app/(main)/page.tsx

@@ -1,6 +1,6 @@
 export default function MainHomePage() {
   return (
-    <div className="space-y-6 px-4 pt-10">
+    <div className="space-y-6 p-4">
       {/* 대시보드 컨텐츠 */}
       <div className="rounded-lg border bg-background p-6 shadow-sm">
         <h3 className="mb-4 text-lg font-semibold">WACE 솔루션에 오신 것을 환영합니다!</h3>

frontend/components/admin/dashboard/CanvasElement.tsx

@@ -193,7 +193,7 @@ import { ListWidget } from "./widgets/ListWidget";
 import { X } from "lucide-react";
 import { Button } from "@/components/ui/button";
 
-// 야드 관리 3D 위젯
+// 3D 필드 위젯
 const YardManagement3DWidget = dynamic(() => import("./widgets/YardManagement3DWidget"), {
   ssr: false,
   loading: () => (
@@ -312,6 +312,24 @@ export function CanvasElement({
         return;
       }
 
+      // 위젯 테두리(바깥쪽 영역)를 클릭한 경우에만 선택/드래그 허용
+      // - 내용 영역을 클릭해도 대시보드 설정 사이드바가 튀어나오지 않도록 하기 위함
+      const container = elementRef.current;
+      if (container) {
+        const rect = container.getBoundingClientRect();
+        const BORDER_HIT_WIDTH = 8; // px, 테두리로 인식할 범위
+        const isOnBorder =
+          e.clientX <= rect.left + BORDER_HIT_WIDTH ||
+          e.clientX >= rect.right - BORDER_HIT_WIDTH ||
+          e.clientY <= rect.top + BORDER_HIT_WIDTH ||
+          e.clientY >= rect.bottom - BORDER_HIT_WIDTH;
+
+        if (!isOnBorder) {
+          // 테두리가 아닌 내부 클릭은 선택/드래그 처리하지 않음
+          return;
+        }
+      }
+
       // 선택되지 않은 경우에만 선택 처리
       if (!isSelected) {
         onSelect(element.id);
@@ -1067,7 +1085,7 @@ export function CanvasElement({
             <ListWidget element={element} />
           </div>
         ) : element.type === "widget" && element.subtype === "yard-management-3d" ? (
-          // 야드 관리 3D 위젯 렌더링
+          // 3D 필드 위젯 렌더링
           <div className="widget-interactive-area h-full w-full">
             <YardManagement3DWidget
               isEditMode={true}

frontend/components/admin/dashboard/DashboardDesigner.tsx

@@ -749,7 +749,7 @@ function getElementTitle(type: ElementType, subtype: ElementSubtype): string {
       case "document":
         return "문서 위젯";
       case "yard-management-3d":
-        return "야드 관리 3D";
+        return "3D 필드";
       case "work-history":
         return "작업 이력";
       case "transport-stats":

frontend/components/admin/dashboard/DashboardTopMenu.tsx

@@ -362,7 +362,7 @@ export function DashboardTopMenu({
               <SelectItem value="list-v2">리스트</SelectItem>
               <SelectItem value="custom-metric-v2">통계 카드</SelectItem>
               <SelectItem value="risk-alert-v2">리스크/알림</SelectItem>
-              <SelectItem value="yard-management-3d">야드 관리 3D</SelectItem>
+              <SelectItem value="yard-management-3d">3D 필드</SelectItem>
               {/* <SelectItem value="transport-stats">커스텀 통계 카드</SelectItem> */}
               {/* <SelectItem value="status-summary">커스텀 상태 카드</SelectItem> */}
             </SelectGroup>

frontend/components/admin/dashboard/WidgetConfigSidebar.tsx

@@ -93,7 +93,7 @@ const getWidgetTitle = (subtype: ElementSubtype): string => {
     chart: "차트",
     "map-summary-v2": "지도",
     "risk-alert-v2": "리스크 알림",
-    "yard-management-3d": "야드 관리 3D",
+    "yard-management-3d": "3D 필드",
     weather: "날씨 위젯",
     exchange: "환율 위젯",
     calculator: "계산기",
@@ -449,7 +449,7 @@ export function WidgetConfigSidebar({ element, isOpen, onClose, onApply }: Widge
               </div>
             </div>
 
-            {/* 레이아웃 선택 (야드 관리 3D 위젯 전용) */}
+            {/* 레이아웃 선택 (3D 필드 위젯 전용) */}
             {element.subtype === "yard-management-3d" && (
               <div className="bg-background rounded-lg p-3 shadow-sm">
                 <Label htmlFor="layout-id" className="mb-2 block text-xs font-semibold">

frontend/components/admin/dashboard/types.ts

@@ -49,7 +49,7 @@ export type ElementSubtype =
   | "maintenance"
   | "document"
   // | "list" // (구버전 - 주석 처리: 2025-10-28, list-v2로 대체)
-  | "yard-management-3d" // 야드 관리 3D 위젯
+  | "yard-management-3d" // 3D 필드 위젯
   | "work-history" // 작업 이력 위젯
   | "transport-stats"; // 커스텀 통계 카드 위젯
 // | "custom-metric"; // (구버전 - 주석 처리: 2025-10-28, custom-metric-v2로 대체)
@@ -116,7 +116,7 @@ export interface DashboardElement {
   calendarConfig?: CalendarConfig; // 달력 설정
   driverManagementConfig?: DriverManagementConfig; // 기사 관리 설정
   listConfig?: ListWidgetConfig; // 리스트 위젯 설정
-  yardConfig?: YardManagementConfig; // 야드 관리 3D 설정
+  yardConfig?: YardManagementConfig; // 3D 필드 설정
   customMetricConfig?: CustomMetricConfig; // 사용자 커스텀 카드 설정
 }
 
@@ -385,7 +385,7 @@ export interface ListColumn {
   visible?: boolean; // 표시 여부 (기본: true)
 }
 
-// 야드 관리 3D 설정
+// 3D 필드 설정
 export interface YardManagementConfig {
   layoutId: number; // 선택된 야드 레이아웃 ID
   layoutName?: string; // 레이아웃 이름 (표시용)

frontend/components/admin/dashboard/widgets/YardManagement3DWidget.tsx

@@ -42,14 +42,16 @@ export default function YardManagement3DWidget({
       setIsLoading(true);
       const response = await getLayouts();
       if (response.success && response.data) {
-        setLayouts(response.data.map((layout: any) => ({
-          id: layout.id,
-          name: layout.layout_name,
-          description: layout.description || "",
-          placement_count: layout.object_count || 0,
-          created_at: layout.created_at,
-          updated_at: layout.updated_at,
-        })));
+        setLayouts(
+          response.data.map((layout: any) => ({
+            id: layout.id,
+            name: layout.layout_name,
+            description: layout.description || "",
+            placement_count: layout.object_count || 0,
+            created_at: layout.created_at,
+            updated_at: layout.updated_at,
+          })),
+        );
       }
     } catch (error) {
       console.error("야드 레이아웃 목록 조회 실패:", error);
@@ -145,12 +147,14 @@ export default function YardManagement3DWidget({
   // 편집 모드: 편집 중인 경우 DigitalTwinEditor 표시
   if (isEditMode && editingLayout) {
     return (
-      <div className="h-full w-full">
-        <DigitalTwinEditor 
-          layoutId={editingLayout.id} 
-          layoutName={editingLayout.name}
-          onBack={handleEditComplete} 
-        />
+      // 대시보드 위젯 선택/사이드바 오픈과 독립적으로 동작해야 하므로
+      // widget-interactive-area 클래스를 부여하고, 마우스 이벤트 전파를 막아준다.
+      <div
+        className="widget-interactive-area h-full w-full"
+        onMouseDown={(e) => e.stopPropagation()}
+        onClick={(e) => e.stopPropagation()}
+      >
+        <DigitalTwinEditor layoutId={editingLayout.id} layoutName={editingLayout.name} onBack={handleEditComplete} />
       </div>
     );
   }
@@ -158,30 +162,31 @@ export default function YardManagement3DWidget({
   // 편집 모드: 레이아웃 선택 UI
   if (isEditMode) {
     return (
-      <div className="widget-interactive-area flex h-full w-full flex-col bg-background">
+      <div className="widget-interactive-area bg-background flex h-full w-full flex-col">
         <div className="flex items-center justify-between border-b p-4">
           <div>
-            <h3 className="text-sm font-semibold text-foreground">야드 레이아웃 선택</h3>
-            <p className="mt-1 text-xs text-muted-foreground">
-              {config?.layoutName ? `선택됨: ${config.layoutName}` : "표시할 야드 레이아웃을 선택하세요"}
+            <h3 className="text-foreground text-sm font-semibold">3D 필드 선택</h3>
+            <p className="text-muted-foreground mt-1 text-xs">
+              {config?.layoutName ? `선택됨: ${config.layoutName}` : "표시할 3D필드를 선택하세요"}
             </p>
           </div>
           <Button onClick={() => setIsCreateModalOpen(true)} size="sm">
-            <Plus className="mr-1 h-4 w-4" />새 야드 생성
+            <Plus className="mr-1 h-4 w-4" />
+            새로운 3D필드 생성
           </Button>
         </div>
 
         <div className="flex-1 overflow-auto p-4">
           {isLoading ? (
             <div className="flex h-full items-center justify-center">
-              <div className="text-sm text-muted-foreground">로딩 중...</div>
+              <div className="text-muted-foreground text-sm">로딩 중...</div>
             </div>
           ) : layouts.length === 0 ? (
             <div className="flex h-full items-center justify-center">
               <div className="text-center">
                 <div className="mb-2 text-4xl">🏗️</div>
-                <div className="text-sm text-foreground">생성된 야드 레이아웃이 없습니다</div>
-                <div className="mt-1 text-xs text-muted-foreground">먼저 야드 레이아웃을 생성하세요</div>
+                <div className="text-foreground text-sm">생성된 3D필드가 없습니다</div>
+                <div className="text-muted-foreground mt-1 text-xs">먼저 3D필드가 생성하세요</div>
               </div>
             </div>
           ) : (
@@ -196,11 +201,11 @@ export default function YardManagement3DWidget({
                   <div className="flex items-start justify-between gap-3">
                     <button onClick={() => handleSelectLayout(layout)} className="flex-1 text-left hover:opacity-80">
                       <div className="flex items-center gap-2">
-                        <span className="font-medium text-foreground">{layout.name}</span>
-                        {config?.layoutId === layout.id && <Check className="h-4 w-4 text-primary" />}
+                        <span className="text-foreground font-medium">{layout.name}</span>
+                        {config?.layoutId === layout.id && <Check className="text-primary h-4 w-4" />}
                       </div>
-                      {layout.description && <p className="mt-1 text-xs text-muted-foreground">{layout.description}</p>}
-                      <div className="mt-2 text-xs text-muted-foreground">배치된 자재: {layout.placement_count}개</div>
+                      {layout.description && <p className="text-muted-foreground mt-1 text-xs">{layout.description}</p>}
+                      <div className="text-muted-foreground mt-2 text-xs">배치된 자재: {layout.placement_count}개</div>
                     </button>
                     <div className="flex gap-1">
                       <Button
@@ -251,12 +256,12 @@ export default function YardManagement3DWidget({
               <DialogTitle>야드 레이아웃 삭제</DialogTitle>
             </DialogHeader>
             <div className="space-y-4">
-              <p className="text-sm text-foreground">
+              <p className="text-foreground text-sm">
                 이 야드 레이아웃을 삭제하시겠습니까?
                 <br />
                 레이아웃 내의 모든 배치 정보도 함께 삭제됩니다.
                 <br />
-                <span className="font-semibold text-destructive">이 작업은 되돌릴 수 없습니다.</span>
+                <span className="text-destructive font-semibold">이 작업은 되돌릴 수 없습니다.</span>
               </p>
               <div className="flex justify-end gap-2">
                 <Button variant="outline" onClick={() => setDeleteLayoutId(null)}>
@@ -277,14 +282,12 @@ export default function YardManagement3DWidget({
   if (!config?.layoutId) {
     console.warn("⚠️ 야드관리 위젯: layoutId가 설정되지 않음", { config, isEditMode });
     return (
-      <div className="flex h-full w-full items-center justify-center bg-muted">
+      <div className="bg-muted flex h-full w-full items-center justify-center">
         <div className="text-center">
           <div className="mb-2 text-4xl">🏗️</div>
-          <div className="text-sm font-medium text-foreground">야드 레이아웃이 설정되지 않았습니다</div>
-          <div className="mt-1 text-xs text-muted-foreground">대시보드 편집에서 레이아웃을 선택하세요</div>
-          <div className="mt-2 text-xs text-destructive">
-            디버그: config={JSON.stringify(config)}
-          </div>
+          <div className="text-foreground text-sm font-medium">3D필드가 설정되지 않았습니다</div>
+          <div className="text-muted-foreground mt-1 text-xs">대시보드 편집에서 3D필드를 선택하세요</div>
+          <div className="text-destructive mt-2 text-xs">디버그: config={JSON.stringify(config)}</div>
         </div>
       </div>
     );

frontend/components/admin/dashboard/widgets/yard-3d/DigitalTwinEditor.tsx

@@ -20,12 +20,24 @@ import {
   getMaterials,
   getHierarchyData,
   getChildrenData,
+  getMappingTemplates,
+  createMappingTemplate,
   type HierarchyData,
+  type DigitalTwinMappingTemplate,
 } from "@/lib/api/digitalTwin";
 import type { MaterialData } from "@/types/digitalTwin";
 import { ExternalDbConnectionAPI } from "@/lib/api/externalDbConnection";
 import HierarchyConfigPanel, { HierarchyConfig } from "./HierarchyConfigPanel";
+import { OBJECT_COLORS, DEFAULT_COLOR } from "./constants";
 import { validateSpatialContainment, updateChildrenPositions, getAllDescendants } from "./spatialContainment";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog";
 
 // 백엔드 DB 객체 타입 (snake_case)
 interface DbObject {
@@ -73,6 +85,7 @@ export default function DigitalTwinEditor({ layoutId, layoutName, onBack }: Digi
   const [draggedTool, setDraggedTool] = useState<ToolType | null>(null);
   const [draggedAreaData, setDraggedAreaData] = useState<Area | null>(null); // 드래그 중인 Area 정보
   const [draggedLocationData, setDraggedLocationData] = useState<Location | null>(null); // 드래그 중인 Location 정보
+  const [previewPosition, setPreviewPosition] = useState<{ x: number; z: number } | null>(null); // 드래그 프리뷰 위치
   const [isLoading, setIsLoading] = useState(true);
   const [isSaving, setIsSaving] = useState(false);
   const [hasUnsavedChanges, setHasUnsavedChanges] = useState(false);
@@ -92,9 +105,17 @@ export default function DigitalTwinEditor({ layoutId, layoutName, onBack }: Digi
   const [loadingMaterials, setLoadingMaterials] = useState(false);
   const [showMaterialPanel, setShowMaterialPanel] = useState(false);
 
+  // 매핑 템플릿
+  const [mappingTemplates, setMappingTemplates] = useState<DigitalTwinMappingTemplate[]>([]);
+  const [selectedTemplateId, setSelectedTemplateId] = useState<string>("");
+  const [loadingTemplates, setLoadingTemplates] = useState(false);
+  const [isSaveTemplateDialogOpen, setIsSaveTemplateDialogOpen] = useState(false);
+  const [newTemplateName, setNewTemplateName] = useState("");
+  const [newTemplateDescription, setNewTemplateDescription] = useState("");
+
   // 동적 계층 구조 설정
   const [hierarchyConfig, setHierarchyConfig] = useState<HierarchyConfig | null>(null);
-  const [availableTables, setAvailableTables] = useState<string[]>([]);
+  const [availableTables, setAvailableTables] = useState<Array<{ table_name: string; description?: string }>>([]);
   const [loadingTables, setLoadingTables] = useState(false);
 
   // 레거시: 테이블 매핑 (구 Area/Location 방식 호환용)
@@ -164,6 +185,36 @@ export default function DigitalTwinEditor({ layoutId, layoutName, onBack }: Digi
     }));
   }, [placedObjects, layoutId]);
 
+  // 외부 DB 또는 레이아웃 타입이 변경될 때 템플릿 목록 로드
+  useEffect(() => {
+    const loadTemplates = async () => {
+      if (!selectedDbConnection) {
+        setMappingTemplates([]);
+        setSelectedTemplateId("");
+        return;
+      }
+
+      try {
+        setLoadingTemplates(true);
+        const response = await getMappingTemplates({
+          externalDbConnectionId: selectedDbConnection,
+          layoutType: "yard-3d",
+        });
+        if (response.success && response.data) {
+          setMappingTemplates(response.data);
+        } else {
+          setMappingTemplates([]);
+        }
+      } catch (error) {
+        console.error("매핑 템플릿 목록 조회 실패:", error);
+      } finally {
+        setLoadingTemplates(false);
+      }
+    };
+
+    loadTemplates();
+  }, [selectedDbConnection]);
+
   // 외부 DB 연결 목록 로드
   useEffect(() => {
     const loadExternalDbConnections = async () => {
@@ -206,12 +257,23 @@ export default function DigitalTwinEditor({ layoutId, layoutName, onBack }: Digi
     const loadTables = async () => {
       try {
         setLoadingTables(true);
-        const { getTables } = await import("@/lib/api/digitalTwin");
-        const response = await getTables(selectedDbConnection);
+        // 외부 DB 메타데이터 API 사용 (테이블 + 설명)
+        const response = await ExternalDbConnectionAPI.getTables(selectedDbConnection);
         if (response.success && response.data) {
-          const tableNames = response.data.map((t) => t.table_name);
-          setAvailableTables(tableNames);
-          console.log("📋 테이블 목록:", tableNames);
+          const rawTables = response.data as any[];
+          const normalized = rawTables.map((t: any) =>
+            typeof t === "string"
+              ? { table_name: t }
+              : {
+                  table_name: t.table_name || t.TABLE_NAME || String(t),
+                  description: t.description || t.table_description || undefined,
+                },
+          );
+          setAvailableTables(normalized);
+          console.log("📋 테이블 목록:", normalized);
+        } else {
+          setAvailableTables([]);
+          console.warn("테이블 목록 조회 실패:", response.message || response.error);
         }
       } catch (error) {
         console.error("테이블 목록 조회 실패:", error);
@@ -656,13 +718,13 @@ export default function DigitalTwinEditor({ layoutId, layoutName, onBack }: Digi
   };
 
   // 캔버스에 드롭
-  const handleCanvasDrop = (x: number, z: number) => {
+  const handleCanvasDrop = async (x: number, z: number) => {
     if (!draggedTool) return;
 
     const defaults = getToolDefaults(draggedTool);
 
     // Area는 바닥(y=0.05)에, 다른 객체는 중앙 정렬
-    const yPosition = draggedTool === "area" ? 0.05 : (defaults.size?.y || 1) / 2;
+    let yPosition = draggedTool === "area" ? 0.05 : (defaults.size?.y || 1) / 2;
 
     // 외부 DB 데이터에서 드래그한 경우 해당 정보 사용
     let objectName = defaults.name || "새 객체";
@@ -696,13 +758,52 @@ export default function DigitalTwinEditor({ layoutId, layoutName, onBack }: Digi
       externalKey = draggedLocationData.LOCAKEY;
     }
 
+    // 기본 크기 설정
+    let objectSize = defaults.size || { x: 5, y: 5, z: 5 };
+
+    // Location 배치 시 자재 개수에 따라 높이 자동 설정
+    if (
+      (draggedTool === "location-bed" ||
+        draggedTool === "location-stp" ||
+        draggedTool === "location-temp" ||
+        draggedTool === "location-dest") &&
+      locaKey &&
+      selectedDbConnection &&
+      hierarchyConfig?.material
+    ) {
+      try {
+        // 해당 Location의 자재 개수 조회
+        const countsResponse = await getMaterialCounts(selectedDbConnection, hierarchyConfig.material.tableName, [
+          locaKey,
+        ]);
+
+        if (countsResponse.success && countsResponse.data && countsResponse.data.length > 0) {
+          const materialCount = countsResponse.data[0].count;
+
+          // 자재 개수에 비례해서 높이(Y축) 설정 (최소 5, 최대 30)
+          // 자재 1개 = 높이 5, 자재 10개 = 높이 15, 자재 50개 = 높이 30
+          const calculatedHeight = Math.min(30, Math.max(5, 5 + materialCount * 0.5));
+
+          objectSize = {
+            ...objectSize,
+            y: calculatedHeight, // Y축이 높이!
+          };
+
+          // 높이가 높아진 만큼 Y 위치도 올려서 바닥을 뚫지 않게 조정
+          yPosition = calculatedHeight / 2;
+        }
+      } catch (error) {
+        console.error("자재 개수 조회 실패, 기본 높이 사용:", error);
+      }
+    }
+
     const newObject: PlacedObject = {
       id: nextObjectId,
       type: draggedTool,
       name: objectName,
       position: { x, y: yPosition, z },
-      size: defaults.size || { x: 5, y: 5, z: 5 },
-      color: defaults.color || "#9ca3af",
+      size: objectSize,
+      color: OBJECT_COLORS[draggedTool] || DEFAULT_COLOR, // 타입별 기본 색상
       areaKey,
       locaKey,
       locType,
@@ -739,9 +840,32 @@ export default function DigitalTwinEditor({ layoutId, layoutName, onBack }: Digi
         return;
       }
 
-      // 부모 ID 설정
+      // 부모 ID 설정 및 논리적 유효성 검사
       if (validation.parent) {
+        // 1. 부모 객체 찾기
+        const parentObj = placedObjects.find((obj) => obj.id === validation.parent!.id);
+
+        // 2. 논리적 키 검사 (DB에서 가져온 데이터인 경우)
+        if (parentObj && parentObj.externalKey && newObject.parentKey) {
+          if (parentObj.externalKey !== newObject.parentKey) {
+            toast({
+              variant: "destructive",
+              title: "배치 오류",
+              description: `이 Location은 '${newObject.parentKey}' Area에만 배치할 수 있습니다. (현재 선택된 Area: ${parentObj.externalKey})`,
+            });
+            return;
+          }
+        }
+
         newObject.parentId = validation.parent.id;
+      } else if (newObject.parentKey) {
+        // DB 데이터인데 부모 영역 위에 놓이지 않은 경우
+        toast({
+          variant: "destructive",
+          title: "배치 오류",
+          description: `이 Location은 '${newObject.parentKey}' Area 내부에 배치해야 합니다.`,
+        });
+        return;
       }
     }
 
@@ -770,7 +894,10 @@ export default function DigitalTwinEditor({ layoutId, layoutName, onBack }: Digi
 
   // Location의 자재 목록 로드
   const loadMaterialsForLocation = async (locaKey: string) => {
+    console.log("🔍 자재 조회 시작:", { locaKey, selectedDbConnection, material: hierarchyConfig?.material });
+
     if (!selectedDbConnection || !hierarchyConfig?.material) {
+      console.error("❌ 설정 누락:", { selectedDbConnection, material: hierarchyConfig?.material });
       toast({
         variant: "destructive",
         title: "자재 조회 실패",
@@ -782,10 +909,15 @@ export default function DigitalTwinEditor({ layoutId, layoutName, onBack }: Digi
     try {
       setLoadingMaterials(true);
       setShowMaterialPanel(true);
-      const response = await getMaterials(selectedDbConnection, {
+
+      const materialConfig = {
         ...hierarchyConfig.material,
         locaKey: locaKey,
-      });
+      };
+      console.log("📡 API 호출:", { externalDbConnectionId: selectedDbConnection, materialConfig });
+
+      const response = await getMaterials(selectedDbConnection, materialConfig);
+      console.log("📦 API 응답:", response);
       if (response.success && response.data) {
         // layerColumn이 있으면 정렬
         const sortedMaterials = hierarchyConfig.material.layerColumn
@@ -904,6 +1036,110 @@ export default function DigitalTwinEditor({ layoutId, layoutName, onBack }: Digi
     }
   };
 
+  // 매핑 템플릿 적용
+  const handleApplyTemplate = (templateId: string) => {
+    if (!templateId) return;
+    const template = mappingTemplates.find((t) => t.id === templateId);
+    if (!template) {
+      toast({
+        variant: "destructive",
+        title: "템플릿 적용 실패",
+        description: "선택한 템플릿을 찾을 수 없습니다.",
+      });
+      return;
+    }
+
+    const config = template.config as HierarchyConfig;
+    setHierarchyConfig(config);
+
+    // 선택된 테이블 정보 동기화
+    const newSelectedTables: any = {
+      warehouse: config.warehouse?.tableName || "",
+      area: "",
+      location: "",
+      material: "",
+    };
+
+    if (config.levels && config.levels.length > 0) {
+      // 레벨 1 = Area
+      if (config.levels[0]?.tableName) {
+        newSelectedTables.area = config.levels[0].tableName;
+      }
+      // 레벨 2 = Location
+      if (config.levels[1]?.tableName) {
+        newSelectedTables.location = config.levels[1].tableName;
+      }
+    }
+
+    if (config.material?.tableName) {
+      newSelectedTables.material = config.material.tableName;
+    }
+
+    setSelectedTables(newSelectedTables);
+    setSelectedWarehouse(config.warehouseKey || null);
+    setHasUnsavedChanges(true);
+
+    toast({
+      title: "템플릿 적용 완료",
+      description: `"${template.name}" 템플릿이 적용되었습니다.`,
+    });
+  };
+
+  // 매핑 템플릿 저장
+  const handleSaveTemplate = async () => {
+    if (!selectedDbConnection || !hierarchyConfig) {
+      toast({
+        variant: "destructive",
+        title: "템플릿 저장 불가",
+        description: "외부 DB와 계층 설정을 먼저 완료해주세요.",
+      });
+      return;
+    }
+
+    if (!newTemplateName.trim()) {
+      toast({
+        variant: "destructive",
+        title: "템플릿 이름 필요",
+        description: "템플릿 이름을 입력해주세요.",
+      });
+      return;
+    }
+
+    try {
+      const response = await createMappingTemplate({
+        name: newTemplateName.trim(),
+        description: newTemplateDescription.trim() || undefined,
+        externalDbConnectionId: selectedDbConnection,
+        layoutType: "yard-3d",
+        config: hierarchyConfig,
+      });
+
+      if (response.success && response.data) {
+        setMappingTemplates((prev) => [response.data!, ...prev]);
+        setIsSaveTemplateDialogOpen(false);
+        setNewTemplateName("");
+        setNewTemplateDescription("");
+        toast({
+          title: "템플릿 저장 완료",
+          description: `"${response.data.name}" 템플릿이 저장되었습니다.`,
+        });
+      } else {
+        toast({
+          variant: "destructive",
+          title: "템플릿 저장 실패",
+          description: response.error || "템플릿을 저장하지 못했습니다.",
+        });
+      }
+    } catch (error) {
+      console.error("매핑 템플릿 저장 실패:", error);
+      toast({
+        variant: "destructive",
+        title: "템플릿 저장 실패",
+        description: "템플릿을 저장하는 중 오류가 발생했습니다.",
+      });
+    }
+  };
+
   // 객체 이동
   const handleObjectMove = (objectId: number, newX: number, newZ: number, newY?: number) => {
     setPlacedObjects((prev) => {
@@ -925,7 +1161,59 @@ export default function DigitalTwinEditor({ layoutId, layoutName, onBack }: Digi
         return obj;
       });
 
-      // 2. 그룹 이동: 자식 객체들도 함께 이동
+      // 2. 하위 계층 객체 이동 시 논리적 키 검증
+      if (hierarchyConfig && targetObj.hierarchyLevel && targetObj.hierarchyLevel > 1) {
+        const spatialObjects = updatedObjects.map((obj) => ({
+          id: obj.id,
+          position: obj.position,
+          size: obj.size,
+          hierarchyLevel: obj.hierarchyLevel || 1,
+          parentId: obj.parentId,
+        }));
+
+        const targetSpatialObj = spatialObjects.find((obj) => obj.id === objectId);
+        if (targetSpatialObj) {
+          const validation = validateSpatialContainment(
+            targetSpatialObj,
+            spatialObjects.filter((obj) => obj.id !== objectId),
+          );
+
+          // 새로운 부모 영역 찾기
+          if (validation.parent) {
+            const newParentObj = prev.find((obj) => obj.id === validation.parent!.id);
+
+            // DB에서 가져온 데이터인 경우 논리적 키 검증
+            if (newParentObj && newParentObj.externalKey && targetObj.parentKey) {
+              if (newParentObj.externalKey !== targetObj.parentKey) {
+                toast({
+                  variant: "destructive",
+                  title: "이동 불가",
+                  description: `이 Location은 '${targetObj.parentKey}' Area에만 배치할 수 있습니다. (현재 선택된 Area: ${newParentObj.externalKey})`,
+                });
+                return prev; // 이동 취소
+              }
+            }
+
+            // 부모 ID 업데이트
+            updatedObjects = updatedObjects.map((obj) => {
+              if (obj.id === objectId) {
+                return { ...obj, parentId: validation.parent!.id };
+              }
+              return obj;
+            });
+          } else if (targetObj.parentKey) {
+            // DB 데이터인데 부모 영역 밖으로 이동하려는 경우
+            toast({
+              variant: "destructive",
+              title: "이동 불가",
+              description: `이 Location은 '${targetObj.parentKey}' Area 내부에 있어야 합니다.`,
+            });
+            return prev; // 이동 취소
+          }
+        }
+      }
+
+      // 3. 그룹 이동: 자식 객체들도 함께 이동
       const spatialObjects = updatedObjects.map((obj) => ({
         id: obj.id,
         position: obj.position,
@@ -1164,13 +1452,14 @@ export default function DigitalTwinEditor({ layoutId, layoutName, onBack }: Digi
         </div>
       </div>
 
-      {/* 도구 팔레트 */}
+      {/* 도구 팔레트 (현재 숨김 처리 - 나중에 재사용 가능) */}
+      {/*
       <div className="bg-muted flex items-center justify-center gap-2 border-b p-4">
         <span className="text-muted-foreground text-sm font-medium">도구:</span>
         {[
           { type: "area" as ToolType, label: "영역", icon: Grid3x3, color: "text-blue-500" },
-          { type: "location-bed" as ToolType, label: "베드", icon: Package, color: "text-emerald-500" },
-          { type: "location-stp" as ToolType, label: "정차", icon: Move, color: "text-orange-500" },
+          { type: "location-bed" as ToolType, label: "베드", icon: Package, color: "text-blue-600" },
+          { type: "location-stp" as ToolType, label: "정차", icon: Move, color: "text-gray-500" },
           // { type: "crane-gantry" as ToolType, label: "겐트리", icon: Combine, color: "text-green-500" },
           { type: "crane-mobile" as ToolType, label: "크레인", icon: Truck, color: "text-yellow-500" },
           { type: "rack" as ToolType, label: "랙", icon: Box, color: "text-purple-500" },
@@ -1190,6 +1479,7 @@ export default function DigitalTwinEditor({ layoutId, layoutName, onBack }: Digi
           );
         })}
       </div>
+      */}
 
       {/* 메인 영역 */}
       <div className="flex flex-1 overflow-hidden">
@@ -1205,6 +1495,7 @@ export default function DigitalTwinEditor({ layoutId, layoutName, onBack }: Digi
                 onValueChange={(value) => {
                   setSelectedDbConnection(parseInt(value));
                   setSelectedWarehouse(null);
+                  setSelectedTemplateId("");
                   setHasUnsavedChanges(true);
                 }}
               >
@@ -1219,55 +1510,66 @@ export default function DigitalTwinEditor({ layoutId, layoutName, onBack }: Digi
                   ))}
                 </SelectContent>
               </Select>
-            </div>
 
-            {/* 창고 테이블 및 컬럼 매핑 */}
-            {selectedDbConnection && (
-              <div className="space-y-3">
-                <Label className="text-sm font-semibold">창고 선택</Label>
-
-                {/* 이 레이아웃의 창고 선택 */}
-                {hierarchyConfig?.warehouse?.tableName && hierarchyConfig?.warehouse?.keyColumn && (
-                  <div>
-                    <Label className="text-muted-foreground mb-1 block text-xs">이 레이아웃의 창고</Label>
-                    {loadingWarehouses ? (
-                      <div className="flex h-9 items-center justify-center rounded-md border">
-                        <Loader2 className="text-muted-foreground h-4 w-4 animate-spin" />
-                      </div>
-                    ) : (
-                      <Select
-                        value={selectedWarehouse || ""}
-                        onValueChange={(value) => {
-                          setSelectedWarehouse(value);
-                          // hierarchyConfig 업데이트 (없으면 새로 생성)
-                          setHierarchyConfig((prev) => ({
-                            warehouseKey: value,
-                            levels: prev?.levels || [],
-                            material: prev?.material,
-                          }));
-                          setHasUnsavedChanges(true);
-                        }}
-                      >
-                        <SelectTrigger className="h-9 text-xs">
-                          <SelectValue placeholder="창고 선택..." />
-                        </SelectTrigger>
-                        <SelectContent>
-                          {warehouses.map((wh: any) => {
-                            const keyCol = hierarchyConfig.warehouse!.keyColumn;
-                            const nameCol = hierarchyConfig.warehouse!.nameColumn;
-                            return (
-                              <SelectItem key={wh[keyCol]} value={wh[keyCol]} className="text-xs">
-                                {wh[nameCol] || wh[keyCol]}
-                              </SelectItem>
-                            );
-                          })}
-                        </SelectContent>
-                      </Select>
-                    )}
+              {/* 매핑 템플릿 선택/저장 */}
+              {selectedDbConnection && (
+                <div className="mt-4 space-y-2">
+                  <div className="flex items-center justify-between">
+                    <Label className="text-sm font-semibold">매핑 템플릿</Label>
+                    <Button
+                      variant="outline"
+                      size="sm"
+                      className="h-7 px-2 text-xs"
+                      onClick={() => {
+                        setNewTemplateName(layoutName || "");
+                        setIsSaveTemplateDialogOpen(true);
+                      }}
+                    >
+                      템플릿 저장
+                    </Button>
                   </div>
-                )}
-              </div>
-            )}
+                  <div className="flex gap-2">
+                    <Select
+                      value={selectedTemplateId}
+                      onValueChange={(val) => setSelectedTemplateId(val)}
+                    >
+                      <SelectTrigger className="h-8 flex-1 text-xs">
+                        <SelectValue placeholder={loadingTemplates ? "로딩 중..." : "템플릿 선택..."} />
+                      </SelectTrigger>
+                      <SelectContent>
+                        {mappingTemplates.length === 0 ? (
+                          <div className="text-muted-foreground px-2 py-1 text-xs">
+                            사용 가능한 템플릿이 없습니다
+                          </div>
+                        ) : (
+                          mappingTemplates.map((tpl) => (
+                            <SelectItem key={tpl.id} value={tpl.id} className="text-xs">
+                              <div className="flex flex-col">
+                                <span>{tpl.name}</span>
+                                {tpl.description && (
+                                  <span className="text-muted-foreground text-[10px]">
+                                    {tpl.description}
+                                  </span>
+                                )}
+                              </div>
+                            </SelectItem>
+                          ))
+                        )}
+                      </SelectContent>
+                    </Select>
+                    <Button
+                      variant="outline"
+                      size="sm"
+                      className="h-8 px-3 text-xs"
+                      disabled={!selectedTemplateId}
+                      onClick={() => handleApplyTemplate(selectedTemplateId)}
+                    >
+                      적용
+                    </Button>
+                  </div>
+                </div>
+              )}
+            </div>
 
             {/* 계층 설정 패널 (신규) */}
             {selectedDbConnection && (
@@ -1311,12 +1613,21 @@ export default function DigitalTwinEditor({ layoutId, layoutName, onBack }: Digi
                 }}
                 onLoadColumns={async (tableName: string) => {
                   try {
-                    const response = await ExternalDbConnectionAPI.getTableColumns(selectedDbConnection, tableName);
+                    const response = await ExternalDbConnectionAPI.getTableColumns(
+                      selectedDbConnection,
+                      tableName,
+                    );
                     if (response.success && response.data) {
-                      // 객체 배열을 문자열 배열로 변환
-                      return response.data.map((col: any) =>
-                        typeof col === "string" ? col : col.column_name || col.COLUMN_NAME || String(col),
-                      );
+                      // 컬럼 정보 객체 배열로 반환 (이름 + 설명 + PK 플래그)
+                      return response.data.map((col: any) => ({
+                        column_name:
+                          typeof col === "string"
+                            ? col
+                            : col.column_name || col.COLUMN_NAME || String(col),
+                        data_type: col.data_type || col.DATA_TYPE,
+                        description: col.description || col.COLUMN_COMMENT || undefined,
+                        is_primary_key: col.is_primary_key ?? col.IS_PRIMARY_KEY,
+                      }));
                     }
                     return [];
                   } catch (error) {
@@ -1327,6 +1638,53 @@ export default function DigitalTwinEditor({ layoutId, layoutName, onBack }: Digi
               />
             )}
 
+            {/* 창고 선택 (HierarchyConfigPanel 아래로 이동) */}
+            {selectedDbConnection && hierarchyConfig?.warehouse?.tableName && hierarchyConfig?.warehouse?.keyColumn && (
+              <div className="space-y-3">
+                <Label className="text-sm font-semibold">창고 선택</Label>
+
+                <div>
+                  <Label className="text-muted-foreground mb-1 block text-xs">배치할 창고를 선택하세요</Label>
+                  {loadingWarehouses ? (
+                    <div className="flex h-9 items-center justify-center rounded-md border">
+                      <Loader2 className="text-muted-foreground h-4 w-4 animate-spin" />
+                    </div>
+                  ) : (
+                    <Select
+                      value={selectedWarehouse || ""}
+                      onValueChange={(value) => {
+                        setSelectedWarehouse(value);
+                        // hierarchyConfig 업데이트
+                        setHierarchyConfig((prev) => ({
+                          ...prev,
+                          warehouseKey: value,
+                          levels: prev?.levels || [],
+                          material: prev?.material,
+                          warehouse: prev?.warehouse,
+                        }));
+                        setHasUnsavedChanges(true);
+                      }}
+                    >
+                      <SelectTrigger className="h-9 text-xs">
+                        <SelectValue placeholder="창고 선택..." />
+                      </SelectTrigger>
+                      <SelectContent>
+                        {warehouses.map((wh: any) => {
+                          const keyCol = hierarchyConfig.warehouse!.keyColumn;
+                          const nameCol = hierarchyConfig.warehouse!.nameColumn;
+                          return (
+                            <SelectItem key={wh[keyCol]} value={wh[keyCol]} className="text-xs">
+                              {wh[nameCol] || wh[keyCol]}
+                            </SelectItem>
+                          );
+                        })}
+                      </SelectContent>
+                    </Select>
+                  )}
+                </div>
+              </div>
+            )}
+
             {/* Area 목록 */}
             {selectedDbConnection && selectedWarehouse && (
               <div className="space-y-3">
@@ -1452,77 +1810,185 @@ export default function DigitalTwinEditor({ layoutId, layoutName, onBack }: Digi
             )}
           </div>
 
-          {/* 배치된 객체 목록 */}
-          <div className="flex-1 overflow-y-auto p-4">
+          {/* 배치된 객체 목록 (계층 구조) */}
+          <div className="flex-1 overflow-y-auto border-t p-4">
             <h3 className="mb-3 text-sm font-semibold">배치된 객체 ({placedObjects.length})</h3>
 
             {placedObjects.length === 0 ? (
               <div className="text-muted-foreground text-center text-sm">상단 도구를 드래그하여 배치하세요</div>
             ) : (
-              <div className="space-y-2">
-                {placedObjects.map((obj) => (
-                  <div
-                    key={obj.id}
-                    onClick={() => handleObjectClick(obj.id)}
-                    className={`cursor-pointer rounded-lg border p-3 transition-all ${
-                      selectedObject?.id === obj.id ? "border-primary bg-primary/10" : "hover:border-primary/50"
-                    }`}
-                  >
-                    <div className="flex items-center justify-between">
-                      <span className="text-sm font-medium">{obj.name}</span>
-                      <div className="h-3 w-3 rounded-full" style={{ backgroundColor: obj.color }} />
-                    </div>
-                    <p className="text-muted-foreground mt-1 text-xs">
-                      위치: ({obj.position.x.toFixed(1)}, {obj.position.z.toFixed(1)})
-                    </p>
-                    {obj.areaKey && <p className="text-muted-foreground mt-1 text-xs">Area: {obj.areaKey}</p>}
-                  </div>
-                ))}
-              </div>
+              <Accordion type="multiple" className="w-full">
+                {/* Area별로 그룹핑 */}
+                {(() => {
+                  // Area 객체들
+                  const areaObjects = placedObjects.filter((obj) => obj.type === "area");
+
+                  // Area가 없으면 기존 방식으로 표시
+                  if (areaObjects.length === 0) {
+                    return (
+                      <div className="space-y-2">
+                        {placedObjects.map((obj) => (
+                          <div
+                            key={obj.id}
+                            onClick={() => handleObjectClick(obj.id)}
+                            className={`cursor-pointer rounded-lg border p-3 transition-all ${
+                              selectedObject?.id === obj.id ? "border-primary bg-primary/10" : "hover:border-primary/50"
+                            }`}
+                          >
+                            <div className="flex items-center justify-between">
+                              <span className="text-sm font-medium">{obj.name}</span>
+                              <div className="h-3 w-3 rounded-full" style={{ backgroundColor: obj.color }} />
+                            </div>
+                            <p className="text-muted-foreground mt-1 text-xs">
+                              위치: ({obj.position.x.toFixed(1)}, {obj.position.z.toFixed(1)})
+                            </p>
+                          </div>
+                        ))}
+                      </div>
+                    );
+                  }
+
+                  // Area별로 Location들을 그룹핑
+                  return areaObjects.map((areaObj) => {
+                    // 이 Area의 자식 Location들 찾기
+                    const childLocations = placedObjects.filter(
+                      (obj) =>
+                        obj.type !== "area" &&
+                        obj.areaKey === areaObj.areaKey &&
+                        (obj.parentId === areaObj.id || obj.externalKey === areaObj.externalKey),
+                    );
+
+                    return (
+                      <AccordionItem key={areaObj.id} value={`area-${areaObj.id}`} className="border-b">
+                        <AccordionTrigger className="px-2 py-3 hover:no-underline">
+                          <div
+                            className={`flex w-full items-center justify-between pr-2 ${
+                              selectedObject?.id === areaObj.id ? "text-primary font-semibold" : ""
+                            }`}
+                            onClick={(e) => {
+                              e.stopPropagation();
+                              handleObjectClick(areaObj.id);
+                            }}
+                          >
+                            <div className="flex items-center gap-2">
+                              <Grid3x3 className="h-4 w-4" />
+                              <span className="text-sm font-medium">{areaObj.name}</span>
+                            </div>
+                            <div className="flex items-center gap-2">
+                              <span className="text-muted-foreground text-xs">({childLocations.length})</span>
+                              <div className="h-3 w-3 rounded-full" style={{ backgroundColor: areaObj.color }} />
+                            </div>
+                          </div>
+                        </AccordionTrigger>
+                        <AccordionContent className="px-2 pb-3">
+                          {childLocations.length === 0 ? (
+                            <p className="text-muted-foreground py-2 text-center text-xs">Location이 없습니다</p>
+                          ) : (
+                            <div className="space-y-2">
+                              {childLocations.map((locationObj) => (
+                                <div
+                                  key={locationObj.id}
+                                  onClick={() => handleObjectClick(locationObj.id)}
+                                  className={`cursor-pointer rounded-lg border p-2 transition-all ${
+                                    selectedObject?.id === locationObj.id
+                                      ? "border-primary bg-primary/10"
+                                      : "hover:border-primary/50"
+                                  }`}
+                                >
+                                  <div className="flex items-center justify-between">
+                                    <div className="flex items-center gap-2">
+                                      <Package className="h-3 w-3" />
+                                      <span className="text-xs font-medium">{locationObj.name}</span>
+                                    </div>
+                                    <div
+                                      className="h-2.5 w-2.5 rounded-full"
+                                      style={{ backgroundColor: locationObj.color }}
+                                    />
+                                  </div>
+                                  <p className="text-muted-foreground mt-1 text-[10px]">
+                                    위치: ({locationObj.position.x.toFixed(1)}, {locationObj.position.z.toFixed(1)})
+                                  </p>
+                                  {locationObj.locaKey && (
+                                    <p className="text-muted-foreground mt-0.5 text-[10px]">
+                                      Key: {locationObj.locaKey}
+                                    </p>
+                                  )}
+                                </div>
+                              ))}
+                            </div>
+                          )}
+                        </AccordionContent>
+                      </AccordionItem>
+                    );
+                  });
+                })()}
+              </Accordion>
             )}
           </div>
         </div>
 
         {/* 중앙: 3D 캔버스 */}
-        <div
-          className="h-full flex-1 bg-gray-100"
-          onDragOver={(e) => e.preventDefault()}
-          onDrop={(e) => {
-            e.preventDefault();
-            const rect = e.currentTarget.getBoundingClientRect();
-            const rawX = ((e.clientX - rect.left) / rect.width - 0.5) * 100;
-            const rawZ = ((e.clientY - rect.top) / rect.height - 0.5) * 100;
-
-            // 그리드 크기 (5 단위)
-            const gridSize = 5;
-
-            // 그리드에 스냅
-            // Area(20x20)는 그리드 교차점에, 다른 객체(5x5)는 타일 중앙에
-            let snappedX = Math.round(rawX / gridSize) * gridSize;
-            let snappedZ = Math.round(rawZ / gridSize) * gridSize;
-
-            // 5x5 객체는 타일 중앙으로 오프셋 (Area는 제외)
-            if (draggedTool !== "area") {
-              snappedX += gridSize / 2;
-              snappedZ += gridSize / 2;
-            }
-
-            handleCanvasDrop(snappedX, snappedZ);
-          }}
-        >
+        <div className="relative h-full flex-1 bg-gray-100">
           {isLoading ? (
             <div className="flex h-full items-center justify-center">
               <Loader2 className="text-muted-foreground h-8 w-8 animate-spin" />
             </div>
           ) : (
-            <Yard3DCanvas
-              placements={placements}
-              selectedPlacementId={selectedObject?.id || null}
-              onPlacementClick={(placement) => handleObjectClick(placement?.id || null)}
-              onPlacementDrag={(id, position) => handleObjectMove(id, position.x, position.z, position.y)}
-              focusOnPlacementId={null}
-              onCollisionDetected={() => {}}
-            />
+            <>
+              <Yard3DCanvas
+                placements={placements}
+                selectedPlacementId={selectedObject?.id || null}
+                onPlacementClick={(placement) => handleObjectClick(placement?.id || null)}
+                onPlacementDrag={(id, position) => handleObjectMove(id, position.x, position.z, position.y)}
+                focusOnPlacementId={null}
+                onCollisionDetected={() => {}}
+                previewTool={draggedTool}
+                previewPosition={previewPosition}
+                onPreviewPositionUpdate={setPreviewPosition}
+              />
+              {/* 드래그 중일 때 Canvas 위에 투명한 오버레이 (프리뷰 및 드롭 이벤트 캐치용) */}
+              {draggedTool && (
+                <div
+                  className="pointer-events-auto absolute inset-0"
+                  style={{ zIndex: 10 }}
+                  onDragOver={(e) => {
+                    e.preventDefault();
+                    const rect = e.currentTarget.getBoundingClientRect();
+                    const rawX = ((e.clientX - rect.left) / rect.width - 0.5) * 100;
+                    const rawZ = ((e.clientY - rect.top) / rect.height - 0.5) * 100;
+
+                    // 그리드 크기 (5 단위)
+                    const gridSize = 5;
+
+                    // 그리드에 스냅
+                    let snappedX = Math.round(rawX / gridSize) * gridSize;
+                    let snappedZ = Math.round(rawZ / gridSize) * gridSize;
+
+                    // 5x5 객체는 타일 중앙으로 오프셋 (Area는 제외)
+                    if (draggedTool !== "area") {
+                      snappedX += gridSize / 2;
+                      snappedZ += gridSize / 2;
+                    }
+
+                    setPreviewPosition({ x: snappedX, z: snappedZ });
+                  }}
+                  onDragLeave={() => {
+                    setPreviewPosition(null);
+                  }}
+                  onDrop={(e) => {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    if (previewPosition) {
+                      handleCanvasDrop(previewPosition.x, previewPosition.z);
+                      setPreviewPosition(null);
+                    }
+                    setDraggedTool(null);
+                    setDraggedAreaData(null);
+                    setDraggedLocationData(null);
+                  }}
+                />
+              )}
+            </>
           )}
         </div>
 
@@ -1605,7 +2071,7 @@ export default function DigitalTwinEditor({ layoutId, layoutName, onBack }: Digi
                   </Label>
                   <Input
                     id="object-name"
-                    value={selectedObject.name}
+                    value={selectedObject.name || ""}
                     onChange={(e) => handleObjectUpdate({ name: e.target.value })}
                     className="mt-1.5 h-9 text-sm"
                   />
@@ -1622,7 +2088,7 @@ export default function DigitalTwinEditor({ layoutId, layoutName, onBack }: Digi
                       <Input
                         id="pos-x"
                         type="number"
-                        value={selectedObject.position.x.toFixed(1)}
+                        value={(selectedObject.position?.x || 0).toFixed(1)}
                         onChange={(e) =>
                           handleObjectUpdate({
                             position: {
@@ -1641,7 +2107,7 @@ export default function DigitalTwinEditor({ layoutId, layoutName, onBack }: Digi
                       <Input
                         id="pos-z"
                         type="number"
-                        value={selectedObject.position.z.toFixed(1)}
+                        value={(selectedObject.position?.z || 0).toFixed(1)}
                         onChange={(e) =>
                           handleObjectUpdate({
                             position: {
@@ -1669,7 +2135,7 @@ export default function DigitalTwinEditor({ layoutId, layoutName, onBack }: Digi
                         type="number"
                         step="5"
                         min="5"
-                        value={selectedObject.size.x}
+                        value={selectedObject.size?.x || 5}
                         onChange={(e) =>
                           handleObjectUpdate({
                             size: {
@@ -1688,7 +2154,7 @@ export default function DigitalTwinEditor({ layoutId, layoutName, onBack }: Digi
                       <Input
                         id="size-y"
                         type="number"
-                        value={selectedObject.size.y}
+                        value={selectedObject.size?.y || 5}
                         onChange={(e) =>
                           handleObjectUpdate({
                             size: {
@@ -1709,7 +2175,7 @@ export default function DigitalTwinEditor({ layoutId, layoutName, onBack }: Digi
                         type="number"
                         step="5"
                         min="5"
-                        value={selectedObject.size.z}
+                        value={selectedObject.size?.z || 5}
                         onChange={(e) =>
                           handleObjectUpdate({
                             size: {
@@ -1732,7 +2198,7 @@ export default function DigitalTwinEditor({ layoutId, layoutName, onBack }: Digi
                   <Input
                     id="object-color"
                     type="color"
-                    value={selectedObject.color}
+                    value={selectedObject.color || "#3b82f6"}
                     onChange={(e) => handleObjectUpdate({ color: e.target.value })}
                     className="mt-1.5 h-9"
                   />
@@ -1751,6 +2217,58 @@ export default function DigitalTwinEditor({ layoutId, layoutName, onBack }: Digi
           )}
         </div>
       </div>
+      {/* 매핑 템플릿 저장 다이얼로그 */}
+      <Dialog open={isSaveTemplateDialogOpen} onOpenChange={setIsSaveTemplateDialogOpen}>
+        <DialogContent className="max-w-[95vw] sm:max-w-[500px]">
+          <DialogHeader>
+            <DialogTitle className="text-base sm:text-lg">매핑 템플릿 저장</DialogTitle>
+            <DialogDescription className="text-xs sm:text-sm">
+              현재 창고/계층/자재 설정을 템플릿으로 저장하여 다른 레이아웃에서 재사용할 수 있습니다.
+            </DialogDescription>
+          </DialogHeader>
+          <div className="space-y-3 sm:space-y-4">
+            <div>
+              <Label htmlFor="template-name" className="text-xs sm:text-sm">
+                템플릿 이름 *
+              </Label>
+              <Input
+                id="template-name"
+                value={newTemplateName}
+                onChange={(e) => setNewTemplateName(e.target.value)}
+                placeholder="예: 동연 야드 표준 매핑"
+                className="h-8 text-xs sm:h-10 sm:text-sm"
+              />
+            </div>
+            <div>
+              <Label htmlFor="template-desc" className="text-xs sm:text-sm">
+                설명 (선택)
+              </Label>
+              <Input
+                id="template-desc"
+                value={newTemplateDescription}
+                onChange={(e) => setNewTemplateDescription(e.target.value)}
+                placeholder="이 템플릿에 대한 설명을 입력하세요"
+                className="h-8 text-xs sm:h-10 sm:text-sm"
+              />
+            </div>
+          </div>
+          <DialogFooter className="gap-2 sm:gap-0">
+            <Button
+              variant="outline"
+              onClick={() => setIsSaveTemplateDialogOpen(false)}
+              className="h-8 flex-1 text-xs sm:h-10 sm:flex-none sm:text-sm"
+            >
+              취소
+            </Button>
+            <Button
+              onClick={handleSaveTemplate}
+              className="h-8 flex-1 text-xs sm:h-10 sm:flex-none sm:text-sm"
+            >
+              저장
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
     </div>
   );
 }

frontend/components/admin/dashboard/widgets/yard-3d/DigitalTwinViewer.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { useState, useEffect, useMemo } from "react";
-import { Loader2, Search, Filter, X } from "lucide-react";
+import { Loader2, Search, X, Grid3x3, Package } from "lucide-react";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import { Button } from "@/components/ui/button";
@@ -10,6 +10,8 @@ import dynamic from "next/dynamic";
 import { useToast } from "@/hooks/use-toast";
 import type { PlacedObject, MaterialData } from "@/types/digitalTwin";
 import { getLayoutById, getMaterials } from "@/lib/api/digitalTwin";
+import { OBJECT_COLORS, DEFAULT_COLOR } from "./constants";
+import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "@/components/ui/accordion";
 
 const Yard3DCanvas = dynamic(() => import("./Yard3DCanvas"), {
   ssr: false,
@@ -81,7 +83,7 @@ export default function DigitalTwinViewer({ layoutId }: DigitalTwinViewerProps)
                 z: parseFloat(obj.size_z),
               },
               rotation: obj.rotation ? parseFloat(obj.rotation) : 0,
-              color: getObjectColor(objectType), // 타입별 기본 색상 사용
+              color: getObjectColor(objectType, obj.color), // 저장된 색상 우선, 없으면 타입별 기본 색상
               areaKey: obj.area_key,
               locaKey: obj.loca_key,
               locType: obj.loc_type,
@@ -93,6 +95,9 @@ export default function DigitalTwinViewer({ layoutId }: DigitalTwinViewerProps)
               displayOrder: obj.display_order,
               locked: obj.locked,
               visible: obj.visible !== false,
+              hierarchyLevel: obj.hierarchy_level,
+              parentKey: obj.parent_key,
+              externalKey: obj.external_key,
             };
           });
 
@@ -225,17 +230,11 @@ export default function DigitalTwinViewer({ layoutId }: DigitalTwinViewerProps)
 
   // 객체 타입별 기본 색상 (useMemo로 최적화)
   const getObjectColor = useMemo(() => {
-    return (type: string): string => {
-      const colorMap: Record<string, string> = {
-        area: "#3b82f6", // 파란색
-        "location-bed": "#2563eb", // 진한 파란색
-        "location-stp": "#6b7280", // 회색
-        "location-temp": "#f59e0b", // 주황색
-        "location-dest": "#10b981", // 초록색
-        "crane-mobile": "#8b5cf6", // 보라색
-        rack: "#ef4444", // 빨간색
-      };
-      return colorMap[type] || "#3b82f6";
+    return (type: string, savedColor?: string): string => {
+      // 저장된 색상이 있으면 우선 사용
+      if (savedColor) return savedColor;
+      // 없으면 타입별 기본 색상 사용
+      return OBJECT_COLORS[type] || DEFAULT_COLOR;
     };
   }, []);
 
@@ -357,61 +356,154 @@ export default function DigitalTwinViewer({ layoutId }: DigitalTwinViewerProps)
                 {searchQuery ? "검색 결과가 없습니다" : "객체가 없습니다"}
               </div>
             ) : (
-              <div className="space-y-2">
-                {filteredObjects.map((obj) => {
-                  // 타입별 레이블
-                  let typeLabel = obj.type;
-                  if (obj.type === "location-bed") typeLabel = "베드(BED)";
-                  else if (obj.type === "location-stp") typeLabel = "정차포인트(STP)";
-                  else if (obj.type === "location-temp") typeLabel = "임시베드(TMP)";
-                  else if (obj.type === "location-dest") typeLabel = "지정착지(DES)";
-                  else if (obj.type === "crane-mobile") typeLabel = "크레인";
-                  else if (obj.type === "area") typeLabel = "Area";
-                  else if (obj.type === "rack") typeLabel = "랙";
+              (() => {
+                // Area 객체가 있는 경우 계층 트리 아코디언 적용
+                const areaObjects = filteredObjects.filter((obj) => obj.type === "area");
 
+                // Area가 없으면 기존 평면 리스트 유지
+                if (areaObjects.length === 0) {
                   return (
-                    <div
-                      key={obj.id}
-                      onClick={() => handleObjectClick(obj.id)}
-                      className={`bg-background hover:bg-accent cursor-pointer rounded-lg border p-3 transition-all ${
-                        selectedObject?.id === obj.id ? "ring-primary bg-primary/5 ring-2" : "hover:shadow-sm"
-                      }`}
-                    >
-                      <div className="flex items-start justify-between">
-                        <div className="flex-1">
-                          <p className="text-sm font-medium">{obj.name}</p>
-                          <div className="text-muted-foreground mt-1 flex items-center gap-2 text-xs">
-                            <span
-                              className="inline-block h-2 w-2 rounded-full"
-                              style={{ backgroundColor: getObjectColor(obj.type) }}
-                            />
-                            <span>{typeLabel}</span>
-                          </div>
-                        </div>
-                      </div>
+                    <div className="space-y-2">
+                      {filteredObjects.map((obj) => {
+                        let typeLabel = obj.type;
+                        if (obj.type === "location-bed") typeLabel = "베드(BED)";
+                        else if (obj.type === "location-stp") typeLabel = "정차포인트(STP)";
+                        else if (obj.type === "location-temp") typeLabel = "임시베드(TMP)";
+                        else if (obj.type === "location-dest") typeLabel = "지정착지(DES)";
+                        else if (obj.type === "crane-mobile") typeLabel = "크레인";
+                        else if (obj.type === "area") typeLabel = "Area";
+                        else if (obj.type === "rack") typeLabel = "랙";
 
-                      {/* 추가 정보 */}
-                      <div className="mt-2 space-y-1">
-                        {obj.areaKey && (
-                          <p className="text-muted-foreground text-xs">
-                            Area: <span className="font-medium">{obj.areaKey}</span>
-                          </p>
-                        )}
-                        {obj.locaKey && (
-                          <p className="text-muted-foreground text-xs">
-                            Location: <span className="font-medium">{obj.locaKey}</span>
-                          </p>
-                        )}
-                        {obj.materialCount !== undefined && obj.materialCount > 0 && (
-                          <p className="text-xs text-yellow-600">
-                            자재: <span className="font-semibold">{obj.materialCount}개</span>
-                          </p>
-                        )}
-                      </div>
+                        return (
+                          <div
+                            key={obj.id}
+                            onClick={() => handleObjectClick(obj.id)}
+                            className={`bg-background hover:bg-accent cursor-pointer rounded-lg border p-3 transition-all ${
+                              selectedObject?.id === obj.id ? "ring-primary bg-primary/5 ring-2" : "hover:shadow-sm"
+                            }`}
+                          >
+                            <div className="flex items-start justify-between">
+                              <div className="flex-1">
+                                <p className="text-sm font-medium">{obj.name}</p>
+                                <div className="text-muted-foreground mt-1 flex items-center gap-2 text-xs">
+                                  <span
+                                    className="inline-block h-2 w-2 rounded-full"
+                                    style={{ backgroundColor: obj.color }}
+                                  />
+                                  <span>{typeLabel}</span>
+                                </div>
+                              </div>
+                            </div>
+                            <div className="mt-2 space-y-1">
+                              {obj.areaKey && (
+                                <p className="text-muted-foreground text-xs">
+                                  Area: <span className="font-medium">{obj.areaKey}</span>
+                                </p>
+                              )}
+                              {obj.locaKey && (
+                                <p className="text-muted-foreground text-xs">
+                                  Location: <span className="font-medium">{obj.locaKey}</span>
+                                </p>
+                              )}
+                              {obj.materialCount !== undefined && obj.materialCount > 0 && (
+                                <p className="text-xs text-yellow-600">
+                                  자재: <span className="font-semibold">{obj.materialCount}개</span>
+                                </p>
+                              )}
+                            </div>
+                          </div>
+                        );
+                      })}
                     </div>
                   );
-                })}
-              </div>
+                }
+
+                // Area가 있는 경우: Area → Location 계층 아코디언
+                return (
+                  <Accordion type="multiple" className="w-full">
+                    {areaObjects.map((areaObj) => {
+                      const childLocations = filteredObjects.filter(
+                        (obj) =>
+                          obj.type !== "area" &&
+                          obj.areaKey === areaObj.areaKey &&
+                          (obj.parentId === areaObj.id || obj.externalKey === areaObj.externalKey),
+                      );
+
+                      return (
+                        <AccordionItem key={areaObj.id} value={`area-${areaObj.id}`} className="border-b">
+                          <AccordionTrigger className="px-2 py-3 hover:no-underline">
+                            <div
+                              className={`flex w-full items-center justify-between pr-2 ${
+                                selectedObject?.id === areaObj.id ? "text-primary font-semibold" : ""
+                              }`}
+                              onClick={(e) => {
+                                e.stopPropagation();
+                                handleObjectClick(areaObj.id);
+                              }}
+                            >
+                              <div className="flex items-center gap-2">
+                                <Grid3x3 className="h-4 w-4" />
+                                <span className="text-sm font-medium">{areaObj.name}</span>
+                              </div>
+                              <div className="flex items-center gap-2">
+                                <span className="text-muted-foreground text-xs">({childLocations.length})</span>
+                                <span
+                                  className="inline-block h-2 w-2 rounded-full"
+                                  style={{ backgroundColor: areaObj.color }}
+                                />
+                              </div>
+                            </div>
+                          </AccordionTrigger>
+                          <AccordionContent className="px-2 pb-3">
+                            {childLocations.length === 0 ? (
+                              <p className="text-muted-foreground py-2 text-center text-xs">Location이 없습니다</p>
+                            ) : (
+                              <div className="space-y-2">
+                                {childLocations.map((locationObj) => (
+                                  <div
+                                    key={locationObj.id}
+                                    onClick={() => handleObjectClick(locationObj.id)}
+                                    className={`cursor-pointer rounded-lg border p-2 transition-all ${
+                                      selectedObject?.id === locationObj.id
+                                        ? "border-primary bg-primary/10"
+                                        : "hover:border-primary/50"
+                                    }`}
+                                  >
+                                    <div className="flex items-center justify-between">
+                                      <div className="flex items-center gap-2">
+                                        <Package className="h-3 w-3" />
+                                        <span className="text-xs font-medium">{locationObj.name}</span>
+                                      </div>
+                                      <span
+                                        className="inline-block h-2.5 w-2.5 rounded-full"
+                                        style={{ backgroundColor: locationObj.color }}
+                                      />
+                                    </div>
+                                    <p className="text-muted-foreground mt-1 text-[10px]">
+                                      위치: ({locationObj.position.x.toFixed(1)},{" "}
+                                      {locationObj.position.z.toFixed(1)})
+                                    </p>
+                                    {locationObj.locaKey && (
+                                      <p className="text-muted-foreground mt-0.5 text-[10px]">
+                                        Location: <span className="font-medium">{locationObj.locaKey}</span>
+                                      </p>
+                                    )}
+                                    {locationObj.materialCount !== undefined && locationObj.materialCount > 0 && (
+                                      <p className="mt-0.5 text-[10px] text-yellow-600">
+                                        자재: <span className="font-semibold">{locationObj.materialCount}개</span>
+                                      </p>
+                                    )}
+                                  </div>
+                                ))}
+                              </div>
+                            )}
+                          </AccordionContent>
+                        </AccordionItem>
+                      );
+                    })}
+                  </Accordion>
+                );
+              })()
             )}
           </div>
         </div>

frontend/components/admin/dashboard/widgets/yard-3d/HIERARCHY_MIGRATION_GUIDE.md

@@ -408,3 +408,4 @@ const handleObjectMove = (
 **작성일**: 2025-11-20  
 **작성자**: AI Assistant
 
+

frontend/components/admin/dashboard/widgets/yard-3d/HierarchyConfigPanel.tsx

@@ -40,13 +40,26 @@ export interface HierarchyConfig {
   };
 }
 
+interface TableInfo {
+  table_name: string;
+  description?: string;
+}
+
+interface ColumnInfo {
+  column_name: string;
+  data_type?: string;
+  description?: string;
+  // 백엔드에서 내려주는 Primary Key 플래그 ("YES"/"NO" 또는 boolean)
+  is_primary_key?: string | boolean;
+}
+
 interface HierarchyConfigPanelProps {
   externalDbConnectionId: number | null;
   hierarchyConfig: HierarchyConfig | null;
   onHierarchyConfigChange: (config: HierarchyConfig) => void;
-  availableTables: string[];
+  availableTables: TableInfo[];
   onLoadTables: () => Promise<void>;
-  onLoadColumns: (tableName: string) => Promise<string[]>;
+  onLoadColumns: (tableName: string) => Promise<ColumnInfo[]>;
 }
 
 export default function HierarchyConfigPanel({
@@ -65,28 +78,156 @@ export default function HierarchyConfigPanel({
   );
 
   const [loadingColumns, setLoadingColumns] = useState(false);
-  const [columnsCache, setColumnsCache] = useState<{ [tableName: string]: string[] }>({});
+  const [columnsCache, setColumnsCache] = useState<{ [tableName: string]: ColumnInfo[] }>({});
 
-  // 외부에서 변경된 경우 동기화
+  // 동일한 column_name 이 여러 번 내려오는 경우(조인 중복 등) 제거
+  const normalizeColumns = (columns: ColumnInfo[]): ColumnInfo[] => {
+    const map = new Map<string, ColumnInfo>();
+    for (const col of columns) {
+      const key = col.column_name;
+      if (!map.has(key)) {
+        map.set(key, col);
+      }
+    }
+    return Array.from(map.values());
+  };
+
+  // 외부에서 변경된 경우 동기화 및 컬럼 자동 로드
+  // 외부에서 변경된 경우 동기화 및 컬럼 자동 로드
   useEffect(() => {
     if (hierarchyConfig) {
       setLocalConfig(hierarchyConfig);
-    }
-  }, [hierarchyConfig]);
 
-  // 테이블 선택 시 컬럼 로드
+      // 저장된 설정의 테이블들에 대한 컬럼 자동 로드
+      const loadSavedColumns = async () => {
+        const tablesToLoad: string[] = [];
+
+        // 창고 테이블
+        if (hierarchyConfig.warehouse?.tableName) {
+          tablesToLoad.push(hierarchyConfig.warehouse.tableName);
+        }
+
+        // 계층 레벨 테이블들
+        hierarchyConfig.levels?.forEach((level) => {
+          if (level.tableName) {
+            tablesToLoad.push(level.tableName);
+          }
+        });
+
+        // 자재 테이블
+        if (hierarchyConfig.material?.tableName) {
+          tablesToLoad.push(hierarchyConfig.material.tableName);
+        }
+
+        // 중복 제거 후, 아직 캐시에 없는 테이블만 병렬로 로드
+        const uniqueTables = [...new Set(tablesToLoad)];
+        const tablesToFetch = uniqueTables.filter((tableName) => !columnsCache[tableName]);
+
+        if (tablesToFetch.length === 0) {
+          return;
+        }
+
+        setLoadingColumns(true);
+        try {
+          await Promise.all(
+            tablesToFetch.map(async (tableName) => {
+              try {
+                const columns = await onLoadColumns(tableName);
+                const normalized = normalizeColumns(columns);
+                setColumnsCache((prev) => ({ ...prev, [tableName]: normalized }));
+              } catch (error) {
+                console.error(`컬럼 로드 실패 (${tableName}):`, error);
+              }
+            }),
+          );
+        } finally {
+          setLoadingColumns(false);
+        }
+      };
+
+      if (externalDbConnectionId) {
+        loadSavedColumns();
+      }
+    }
+  }, [hierarchyConfig, externalDbConnectionId]);
+
+  // 지정된 컬럼이 Primary Key 인지 여부
+  const isPrimaryKey = (col: ColumnInfo): boolean => {
+    if (col.is_primary_key === true) return true;
+    if (typeof col.is_primary_key === "string") {
+      const v = col.is_primary_key.toUpperCase();
+      return v === "YES" || v === "Y" || v === "TRUE" || v === "PK";
+    }
+    return false;
+  };
+
+  // 테이블 선택 시 컬럼 로드 + PK 기반 기본값 설정
   const handleTableChange = async (tableName: string, type: "warehouse" | "material" | number) => {
-    if (columnsCache[tableName]) return; // 이미 로드된 경우 스킵
+    let loadedColumns = columnsCache[tableName];
 
-    setLoadingColumns(true);
-    try {
-      const columns = await onLoadColumns(tableName);
-      setColumnsCache((prev) => ({ ...prev, [tableName]: columns }));
-    } catch (error) {
-      console.error("컬럼 로드 실패:", error);
-    } finally {
-      setLoadingColumns(false);
+    // 아직 캐시에 없으면 먼저 컬럼 조회
+    if (!loadedColumns) {
+      setLoadingColumns(true);
+      try {
+        const fetched = await onLoadColumns(tableName);
+        loadedColumns = normalizeColumns(fetched);
+        setColumnsCache((prev) => ({ ...prev, [tableName]: loadedColumns! }));
+      } catch (error) {
+        console.error("컬럼 로드 실패:", error);
+        loadedColumns = [];
+      } finally {
+        setLoadingColumns(false);
+      }
     }
+
+    const columns = loadedColumns || [];
+
+    // PK 기반으로 keyColumn 기본값 자동 설정 (이미 값이 있으면 건드리지 않음)
+    // PK 정보가 없으면 첫 번째 컬럼을 기본값으로 사용
+    setLocalConfig((prev) => {
+      const next = { ...prev };
+      const primaryColumns = columns.filter((col) => isPrimaryKey(col));
+      const pkName = (primaryColumns[0] || columns[0])?.column_name;
+
+      if (!pkName) {
+        return next;
+      }
+
+      if (type === "warehouse") {
+        const wh = {
+          ...(next.warehouse || { tableName }),
+          tableName: next.warehouse?.tableName || tableName,
+        };
+        if (!wh.keyColumn) {
+          wh.keyColumn = pkName;
+        }
+        next.warehouse = wh;
+      } else if (type === "material") {
+        const material = {
+          ...(next.material || { tableName }),
+          tableName: next.material?.tableName || tableName,
+        };
+        if (!material.keyColumn) {
+          material.keyColumn = pkName;
+        }
+        next.material = material as NonNullable<HierarchyConfig["material"]>;
+      } else if (typeof type === "number") {
+        // 계층 레벨
+        next.levels = next.levels.map((lvl) => {
+          if (lvl.level !== type) return lvl;
+          const updated: HierarchyLevel = {
+            ...lvl,
+            tableName: lvl.tableName || tableName,
+          };
+          if (!updated.keyColumn) {
+            updated.keyColumn = pkName;
+          }
+          return updated;
+        });
+      }
+
+      return next;
+    });
   };
 
   // 창고 키 변경 (제거됨 - 상위 컴포넌트에서 처리)
@@ -187,12 +328,22 @@ export default function HierarchyConfigPanel({
               </SelectTrigger>
               <SelectContent>
                 {availableTables.map((table) => (
-                  <SelectItem key={table} value={table} className="text-[10px]">
-                    {table}
+                  <SelectItem key={table.table_name} value={table.table_name} className="text-[10px]">
+                    <div className="flex flex-col">
+                      <span>{table.table_name}</span>
+                      {table.description && (
+                        <span className="text-muted-foreground text-[9px]">{table.description}</span>
+                      )}
+                    </div>
                   </SelectItem>
                 ))}
               </SelectContent>
             </Select>
+            {!localConfig.warehouse?.tableName && (
+              <p className="text-muted-foreground mt-1 text-[9px]">
+                ℹ️ 창고 테이블을 선택하고 "설정 적용"을 눌러주세요
+              </p>
+            )}
           </div>
 
           {/* 창고 컬럼 매핑 */}
@@ -208,11 +359,22 @@ export default function HierarchyConfigPanel({
                     <SelectValue placeholder="선택..." />
                   </SelectTrigger>
                   <SelectContent>
-                    {columnsCache[localConfig.warehouse.tableName].map((col) => (
-                      <SelectItem key={col} value={col} className="text-[10px]">
-                        {col}
-                      </SelectItem>
-                    ))}
+                    {columnsCache[localConfig.warehouse.tableName].map((col) => {
+                      const pk = isPrimaryKey(col);
+                      return (
+                        <SelectItem key={col.column_name} value={col.column_name} className="text-[10px]">
+                          <div className="flex flex-col">
+                            <span>
+                              {col.column_name}
+                              {pk && <span className="text-amber-500 ml-1 text-[8px]">PK</span>}
+                            </span>
+                            {col.description && (
+                              <span className="text-muted-foreground text-[8px]">{col.description}</span>
+                            )}
+                          </div>
+                        </SelectItem>
+                      );
+                    })}
                   </SelectContent>
                 </Select>
               </div>
@@ -228,8 +390,13 @@ export default function HierarchyConfigPanel({
                   </SelectTrigger>
                   <SelectContent>
                     {columnsCache[localConfig.warehouse.tableName].map((col) => (
-                      <SelectItem key={col} value={col} className="text-[10px]">
-                        {col}
+                      <SelectItem key={col.column_name} value={col.column_name} className="text-[10px]">
+                        <div className="flex flex-col">
+                          <span>{col.column_name}</span>
+                          {col.description && (
+                            <span className="text-muted-foreground text-[8px]">{col.description}</span>
+                          )}
+                        </div>
                       </SelectItem>
                     ))}
                   </SelectContent>
@@ -237,6 +404,15 @@ export default function HierarchyConfigPanel({
               </div>
             </div>
           )}
+
+          {localConfig.warehouse?.tableName &&
+            !columnsCache[localConfig.warehouse.tableName] &&
+            loadingColumns && (
+              <div className="flex items-center gap-2 pt-2 text-[10px] text-muted-foreground">
+                <Loader2 className="h-3 w-3 animate-spin" />
+                <span>컬럼 정보를 불러오는 중입니다...</span>
+              </div>
+            )}
         </CardContent>
       </Card>
 
@@ -257,7 +433,7 @@ export default function HierarchyConfigPanel({
                 <div className="flex items-center gap-2">
                   <GripVertical className="text-muted-foreground h-4 w-4" />
                   <Input
-                    value={level.name}
+                    value={level.name || ""}
                     onChange={(e) => handleLevelChange(level.level, "name", e.target.value)}
                     className="h-7 w-32 text-xs"
                     placeholder="레벨명"
@@ -276,7 +452,7 @@ export default function HierarchyConfigPanel({
                 <div>
                   <Label className="text-[10px]">테이블</Label>
                   <Select
-                    value={level.tableName}
+                    value={level.tableName || ""}
                     onValueChange={(val) => {
                       handleLevelChange(level.level, "tableName", val);
                       handleTableChange(val, level.level);
@@ -287,8 +463,13 @@ export default function HierarchyConfigPanel({
                     </SelectTrigger>
                     <SelectContent>
                       {availableTables.map((table) => (
-                        <SelectItem key={table} value={table} className="text-xs">
-                          {table}
+                        <SelectItem key={table.table_name} value={table.table_name} className="text-xs">
+                          <div className="flex flex-col">
+                            <span>{table.table_name}</span>
+                            {table.description && (
+                              <span className="text-muted-foreground text-[10px]">{table.description}</span>
+                            )}
+                          </div>
                         </SelectItem>
                       ))}
                     </SelectContent>
@@ -297,48 +478,64 @@ export default function HierarchyConfigPanel({
 
                 {level.tableName && columnsCache[level.tableName] && (
                   <>
-                      <div>
-                        <Label className="text-[10px]">ID 컬럼</Label>
-                        <Select
-                          value={level.keyColumn}
-                          onValueChange={(val) => handleLevelChange(level.level, "keyColumn", val)}
-                        >
-                          <SelectTrigger className="h-7 text-[10px]">
-                            <SelectValue />
-                          </SelectTrigger>
-                          <SelectContent>
-                            {columnsCache[level.tableName].map((col) => (
-                              <SelectItem key={col} value={col} className="text-xs">
-                                {col}
+                    <div>
+                      <Label className="text-[10px]">ID 컬럼</Label>
+                      <Select
+                        value={level.keyColumn || ""}
+                        onValueChange={(val) => handleLevelChange(level.level, "keyColumn", val)}
+                      >
+                        <SelectTrigger className="h-7 text-[10px]">
+                          <SelectValue />
+                        </SelectTrigger>
+                        <SelectContent>
+                          {columnsCache[level.tableName].map((col) => {
+                            const pk = isPrimaryKey(col);
+                            return (
+                              <SelectItem key={col.column_name} value={col.column_name} className="text-xs">
+                                <div className="flex flex-col">
+                                  <span>
+                                    {col.column_name}
+                                    {pk && <span className="text-amber-500 ml-1 text-[9px]">PK</span>}
+                                  </span>
+                                  {col.description && (
+                                    <span className="text-muted-foreground text-[9px]">{col.description}</span>
+                                  )}
+                                </div>
                               </SelectItem>
-                            ))}
-                          </SelectContent>
-                        </Select>
-                      </div>
+                            );
+                          })}
+                        </SelectContent>
+                      </Select>
+                    </div>
 
-                      <div>
-                        <Label className="text-[10px]">이름 컬럼</Label>
-                        <Select
-                          value={level.nameColumn}
-                          onValueChange={(val) => handleLevelChange(level.level, "nameColumn", val)}
-                        >
-                          <SelectTrigger className="h-7 text-[10px]">
-                            <SelectValue />
-                          </SelectTrigger>
-                          <SelectContent>
-                            {columnsCache[level.tableName].map((col) => (
-                              <SelectItem key={col} value={col} className="text-xs">
-                                {col}
-                              </SelectItem>
-                            ))}
-                          </SelectContent>
-                        </Select>
+                    <div>
+                      <Label className="text-[10px]">이름 컬럼</Label>
+                      <Select
+                        value={level.nameColumn || ""}
+                        onValueChange={(val) => handleLevelChange(level.level, "nameColumn", val)}
+                      >
+                        <SelectTrigger className="h-7 text-[10px]">
+                          <SelectValue />
+                        </SelectTrigger>
+                        <SelectContent>
+                          {columnsCache[level.tableName].map((col) => (
+                            <SelectItem key={col.column_name} value={col.column_name} className="text-xs">
+                              <div className="flex flex-col">
+                                <span>{col.column_name}</span>
+                                {col.description && (
+                                  <span className="text-muted-foreground text-[9px]">{col.description}</span>
+                                )}
+                              </div>
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
+                      </Select>
                     </div>
 
                     <div>
                       <Label className="text-[10px]">부모 키 컬럼</Label>
                       <Select
-                        value={level.parentKeyColumn}
+                        value={level.parentKeyColumn || ""}
                         onValueChange={(val) => handleLevelChange(level.level, "parentKeyColumn", val)}
                       >
                         <SelectTrigger className="h-7 text-[10px]">
@@ -346,8 +543,13 @@ export default function HierarchyConfigPanel({
                         </SelectTrigger>
                         <SelectContent>
                           {columnsCache[level.tableName].map((col) => (
-                            <SelectItem key={col} value={col} className="text-xs">
-                              {col}
+                            <SelectItem key={col.column_name} value={col.column_name} className="text-xs">
+                              <div className="flex flex-col">
+                                <span>{col.column_name}</span>
+                                {col.description && (
+                                  <span className="text-muted-foreground text-[9px]">{col.description}</span>
+                                )}
+                              </div>
                             </SelectItem>
                           ))}
                         </SelectContent>
@@ -368,8 +570,13 @@ export default function HierarchyConfigPanel({
                         <SelectContent>
                           <SelectItem value="__none__">없음</SelectItem>
                           {columnsCache[level.tableName].map((col) => (
-                            <SelectItem key={col} value={col} className="text-xs">
-                              {col}
+                            <SelectItem key={col.column_name} value={col.column_name} className="text-xs">
+                              <div className="flex flex-col">
+                                <span>{col.column_name}</span>
+                                {col.description && (
+                                  <span className="text-muted-foreground text-[9px]">{col.description}</span>
+                                )}
+                              </div>
                             </SelectItem>
                           ))}
                         </SelectContent>
@@ -377,6 +584,13 @@ export default function HierarchyConfigPanel({
                     </div>
                   </>
                 )}
+
+                {level.tableName && !columnsCache[level.tableName] && loadingColumns && (
+                  <div className="flex items-center gap-2 pt-2 text-[10px] text-muted-foreground">
+                    <Loader2 className="h-3 w-3 animate-spin" />
+                    <span>컬럼 정보를 불러오는 중입니다...</span>
+                  </div>
+                )}
               </CardContent>
             </Card>
           ))}
@@ -409,8 +623,13 @@ export default function HierarchyConfigPanel({
               </SelectTrigger>
               <SelectContent>
                 {availableTables.map((table) => (
-                  <SelectItem key={table} value={table} className="text-xs">
-                    {table}
+                  <SelectItem key={table.table_name} value={table.table_name} className="text-xs">
+                    <div className="flex flex-col">
+                      <span>{table.table_name}</span>
+                      {table.description && (
+                        <span className="text-muted-foreground text-[10px]">{table.description}</span>
+                      )}
+                    </div>
                   </SelectItem>
                 ))}
               </SelectContent>
@@ -419,82 +638,108 @@ export default function HierarchyConfigPanel({
 
           {localConfig.material?.tableName && columnsCache[localConfig.material.tableName] && (
             <>
-                <div>
-                  <Label className="text-[10px]">ID 컬럼</Label>
-                  <Select
-                    value={localConfig.material.keyColumn}
-                    onValueChange={(val) => handleMaterialChange("keyColumn", val)}
-                  >
-                    <SelectTrigger className="h-7 text-[10px]">
-                      <SelectValue />
-                    </SelectTrigger>
-                    <SelectContent>
-                      {columnsCache[localConfig.material.tableName].map((col) => (
-                        <SelectItem key={col} value={col} className="text-xs">
-                          {col}
-                        </SelectItem>
-                      ))}
-                    </SelectContent>
-                  </Select>
-                </div>
-
-                <div>
-                  <Label className="text-[10px]">위치 키 컬럼</Label>
-                  <Select
-                    value={localConfig.material.locationKeyColumn}
-                    onValueChange={(val) => handleMaterialChange("locationKeyColumn", val)}
-                  >
-                    <SelectTrigger className="h-7 text-[10px]">
-                      <SelectValue />
-                    </SelectTrigger>
-                    <SelectContent>
-                      {columnsCache[localConfig.material.tableName].map((col) => (
-                        <SelectItem key={col} value={col} className="text-xs">
-                          {col}
-                        </SelectItem>
-                      ))}
-                    </SelectContent>
-                  </Select>
+              <div>
+                <Label className="text-[10px]">ID 컬럼</Label>
+                <Select
+                  value={localConfig.material.keyColumn || ""}
+                  onValueChange={(val) => handleMaterialChange("keyColumn", val)}
+                >
+                        <SelectTrigger className="h-7 text-[10px]">
+                          <SelectValue />
+                        </SelectTrigger>
+                        <SelectContent>
+                          {columnsCache[localConfig.material.tableName].map((col) => {
+                            const pk = isPrimaryKey(col);
+                            return (
+                              <SelectItem key={col.column_name} value={col.column_name} className="text-xs">
+                                <div className="flex flex-col">
+                                  <span>
+                                    {col.column_name}
+                                    {pk && <span className="text-amber-500 ml-1 text-[9px]">PK</span>}
+                                  </span>
+                                  {col.description && (
+                                    <span className="text-muted-foreground text-[9px]">{col.description}</span>
+                                  )}
+                                </div>
+                              </SelectItem>
+                            );
+                          })}
+                        </SelectContent>
+                </Select>
               </div>
 
-                <div>
-                  <Label className="text-[10px]">레이어 컬럼 (선택)</Label>
-                  <Select
+              <div>
+                <Label className="text-[10px]">위치 키 컬럼</Label>
+                <Select
+                  value={localConfig.material.locationKeyColumn || ""}
+                  onValueChange={(val) => handleMaterialChange("locationKeyColumn", val)}
+                >
+                  <SelectTrigger className="h-7 text-[10px]">
+                    <SelectValue />
+                  </SelectTrigger>
+                  <SelectContent>
+                    {columnsCache[localConfig.material.tableName].map((col) => (
+                      <SelectItem key={col.column_name} value={col.column_name} className="text-xs">
+                        <div className="flex flex-col">
+                          <span>{col.column_name}</span>
+                          {col.description && (
+                            <span className="text-muted-foreground text-[9px]">{col.description}</span>
+                          )}
+                        </div>
+                      </SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
+              </div>
+
+              <div>
+                <Label className="text-[10px]">레이어 컬럼 (선택)</Label>
+                <Select
                   value={localConfig.material.layerColumn || "__none__"}
                   onValueChange={(val) => handleMaterialChange("layerColumn", val === "__none__" ? undefined : val)}
-                  >
-                    <SelectTrigger className="h-7 text-[10px]">
-                      <SelectValue placeholder="레이어 컬럼" />
-                    </SelectTrigger>
-                    <SelectContent>
+                >
+                  <SelectTrigger className="h-7 text-[10px]">
+                    <SelectValue placeholder="레이어 컬럼" />
+                  </SelectTrigger>
+                  <SelectContent>
                     <SelectItem value="__none__">없음</SelectItem>
-                      {columnsCache[localConfig.material.tableName].map((col) => (
-                        <SelectItem key={col} value={col} className="text-xs">
-                          {col}
-                        </SelectItem>
-                      ))}
-                    </SelectContent>
-                  </Select>
-                </div>
+                    {columnsCache[localConfig.material.tableName].map((col) => (
+                      <SelectItem key={col.column_name} value={col.column_name} className="text-xs">
+                        <div className="flex flex-col">
+                          <span>{col.column_name}</span>
+                          {col.description && (
+                            <span className="text-muted-foreground text-[9px]">{col.description}</span>
+                          )}
+                        </div>
+                      </SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
+              </div>
 
-                <div>
-                  <Label className="text-[10px]">수량 컬럼 (선택)</Label>
-                  <Select
+              <div>
+                <Label className="text-[10px]">수량 컬럼 (선택)</Label>
+                <Select
                   value={localConfig.material.quantityColumn || "__none__"}
                   onValueChange={(val) => handleMaterialChange("quantityColumn", val === "__none__" ? undefined : val)}
-                  >
-                    <SelectTrigger className="h-7 text-[10px]">
-                      <SelectValue placeholder="수량 컬럼" />
-                    </SelectTrigger>
-                    <SelectContent>
+                >
+                  <SelectTrigger className="h-7 text-[10px]">
+                    <SelectValue placeholder="수량 컬럼" />
+                  </SelectTrigger>
+                  <SelectContent>
                     <SelectItem value="__none__">없음</SelectItem>
-                      {columnsCache[localConfig.material.tableName].map((col) => (
-                        <SelectItem key={col} value={col} className="text-xs">
-                          {col}
-                        </SelectItem>
-                      ))}
-                    </SelectContent>
-                  </Select>
+                    {columnsCache[localConfig.material.tableName].map((col) => (
+                      <SelectItem key={col.column_name} value={col.column_name} className="text-xs">
+                        <div className="flex flex-col">
+                          <span>{col.column_name}</span>
+                          {col.description && (
+                            <span className="text-muted-foreground text-[9px]">{col.description}</span>
+                          )}
+                        </div>
+                      </SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
               </div>
 
               <Separator className="my-3" />
@@ -507,30 +752,35 @@ export default function HierarchyConfigPanel({
                 </p>
                 <div className="max-h-60 space-y-2 overflow-y-auto rounded border p-2">
                   {columnsCache[localConfig.material.tableName].map((col) => {
-                    const displayItem = localConfig.material?.displayColumns?.find((d) => d.column === col);
+                    const displayItem = localConfig.material?.displayColumns?.find((d) => d.column === col.column_name);
                     const isSelected = !!displayItem;
                     return (
-                      <div key={col} className="flex items-center gap-2">
+                      <div key={col.column_name} className="flex items-center gap-2">
                         <input
                           type="checkbox"
                           checked={isSelected}
                           onChange={(e) => {
                             const currentDisplay = localConfig.material?.displayColumns || [];
                             const newDisplay = e.target.checked
-                              ? [...currentDisplay, { column: col, label: col }]
-                              : currentDisplay.filter((d) => d.column !== col);
+                              ? [...currentDisplay, { column: col.column_name, label: col.column_name }]
+                              : currentDisplay.filter((d) => d.column !== col.column_name);
                             handleMaterialChange("displayColumns", newDisplay);
                           }}
                           className="h-3 w-3 shrink-0"
                         />
-                        <span className="w-20 shrink-0 text-[10px]">{col}</span>
+                        <div className="flex w-24 shrink-0 flex-col">
+                          <span className="text-[10px]">{col.column_name}</span>
+                          {col.description && (
+                            <span className="text-muted-foreground text-[8px]">{col.description}</span>
+                          )}
+                        </div>
                         {isSelected && (
                           <Input
-                            value={displayItem?.label || col}
+                            value={displayItem?.label ?? ""}
                             onChange={(e) => {
                               const currentDisplay = localConfig.material?.displayColumns || [];
                               const newDisplay = currentDisplay.map((d) =>
-                                d.column === col ? { ...d, label: e.target.value } : d,
+                                d.column === col.column_name ? { ...d, label: e.target.value } : d,
                               );
                               handleMaterialChange("displayColumns", newDisplay);
                             }}
@@ -545,6 +795,15 @@ export default function HierarchyConfigPanel({
               </div>
             </>
           )}
+
+          {localConfig.material?.tableName &&
+            !columnsCache[localConfig.material.tableName] &&
+            loadingColumns && (
+              <div className="flex items-center gap-2 pt-2 text-[10px] text-muted-foreground">
+                <Loader2 className="h-3 w-3 animate-spin" />
+                <span>컬럼 정보를 불러오는 중입니다...</span>
+              </div>
+          )}
         </CardContent>
       </Card>
 

frontend/components/admin/dashboard/widgets/yard-3d/Yard3DCanvas.tsx

@@ -35,6 +35,9 @@ interface Yard3DCanvasProps {
   gridSize?: number; // 그리드 크기 (기본값: 5)
   onCollisionDetected?: () => void; // 충돌 감지 시 콜백
   focusOnPlacementId?: number | null; // 카메라가 포커스할 요소 ID
+  previewTool?: string | null; // 드래그 중인 도구 타입
+  previewPosition?: { x: number; z: number } | null; // 프리뷰 위치
+  onPreviewPositionUpdate?: (position: { x: number; z: number } | null) => void;
 }
 
 // 좌표를 그리드 칸의 중심에 스냅 (마인크래프트 스타일)
@@ -442,20 +445,79 @@ function MaterialBox({
               </>
             )}
 
-            {/* Area 이름 텍스트 */}
+            {/* Area 이름 텍스트 - 위쪽 (바닥) */}
             {placement.name && (
-              <Text
-                position={[0, 0.15, 0]}
-                rotation={[-Math.PI / 2, 0, 0]}
-                fontSize={Math.min(boxWidth, boxDepth) * 0.2}
-                color={placement.color}
-                anchorX="center"
-                anchorY="middle"
-                outlineWidth={0.05}
-                outlineColor="#000000"
-              >
-                {placement.name}
-              </Text>
+              <>
+                <Text
+                  position={[0, 0.15, 0]}
+                  rotation={[-Math.PI / 2, 0, 0]}
+                  fontSize={Math.min(boxWidth, boxDepth) * 0.2}
+                  color={placement.color}
+                  anchorX="center"
+                  anchorY="middle"
+                  outlineWidth={0.05}
+                  outlineColor="#000000"
+                >
+                  {placement.name}
+                </Text>
+
+                {/* 4면에 텍스트 표시 */}
+                {/* 앞면 (+Z) */}
+                <Text
+                  position={[0, boxHeight / 2, boxDepth / 2 + 0.01]}
+                  rotation={[0, 0, 0]}
+                  fontSize={Math.min(boxWidth, boxHeight) * 0.3}
+                  color="#ffffff"
+                  anchorX="center"
+                  anchorY="middle"
+                  outlineWidth={0.08}
+                  outlineColor="#000000"
+                >
+                  {placement.name}
+                </Text>
+
+                {/* 뒷면 (-Z) */}
+                <Text
+                  position={[0, boxHeight / 2, -boxDepth / 2 - 0.01]}
+                  rotation={[0, Math.PI, 0]}
+                  fontSize={Math.min(boxWidth, boxHeight) * 0.3}
+                  color="#ffffff"
+                  anchorX="center"
+                  anchorY="middle"
+                  outlineWidth={0.08}
+                  outlineColor="#000000"
+                >
+                  {placement.name}
+                </Text>
+
+                {/* 왼쪽면 (-X) */}
+                <Text
+                  position={[-boxWidth / 2 - 0.01, boxHeight / 2, 0]}
+                  rotation={[0, -Math.PI / 2, 0]}
+                  fontSize={Math.min(boxDepth, boxHeight) * 0.3}
+                  color="#ffffff"
+                  anchorX="center"
+                  anchorY="middle"
+                  outlineWidth={0.08}
+                  outlineColor="#000000"
+                >
+                  {placement.name}
+                </Text>
+
+                {/* 오른쪽면 (+X) */}
+                <Text
+                  position={[boxWidth / 2 + 0.01, boxHeight / 2, 0]}
+                  rotation={[0, Math.PI / 2, 0]}
+                  fontSize={Math.min(boxDepth, boxHeight) * 0.3}
+                  color="#ffffff"
+                  anchorX="center"
+                  anchorY="middle"
+                  outlineWidth={0.08}
+                  outlineColor="#000000"
+                >
+                  {placement.name}
+                </Text>
+              </>
             )}
           </>
         );
@@ -1007,10 +1069,26 @@ function Scene({
   gridSize = 5,
   onCollisionDetected,
   focusOnPlacementId,
+  previewTool,
+  previewPosition,
 }: Yard3DCanvasProps) {
   const [isDraggingAny, setIsDraggingAny] = useState(false);
   const orbitControlsRef = useRef<any>(null);
 
+  // 프리뷰 박스 크기 계산
+  const getPreviewSize = (tool: string) => {
+    if (tool === "area") return { x: 20, y: 0.1, z: 20 };
+    return { x: 5, y: 5, z: 5 };
+  };
+
+  // 프리뷰 박스 색상
+  const getPreviewColor = (tool: string) => {
+    if (tool === "area") return "#3b82f6";
+    if (tool === "location-bed") return "#10b981";
+    if (tool === "location-stp") return "#f59e0b";
+    return "#9ca3af";
+  };
+
   return (
     <>
       {/* 카메라 포커스 컨트롤러 */}
@@ -1069,6 +1147,30 @@ function Scene({
         />
       ))}
 
+      {/* 드래그 프리뷰 박스 */}
+      {previewTool && previewPosition && (
+        <Box
+          args={[
+            getPreviewSize(previewTool).x,
+            getPreviewSize(previewTool).y,
+            getPreviewSize(previewTool).z,
+          ]}
+          position={[
+            previewPosition.x,
+            previewTool === "area" ? 0.05 : getPreviewSize(previewTool).y / 2,
+            previewPosition.z,
+          ]}
+        >
+          <meshStandardMaterial
+            color={getPreviewColor(previewTool)}
+            transparent
+            opacity={0.4}
+            roughness={0.5}
+            metalness={0.1}
+          />
+        </Box>
+      )}
+
       {/* 카메라 컨트롤 */}
       <OrbitControls
         ref={orbitControlsRef}
@@ -1095,6 +1197,9 @@ export default function Yard3DCanvas({
   gridSize = 5,
   onCollisionDetected,
   focusOnPlacementId,
+  previewTool,
+  previewPosition,
+  onPreviewPositionUpdate,
 }: Yard3DCanvasProps) {
   const handleCanvasClick = (e: any) => {
     // Canvas의 빈 공간을 클릭했을 때만 선택 해제
@@ -1123,6 +1228,8 @@ export default function Yard3DCanvas({
             gridSize={gridSize}
             onCollisionDetected={onCollisionDetected}
             focusOnPlacementId={focusOnPlacementId}
+            previewTool={previewTool}
+            previewPosition={previewPosition}
           />
         </Suspense>
       </Canvas>

frontend/components/admin/dashboard/widgets/yard-3d/YardLayoutCreateModal.tsx

@@ -68,15 +68,15 @@ export default function YardLayoutCreateModal({ isOpen, onClose, onCreate }: Yar
       <ResizableDialogContent className="sm:max-w-[500px]" onPointerDown={(e) => e.stopPropagation()}>
         <ResizableDialogHeader>
           <div className="flex items-center gap-2">
-            <ResizableDialogTitle>새 야드 생성</ResizableDialogTitle>
-            <ResizableDialogDescription>야드 이름을 입력하세요</ResizableDialogDescription>
+            <ResizableDialogTitle>새로운 3D필드 생성</ResizableDialogTitle>
+            <ResizableDialogDescription>필드 이름을 입력하세요</ResizableDialogDescription>
           </div>
         </ResizableDialogHeader>
 
         <div className="space-y-4 py-4">
           <div className="space-y-2">
             <Label htmlFor="yard-name">
-              야드 이름 <span className="text-destructive">*</span>
+              필드 이름 <span className="text-destructive">*</span>
             </Label>
             <Input
               id="yard-name"
@@ -86,7 +86,7 @@ export default function YardLayoutCreateModal({ isOpen, onClose, onCreate }: Yar
                 setError("");
               }}
               onKeyDown={handleKeyDown}
-              placeholder="예: A구역, 1번 야드"
+              placeholder="예: A 공장"
               disabled={isCreating}
               autoFocus
             />

frontend/components/admin/dashboard/widgets/yard-3d/constants.ts

@@ -0,0 +1,30 @@
+/**
+ * 디지털 트윈 3D 야드 - 공통 상수
+ */
+
+// 객체 타입별 색상 매핑 (HEX 코드)
+export const OBJECT_COLORS: Record<string, string> = {
+  area: "#3b82f6", // 파란색
+  "location-bed": "#2563eb", // 진한 파란색
+  "location-stp": "#6b7280", // 회색
+  "location-temp": "#f59e0b", // 주황색
+  "location-dest": "#10b981", // 초록색
+  "crane-mobile": "#8b5cf6", // 보라색
+  rack: "#ef4444", // 빨간색
+};
+
+// Tailwind 색상 클래스 매핑 (아이콘용)
+export const OBJECT_COLOR_CLASSES: Record<string, string> = {
+  area: "text-blue-500",
+  "location-bed": "text-blue-600",
+  "location-stp": "text-gray-500",
+  "location-temp": "text-orange-500",
+  "location-dest": "text-emerald-500",
+  "crane-mobile": "text-purple-500",
+  rack: "text-red-500",
+};
+
+// 기본 색상
+export const DEFAULT_COLOR = "#3b82f6";
+export const DEFAULT_COLOR_CLASS = "text-blue-500";
+

frontend/components/admin/dashboard/widgets/yard-3d/spatialContainment.ts

@@ -163,3 +163,4 @@ export function getAllDescendants(
 }
 
 
+

frontend/components/admin/dashboard/widgets/yard-3d/types.ts

@@ -1,4 +1,4 @@
-// 야드 관리 3D - 타입 정의
+// 3D 필드 - 타입 정의
 
 import { ChartDataSource } from "../../types";
 

frontend/components/common/ScreenModal.tsx

@@ -57,16 +57,18 @@ export const ScreenModal: React.FC<ScreenModalProps> = ({ className }) => {
   // 폼 데이터 상태 추가
   const [formData, setFormData] = useState<Record<string, any>>({});
 
-  // 연속 등록 모드 상태 (localStorage에 저장하여 리렌더링에 영향받지 않도록)
-  const continuousModeRef = useRef(false);
-  const [, setForceUpdate] = useState(0); // 강제 리렌더링용 (값은 사용하지 않음)
+  // 연속 등록 모드 상태 (state로 변경 - 체크박스 UI 업데이트를 위해)
+  const [continuousMode, setContinuousMode] = useState(false);
+  
+  // 화면 리셋 키 (컴포넌트 강제 리마운트용)
+  const [resetKey, setResetKey] = useState(0);
 
   // localStorage에서 연속 모드 상태 복원
   useEffect(() => {
     const savedMode = localStorage.getItem("screenModal_continuousMode");
     if (savedMode === "true") {
-      continuousModeRef.current = true;
-      // console.log("🔄 연속 모드 복원: true");
+      setContinuousMode(true);
+      console.log("🔄 연속 모드 복원: true");
     }
   }, []);
 
@@ -162,29 +164,39 @@ export const ScreenModal: React.FC<ScreenModalProps> = ({ className }) => {
       });
       setScreenData(null);
       setFormData({});
-      continuousModeRef.current = false;
+      setContinuousMode(false);
       localStorage.setItem("screenModal_continuousMode", "false"); // localStorage에 저장
-      // console.log("🔄 연속 모드 초기화: false");
+      console.log("🔄 연속 모드 초기화: false");
     };
 
     // 저장 성공 이벤트 처리 (연속 등록 모드 지원)
     const handleSaveSuccess = () => {
-      const isContinuousMode = continuousModeRef.current;
-      // console.log("💾 저장 성공 이벤트 수신");
-      // console.log("📌 현재 연속 모드 상태 (ref):", isContinuousMode);
-      // console.log("📌 localStorage:", localStorage.getItem("screenModal_continuousMode"));
+      const isContinuousMode = continuousMode;
+      console.log("💾 저장 성공 이벤트 수신");
+      console.log("📌 현재 연속 모드 상태:", isContinuousMode);
+      console.log("📌 localStorage:", localStorage.getItem("screenModal_continuousMode"));
 
       if (isContinuousMode) {
         // 연속 모드: 폼만 초기화하고 모달은 유지
-        // console.log("✅ 연속 모드 활성화 - 폼만 초기화");
+        console.log("✅ 연속 모드 활성화 - 폼 초기화 및 화면 리셋");
 
-        // 폼만 초기화 (연속 모드 상태는 localStorage에 저장되어 있으므로 유지됨)
+        // 1. 폼 데이터 초기화
         setFormData({});
+        
+        // 2. 리셋 키 변경 (컴포넌트 강제 리마운트)
+        setResetKey(prev => prev + 1);
+        console.log("🔄 resetKey 증가 - 컴포넌트 리마운트");
+        
+        // 3. 화면 데이터 다시 로드 (채번 규칙 새로 생성)
+        if (modalState.screenId) {
+          console.log("🔄 화면 데이터 다시 로드:", modalState.screenId);
+          loadScreenData(modalState.screenId);
+        }
 
         toast.success("저장되었습니다. 계속 입력하세요.");
       } else {
         // 일반 모드: 모달 닫기
-        // console.log("❌ 일반 모드 - 모달 닫기");
+        console.log("❌ 일반 모드 - 모달 닫기");
         handleCloseModal();
       }
     };
@@ -198,7 +210,7 @@ export const ScreenModal: React.FC<ScreenModalProps> = ({ className }) => {
       window.removeEventListener("closeSaveModal", handleCloseModal);
       window.removeEventListener("saveSuccessInModal", handleSaveSuccess);
     };
-  }, []); // 의존성 제거 (ref 사용으로 최신 상태 참조)
+  }, [continuousMode]); // continuousMode 의존성 추가
 
   // 화면 데이터 로딩
   useEffect(() => {
@@ -415,18 +427,21 @@ export const ScreenModal: React.FC<ScreenModalProps> = ({ className }) => {
     setFormData({}); // 폼 데이터 초기화
   };
 
-  // 모달 크기 설정 - 화면 내용에 맞게 동적 조정
+  // 모달 크기 설정 - 화면관리 설정 크기 + 헤더/푸터
   const getModalStyle = () => {
     if (!screenDimensions) {
       return {
         className: "w-fit min-w-[400px] max-w-4xl max-h-[90vh] overflow-hidden p-0",
-        style: {},
+        style: undefined, // undefined로 변경 - defaultWidth/defaultHeight 사용
       };
     }
 
-    // 헤더 높이를 최소화 (제목 영역만)
-    const headerHeight = 60; // DialogHeader 최소 높이 (타이틀 + 최소 패딩)
-    const totalHeight = screenDimensions.height + headerHeight;
+    // 화면관리에서 설정한 크기 = 컨텐츠 영역 크기
+    // 실제 모달 크기 = 컨텐츠 + 헤더 + 연속등록 체크박스
+    const headerHeight = 60; // DialogHeader (타이틀 + 패딩)
+    const footerHeight = 52; // 연속 등록 모드 체크박스 영역
+    
+    const totalHeight = screenDimensions.height + headerHeight + footerHeight;
 
     return {
       className: "overflow-hidden p-0",
@@ -504,7 +519,7 @@ export const ScreenModal: React.FC<ScreenModalProps> = ({ className }) => {
     <ResizableDialog open={modalState.isOpen} onOpenChange={handleClose}>
       <ResizableDialogContent
         className={`${modalStyle.className} ${className || ""}`}
-        style={modalStyle.style}
+        {...(modalStyle.style && { style: modalStyle.style })} // undefined일 때는 prop 자체를 전달하지 않음
         defaultWidth={600}
         defaultHeight={800}
         minWidth={500}
@@ -530,7 +545,7 @@ export const ScreenModal: React.FC<ScreenModalProps> = ({ className }) => {
           </div>
         </ResizableDialogHeader>
 
-        <div className="flex-1 overflow-auto p-6">
+        <div className="flex-1 overflow-auto">
           {loading ? (
             <div className="flex h-full items-center justify-center">
               <div className="text-center">
@@ -568,7 +583,7 @@ export const ScreenModal: React.FC<ScreenModalProps> = ({ className }) => {
 
                   return (
                     <InteractiveScreenViewerDynamic
-                      key={component.id}
+                      key={`${component.id}-${resetKey}`}
                       component={adjustedComponent}
                       allComponents={screenData.components}
                       formData={formData}
@@ -607,13 +622,12 @@ export const ScreenModal: React.FC<ScreenModalProps> = ({ className }) => {
           <div className="flex items-center gap-2">
             <Checkbox
               id="continuous-mode"
-              checked={continuousModeRef.current}
+              checked={continuousMode}
               onCheckedChange={(checked) => {
                 const isChecked = checked === true;
-                continuousModeRef.current = isChecked;
+                setContinuousMode(isChecked);
                 localStorage.setItem("screenModal_continuousMode", String(isChecked));
-                setForceUpdate((prev) => prev + 1); // 체크박스 UI 업데이트를 위한 강제 리렌더링
-                // console.log("🔄 연속 모드 변경:", isChecked);
+                console.log("🔄 연속 모드 변경:", isChecked);
               }}
             />
             <Label htmlFor="continuous-mode" className="cursor-pointer text-sm font-normal select-none">

frontend/components/layout/AppLayout.tsx

@@ -470,7 +470,7 @@ function AppLayoutInner({ children }: AppLayoutProps) {
 
         {/* 가운데 컨텐츠 영역 - 스크롤 가능 */}
         <main className="h-[calc(100vh-3.5rem)] min-w-0 flex-1 overflow-auto bg-white">
-          <div className="h-full w-full p-4">{children}</div>
+          {children}
         </main>
       </div>
 

frontend/components/screen/EditModal.tsx

@@ -24,6 +24,8 @@ interface EditModalState {
   modalSize: "sm" | "md" | "lg" | "xl";
   editData: Record<string, any>;
   onSave?: () => void;
+  groupByColumns?: string[]; // 🆕 그룹핑 컬럼 (예: ["order_no"])
+  tableName?: string; // 🆕 테이블명 (그룹 조회용)
 }
 
 interface EditModalProps {
@@ -40,6 +42,8 @@ export const EditModal: React.FC<EditModalProps> = ({ className }) => {
     modalSize: "md",
     editData: {},
     onSave: undefined,
+    groupByColumns: undefined,
+    tableName: undefined,
   });
 
   const [screenData, setScreenData] = useState<{
@@ -58,6 +62,10 @@ export const EditModal: React.FC<EditModalProps> = ({ className }) => {
   // 폼 데이터 상태 (편집 데이터로 초기화됨)
   const [formData, setFormData] = useState<Record<string, any>>({});
   const [originalData, setOriginalData] = useState<Record<string, any>>({});
+  
+  // 🆕 그룹 데이터 상태 (같은 order_no의 모든 품목)
+  const [groupData, setGroupData] = useState<Record<string, any>[]>([]);
+  const [originalGroupData, setOriginalGroupData] = useState<Record<string, any>[]>([]);
 
   // 화면의 실제 크기 계산 함수 (ScreenModal과 동일)
   const calculateScreenDimensions = (components: ComponentData[]) => {
@@ -92,25 +100,25 @@ export const EditModal: React.FC<EditModalProps> = ({ className }) => {
     const contentWidth = maxX - minX;
     const contentHeight = maxY - minY;
 
-    // 적절한 여백 추가
-    const paddingX = 40;
-    const paddingY = 40;
+    // 적절한 여백 추가 (주석처리 - 사용자 설정 크기 그대로 사용)
+    // const paddingX = 40;
+    // const paddingY = 40;
 
-    const finalWidth = Math.max(contentWidth + paddingX, 400);
-    const finalHeight = Math.max(contentHeight + paddingY, 300);
+    const finalWidth = Math.max(contentWidth, 400); // padding 제거
+    const finalHeight = Math.max(contentHeight, 300); // padding 제거
 
     return {
       width: Math.min(finalWidth, window.innerWidth * 0.95),
       height: Math.min(finalHeight, window.innerHeight * 0.9),
-      offsetX: Math.max(0, minX - paddingX / 2),
-      offsetY: Math.max(0, minY - paddingY / 2),
+      offsetX: Math.max(0, minX), // paddingX 제거
+      offsetY: Math.max(0, minY), // paddingY 제거
     };
   };
 
   // 전역 모달 이벤트 리스너
   useEffect(() => {
     const handleOpenEditModal = (event: CustomEvent) => {
-      const { screenId, title, description, modalSize, editData, onSave } = event.detail;
+      const { screenId, title, description, modalSize, editData, onSave, groupByColumns, tableName } = event.detail;
 
       setModalState({
         isOpen: true,
@@ -120,6 +128,8 @@ export const EditModal: React.FC<EditModalProps> = ({ className }) => {
         modalSize: modalSize || "lg",
         editData: editData || {},
         onSave,
+        groupByColumns, // 🆕 그룹핑 컬럼
+        tableName, // 🆕 테이블명
       });
 
       // 편집 데이터로 폼 데이터 초기화
@@ -154,9 +164,78 @@ export const EditModal: React.FC<EditModalProps> = ({ className }) => {
   useEffect(() => {
     if (modalState.isOpen && modalState.screenId) {
       loadScreenData(modalState.screenId);
+      
+      // 🆕 그룹 데이터 조회 (groupByColumns가 있는 경우)
+      if (modalState.groupByColumns && modalState.groupByColumns.length > 0 && modalState.tableName) {
+        loadGroupData();
+      }
     }
   }, [modalState.isOpen, modalState.screenId]);
 
+  // 🆕 그룹 데이터 조회 함수
+  const loadGroupData = async () => {
+    if (!modalState.tableName || !modalState.groupByColumns || modalState.groupByColumns.length === 0) {
+      console.warn("테이블명 또는 그룹핑 컬럼이 없습니다.");
+      return;
+    }
+
+    try {
+      console.log("🔍 그룹 데이터 조회 시작:", {
+        tableName: modalState.tableName,
+        groupByColumns: modalState.groupByColumns,
+        editData: modalState.editData,
+      });
+
+      // 그룹핑 컬럼 값 추출 (예: order_no = "ORD-20251124-001")
+      const groupValues: Record<string, any> = {};
+      modalState.groupByColumns.forEach((column) => {
+        if (modalState.editData[column]) {
+          groupValues[column] = modalState.editData[column];
+        }
+      });
+
+      if (Object.keys(groupValues).length === 0) {
+        console.warn("그룹핑 컬럼 값이 없습니다:", modalState.groupByColumns);
+        return;
+      }
+
+      console.log("🔍 그룹 조회 요청:", {
+        tableName: modalState.tableName,
+        groupValues,
+      });
+
+      // 같은 그룹의 모든 레코드 조회 (entityJoinApi 사용)
+      const { entityJoinApi } = await import("@/lib/api/entityJoin");
+      const response = await entityJoinApi.getTableDataWithJoins(modalState.tableName, {
+        page: 1,
+        size: 1000,
+        search: groupValues, // search 파라미터로 전달 (백엔드에서 WHERE 조건으로 처리)
+        enableEntityJoin: true,
+      });
+
+      console.log("🔍 그룹 조회 응답:", response);
+
+      // entityJoinApi는 배열 또는 { data: [] } 형식으로 반환
+      const dataArray = Array.isArray(response) ? response : response?.data || [];
+
+      if (dataArray.length > 0) {
+        console.log("✅ 그룹 데이터 조회 성공:", dataArray);
+        setGroupData(dataArray);
+        setOriginalGroupData(JSON.parse(JSON.stringify(dataArray))); // Deep copy
+        toast.info(`${dataArray.length}개의 관련 품목을 불러왔습니다.`);
+      } else {
+        console.warn("그룹 데이터가 없습니다:", response);
+        setGroupData([modalState.editData]); // 기본값: 선택된 행만
+        setOriginalGroupData([JSON.parse(JSON.stringify(modalState.editData))]);
+      }
+    } catch (error: any) {
+      console.error("❌ 그룹 데이터 조회 오류:", error);
+      toast.error("관련 데이터를 불러오는 중 오류가 발생했습니다.");
+      setGroupData([modalState.editData]); // 기본값: 선택된 행만
+      setOriginalGroupData([JSON.parse(JSON.stringify(modalState.editData))]);
+    }
+  };
+
   const loadScreenData = async (screenId: number) => {
     try {
       setLoading(true);
@@ -208,10 +287,14 @@ export const EditModal: React.FC<EditModalProps> = ({ className }) => {
       modalSize: "md",
       editData: {},
       onSave: undefined,
+      groupByColumns: undefined,
+      tableName: undefined,
     });
     setScreenData(null);
     setFormData({});
     setOriginalData({});
+    setGroupData([]); // 🆕
+    setOriginalGroupData([]); // 🆕
   };
 
   // 저장 버튼 클릭 시 - UPDATE 액션 실행
@@ -222,7 +305,214 @@ export const EditModal: React.FC<EditModalProps> = ({ className }) => {
     }
 
     try {
-      // 변경된 필드만 추출
+      // 🆕 그룹 데이터가 있는 경우: 모든 품목 일괄 처리 (추가/수정/삭제)
+      if (groupData.length > 0 || originalGroupData.length > 0) {
+        console.log("🔄 그룹 데이터 일괄 처리 시작:", {
+          groupDataLength: groupData.length,
+          originalGroupDataLength: originalGroupData.length,
+          groupData,
+          originalGroupData,
+          tableName: screenData.screenInfo.tableName,
+          screenId: modalState.screenId,
+        });
+
+        let insertedCount = 0;
+        let updatedCount = 0;
+        let deletedCount = 0;
+
+        // 1️⃣ 신규 품목 추가 (id가 없는 항목)
+        for (const currentData of groupData) {
+          if (!currentData.id) {
+            console.log("➕ 신규 품목 추가:", currentData);
+            console.log("📋 [신규 품목] currentData 키 목록:", Object.keys(currentData));
+
+            // 🆕 모든 데이터를 포함 (id 제외)
+            const insertData: Record<string, any> = { ...currentData };
+            console.log("📦 [신규 품목] 복사 직후 insertData:", insertData);
+            console.log("📋 [신규 품목] insertData 키 목록:", Object.keys(insertData));
+            
+            delete insertData.id; // id는 자동 생성되므로 제거
+
+            // 🆕 groupByColumns의 값을 강제로 포함 (order_no 등)
+            if (modalState.groupByColumns && modalState.groupByColumns.length > 0) {
+              modalState.groupByColumns.forEach((colName) => {
+                // 기존 품목(originalGroupData[0])에서 groupByColumns 값 가져오기
+                const referenceData = originalGroupData[0] || groupData.find((item) => item.id);
+                if (referenceData && referenceData[colName]) {
+                  insertData[colName] = referenceData[colName];
+                  console.log(`🔑 [신규 품목] ${colName} 값 추가:`, referenceData[colName]);
+                }
+              });
+            }
+
+            // 🆕 공통 필드 추가 (거래처, 담당자, 납품처, 메모 등)
+            // formData에서 품목별 필드가 아닌 공통 필드를 복사
+            const commonFields = [
+              'partner_id',           // 거래처
+              'manager_id',           // 담당자
+              'delivery_partner_id',  // 납품처
+              'delivery_address',     // 납품장소
+              'memo',                 // 메모
+              'order_date',           // 주문일
+              'due_date',             // 납기일
+              'shipping_method',      // 배송방법
+              'status',               // 상태
+              'sales_type',           // 영업유형
+            ];
+
+            commonFields.forEach((fieldName) => {
+              // formData에 값이 있으면 추가
+              if (formData[fieldName] !== undefined && formData[fieldName] !== null) {
+                insertData[fieldName] = formData[fieldName];
+                console.log(`🔗 [공통 필드] ${fieldName} 값 추가:`, formData[fieldName]);
+              }
+            });
+
+            console.log("📦 [신규 품목] 최종 insertData:", insertData);
+            console.log("📋 [신규 품목] 최종 insertData 키 목록:", Object.keys(insertData));
+
+            try {
+              const response = await dynamicFormApi.saveFormData({
+                screenId: modalState.screenId || 0,
+                tableName: screenData.screenInfo.tableName,
+                data: insertData,
+              });
+
+              if (response.success) {
+                insertedCount++;
+                console.log("✅ 신규 품목 추가 성공:", response.data);
+              } else {
+                console.error("❌ 신규 품목 추가 실패:", response.message);
+              }
+            } catch (error: any) {
+              console.error("❌ 신규 품목 추가 오류:", error);
+            }
+          }
+        }
+
+        // 2️⃣ 기존 품목 수정 (id가 있는 항목)
+        for (const currentData of groupData) {
+          if (currentData.id) {
+            // id 기반 매칭 (인덱스 기반 X)
+            const originalItemData = originalGroupData.find(
+              (orig) => orig.id === currentData.id
+            );
+
+            if (!originalItemData) {
+              console.warn(`원본 데이터를 찾을 수 없습니다 (id: ${currentData.id})`);
+              continue;
+            }
+
+            // 🆕 값 정규화 함수 (타입 통일)
+            const normalizeValue = (val: any): any => {
+              if (val === null || val === undefined || val === "") return null;
+              if (typeof val === "string" && !isNaN(Number(val))) {
+                // 숫자로 변환 가능한 문자열은 숫자로
+                return Number(val);
+              }
+              return val;
+            };
+
+            // 변경된 필드만 추출 (id 제외)
+            const changedData: Record<string, any> = {};
+            Object.keys(currentData).forEach((key) => {
+              // id는 변경 불가
+              if (key === "id") {
+                return;
+              }
+
+              // 🆕 타입 정규화 후 비교
+              const currentValue = normalizeValue(currentData[key]);
+              const originalValue = normalizeValue(originalItemData[key]);
+
+              // 값이 변경된 경우만 포함
+              if (currentValue !== originalValue) {
+                console.log(`🔍 [품목 수정 감지] ${key}: ${originalValue} → ${currentValue}`);
+                changedData[key] = currentData[key]; // 원본 값 사용 (문자열 그대로)
+              }
+            });
+
+            // 변경사항이 없으면 스킵
+            if (Object.keys(changedData).length === 0) {
+              console.log(`변경사항 없음 (id: ${currentData.id})`);
+              continue;
+            }
+
+            // UPDATE 실행
+            try {
+              const response = await dynamicFormApi.updateFormDataPartial(
+                currentData.id,
+                originalItemData,
+                changedData,
+                screenData.screenInfo.tableName,
+              );
+
+              if (response.success) {
+                updatedCount++;
+                console.log(`✅ 품목 수정 성공 (id: ${currentData.id})`);
+              } else {
+                console.error(`❌ 품목 수정 실패 (id: ${currentData.id}):`, response.message);
+              }
+            } catch (error: any) {
+              console.error(`❌ 품목 수정 오류 (id: ${currentData.id}):`, error);
+            }
+          }
+        }
+
+        // 3️⃣ 삭제된 품목 제거 (원본에는 있지만 현재 데이터에는 없는 항목)
+        const currentIds = new Set(groupData.map((item) => item.id).filter(Boolean));
+        const deletedItems = originalGroupData.filter(
+          (orig) => orig.id && !currentIds.has(orig.id)
+        );
+
+        for (const deletedItem of deletedItems) {
+          console.log("🗑️ 품목 삭제:", deletedItem);
+
+          try {
+            const response = await dynamicFormApi.deleteFormDataFromTable(
+              deletedItem.id,
+              screenData.screenInfo.tableName
+            );
+
+            if (response.success) {
+              deletedCount++;
+              console.log(`✅ 품목 삭제 성공 (id: ${deletedItem.id})`);
+            } else {
+              console.error(`❌ 품목 삭제 실패 (id: ${deletedItem.id}):`, response.message);
+            }
+          } catch (error: any) {
+            console.error(`❌ 품목 삭제 오류 (id: ${deletedItem.id}):`, error);
+          }
+        }
+
+        // 결과 메시지
+        const messages: string[] = [];
+        if (insertedCount > 0) messages.push(`${insertedCount}개 추가`);
+        if (updatedCount > 0) messages.push(`${updatedCount}개 수정`);
+        if (deletedCount > 0) messages.push(`${deletedCount}개 삭제`);
+
+        if (messages.length > 0) {
+          toast.success(`품목이 저장되었습니다 (${messages.join(", ")})`);
+
+          // 부모 컴포넌트의 onSave 콜백 실행 (테이블 새로고침)
+          if (modalState.onSave) {
+            try {
+              modalState.onSave();
+            } catch (callbackError) {
+              console.error("⚠️ onSave 콜백 에러:", callbackError);
+            }
+          }
+
+          handleClose();
+        } else {
+          toast.info("변경된 내용이 없습니다.");
+          handleClose();
+        }
+
+        return;
+      }
+
+      // 기존 로직: 단일 레코드 수정
       const changedData: Record<string, any> = {};
       Object.keys(formData).forEach((key) => {
         if (formData[key] !== originalData[key]) {
@@ -269,16 +559,18 @@ export const EditModal: React.FC<EditModalProps> = ({ className }) => {
     }
   };
 
-  // 모달 크기 설정 - ScreenModal과 동일
+  // 모달 크기 설정 - 화면관리 설정 크기 + 헤더
   const getModalStyle = () => {
     if (!screenDimensions) {
       return {
         className: "w-fit min-w-[400px] max-w-4xl max-h-[90vh] overflow-hidden p-0",
-        style: {},
+        style: undefined, // undefined로 변경 - defaultWidth/defaultHeight 사용
       };
     }
 
-    const headerHeight = 60;
+    // 화면관리에서 설정한 크기 = 컨텐츠 영역 크기
+    // 실제 모달 크기 = 컨텐츠 + 헤더
+    const headerHeight = 60; // DialogHeader
     const totalHeight = screenDimensions.height + headerHeight;
 
     return {
@@ -339,6 +631,13 @@ export const EditModal: React.FC<EditModalProps> = ({ className }) => {
                 maxHeight: "100%",
               }}
             >
+              {/* 🆕 그룹 데이터가 있으면 안내 메시지 표시 */}
+              {groupData.length > 1 && (
+                <div className="absolute left-4 top-4 z-10 rounded-md bg-blue-50 px-3 py-2 text-xs text-blue-700 shadow-sm">
+                  {groupData.length}개의 관련 품목을 함께 수정합니다
+                </div>
+              )}
+
               {screenData.components.map((component) => {
                 // 컴포넌트 위치를 offset만큼 조정
                 const offsetX = screenDimensions?.offsetX || 0;
@@ -353,23 +652,54 @@ export const EditModal: React.FC<EditModalProps> = ({ className }) => {
                   },
                 };
 
+                // 🔍 디버깅: 컴포넌트 렌더링 시점의 groupData 확인
+                if (component.id === screenData.components[0]?.id) {
+                  console.log("🔍 [EditModal] InteractiveScreenViewerDynamic props:", {
+                    componentId: component.id,
+                    groupDataLength: groupData.length,
+                    groupData: groupData,
+                    formData: groupData.length > 0 ? groupData[0] : formData,
+                  });
+                }
+
                 return (
                   <InteractiveScreenViewerDynamic
                     key={component.id}
                     component={adjustedComponent}
                     allComponents={screenData.components}
-                    formData={formData}
+                    formData={groupData.length > 0 ? groupData[0] : formData}
                     onFormDataChange={(fieldName, value) => {
+                      // 🆕 그룹 데이터가 있으면 처리
+                      if (groupData.length > 0) {
+                        // ModalRepeaterTable의 경우 배열 전체를 받음
+                        if (Array.isArray(value)) {
+                          setGroupData(value);
+                        } else {
+                          // 일반 필드는 모든 항목에 동일하게 적용
+                          setGroupData((prev) =>
+                            prev.map((item) => ({
+                              ...item,
+                              [fieldName]: value,
+                            }))
+                          );
+                        }
+                      } else {
                       setFormData((prev) => ({
                         ...prev,
                         [fieldName]: value,
                       }));
+                      }
                     }}
                     screenInfo={{
                       id: modalState.screenId!,
                       tableName: screenData.screenInfo?.tableName,
                     }}
                     onSave={handleSave}
+                    isInModal={true}
+                    // 🆕 그룹 데이터를 ModalRepeaterTable에 전달
+                    groupedData={groupData.length > 0 ? groupData : undefined}
+                    // 🆕 수정 모달에서 읽기 전용 필드 지정 (수주번호, 거래처)
+                    disabledFields={["order_no", "partner_id"]}
                   />
                 );
               })}

frontend/components/screen/InteractiveScreenViewer.tsx

@@ -346,6 +346,14 @@ export const InteractiveScreenViewer: React.FC<InteractiveScreenViewerProps> = (
 
   // 실제 사용 가능한 위젯 렌더링
   const renderInteractiveWidget = (comp: ComponentData) => {
+    console.log("🎯 renderInteractiveWidget 호출:", {
+      type: comp.type,
+      id: comp.id,
+      componentId: (comp as any).componentId,
+      hasComponentConfig: !!(comp as any).componentConfig,
+      componentConfig: (comp as any).componentConfig,
+    });
+
     // 데이터 테이블 컴포넌트 처리
     if (comp.type === "datatable") {
       return (
@@ -397,6 +405,39 @@ export const InteractiveScreenViewer: React.FC<InteractiveScreenViewerProps> = (
       );
     }
 
+    // 탭 컴포넌트 처리
+    const componentType = (comp as any).componentType || (comp as any).componentId;
+    if (comp.type === "tabs" || (comp.type === "component" && componentType === "tabs-widget")) {
+      const TabsWidget = require("@/components/screen/widgets/TabsWidget").TabsWidget;
+      
+      // componentConfig에서 탭 정보 추출
+      const tabsConfig = comp.componentConfig || {};
+      const tabsComponent = {
+        ...comp,
+        type: "tabs" as const,
+        tabs: tabsConfig.tabs || [],
+        defaultTab: tabsConfig.defaultTab,
+        orientation: tabsConfig.orientation || "horizontal",
+        variant: tabsConfig.variant || "default",
+        allowCloseable: tabsConfig.allowCloseable || false,
+        persistSelection: tabsConfig.persistSelection || false,
+      };
+      
+      console.log("🔍 탭 컴포넌트 렌더링:", {
+        originalType: comp.type,
+        componentType,
+        componentId: (comp as any).componentId,
+        tabs: tabsComponent.tabs,
+        tabsConfig,
+      });
+      
+      return (
+        <div className="h-full w-full">
+          <TabsWidget component={tabsComponent as any} />
+        </div>
+      );
+    }
+
     const { widgetType, label, placeholder, required, readonly, columnName } = comp;
     const fieldName = columnName || comp.id;
     const currentValue = formData[fieldName] || "";

frontend/components/screen/InteractiveScreenViewerDynamic.tsx

@@ -46,6 +46,12 @@ interface InteractiveScreenViewerProps {
   userId?: string;
   userName?: string;
   companyCode?: string;
+  // 🆕 그룹 데이터 (EditModal에서 전달)
+  groupedData?: Record<string, any>[];
+  // 🆕 비활성화할 필드 목록 (EditModal에서 전달)
+  disabledFields?: string[];
+  // 🆕 EditModal 내부인지 여부 (button-primary가 EditModal의 handleSave 사용하도록)
+  isInModal?: boolean;
 }
 
 export const InteractiveScreenViewerDynamic: React.FC<InteractiveScreenViewerProps> = ({
@@ -61,6 +67,9 @@ export const InteractiveScreenViewerDynamic: React.FC<InteractiveScreenViewerPro
   userId: externalUserId,
   userName: externalUserName,
   companyCode: externalCompanyCode,
+  groupedData,
+  disabledFields = [],
+  isInModal = false,
 }) => {
   const { isPreviewMode } = useScreenPreview(); // 프리뷰 모드 확인
   const { userName: authUserName, user: authUser } = useAuth();
@@ -326,12 +335,17 @@ export const InteractiveScreenViewerDynamic: React.FC<InteractiveScreenViewerPro
           userId={user?.userId} // ✅ 사용자 ID 전달
           userName={user?.userName} // ✅ 사용자 이름 전달
           companyCode={user?.companyCode} // ✅ 회사 코드 전달
+          onSave={onSave} // 🆕 EditModal의 handleSave 콜백 전달
           allComponents={allComponents} // 🆕 같은 화면의 모든 컴포넌트 전달 (TableList 자동 감지용)
           selectedRowsData={selectedRowsData}
           onSelectedRowsChange={(selectedRows, selectedData) => {
             console.log("🔍 테이블에서 선택된 행 데이터:", selectedData);
             setSelectedRowsData(selectedData);
           }}
+          // 🆕 그룹 데이터 전달 (EditModal → ModalRepeaterTable)
+          groupedData={groupedData}
+          // 🆕 비활성화 필드 전달 (EditModal → 각 컴포넌트)
+          disabledFields={disabledFields}
           flowSelectedData={flowSelectedData}
           flowSelectedStepId={flowSelectedStepId}
           onFlowSelectedDataChange={(selectedData, stepId) => {
@@ -396,6 +410,8 @@ export const InteractiveScreenViewerDynamic: React.FC<InteractiveScreenViewerPro
               required: required,
               placeholder: placeholder,
               className: "w-full h-full",
+              isInModal: isInModal, // 🆕 EditModal 내부 여부 전달
+              onSave: onSave, // 🆕 EditModal의 handleSave 콜백 전달
             }}
             config={widget.webTypeConfig}
             onEvent={(event: string, data: any) => {

frontend/components/screen/RealtimePreview.tsx

@@ -554,6 +554,73 @@ export const RealtimePreviewDynamic: React.FC<RealtimePreviewProps> = ({
             );
           })()}
 
+        {/* 탭 컴포넌트 타입 */}
+        {(type === "tabs" || (type === "component" && ((component as any).componentType === "tabs-widget" || (component as any).componentId === "tabs-widget"))) &&
+          (() => {
+            console.log("🎯 탭 컴포넌트 조건 충족:", {
+              type,
+              componentType: (component as any).componentType,
+              componentId: (component as any).componentId,
+              isDesignMode,
+            });
+
+            if (isDesignMode) {
+              // 디자인 모드: 미리보기 표시
+              const tabsComponent = component as any;
+              const tabs = tabsComponent.componentConfig?.tabs || tabsComponent.tabs || [];
+
+              return (
+                <div className="flex h-full w-full items-center justify-center rounded border-2 border-dashed border-gray-300 bg-gray-50">
+                  <div className="text-center">
+                    <div className="flex items-center justify-center">
+                      <Folder className="h-8 w-8 text-gray-400" />
+                    </div>
+                    <p className="text-muted-foreground mt-2 text-sm font-medium">탭 컴포넌트</p>
+                    <p className="text-xs text-gray-400">
+                      {tabs.length > 0
+                        ? `${tabs.length}개의 탭 (실제 화면에서 표시됩니다)`
+                        : "탭이 없습니다. 설정 패널에서 탭을 추가하세요"}
+                    </p>
+                    {tabs.length > 0 && (
+                      <div className="mt-2 flex flex-wrap justify-center gap-1">
+                        {tabs.map((tab: any, index: number) => (
+                          <Badge key={tab.id} variant="outline" className="text-xs">
+                            {tab.label || `탭 ${index + 1}`}
+                            {tab.screenName && (
+                              <span className="ml-1 text-[10px] text-gray-400">
+                                ({tab.screenName})
+                              </span>
+                            )}
+                          </Badge>
+                        ))}
+                      </div>
+                    )}
+                  </div>
+                </div>
+              );
+            } else {
+              // 실제 화면: TabsWidget 렌더링
+              const TabsWidget = require("@/components/screen/widgets/TabsWidget").TabsWidget;
+              const tabsConfig = (component as any).componentConfig || {};
+              const tabsComponent = {
+                ...component,
+                type: "tabs" as const,
+                tabs: tabsConfig.tabs || [],
+                defaultTab: tabsConfig.defaultTab,
+                orientation: tabsConfig.orientation || "horizontal",
+                variant: tabsConfig.variant || "default",
+                allowCloseable: tabsConfig.allowCloseable || false,
+                persistSelection: tabsConfig.persistSelection || false,
+              };
+
+              return (
+                <div className="h-full w-full">
+                  <TabsWidget component={tabsComponent as any} />
+                </div>
+              );
+            }
+          })()}
+
         {/* 그룹 타입 */}
         {type === "group" && (
           <div className="relative h-full w-full">

frontend/components/screen/ResponsiveDesignerContainer.tsx

@@ -35,9 +35,9 @@ export const ResponsiveDesignerContainer: React.FC<ResponsiveDesignerContainerPr
 
     switch (viewMode) {
       case "fit":
-        // 컨테이너에 맞춰 비율 유지하며 조정 (여백 허용)
-        const scaleX = (containerSize.width - 40) / designWidth;
-        const scaleY = (containerSize.height - 40) / designHeight;
+        // 컨테이너에 맞춰 비율 유지하며 조정 (좌우 여백 16px씩 유지)
+        const scaleX = (containerSize.width - 32) / designWidth;
+        const scaleY = (containerSize.height - 64) / designHeight;
         return Math.min(scaleX, scaleY, 2); // 최대 2배까지 허용
 
       case "custom":
@@ -154,7 +154,7 @@ export const ResponsiveDesignerContainer: React.FC<ResponsiveDesignerContainerPr
       {/* 디자인 영역 */}
       <div
         ref={containerRef}
-        className="flex-1 overflow-auto p-8"
+        className="flex-1 overflow-auto px-4 py-8"
         style={{
           justifyContent: "center",
           alignItems: "flex-start",

frontend/components/screen/SaveModal.tsx

@@ -216,10 +216,16 @@ export const SaveModal: React.FC<SaveModalProps> = ({
       return y + height;
     }));
 
-    const padding = 40;
+    // 컨텐츠 영역 크기 (화면관리 설정 크기)
+    const contentWidth = Math.max(maxX, 400);
+    const contentHeight = Math.max(maxY, 300);
+    
+    // 실제 모달 크기 = 컨텐츠 + 헤더
+    const headerHeight = 60; // DialogHeader
+    
     return {
-      width: Math.max(maxX + padding, 400),
-      height: Math.max(maxY + padding, 300),
+      width: contentWidth,
+      height: contentHeight + headerHeight, // 헤더 높이 포함
     };
   };
 
@@ -229,8 +235,12 @@ export const SaveModal: React.FC<SaveModalProps> = ({
     <ResizableDialog open={isOpen} onOpenChange={(open) => !isSaving && !open && onClose()}>
       <ResizableDialogContent 
         modalId={`save-modal-${screenId}`}
-        defaultWidth={dynamicSize.width + 48}
-        defaultHeight={dynamicSize.height + 120}
+        style={{
+          width: `${dynamicSize.width}px`,
+          height: `${dynamicSize.height}px`, // 화면관리 설정 크기 그대로 사용
+        }}
+        defaultWidth={600} // 폴백용 기본값
+        defaultHeight={400} // 폴백용 기본값
         minWidth={400}
         minHeight={300}
         className="gap-0 p-0"

frontend/components/screen/ScreenDesigner.tsx

@@ -981,7 +981,18 @@ export default function ScreenDesigner({ selectedScreen, onBackToList }: ScreenD
   // 스페이스바 키 이벤트 처리 (Pan 모드) + 전역 마우스 이벤트
   useEffect(() => {
     const handleKeyDown = (e: KeyboardEvent) => {
-      // 입력 필드에서는 스페이스바 무시
+      // 입력 필드에서는 스페이스바 무시 (activeElement로 정확하게 체크)
+      const activeElement = document.activeElement;
+      if (
+        activeElement instanceof HTMLInputElement ||
+        activeElement instanceof HTMLTextAreaElement ||
+        activeElement?.getAttribute('contenteditable') === 'true' ||
+        activeElement?.getAttribute('role') === 'textbox'
+      ) {
+        return;
+      }
+
+      // e.target도 함께 체크 (이중 방어)
       if (e.target instanceof HTMLInputElement || e.target instanceof HTMLTextAreaElement) {
         return;
       }
@@ -997,6 +1008,17 @@ export default function ScreenDesigner({ selectedScreen, onBackToList }: ScreenD
     };
 
     const handleKeyUp = (e: KeyboardEvent) => {
+      // 입력 필드에서는 스페이스바 무시
+      const activeElement = document.activeElement;
+      if (
+        activeElement instanceof HTMLInputElement ||
+        activeElement instanceof HTMLTextAreaElement ||
+        activeElement?.getAttribute('contenteditable') === 'true' ||
+        activeElement?.getAttribute('role') === 'textbox'
+      ) {
+        return;
+      }
+
       if (e.code === "Space") {
         e.preventDefault(); // 스페이스바 기본 스크롤 동작 차단
         setIsPanMode(false);

frontend/components/screen/ScreenList.tsx

@@ -35,7 +35,10 @@ import {
   DialogDescription,
 } from "@/components/ui/dialog";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
-import { MoreHorizontal, Edit, Trash2, Copy, Eye, Plus, Search, Palette, RotateCcw, Trash } from "lucide-react";
+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
+import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, CommandList } from "@/components/ui/command";
+import { cn } from "@/lib/utils";
+import { MoreHorizontal, Edit, Trash2, Copy, Eye, Plus, Search, Palette, RotateCcw, Trash, Check, ChevronsUpDown } from "lucide-react";
 import { ScreenDefinition } from "@/types/screen";
 import { screenApi } from "@/lib/api/screen";
 import CreateScreenModal from "./CreateScreenModal";
@@ -127,8 +130,9 @@ export default function ScreenList({ onScreenSelect, selectedScreen, onDesignScr
     isActive: "Y",
     tableName: "",
   });
-  const [tables, setTables] = useState<string[]>([]);
+  const [tables, setTables] = useState<Array<{ tableName: string; tableLabel: string }>>([]);
   const [loadingTables, setLoadingTables] = useState(false);
+  const [tableComboboxOpen, setTableComboboxOpen] = useState(false);
 
   // 미리보기 관련 상태
   const [previewDialogOpen, setPreviewDialogOpen] = useState(false);
@@ -279,9 +283,12 @@ export default function ScreenList({ onScreenSelect, selectedScreen, onDesignScr
       const { tableManagementApi } = await import("@/lib/api/tableManagement");
       const response = await tableManagementApi.getTableList();
       if (response.success && response.data) {
-        // tableName만 추출 (camelCase)
-        const tableNames = response.data.map((table: any) => table.tableName);
-        setTables(tableNames);
+        // tableName과 displayName 매핑 (백엔드에서 displayName으로 라벨을 반환함)
+        const tableList = response.data.map((table: any) => ({
+          tableName: table.tableName,
+          tableLabel: table.displayName || table.tableName,
+        }));
+        setTables(tableList);
       }
     } catch (error) {
       console.error("테이블 목록 조회 실패:", error);
@@ -297,6 +304,10 @@ export default function ScreenList({ onScreenSelect, selectedScreen, onDesignScr
       // 화면 정보 업데이트 API 호출
       await screenApi.updateScreenInfo(screenToEdit.screenId, editFormData);
 
+      // 선택된 테이블의 라벨 찾기
+      const selectedTable = tables.find((t) => t.tableName === editFormData.tableName);
+      const tableLabel = selectedTable?.tableLabel || editFormData.tableName;
+
       // 목록에서 해당 화면 정보 업데이트
       setScreens((prev) =>
         prev.map((s) =>
@@ -304,6 +315,8 @@ export default function ScreenList({ onScreenSelect, selectedScreen, onDesignScr
             ? {
                 ...s,
                 screenName: editFormData.screenName,
+                tableName: editFormData.tableName,
+                tableLabel: tableLabel,
                 description: editFormData.description,
                 isActive: editFormData.isActive,
               }
@@ -1202,22 +1215,62 @@ export default function ScreenList({ onScreenSelect, selectedScreen, onDesignScr
             </div>
             <div className="space-y-2">
               <Label htmlFor="edit-tableName">테이블 *</Label>
-              <Select
-                value={editFormData.tableName}
-                onValueChange={(value) => setEditFormData({ ...editFormData, tableName: value })}
-                disabled={loadingTables}
-              >
-                <SelectTrigger id="edit-tableName">
-                  <SelectValue placeholder={loadingTables ? "로딩 중..." : "테이블을 선택하세요"} />
-                </SelectTrigger>
-                <SelectContent>
-                  {tables.map((tableName) => (
-                    <SelectItem key={tableName} value={tableName}>
-                      {tableName}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
+              <Popover open={tableComboboxOpen} onOpenChange={setTableComboboxOpen}>
+                <PopoverTrigger asChild>
+                  <Button
+                    variant="outline"
+                    role="combobox"
+                    aria-expanded={tableComboboxOpen}
+                    className="h-8 w-full justify-between text-xs sm:h-10 sm:text-sm"
+                    disabled={loadingTables}
+                  >
+                    {loadingTables
+                      ? "로딩 중..."
+                      : editFormData.tableName
+                        ? tables.find((table) => table.tableName === editFormData.tableName)?.tableLabel || editFormData.tableName
+                        : "테이블을 선택하세요"}
+                    <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+                  </Button>
+                </PopoverTrigger>
+                <PopoverContent
+                  className="p-0"
+                  style={{ width: "var(--radix-popover-trigger-width)" }}
+                  align="start"
+                >
+                  <Command>
+                    <CommandInput placeholder="테이블 검색..." className="text-xs sm:text-sm" />
+                    <CommandList>
+                      <CommandEmpty className="text-xs sm:text-sm">
+                        테이블을 찾을 수 없습니다.
+                      </CommandEmpty>
+                      <CommandGroup>
+                        {tables.map((table) => (
+                          <CommandItem
+                            key={table.tableName}
+                            value={`${table.tableName} ${table.tableLabel}`}
+                            onSelect={() => {
+                              setEditFormData({ ...editFormData, tableName: table.tableName });
+                              setTableComboboxOpen(false);
+                            }}
+                            className="text-xs sm:text-sm"
+                          >
+                            <Check
+                              className={cn(
+                                "mr-2 h-4 w-4",
+                                editFormData.tableName === table.tableName ? "opacity-100" : "opacity-0"
+                              )}
+                            />
+                            <div className="flex flex-col">
+                              <span className="font-medium">{table.tableLabel}</span>
+                              <span className="text-[10px] text-gray-500">{table.tableName}</span>
+                            </div>
+                          </CommandItem>
+                        ))}
+                      </CommandGroup>
+                    </CommandList>
+                  </Command>
+                </PopoverContent>
+              </Popover>
             </div>
             <div className="space-y-2">
               <Label htmlFor="edit-description">설명</Label>

frontend/components/screen/StyleEditor.tsx

@@ -49,7 +49,6 @@ export default function StyleEditor({ style, onStyleChange, className }: StyleEd
                 value={localStyle.borderWidth || ""}
                 onChange={(e) => handleStyleChange("borderWidth", e.target.value)}
                 className="h-6 w-full px-2 py-0 text-xs"
-                style={{ fontSize: "12px" }}
               />
             </div>
             <div className="space-y-1">
@@ -60,20 +59,20 @@ export default function StyleEditor({ style, onStyleChange, className }: StyleEd
                 value={localStyle.borderStyle || "solid"}
                 onValueChange={(value) => handleStyleChange("borderStyle", value)}
               >
-                <SelectTrigger className="h-6 w-full px-2 py-0" style={{ fontSize: "12px" }}>
+                <SelectTrigger className=" text-xsh-6 w-full px-2 py-0">
                   <SelectValue />
                 </SelectTrigger>
                 <SelectContent>
-                  <SelectItem value="solid" style={{ fontSize: "12px" }}>
+                  <SelectItem value="solid" className="text-xs">
                     실선
                   </SelectItem>
-                  <SelectItem value="dashed" style={{ fontSize: "12px" }}>
+                  <SelectItem value="dashed" className="text-xs">
                     파선
                   </SelectItem>
-                  <SelectItem value="dotted" style={{ fontSize: "12px" }}>
+                  <SelectItem value="dotted" className="text-xs">
                     점선
                   </SelectItem>
-                  <SelectItem value="none" style={{ fontSize: "12px" }}>
+                  <SelectItem value="none" className="text-xs">
                     없음
                   </SelectItem>
                 </SelectContent>
@@ -93,7 +92,7 @@ export default function StyleEditor({ style, onStyleChange, className }: StyleEd
                   value={localStyle.borderColor || "#000000"}
                   onChange={(e) => handleStyleChange("borderColor", e.target.value)}
                   className="h-6 w-12 p-1"
-                  style={{ fontSize: "12px" }}
+                  className="text-xs"
                 />
                 <Input
                   type="text"
@@ -101,7 +100,6 @@ export default function StyleEditor({ style, onStyleChange, className }: StyleEd
                   onChange={(e) => handleStyleChange("borderColor", e.target.value)}
                   placeholder="#000000"
                   className="h-6 flex-1 text-xs"
-                  style={{ fontSize: "12px" }}
                 />
               </div>
             </div>
@@ -116,7 +114,6 @@ export default function StyleEditor({ style, onStyleChange, className }: StyleEd
                 value={localStyle.borderRadius || ""}
                 onChange={(e) => handleStyleChange("borderRadius", e.target.value)}
                 className="h-6 w-full px-2 py-0 text-xs"
-                style={{ fontSize: "12px" }}
               />
             </div>
           </div>
@@ -142,7 +139,7 @@ export default function StyleEditor({ style, onStyleChange, className }: StyleEd
                 value={localStyle.backgroundColor || "#ffffff"}
                 onChange={(e) => handleStyleChange("backgroundColor", e.target.value)}
                 className="h-6 w-12 p-1"
-                style={{ fontSize: "12px" }}
+                className="text-xs"
               />
               <Input
                 type="text"
@@ -150,7 +147,6 @@ export default function StyleEditor({ style, onStyleChange, className }: StyleEd
                 onChange={(e) => handleStyleChange("backgroundColor", e.target.value)}
                 placeholder="#ffffff"
                 className="h-6 flex-1 text-xs"
-                style={{ fontSize: "12px" }}
               />
             </div>
           </div>
@@ -166,7 +162,6 @@ export default function StyleEditor({ style, onStyleChange, className }: StyleEd
               value={localStyle.backgroundImage || ""}
               onChange={(e) => handleStyleChange("backgroundImage", e.target.value)}
               className="h-6 w-full px-2 py-0 text-xs"
-              style={{ fontSize: "12px" }}
             />
             <p className="text-[10px] text-muted-foreground">
               위젯 배경 꾸미기용 (고급 사용자 전용)
@@ -195,7 +190,7 @@ export default function StyleEditor({ style, onStyleChange, className }: StyleEd
                   value={localStyle.color || "#000000"}
                   onChange={(e) => handleStyleChange("color", e.target.value)}
                   className="h-6 w-12 p-1"
-                  style={{ fontSize: "12px" }}
+                  className="text-xs"
                 />
                 <Input
                   type="text"
@@ -203,7 +198,6 @@ export default function StyleEditor({ style, onStyleChange, className }: StyleEd
                   onChange={(e) => handleStyleChange("color", e.target.value)}
                   placeholder="#000000"
                   className="h-6 flex-1 text-xs"
-                  style={{ fontSize: "12px" }}
                 />
               </div>
             </div>
@@ -218,7 +212,6 @@ export default function StyleEditor({ style, onStyleChange, className }: StyleEd
                 value={localStyle.fontSize || ""}
                 onChange={(e) => handleStyleChange("fontSize", e.target.value)}
                 className="h-6 w-full px-2 py-0 text-xs"
-                style={{ fontSize: "12px" }}
               />
             </div>
           </div>
@@ -232,29 +225,29 @@ export default function StyleEditor({ style, onStyleChange, className }: StyleEd
                 value={localStyle.fontWeight || "normal"}
                 onValueChange={(value) => handleStyleChange("fontWeight", value)}
               >
-                <SelectTrigger className="h-6 w-full px-2 py-0" style={{ fontSize: "12px" }}>
+                <SelectTrigger className=" text-xsh-6 w-full px-2 py-0">
                   <SelectValue />
                 </SelectTrigger>
                 <SelectContent>
-                  <SelectItem value="normal" style={{ fontSize: "12px" }}>
+                  <SelectItem value="normal" className="text-xs">
                     보통
                   </SelectItem>
-                  <SelectItem value="bold" style={{ fontSize: "12px" }}>
+                  <SelectItem value="bold" className="text-xs">
                     굵게
                   </SelectItem>
-                  <SelectItem value="100" style={{ fontSize: "12px" }}>
+                  <SelectItem value="100" className="text-xs">
                     100
                   </SelectItem>
-                  <SelectItem value="400" style={{ fontSize: "12px" }}>
+                  <SelectItem value="400" className="text-xs">
                     400
                   </SelectItem>
-                  <SelectItem value="500" style={{ fontSize: "12px" }}>
+                  <SelectItem value="500" className="text-xs">
                     500
                   </SelectItem>
-                  <SelectItem value="600" style={{ fontSize: "12px" }}>
+                  <SelectItem value="600" className="text-xs">
                     600
                   </SelectItem>
-                  <SelectItem value="700" style={{ fontSize: "12px" }}>
+                  <SelectItem value="700" className="text-xs">
                     700
                   </SelectItem>
                 </SelectContent>
@@ -268,20 +261,20 @@ export default function StyleEditor({ style, onStyleChange, className }: StyleEd
                 value={localStyle.textAlign || "left"}
                 onValueChange={(value) => handleStyleChange("textAlign", value)}
               >
-                <SelectTrigger className="h-6 w-full px-2 py-0" style={{ fontSize: "12px" }}>
+                <SelectTrigger className=" text-xsh-6 w-full px-2 py-0">
                   <SelectValue />
                 </SelectTrigger>
                 <SelectContent>
-                  <SelectItem value="left" style={{ fontSize: "12px" }}>
+                  <SelectItem value="left" className="text-xs">
                     왼쪽
                   </SelectItem>
-                  <SelectItem value="center" style={{ fontSize: "12px" }}>
+                  <SelectItem value="center" className="text-xs">
                     가운데
                   </SelectItem>
-                  <SelectItem value="right" style={{ fontSize: "12px" }}>
+                  <SelectItem value="right" className="text-xs">
                     오른쪽
                   </SelectItem>
-                  <SelectItem value="justify" style={{ fontSize: "12px" }}>
+                  <SelectItem value="justify" className="text-xs">
                     양쪽
                   </SelectItem>
                 </SelectContent>

frontend/components/screen/config-panels/ButtonConfigPanel.tsx

@@ -509,7 +509,7 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
                   role="combobox"
                   aria-expanded={modalScreenOpen}
                   className="h-6 w-full justify-between px-2 py-0"
-                  style={{ fontSize: "12px" }}
+                  className="text-xs"
                   disabled={screensLoading}
                 >
                   {config.action?.targetScreenId
@@ -900,7 +900,7 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
                   role="combobox"
                   aria-expanded={modalScreenOpen}
                   className="h-6 w-full justify-between px-2 py-0"
-                  style={{ fontSize: "12px" }}
+                  className="text-xs"
                   disabled={screensLoading}
                 >
                   {config.action?.targetScreenId
@@ -978,7 +978,7 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
                   role="combobox"
                   aria-expanded={modalScreenOpen}
                   className="h-6 w-full justify-between px-2 py-0"
-                  style={{ fontSize: "12px" }}
+                  className="text-xs"
                   disabled={screensLoading}
                 >
                   {config.action?.targetScreenId
@@ -1132,7 +1132,7 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
                   role="combobox"
                   aria-expanded={modalScreenOpen}
                   className="h-6 w-full justify-between px-2 py-0"
-                  style={{ fontSize: "12px" }}
+                  className="text-xs"
                   disabled={screensLoading}
                 >
                   {config.action?.targetScreenId
@@ -1286,7 +1286,6 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
                   role="combobox"
                   aria-expanded={displayColumnOpen}
                   className="mt-2 h-8 w-full justify-between text-xs"
-                  style={{ fontSize: "12px" }}
                   disabled={columnsLoading || tableColumns.length === 0}
                 >
                   {columnsLoading
@@ -1301,9 +1300,9 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
               </PopoverTrigger>
               <PopoverContent className="p-0" style={{ width: "var(--radix-popover-trigger-width)" }} align="start">
                 <Command>
-                  <CommandInput placeholder="컬럼 검색..." className="text-xs" style={{ fontSize: "12px" }} />
+                  <CommandInput placeholder="컬럼 검색..." className="text-xs" />
                   <CommandList>
-                    <CommandEmpty className="text-xs" style={{ fontSize: "12px" }}>
+                    <CommandEmpty className="text-xs">
                       컬럼을 찾을 수 없습니다.
                     </CommandEmpty>
                     <CommandGroup>
@@ -1316,7 +1315,6 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
                             setDisplayColumnOpen(false);
                           }}
                           className="text-xs"
-                          style={{ fontSize: "12px" }}
                         >
                           <Check
                             className={cn(
@@ -1350,7 +1348,7 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
                   role="combobox"
                   aria-expanded={navScreenOpen}
                   className="h-6 w-full justify-between px-2 py-0"
-                  style={{ fontSize: "12px" }}
+                  className="text-xs"
                   disabled={screensLoading}
                 >
                   {config.action?.targetScreenId
@@ -1424,7 +1422,6 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
                 onUpdateProperty("componentConfig.action.targetUrl", newValue);
               }}
               className="h-6 w-full px-2 py-0 text-xs"
-              style={{ fontSize: "12px" }}
             />
             <p className="mt-1 text-xs text-muted-foreground">URL을 입력하면 화면 선택보다 우선 적용됩니다</p>
           </div>

frontend/components/screen/config-panels/CheckboxConfigPanel.tsx

@@ -117,7 +117,7 @@ export const CheckboxConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
   return (
     <Card>
       <CardHeader>
-        <CardTitle className="flex items-center gap-2 text-xs" style={{ fontSize: "12px" }}>
+        <CardTitle className="flex items-center gap-2 text-xs">
           <CheckSquare className="h-4 w-4" />
           체크박스 설정
         </CardTitle>
@@ -173,7 +173,7 @@ export const CheckboxConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                 value={localConfig.label || ""}
                 onChange={(e) => updateConfig("label", e.target.value)}
                 placeholder="체크박스 라벨"
-                className="text-xs" style={{ fontSize: "12px" }}
+                className="text-xs"
               />
             </div>
 
@@ -187,7 +187,7 @@ export const CheckboxConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                   value={localConfig.checkedValue || ""}
                   onChange={(e) => updateConfig("checkedValue", e.target.value)}
                   placeholder="Y"
-                  className="text-xs" style={{ fontSize: "12px" }}
+                  className="text-xs"
                 />
               </div>
               <div className="space-y-2">
@@ -199,7 +199,7 @@ export const CheckboxConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                   value={localConfig.uncheckedValue || ""}
                   onChange={(e) => updateConfig("uncheckedValue", e.target.value)}
                   placeholder="N"
-                  className="text-xs" style={{ fontSize: "12px" }}
+                  className="text-xs"
                 />
               </div>
             </div>
@@ -232,7 +232,7 @@ export const CheckboxConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                 value={localConfig.groupLabel || ""}
                 onChange={(e) => updateConfig("groupLabel", e.target.value)}
                 placeholder="체크박스 그룹 제목"
-                className="text-xs" style={{ fontSize: "12px" }}
+                className="text-xs"
               />
             </div>
 
@@ -244,19 +244,19 @@ export const CheckboxConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                   value={newOptionLabel}
                   onChange={(e) => setNewOptionLabel(e.target.value)}
                   placeholder="라벨"
-                  className="flex-1 text-xs" style={{ fontSize: "12px" }}
+                  className="flex-1 text-xs"
                 />
                 <Input
                   value={newOptionValue}
                   onChange={(e) => setNewOptionValue(e.target.value)}
                   placeholder="값"
-                  className="flex-1 text-xs" style={{ fontSize: "12px" }}
+                  className="flex-1 text-xs"
                 />
                 <Button
                   size="sm"
                   onClick={addOption}
                   disabled={!newOptionLabel.trim() || !newOptionValue.trim()}
-                  className="text-xs" style={{ fontSize: "12px" }}
+                  className="text-xs"
                 >
                   <Plus className="h-3 w-3" />
                 </Button>
@@ -277,13 +277,13 @@ export const CheckboxConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                       value={option.label}
                       onChange={(e) => updateOption(index, "label", e.target.value)}
                       placeholder="라벨"
-                      className="flex-1 text-xs" style={{ fontSize: "12px" }}
+                      className="flex-1 text-xs"
                     />
                     <Input
                       value={option.value}
                       onChange={(e) => updateOption(index, "value", e.target.value)}
                       placeholder="값"
-                      className="flex-1 text-xs" style={{ fontSize: "12px" }}
+                      className="flex-1 text-xs"
                     />
                     <Switch
                       checked={!option.disabled}
@@ -361,7 +361,7 @@ export const CheckboxConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                   disabled={localConfig.readonly}
                   required={localConfig.required}
                   defaultChecked={localConfig.defaultChecked}
-                  className="text-xs" style={{ fontSize: "12px" }}
+                  className="text-xs"
                 />
                 <Label htmlFor="preview-single" className="text-xs">
                   {localConfig.label || "체크박스 라벨"}
@@ -380,7 +380,7 @@ export const CheckboxConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                         disabled={localConfig.readonly || option.disabled}
                         required={localConfig.required && index === 0} // 첫 번째에만 required 표시
                         defaultChecked={option.checked}
-                        className="text-xs" style={{ fontSize: "12px" }}
+                        className="text-xs"
                       />
                       <Label htmlFor={`preview-group-${index}`} className="text-xs">
                         {option.label}

frontend/components/screen/config-panels/CodeConfigPanel.tsx

@@ -106,7 +106,7 @@ export const CodeConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
   return (
     <Card>
       <CardHeader>
-        <CardTitle className="flex items-center gap-2 text-xs" style={{ fontSize: "12px" }}>
+        <CardTitle className="flex items-center gap-2 text-xs">
           <Code className="h-4 w-4" />
           코드 에디터 설정
         </CardTitle>
@@ -174,7 +174,7 @@ export const CodeConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               step={50}
               value={localConfig.height || 300}
               onChange={(e) => updateConfig("height", parseInt(e.target.value))}
-              className="text-xs" style={{ fontSize: "12px" }}
+              className="text-xs"
             />
             <div className="text-muted-foreground flex justify-between text-xs">
               <span>150px</span>
@@ -199,7 +199,7 @@ export const CodeConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                 onChange={(e) => updateConfig("fontSize", parseInt(e.target.value))}
                 min={10}
                 max={24}
-                className="text-xs" style={{ fontSize: "12px" }}
+                className="text-xs"
               />
             </div>
 
@@ -214,7 +214,7 @@ export const CodeConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                 onChange={(e) => updateConfig("tabSize", parseInt(e.target.value))}
                 min={1}
                 max={8}
-                className="text-xs" style={{ fontSize: "12px" }}
+                className="text-xs"
               />
             </div>
           </div>
@@ -308,7 +308,7 @@ export const CodeConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               value={localConfig.placeholder || ""}
               onChange={(e) => updateConfig("placeholder", e.target.value)}
               placeholder="코드를 입력하세요..."
-              className="text-xs" style={{ fontSize: "12px" }}
+              className="text-xs"
             />
           </div>
 
@@ -330,7 +330,7 @@ export const CodeConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               value={localConfig.defaultValue || ""}
               onChange={(e) => updateConfig("defaultValue", e.target.value)}
               placeholder="기본 코드 내용"
-              className="font-mono text-xs" style={{ fontSize: "12px" }}
+              className="font-mono text-xs"
               rows={4}
             />
           </div>

frontend/components/screen/config-panels/DateConfigPanel.tsx

@@ -75,7 +75,7 @@ export const DateConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
   return (
     <Card>
       <CardHeader>
-        <CardTitle className="flex items-center gap-2 text-xs" style={{ fontSize: "12px" }}>
+        <CardTitle className="flex items-center gap-2 text-xs">
           <Calendar className="h-4 w-4" />
           날짜 설정
         </CardTitle>
@@ -95,7 +95,7 @@ export const DateConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               value={localConfig.placeholder || ""}
               onChange={(e) => updateConfig("placeholder", e.target.value)}
               placeholder="날짜를 선택하세요"
-              className="text-xs" style={{ fontSize: "12px" }}
+              className="text-xs"
             />
           </div>
 
@@ -149,7 +149,7 @@ export const DateConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                 type={localConfig.showTime ? "datetime-local" : "date"}
                 value={localConfig.minDate || ""}
                 onChange={(e) => updateConfig("minDate", e.target.value)}
-                className="flex-1 text-xs" style={{ fontSize: "12px" }}
+                className="flex-1 text-xs"
               />
               <Button size="sm" variant="outline" onClick={() => setCurrentDate("minDate")} className="text-xs">
                 오늘
@@ -167,7 +167,7 @@ export const DateConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                 type={localConfig.showTime ? "datetime-local" : "date"}
                 value={localConfig.maxDate || ""}
                 onChange={(e) => updateConfig("maxDate", e.target.value)}
-                className="flex-1 text-xs" style={{ fontSize: "12px" }}
+                className="flex-1 text-xs"
               />
               <Button size="sm" variant="outline" onClick={() => setCurrentDate("maxDate")} className="text-xs">
                 오늘
@@ -190,7 +190,7 @@ export const DateConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                 type={localConfig.showTime ? "datetime-local" : "date"}
                 value={localConfig.defaultValue || ""}
                 onChange={(e) => updateConfig("defaultValue", e.target.value)}
-                className="flex-1 text-xs" style={{ fontSize: "12px" }}
+                className="flex-1 text-xs"
               />
               <Button size="sm" variant="outline" onClick={() => setCurrentDate("defaultValue")} className="text-xs">
                 현재
@@ -245,7 +245,7 @@ export const DateConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               min={localConfig.minDate}
               max={localConfig.maxDate}
               defaultValue={localConfig.defaultValue}
-              className="text-xs" style={{ fontSize: "12px" }}
+              className="text-xs"
             />
             <div className="text-muted-foreground mt-2 text-xs">
               형식: {localConfig.format}

frontend/components/screen/config-panels/EntityConfigPanel.tsx

@@ -51,37 +51,52 @@ export const EntityConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
   const [newFieldName, setNewFieldName] = useState("");
   const [newFieldLabel, setNewFieldLabel] = useState("");
   const [newFieldType, setNewFieldType] = useState("string");
+  const [isUserEditing, setIsUserEditing] = useState(false);
 
-  // 컴포넌트 변경 시 로컬 상태 동기화
+  // 컴포넌트 변경 시 로컬 상태 동기화 (사용자가 입력 중이 아닐 때만)
   useEffect(() => {
-    const currentConfig = (widget.webTypeConfig as EntityTypeConfig) || {};
-    setLocalConfig({
-      entityType: currentConfig.entityType || "",
-      displayFields: currentConfig.displayFields || [],
-      searchFields: currentConfig.searchFields || [],
-      valueField: currentConfig.valueField || "id",
-      labelField: currentConfig.labelField || "name",
-      multiple: currentConfig.multiple || false,
-      searchable: currentConfig.searchable !== false,
-      placeholder: currentConfig.placeholder || "엔티티를 선택하세요",
-      emptyMessage: currentConfig.emptyMessage || "검색 결과가 없습니다",
-      pageSize: currentConfig.pageSize || 20,
-      minSearchLength: currentConfig.minSearchLength || 1,
-      defaultValue: currentConfig.defaultValue || "",
-      required: currentConfig.required || false,
-      readonly: currentConfig.readonly || false,
-      apiEndpoint: currentConfig.apiEndpoint || "",
-      filters: currentConfig.filters || {},
-    });
-  }, [widget.webTypeConfig]);
+    if (!isUserEditing) {
+      const currentConfig = (widget.webTypeConfig as EntityTypeConfig) || {};
+      setLocalConfig({
+        entityType: currentConfig.entityType || "",
+        displayFields: currentConfig.displayFields || [],
+        searchFields: currentConfig.searchFields || [],
+        valueField: currentConfig.valueField || "id",
+        labelField: currentConfig.labelField || "name",
+        multiple: currentConfig.multiple || false,
+        searchable: currentConfig.searchable !== false,
+        placeholder: currentConfig.placeholder || "엔티티를 선택하세요",
+        emptyMessage: currentConfig.emptyMessage || "검색 결과가 없습니다",
+        pageSize: currentConfig.pageSize || 20,
+        minSearchLength: currentConfig.minSearchLength || 1,
+        defaultValue: currentConfig.defaultValue || "",
+        required: currentConfig.required || false,
+        readonly: currentConfig.readonly || false,
+        apiEndpoint: currentConfig.apiEndpoint || "",
+        filters: currentConfig.filters || {},
+      });
+    }
+  }, [widget.webTypeConfig, isUserEditing]);
 
-  // 설정 업데이트 핸들러
+  // 설정 업데이트 핸들러 (즉시 부모에게 전달 - 드롭다운, 체크박스 등)
   const updateConfig = (field: keyof EntityTypeConfig, value: any) => {
     const newConfig = { ...localConfig, [field]: value };
     setLocalConfig(newConfig);
     onUpdateProperty("webTypeConfig", newConfig);
   };
 
+  // 입력 필드용 업데이트 (로컬 상태만)
+  const updateConfigLocal = (field: keyof EntityTypeConfig, value: any) => {
+    setIsUserEditing(true);
+    setLocalConfig({ ...localConfig, [field]: value });
+  };
+
+  // 입력 완료 시 부모에게 전달
+  const handleInputBlur = () => {
+    setIsUserEditing(false);
+    onUpdateProperty("webTypeConfig", localConfig);
+  };
+
   // 필드 추가
   const addDisplayField = () => {
     if (!newFieldName.trim() || !newFieldLabel.trim()) return;
@@ -106,11 +121,18 @@ export const EntityConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
     updateConfig("displayFields", newFields);
   };
 
-  // 필드 업데이트
+  // 필드 업데이트 (입력 중)
   const updateDisplayField = (index: number, field: keyof EntityField, value: any) => {
+    setIsUserEditing(true);
     const newFields = [...localConfig.displayFields];
     newFields[index] = { ...newFields[index], [field]: value };
-    updateConfig("displayFields", newFields);
+    setLocalConfig({ ...localConfig, displayFields: newFields });
+  };
+
+  // 필드 업데이트 완료 (onBlur)
+  const handleFieldBlur = () => {
+    setIsUserEditing(false);
+    onUpdateProperty("webTypeConfig", localConfig);
   };
 
   // 검색 필드 토글
@@ -163,7 +185,7 @@ export const EntityConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
   return (
     <Card>
       <CardHeader>
-        <CardTitle className="flex items-center gap-2 text-xs" style={{ fontSize: "12px" }}>
+        <CardTitle className="flex items-center gap-2 text-xs">
           <Database className="h-4 w-4" />
           엔티티 설정
         </CardTitle>
@@ -181,9 +203,10 @@ export const EntityConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
             <Input
               id="entityType"
               value={localConfig.entityType || ""}
-              onChange={(e) => updateConfig("entityType", e.target.value)}
+              onChange={(e) => updateConfigLocal("entityType", e.target.value)}
+              onBlur={handleInputBlur}
               placeholder="user, product, department..."
-              className="text-xs" style={{ fontSize: "12px" }}
+              className="text-xs"
             />
           </div>
 
@@ -196,7 +219,7 @@ export const EntityConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                   size="sm"
                   variant="outline"
                   onClick={() => applyEntityType(entity.value)}
-                  className="text-xs" style={{ fontSize: "12px" }}
+                  className="text-xs"
                 >
                   {entity.label}
                 </Button>
@@ -211,9 +234,10 @@ export const EntityConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
             <Input
               id="apiEndpoint"
               value={localConfig.apiEndpoint || ""}
-              onChange={(e) => updateConfig("apiEndpoint", e.target.value)}
+              onChange={(e) => updateConfigLocal("apiEndpoint", e.target.value)}
+              onBlur={handleInputBlur}
               placeholder="/api/entities/user"
-              className="text-xs" style={{ fontSize: "12px" }}
+              className="text-xs"
             />
           </div>
         </div>
@@ -230,9 +254,10 @@ export const EntityConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               <Input
                 id="valueField"
                 value={localConfig.valueField || ""}
-                onChange={(e) => updateConfig("valueField", e.target.value)}
+                onChange={(e) => updateConfigLocal("valueField", e.target.value)}
+                onBlur={handleInputBlur}
                 placeholder="id"
-                className="text-xs" style={{ fontSize: "12px" }}
+                className="text-xs"
               />
             </div>
 
@@ -243,9 +268,10 @@ export const EntityConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               <Input
                 id="labelField"
                 value={localConfig.labelField || ""}
-                onChange={(e) => updateConfig("labelField", e.target.value)}
+                onChange={(e) => updateConfigLocal("labelField", e.target.value)}
+                onBlur={handleInputBlur}
                 placeholder="name"
-                className="text-xs" style={{ fontSize: "12px" }}
+                className="text-xs"
               />
             </div>
           </div>
@@ -263,13 +289,13 @@ export const EntityConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                 value={newFieldName}
                 onChange={(e) => setNewFieldName(e.target.value)}
                 placeholder="필드명"
-                className="flex-1 text-xs" style={{ fontSize: "12px" }}
+                className="flex-1 text-xs"
               />
               <Input
                 value={newFieldLabel}
                 onChange={(e) => setNewFieldLabel(e.target.value)}
                 placeholder="라벨"
-                className="flex-1 text-xs" style={{ fontSize: "12px" }}
+                className="flex-1 text-xs"
               />
               <Select value={newFieldType} onValueChange={setNewFieldType}>
                 <SelectTrigger className="w-24 text-xs">
@@ -287,7 +313,7 @@ export const EntityConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                 size="sm"
                 onClick={addDisplayField}
                 disabled={!newFieldName.trim() || !newFieldLabel.trim()}
-                className="text-xs" style={{ fontSize: "12px" }}
+                className="text-xs"
               >
                 <Plus className="h-3 w-3" />
               </Button>
@@ -302,19 +328,24 @@ export const EntityConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                 <div key={index} className="flex items-center gap-2 rounded border p-2">
                   <Switch
                     checked={field.visible}
-                    onCheckedChange={(checked) => updateDisplayField(index, "visible", checked)}
+                    onCheckedChange={(checked) => {
+                      updateDisplayField(index, "visible", checked);
+                      handleFieldBlur();
+                    }}
                   />
                   <Input
                     value={field.name}
                     onChange={(e) => updateDisplayField(index, "name", e.target.value)}
+                    onBlur={handleFieldBlur}
                     placeholder="필드명"
-                    className="flex-1 text-xs" style={{ fontSize: "12px" }}
+                    className="flex-1 text-xs"
                   />
                   <Input
                     value={field.label}
                     onChange={(e) => updateDisplayField(index, "label", e.target.value)}
+                    onBlur={handleFieldBlur}
                     placeholder="라벨"
-                    className="flex-1 text-xs" style={{ fontSize: "12px" }}
+                    className="flex-1 text-xs"
                   />
                   <Select value={field.type} onValueChange={(value) => updateDisplayField(index, "type", value)}>
                     <SelectTrigger className="w-24 text-xs">
@@ -332,7 +363,7 @@ export const EntityConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                     size="sm"
                     variant={localConfig.searchFields.includes(field.name) ? "default" : "outline"}
                     onClick={() => toggleSearchField(field.name)}
-                    className="p-1 text-xs" style={{ fontSize: "12px" }}
+                    className="p-1 text-xs"
                     title={localConfig.searchFields.includes(field.name) ? "검색 필드에서 제거" : "검색 필드로 추가"}
                   >
                     <Search className="h-3 w-3" />
@@ -341,7 +372,7 @@ export const EntityConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                     size="sm"
                     variant="destructive"
                     onClick={() => removeDisplayField(index)}
-                    className="p-1 text-xs" style={{ fontSize: "12px" }}
+                    className="p-1 text-xs"
                   >
                     <Trash2 className="h-3 w-3" />
                   </Button>
@@ -362,9 +393,10 @@ export const EntityConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
             <Input
               id="placeholder"
               value={localConfig.placeholder || ""}
-              onChange={(e) => updateConfig("placeholder", e.target.value)}
+              onChange={(e) => updateConfigLocal("placeholder", e.target.value)}
+              onBlur={handleInputBlur}
               placeholder="엔티티를 선택하세요"
-              className="text-xs" style={{ fontSize: "12px" }}
+              className="text-xs"
             />
           </div>
 
@@ -375,9 +407,10 @@ export const EntityConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
             <Input
               id="emptyMessage"
               value={localConfig.emptyMessage || ""}
-              onChange={(e) => updateConfig("emptyMessage", e.target.value)}
+              onChange={(e) => updateConfigLocal("emptyMessage", e.target.value)}
+              onBlur={handleInputBlur}
               placeholder="검색 결과가 없습니다"
-              className="text-xs" style={{ fontSize: "12px" }}
+              className="text-xs"
             />
           </div>
 
@@ -393,7 +426,7 @@ export const EntityConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                 onChange={(e) => updateConfig("minSearchLength", parseInt(e.target.value))}
                 min={0}
                 max={10}
-                className="text-xs" style={{ fontSize: "12px" }}
+                className="text-xs"
               />
             </div>
 
@@ -408,7 +441,7 @@ export const EntityConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                 onChange={(e) => updateConfig("pageSize", parseInt(e.target.value))}
                 min={5}
                 max={100}
-                className="text-xs" style={{ fontSize: "12px" }}
+                className="text-xs"
               />
             </div>
           </div>
@@ -462,7 +495,7 @@ export const EntityConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                 }
               }}
               placeholder='{"status": "active", "department": "IT"}'
-              className="font-mono text-xs" style={{ fontSize: "12px" }}
+              className="font-mono text-xs"
               rows={3}
             />
             <p className="text-muted-foreground text-xs">API 요청에 추가될 필터 조건을 JSON 형태로 입력하세요.</p>

frontend/components/screen/config-panels/FileConfigPanel.tsx

@@ -113,7 +113,7 @@ export const FileConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
   return (
     <Card>
       <CardHeader>
-        <CardTitle className="flex items-center gap-2 text-xs" style={{ fontSize: "12px" }}>
+        <CardTitle className="flex items-center gap-2 text-xs">
           <Upload className="h-4 w-4" />
           파일 업로드 설정
         </CardTitle>
@@ -133,7 +133,7 @@ export const FileConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               value={localConfig.uploadText || ""}
               onChange={(e) => updateConfig("uploadText", e.target.value)}
               placeholder="파일을 선택하거나 여기에 드래그하세요"
-              className="text-xs" style={{ fontSize: "12px" }}
+              className="text-xs"
             />
           </div>
 
@@ -146,7 +146,7 @@ export const FileConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               value={localConfig.browseText || ""}
               onChange={(e) => updateConfig("browseText", e.target.value)}
               placeholder="파일 선택"
-              className="text-xs" style={{ fontSize: "12px" }}
+              className="text-xs"
             />
           </div>
 
@@ -196,7 +196,7 @@ export const FileConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                 min={0.1}
                 max={1024}
                 step={0.1}
-                className="flex-1 text-xs" style={{ fontSize: "12px" }}
+                className="flex-1 text-xs"
               />
               <span className="text-muted-foreground text-xs">MB</span>
             </div>
@@ -214,7 +214,7 @@ export const FileConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                 onChange={(e) => updateConfig("maxFiles", parseInt(e.target.value))}
                 min={1}
                 max={100}
-                className="text-xs" style={{ fontSize: "12px" }}
+                className="text-xs"
               />
             </div>
           )}
@@ -257,7 +257,7 @@ export const FileConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                 value={newFileType}
                 onChange={(e) => setNewFileType(e.target.value)}
                 placeholder=".pdf 또는 pdf"
-                className="flex-1 text-xs" style={{ fontSize: "12px" }}
+                className="flex-1 text-xs"
               />
               <Button size="sm" onClick={addFileType} disabled={!newFileType.trim()} className="text-xs">
                 추가

frontend/components/screen/config-panels/FlowVisibilityConfigPanel.tsx

@@ -236,11 +236,11 @@ export const FlowVisibilityConfigPanel: React.FC<FlowVisibilityConfigPanelProps>
   return (
     <div className="space-y-4">
       <div className="space-y-1">
-        <h4 className="flex items-center gap-2 text-xs font-medium" style={{ fontSize: "12px" }}>
+        <h4 className="flex items-center gap-2 text-xs font-medium">
           <Workflow className="h-4 w-4" />
           플로우 단계별 표시 설정
         </h4>
-        <p className="text-muted-foreground text-xs" style={{ fontSize: "12px" }}>
+        <p className="text-muted-foreground text-xs">
           플로우의 특정 단계에서만 이 버튼을 표시하거나 숨길 수 있습니다
         </p>
       </div>
@@ -256,7 +256,7 @@ export const FlowVisibilityConfigPanel: React.FC<FlowVisibilityConfigPanelProps>
               setTimeout(() => applyConfig(), 0);
             }}
           />
-          <Label htmlFor="flow-control-enabled" className="text-xs font-medium" style={{ fontSize: "12px" }}>
+          <Label htmlFor="flow-control-enabled" className="text-xs font-medium">
             플로우 단계에 따라 버튼 표시 제어
           </Label>
         </div>
@@ -265,7 +265,7 @@ export const FlowVisibilityConfigPanel: React.FC<FlowVisibilityConfigPanelProps>
           <>
             {/* 대상 플로우 선택 */}
             <div className="space-y-2">
-              <Label className="text-xs font-medium" style={{ fontSize: "12px" }}>
+              <Label className="text-xs font-medium">
                 대상 플로우
               </Label>
               <Select
@@ -275,7 +275,7 @@ export const FlowVisibilityConfigPanel: React.FC<FlowVisibilityConfigPanelProps>
                   setTimeout(() => applyConfig(), 0);
                 }}
               >
-                <SelectTrigger className="h-6 text-xs" style={{ fontSize: "12px" }}>
+                <SelectTrigger className="h-6 text-xs">
                   <SelectValue placeholder="플로우 위젯 선택" />
                 </SelectTrigger>
                 <SelectContent>
@@ -283,7 +283,7 @@ export const FlowVisibilityConfigPanel: React.FC<FlowVisibilityConfigPanelProps>
                     const flowConfig = (fw as any).componentConfig || {};
                     const flowName = flowConfig.flowName || `플로우 ${fw.id}`;
                     return (
-                      <SelectItem key={fw.id} value={fw.id} style={{ fontSize: "12px" }}>
+                      <SelectItem key={fw.id} value={fw.id} className="text-xs">
                         {flowName}
                       </SelectItem>
                     );
@@ -298,7 +298,7 @@ export const FlowVisibilityConfigPanel: React.FC<FlowVisibilityConfigPanelProps>
                 {/* 단계 선택 */}
                 <div className="space-y-3">
                   <div className="flex items-center justify-between">
-                    <Label className="text-xs font-medium" style={{ fontSize: "12px" }}>
+                    <Label className="text-xs font-medium">
                       표시할 단계
                     </Label>
                     <div className="flex gap-1">
@@ -307,7 +307,6 @@ export const FlowVisibilityConfigPanel: React.FC<FlowVisibilityConfigPanelProps>
                         size="sm"
                         onClick={selectAll}
                         className="h-7 px-2 text-xs"
-                        style={{ fontSize: "12px" }}
                       >
                         모두 선택
                       </Button>
@@ -316,7 +315,6 @@ export const FlowVisibilityConfigPanel: React.FC<FlowVisibilityConfigPanelProps>
                         size="sm"
                         onClick={selectNone}
                         className="h-7 px-2 text-xs"
-                        style={{ fontSize: "12px" }}
                       >
                         모두 해제
                       </Button>
@@ -325,7 +323,6 @@ export const FlowVisibilityConfigPanel: React.FC<FlowVisibilityConfigPanelProps>
                         size="sm"
                         onClick={invertSelection}
                         className="h-7 px-2 text-xs"
-                        style={{ fontSize: "12px" }}
                       >
                         반전
                       </Button>
@@ -347,9 +344,8 @@ export const FlowVisibilityConfigPanel: React.FC<FlowVisibilityConfigPanelProps>
                           <Label
                             htmlFor={`step-${step.id}`}
                             className="flex flex-1 items-center gap-2 text-xs"
-                            style={{ fontSize: "12px" }}
                           >
-                            <Badge variant="outline" className="text-xs" style={{ fontSize: "12px" }}>
+                            <Badge variant="outline" className="text-xs">
                               Step {step.stepOrder}
                             </Badge>
                             <span>{step.stepName}</span>
@@ -363,7 +359,7 @@ export const FlowVisibilityConfigPanel: React.FC<FlowVisibilityConfigPanelProps>
 
                 {/* 정렬 방식 */}
                 <div className="space-y-2">
-                  <Label htmlFor="group-align" className="text-xs font-medium" style={{ fontSize: "12px" }}>
+                  <Label htmlFor="group-align" className="text-xs font-medium">
                     정렬 방식
                   </Label>
                   <Select
@@ -373,23 +369,23 @@ export const FlowVisibilityConfigPanel: React.FC<FlowVisibilityConfigPanelProps>
                       onUpdateProperty("webTypeConfig.flowVisibilityConfig.groupAlign", value);
                     }}
                   >
-                    <SelectTrigger id="group-align" className="h-6 text-xs" style={{ fontSize: "12px" }}>
+                    <SelectTrigger id="group-align" className="h-6 text-xs">
                       <SelectValue />
                     </SelectTrigger>
                     <SelectContent>
-                      <SelectItem value="start" style={{ fontSize: "12px" }}>
+                      <SelectItem value="start" className="text-xs">
                         시작점 정렬
                       </SelectItem>
-                      <SelectItem value="center" style={{ fontSize: "12px" }}>
+                      <SelectItem value="center" className="text-xs">
                         중앙 정렬
                       </SelectItem>
-                      <SelectItem value="end" style={{ fontSize: "12px" }}>
+                      <SelectItem value="end" className="text-xs">
                         끝점 정렬
                       </SelectItem>
-                      <SelectItem value="space-between" style={{ fontSize: "12px" }}>
+                      <SelectItem value="space-between" className="text-xs">
                         양 끝 정렬
                       </SelectItem>
-                      <SelectItem value="space-around" style={{ fontSize: "12px" }}>
+                      <SelectItem value="space-around" className="text-xs">
                         균등 배분
                       </SelectItem>
                     </SelectContent>

frontend/components/screen/config-panels/FlowWidgetConfigPanel.tsx

@@ -55,7 +55,7 @@ export function FlowWidgetConfigPanel({ config = {}, onChange }: FlowWidgetConfi
             {loading ? (
               <div className="flex items-center gap-2 rounded-md border px-3 py-2">
                 <Loader2 className="h-4 w-4 animate-spin" />
-                <span className="text-muted-foreground text-xs" style={{ fontSize: "12px" }}>로딩 중...</span>
+                <span className="text-muted-foreground text-xs">로딩 중...</span>
               </div>
             ) : (
               <>

frontend/components/screen/config-panels/NumberConfigPanel.tsx

@@ -56,7 +56,7 @@ export const NumberConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
   return (
     <Card>
       <CardHeader>
-        <CardTitle className="flex items-center gap-2 text-xs" style={{ fontSize: "12px" }}>숫자 설정</CardTitle>
+        <CardTitle className="flex items-center gap-2 text-xs">숫자 설정</CardTitle>
         <CardDescription className="text-xs">숫자 입력 필드의 세부 설정을 관리합니다.</CardDescription>
       </CardHeader>
       <CardContent className="space-y-4">
@@ -73,7 +73,7 @@ export const NumberConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               value={localConfig.placeholder || ""}
               onChange={(e) => updateConfig("placeholder", e.target.value)}
               placeholder="숫자를 입력하세요"
-              className="text-xs" style={{ fontSize: "12px" }}
+              className="text-xs"
             />
           </div>
 
@@ -88,7 +88,7 @@ export const NumberConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                 value={localConfig.min ?? ""}
                 onChange={(e) => updateConfig("min", e.target.value ? parseFloat(e.target.value) : undefined)}
                 placeholder="0"
-                className="text-xs" style={{ fontSize: "12px" }}
+                className="text-xs"
               />
             </div>
             <div className="space-y-2">
@@ -101,7 +101,7 @@ export const NumberConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                 value={localConfig.max ?? ""}
                 onChange={(e) => updateConfig("max", e.target.value ? parseFloat(e.target.value) : undefined)}
                 placeholder="100"
-                className="text-xs" style={{ fontSize: "12px" }}
+                className="text-xs"
               />
             </div>
           </div>
@@ -118,7 +118,7 @@ export const NumberConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               placeholder="1"
               min="0"
               step="0.01"
-              className="text-xs" style={{ fontSize: "12px" }}
+              className="text-xs"
             />
             <p className="text-muted-foreground text-xs">증가/감소 버튼 클릭 시 변경되는 값의 크기</p>
           </div>
@@ -158,7 +158,7 @@ export const NumberConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                 placeholder="2"
                 min="0"
                 max="10"
-                className="text-xs" style={{ fontSize: "12px" }}
+                className="text-xs"
               />
             </div>
           )}
@@ -223,7 +223,7 @@ export const NumberConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               min={localConfig.min}
               max={localConfig.max}
               step={localConfig.step}
-              className="text-xs" style={{ fontSize: "12px" }}
+              className="text-xs"
             />
             <div className="text-muted-foreground mt-2 text-xs">
               {localConfig.format === "currency" && "통화 형식으로 표시됩니다."}

frontend/components/screen/config-panels/RadioConfigPanel.tsx

@@ -168,7 +168,7 @@ export const RadioConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
   return (
     <Card>
       <CardHeader>
-        <CardTitle className="flex items-center gap-2 text-xs" style={{ fontSize: "12px" }}>
+        <CardTitle className="flex items-center gap-2 text-xs">
           <Radio className="h-4 w-4" />
           라디오버튼 설정
         </CardTitle>
@@ -188,7 +188,7 @@ export const RadioConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               value={localConfig.groupLabel || ""}
               onChange={(e) => updateConfig("groupLabel", e.target.value)}
               placeholder="라디오버튼 그룹 제목"
-              className="text-xs" style={{ fontSize: "12px" }}
+              className="text-xs"
             />
           </div>
 
@@ -201,7 +201,7 @@ export const RadioConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               value={localConfig.groupName || ""}
               onChange={(e) => updateConfig("groupName", e.target.value)}
               placeholder="자동 생성 (필드명 기반)"
-              className="text-xs" style={{ fontSize: "12px" }}
+              className="text-xs"
             />
             <p className="text-muted-foreground text-xs">비워두면 필드명을 기반으로 자동 생성됩니다.</p>
           </div>
@@ -252,19 +252,19 @@ export const RadioConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                 value={newOptionLabel}
                 onChange={(e) => setNewOptionLabel(e.target.value)}
                 placeholder="라벨"
-                className="flex-1 text-xs" style={{ fontSize: "12px" }}
+                className="flex-1 text-xs"
               />
               <Input
                 value={newOptionValue}
                 onChange={(e) => setNewOptionValue(e.target.value)}
                 placeholder="값"
-                className="flex-1 text-xs" style={{ fontSize: "12px" }}
+                className="flex-1 text-xs"
               />
               <Button
                 size="sm"
                 onClick={addOption}
                 disabled={!newOptionLabel.trim() || !newOptionValue.trim()}
-                className="text-xs" style={{ fontSize: "12px" }}
+                className="text-xs"
               >
                 <Plus className="h-3 w-3" />
               </Button>
@@ -278,7 +278,7 @@ export const RadioConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               value={bulkOptions}
               onChange={(e) => setBulkOptions(e.target.value)}
               placeholder="한 줄당 하나씩 입력하세요.&#10;라벨만 입력하면 값과 동일하게 설정됩니다.&#10;라벨|값 형식으로 입력하면 별도 값을 설정할 수 있습니다.&#10;&#10;예시:&#10;서울&#10;부산&#10;대구시|daegu"
-              className="h-20 text-xs" style={{ fontSize: "12px" }}
+              className="h-20 text-xs"
             />
             <Button size="sm" onClick={addBulkOptions} disabled={!bulkOptions.trim()} className="text-xs">
               옵션 추가
@@ -295,13 +295,13 @@ export const RadioConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                     value={option.label}
                     onChange={(e) => updateOption(index, "label", e.target.value)}
                     placeholder="라벨"
-                    className="flex-1 text-xs" style={{ fontSize: "12px" }}
+                    className="flex-1 text-xs"
                   />
                   <Input
                     value={option.value}
                     onChange={(e) => updateOption(index, "value", e.target.value)}
                     placeholder="값"
-                    className="flex-1 text-xs" style={{ fontSize: "12px" }}
+                    className="flex-1 text-xs"
                   />
                   <Switch
                     checked={!option.disabled}
@@ -328,7 +328,7 @@ export const RadioConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               id="defaultValue"
               value={localConfig.defaultValue || ""}
               onChange={(e) => updateConfig("defaultValue", e.target.value)}
-              className="w-full rounded-md border px-3 py-1 text-xs" style={{ fontSize: "12px" }}
+              className="w-full rounded-md border px-3 py-1 text-xs"
             >
               <option value="">선택하지 않음</option>
               {localConfig.options.map((option, index) => (
@@ -390,7 +390,7 @@ export const RadioConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                       disabled={localConfig.readonly || option.disabled}
                       required={localConfig.required && index === 0} // 첫 번째에만 required 표시
                       defaultChecked={localConfig.defaultValue === option.value}
-                      className="text-xs" style={{ fontSize: "12px" }}
+                      className="text-xs"
                     />
                     <Label htmlFor={`preview-radio-${index}`} className="text-xs">
                       {option.label}

frontend/components/screen/config-panels/SelectConfigPanel.tsx

@@ -153,7 +153,7 @@ export const SelectConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
   return (
     <Card>
       <CardHeader>
-        <CardTitle className="flex items-center gap-2 text-xs" style={{ fontSize: "12px" }}>
+        <CardTitle className="flex items-center gap-2 text-xs">
           <List className="h-4 w-4" />
           선택박스 설정
         </CardTitle>
@@ -173,7 +173,7 @@ export const SelectConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               value={localConfig.placeholder || ""}
               onChange={(e) => updateConfig("placeholder", e.target.value)}
               placeholder="선택하세요"
-              className="text-xs" style={{ fontSize: "12px" }}
+              className="text-xs"
             />
           </div>
 
@@ -186,7 +186,7 @@ export const SelectConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               value={localConfig.emptyMessage || ""}
               onChange={(e) => updateConfig("emptyMessage", e.target.value)}
               placeholder="선택 가능한 옵션이 없습니다"
-              className="text-xs" style={{ fontSize: "12px" }}
+              className="text-xs"
             />
           </div>
 
@@ -247,19 +247,19 @@ export const SelectConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                 value={newOptionLabel}
                 onChange={(e) => setNewOptionLabel(e.target.value)}
                 placeholder="라벨"
-                className="flex-1 text-xs" style={{ fontSize: "12px" }}
+                className="flex-1 text-xs"
               />
               <Input
                 value={newOptionValue}
                 onChange={(e) => setNewOptionValue(e.target.value)}
                 placeholder="값"
-                className="flex-1 text-xs" style={{ fontSize: "12px" }}
+                className="flex-1 text-xs"
               />
               <Button
                 size="sm"
                 onClick={addOption}
                 disabled={!newOptionLabel.trim() || !newOptionValue.trim()}
-                className="text-xs" style={{ fontSize: "12px" }}
+                className="text-xs"
               >
                 <Plus className="h-3 w-3" />
               </Button>
@@ -273,7 +273,7 @@ export const SelectConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               value={bulkOptions}
               onChange={(e) => setBulkOptions(e.target.value)}
               placeholder="한 줄당 하나씩 입력하세요.&#10;라벨만 입력하면 값과 동일하게 설정됩니다.&#10;라벨|값 형식으로 입력하면 별도 값을 설정할 수 있습니다.&#10;&#10;예시:&#10;서울&#10;부산&#10;대구시|daegu"
-              className="h-20 text-xs" style={{ fontSize: "12px" }}
+              className="h-20 text-xs"
             />
             <Button size="sm" onClick={addBulkOptions} disabled={!bulkOptions.trim()} className="text-xs">
               옵션 추가
@@ -290,13 +290,13 @@ export const SelectConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                     value={option.label}
                     onChange={(e) => updateOption(index, "label", e.target.value)}
                     placeholder="라벨"
-                    className="flex-1 text-xs" style={{ fontSize: "12px" }}
+                    className="flex-1 text-xs"
                   />
                   <Input
                     value={option.value}
                     onChange={(e) => updateOption(index, "value", e.target.value)}
                     placeholder="값"
-                    className="flex-1 text-xs" style={{ fontSize: "12px" }}
+                    className="flex-1 text-xs"
                   />
                   <Switch
                     checked={!option.disabled}
@@ -323,7 +323,7 @@ export const SelectConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               id="defaultValue"
               value={localConfig.defaultValue || ""}
               onChange={(e) => updateConfig("defaultValue", e.target.value)}
-              className="w-full rounded-md border px-3 py-1 text-xs" style={{ fontSize: "12px" }}
+              className="w-full rounded-md border px-3 py-1 text-xs"
             >
               <option value="">선택하지 않음</option>
               {localConfig.options.map((option, index) => (
@@ -376,7 +376,7 @@ export const SelectConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               disabled={localConfig.readonly}
               required={localConfig.required}
               multiple={localConfig.multiple}
-              className="w-full rounded-md border px-3 py-1 text-xs" style={{ fontSize: "12px" }}
+              className="w-full rounded-md border px-3 py-1 text-xs"
               defaultValue={localConfig.defaultValue}
             >
               <option value="" disabled>

frontend/components/screen/config-panels/TabsConfigPanel.tsx

@@ -0,0 +1,404 @@
+"use client";
+
+import React, { useEffect, useState } from "react";
+import { Label } from "@/components/ui/label";
+import { Input } from "@/components/ui/input";
+import { Button } from "@/components/ui/button";
+import { Switch } from "@/components/ui/switch";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
+import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, CommandList } from "@/components/ui/command";
+import { Check, ChevronsUpDown, Plus, X, GripVertical, Loader2 } from "lucide-react";
+import { cn } from "@/lib/utils";
+import type { TabItem, TabsComponent } from "@/types/screen-management";
+
+interface TabsConfigPanelProps {
+  config: any;
+  onChange: (config: any) => void;
+}
+
+interface ScreenInfo {
+  screenId: number;
+  screenName: string;
+  screenCode: string;
+  tableName: string;
+}
+
+export function TabsConfigPanel({ config, onChange }: TabsConfigPanelProps) {
+  const [screens, setScreens] = useState<ScreenInfo[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [localTabs, setLocalTabs] = useState<TabItem[]>(config.tabs || []);
+
+  // 화면 목록 로드
+  useEffect(() => {
+    const loadScreens = async () => {
+      try {
+        setLoading(true);
+        
+        // API 클라이언트 동적 import (named export 사용)
+        const { apiClient } = await import("@/lib/api/client");
+        
+        // 전체 화면 목록 조회 (페이징 사이즈 크게)
+        const response = await apiClient.get("/screen-management/screens", {
+          params: { size: 1000 }
+        });
+        
+        console.log("화면 목록 조회 성공:", response.data);
+        
+        if (response.data.success && response.data.data) {
+          setScreens(response.data.data);
+        }
+      } catch (error: any) {
+        console.error("Failed to load screens:", error);
+        console.error("Error response:", error.response?.data);
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    loadScreens();
+  }, []);
+
+  // 컴포넌트 변경 시 로컬 상태 동기화 (초기화만, 입력 중에는 동기화하지 않음)
+  const [isUserEditing, setIsUserEditing] = useState(false);
+  
+  useEffect(() => {
+    // 사용자가 입력 중이 아닐 때만 동기화
+    if (!isUserEditing) {
+      setLocalTabs(config.tabs || []);
+    }
+  }, [config.tabs, isUserEditing]);
+
+  // 탭 추가
+  const handleAddTab = () => {
+    const newTab: TabItem = {
+      id: `tab-${Date.now()}`,
+      label: `새 탭 ${localTabs.length + 1}`,
+      order: localTabs.length,
+      disabled: false,
+    };
+
+    const updatedTabs = [...localTabs, newTab];
+    setLocalTabs(updatedTabs);
+    onChange({ ...config, tabs: updatedTabs });
+  };
+
+  // 탭 제거
+  const handleRemoveTab = (tabId: string) => {
+    const updatedTabs = localTabs.filter((tab) => tab.id !== tabId);
+    setLocalTabs(updatedTabs);
+    onChange({ ...config, tabs: updatedTabs });
+  };
+
+  // 탭 라벨 변경 (입력 중)
+  const handleLabelChange = (tabId: string, label: string) => {
+    setIsUserEditing(true);
+    const updatedTabs = localTabs.map((tab) => (tab.id === tabId ? { ...tab, label } : tab));
+    setLocalTabs(updatedTabs);
+    // onChange는 onBlur에서 호출
+  };
+
+  // 탭 라벨 변경 완료 (포커스 아웃 시)
+  const handleLabelBlur = () => {
+    setIsUserEditing(false);
+    onChange({ ...config, tabs: localTabs });
+  };
+
+  // 탭 화면 선택
+  const handleScreenSelect = (tabId: string, screenId: number, screenName: string) => {
+    const updatedTabs = localTabs.map((tab) => (tab.id === tabId ? { ...tab, screenId, screenName } : tab));
+    setLocalTabs(updatedTabs);
+    onChange({ ...config, tabs: updatedTabs });
+  };
+
+  // 탭 비활성화 토글
+  const handleDisabledToggle = (tabId: string, disabled: boolean) => {
+    const updatedTabs = localTabs.map((tab) => (tab.id === tabId ? { ...tab, disabled } : tab));
+    setLocalTabs(updatedTabs);
+    onChange({ ...config, tabs: updatedTabs });
+  };
+
+  // 탭 순서 변경
+  const handleMoveTab = (tabId: string, direction: "up" | "down") => {
+    const index = localTabs.findIndex((tab) => tab.id === tabId);
+    if (
+      (direction === "up" && index === 0) ||
+      (direction === "down" && index === localTabs.length - 1)
+    ) {
+      return;
+    }
+
+    const newTabs = [...localTabs];
+    const targetIndex = direction === "up" ? index - 1 : index + 1;
+    [newTabs[index], newTabs[targetIndex]] = [newTabs[targetIndex], newTabs[index]];
+
+    // order 값 재조정
+    const updatedTabs = newTabs.map((tab, idx) => ({ ...tab, order: idx }));
+    setLocalTabs(updatedTabs);
+    onChange({ ...config, tabs: updatedTabs });
+  };
+
+  return (
+    <div className="space-y-6 p-4">
+      <div>
+        <h3 className="mb-4 text-sm font-semibold">탭 설정</h3>
+
+        <div className="space-y-4">
+          {/* 탭 방향 */}
+          <div>
+            <Label className="text-xs sm:text-sm">탭 방향</Label>
+            <Select
+              value={config.orientation || "horizontal"}
+              onValueChange={(value: "horizontal" | "vertical") =>
+                onChange({ ...config, orientation: value })
+              }
+            >
+              <SelectTrigger className="h-8 text-xs sm:h-10 sm:text-sm">
+                <SelectValue />
+              </SelectTrigger>
+              <SelectContent>
+                <SelectItem value="horizontal">가로</SelectItem>
+                <SelectItem value="vertical">세로</SelectItem>
+              </SelectContent>
+            </Select>
+          </div>
+
+          {/* 탭 스타일 */}
+          <div>
+            <Label className="text-xs sm:text-sm">탭 스타일</Label>
+            <Select
+              value={config.variant || "default"}
+              onValueChange={(value: "default" | "pills" | "underline") =>
+                onChange({ ...config, variant: value })
+              }
+            >
+              <SelectTrigger className="h-8 text-xs sm:h-10 sm:text-sm">
+                <SelectValue />
+              </SelectTrigger>
+              <SelectContent>
+                <SelectItem value="default">기본</SelectItem>
+                <SelectItem value="pills">알약형</SelectItem>
+                <SelectItem value="underline">밑줄</SelectItem>
+              </SelectContent>
+            </Select>
+          </div>
+
+          {/* 선택 상태 유지 */}
+          <div className="flex items-center justify-between">
+            <div>
+              <Label className="text-xs sm:text-sm">선택 상태 유지</Label>
+              <p className="text-muted-foreground text-[10px] sm:text-xs">
+                페이지 새로고침 후에도 선택한 탭이 유지됩니다
+              </p>
+            </div>
+            <Switch
+              checked={config.persistSelection || false}
+              onCheckedChange={(checked) => onChange({ ...config, persistSelection: checked })}
+            />
+          </div>
+
+          {/* 탭 닫기 버튼 */}
+          <div className="flex items-center justify-between">
+            <div>
+              <Label className="text-xs sm:text-sm">탭 닫기 버튼</Label>
+              <p className="text-muted-foreground text-[10px] sm:text-xs">
+                각 탭에 닫기 버튼을 표시합니다
+              </p>
+            </div>
+            <Switch
+              checked={config.allowCloseable || false}
+              onCheckedChange={(checked) => onChange({ ...config, allowCloseable: checked })}
+            />
+          </div>
+        </div>
+      </div>
+
+      <div>
+        <div className="mb-4 flex items-center justify-between">
+          <h3 className="text-sm font-semibold">탭 목록</h3>
+          <Button
+            onClick={handleAddTab}
+            size="sm"
+            variant="outline"
+            className="h-8 text-xs sm:h-9 sm:text-sm"
+          >
+            <Plus className="mr-1 h-3 w-3 sm:h-4 sm:w-4" />
+            탭 추가
+          </Button>
+        </div>
+
+        {localTabs.length === 0 ? (
+          <div className="rounded-lg border border-dashed p-8 text-center">
+            <p className="text-muted-foreground text-sm">탭이 없습니다</p>
+            <p className="text-muted-foreground mt-1 text-xs">
+              탭 추가 버튼을 클릭하여 새 탭을 생성하세요
+            </p>
+          </div>
+        ) : (
+          <div className="space-y-3">
+            {localTabs.map((tab, index) => (
+              <div
+                key={tab.id}
+                className="rounded-lg border bg-card p-3 shadow-sm"
+              >
+                <div className="mb-3 flex items-center justify-between">
+                  <div className="flex items-center gap-2">
+                    <GripVertical className="h-4 w-4 text-muted-foreground" />
+                    <span className="text-xs font-medium">탭 {index + 1}</span>
+                  </div>
+                  <div className="flex items-center gap-1">
+                    <Button
+                      onClick={() => handleMoveTab(tab.id, "up")}
+                      disabled={index === 0}
+                      size="sm"
+                      variant="ghost"
+                      className="h-7 w-7 p-0"
+                    >
+                      ↑
+                    </Button>
+                    <Button
+                      onClick={() => handleMoveTab(tab.id, "down")}
+                      disabled={index === localTabs.length - 1}
+                      size="sm"
+                      variant="ghost"
+                      className="h-7 w-7 p-0"
+                    >
+                      ↓
+                    </Button>
+                    <Button
+                      onClick={() => handleRemoveTab(tab.id)}
+                      size="sm"
+                      variant="ghost"
+                      className="h-7 w-7 p-0 text-destructive hover:text-destructive"
+                    >
+                      <X className="h-3 w-3" />
+                    </Button>
+                  </div>
+                </div>
+
+                <div className="space-y-3">
+                  {/* 탭 라벨 */}
+                  <div>
+                    <Label className="text-xs">탭 라벨</Label>
+                    <Input
+                      value={tab.label}
+                      onChange={(e) => handleLabelChange(tab.id, e.target.value)}
+                      onBlur={handleLabelBlur}
+                      placeholder="탭 이름"
+                      className="h-8 text-xs sm:h-9 sm:text-sm"
+                    />
+                  </div>
+
+                  {/* 화면 선택 */}
+                  <div>
+                    <Label className="text-xs">연결된 화면</Label>
+                    {loading ? (
+                      <div className="flex items-center gap-2 rounded-md border px-3 py-2">
+                        <Loader2 className="h-3 w-3 animate-spin" />
+                        <span className="text-muted-foreground text-xs">로딩 중...</span>
+                      </div>
+                    ) : (
+                      <ScreenSelectCombobox
+                        screens={screens}
+                        selectedScreenId={tab.screenId}
+                        onSelect={(screenId, screenName) =>
+                          handleScreenSelect(tab.id, screenId, screenName)
+                        }
+                      />
+                    )}
+                    {tab.screenName && (
+                      <p className="text-muted-foreground mt-1 text-xs">
+                        선택된 화면: {tab.screenName}
+                      </p>
+                    )}
+                  </div>
+
+                  {/* 비활성화 */}
+                  <div className="flex items-center justify-between">
+                    <Label className="text-xs">비활성화</Label>
+                    <Switch
+                      checked={tab.disabled || false}
+                      onCheckedChange={(checked) => handleDisabledToggle(tab.id, checked)}
+                    />
+                  </div>
+                </div>
+              </div>
+            ))}
+          </div>
+        )}
+      </div>
+    </div>
+  );
+}
+
+// 화면 선택 Combobox 컴포넌트
+function ScreenSelectCombobox({
+  screens,
+  selectedScreenId,
+  onSelect,
+}: {
+  screens: ScreenInfo[];
+  selectedScreenId?: number;
+  onSelect: (screenId: number, screenName: string) => void;
+}) {
+  const [open, setOpen] = useState(false);
+
+  const selectedScreen = screens.find((s) => s.screenId === selectedScreenId);
+
+  return (
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger asChild>
+        <Button
+          variant="outline"
+          role="combobox"
+          aria-expanded={open}
+          className="h-8 w-full justify-between text-xs sm:h-9 sm:text-sm"
+        >
+          {selectedScreen ? selectedScreen.screenName : "화면 선택"}
+          <ChevronsUpDown className="ml-2 h-3 w-3 shrink-0 opacity-50 sm:h-4 sm:w-4" />
+        </Button>
+      </PopoverTrigger>
+      <PopoverContent
+        className="p-0"
+        style={{ width: "var(--radix-popover-trigger-width)" }}
+        align="start"
+      >
+        <Command>
+          <CommandInput placeholder="화면 검색..." className="text-xs sm:text-sm" />
+          <CommandList>
+            <CommandEmpty className="text-xs sm:text-sm">
+              화면을 찾을 수 없습니다.
+            </CommandEmpty>
+            <CommandGroup>
+              {screens.map((screen) => (
+                <CommandItem
+                  key={screen.screenId}
+                  value={screen.screenName}
+                  onSelect={() => {
+                    onSelect(screen.screenId, screen.screenName);
+                    setOpen(false);
+                  }}
+                  className="text-xs sm:text-sm"
+                >
+                  <Check
+                    className={cn(
+                      "mr-2 h-3 w-3 sm:h-4 sm:w-4",
+                      selectedScreenId === screen.screenId ? "opacity-100" : "opacity-0"
+                    )}
+                  />
+                  <div className="flex flex-col">
+                    <span className="font-medium">{screen.screenName}</span>
+                    <span className="text-muted-foreground text-[10px]">
+                      코드: {screen.screenCode} | 테이블: {screen.tableName}
+                    </span>
+                  </div>
+                </CommandItem>
+              ))}
+            </CommandGroup>
+          </CommandList>
+        </Command>
+      </PopoverContent>
+    </Popover>
+  );
+}
+

frontend/components/screen/config-panels/TextConfigPanel.tsx

@@ -55,7 +55,7 @@ export const TextConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
   return (
     <Card>
       <CardHeader>
-        <CardTitle className="flex items-center gap-2 text-xs" style={{ fontSize: "12px" }}>텍스트 설정</CardTitle>
+        <CardTitle className="flex items-center gap-2 text-xs">텍스트 설정</CardTitle>
         <CardDescription className="text-xs">텍스트 입력 필드의 세부 설정을 관리합니다.</CardDescription>
       </CardHeader>
       <CardContent className="space-y-4">
@@ -72,7 +72,7 @@ export const TextConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               value={localConfig.placeholder || ""}
               onChange={(e) => updateConfig("placeholder", e.target.value)}
               placeholder="입력 안내 텍스트"
-              className="text-xs" style={{ fontSize: "12px" }}
+              className="text-xs"
             />
           </div>
 
@@ -88,7 +88,7 @@ export const TextConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                 onChange={(e) => updateConfig("minLength", e.target.value ? parseInt(e.target.value) : undefined)}
                 placeholder="0"
                 min="0"
-                className="text-xs" style={{ fontSize: "12px" }}
+                className="text-xs"
               />
             </div>
             <div className="space-y-2">
@@ -102,7 +102,7 @@ export const TextConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                 onChange={(e) => updateConfig("maxLength", e.target.value ? parseInt(e.target.value) : undefined)}
                 placeholder="100"
                 min="1"
-                className="text-xs" style={{ fontSize: "12px" }}
+                className="text-xs"
               />
             </div>
           </div>
@@ -141,7 +141,7 @@ export const TextConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               value={localConfig.pattern || ""}
               onChange={(e) => updateConfig("pattern", e.target.value)}
               placeholder="예: [A-Za-z0-9]+"
-              className="font-mono text-xs" style={{ fontSize: "12px" }}
+              className="font-mono text-xs"
             />
             <p className="text-muted-foreground text-xs">JavaScript 정규식 패턴을 입력하세요.</p>
           </div>
@@ -219,7 +219,7 @@ export const TextConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               minLength={localConfig.minLength}
               pattern={localConfig.pattern}
               autoComplete={localConfig.autoComplete}
-              className="text-xs" style={{ fontSize: "12px" }}
+              className="text-xs"
             />
           </div>
         </div>

frontend/components/screen/config-panels/TextareaConfigPanel.tsx

@@ -68,7 +68,7 @@ export const TextareaConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
   return (
     <Card>
       <CardHeader>
-        <CardTitle className="flex items-center gap-2 text-xs" style={{ fontSize: "12px" }}>
+        <CardTitle className="flex items-center gap-2 text-xs">
           <AlignLeft className="h-4 w-4" />
           텍스트영역 설정
         </CardTitle>
@@ -88,7 +88,7 @@ export const TextareaConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               value={localConfig.placeholder || ""}
               onChange={(e) => updateConfig("placeholder", e.target.value)}
               placeholder="내용을 입력하세요"
-              className="text-xs" style={{ fontSize: "12px" }}
+              className="text-xs"
             />
           </div>
 
@@ -101,7 +101,7 @@ export const TextareaConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               value={localConfig.defaultValue || ""}
               onChange={(e) => updateConfig("defaultValue", e.target.value)}
               placeholder="기본 텍스트 내용"
-              className="text-xs" style={{ fontSize: "12px" }}
+              className="text-xs"
               rows={3}
             />
             {localConfig.showCharCount && (
@@ -151,7 +151,7 @@ export const TextareaConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               placeholder="자동 (CSS로 제어)"
               min={10}
               max={200}
-              className="text-xs" style={{ fontSize: "12px" }}
+              className="text-xs"
             />
             <p className="text-muted-foreground text-xs">비워두면 CSS width로 제어됩니다.</p>
           </div>
@@ -203,7 +203,7 @@ export const TextareaConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               }}
               placeholder="제한 없음"
               min={0}
-              className="text-xs" style={{ fontSize: "12px" }}
+              className="text-xs"
             />
           </div>
 
@@ -221,7 +221,7 @@ export const TextareaConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
               }}
               placeholder="제한 없음"
               min={1}
-              className="text-xs" style={{ fontSize: "12px" }}
+              className="text-xs"
             />
           </div>
 
@@ -333,7 +333,7 @@ export const TextareaConfigPanel: React.FC<WebTypeConfigPanelProps> = ({
                 resize: localConfig.resizable ? "both" : "none",
                 minHeight: localConfig.autoHeight ? "auto" : undefined,
               }}
-              className="text-xs" style={{ fontSize: "12px" }}
+              className="text-xs"
               wrap={localConfig.wrap}
             />
             {localConfig.showCharCount && (

frontend/components/screen/dialogs/FlowButtonGroupDialog.tsx

@@ -94,7 +94,7 @@ export const FlowButtonGroupDialog: React.FC<FlowButtonGroupDialogProps> = ({
                 max={100}
                 value={gap}
                 onChange={(e) => setGap(Number(e.target.value))}
-                className="h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}
+                className="h-6 w-full px-2 py-0 text-xs"
               />
               <Badge variant="outline" className="text-xs">
                 {gap}px
@@ -109,7 +109,7 @@ export const FlowButtonGroupDialog: React.FC<FlowButtonGroupDialogProps> = ({
               정렬 방식
             </Label>
             <Select value={align} onValueChange={(value: any) => setAlign(value)}>
-              <SelectTrigger id="align" className="h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}>
+              <SelectTrigger id="align" className="h-6 w-full px-2 py-0 text-xs">
                 <SelectValue />
               </SelectTrigger>
               <SelectContent>

frontend/components/screen/panels/ComponentsPanel.tsx

@@ -181,7 +181,7 @@ export function ComponentsPanel({
                 onSearchChange(value);
               }
             }}
-            className="h-8 pl-8 text-xs" style={{ fontSize: "12px" }}
+            className="h-8 pl-8 text-xs"
           />
         </div>
       </div>

frontend/components/screen/panels/DataTableConfigPanel.tsx

@@ -458,7 +458,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                             updateSettings({ options: newOptions });
                           }}
                           placeholder="옵션명"
-                          className="h-7 text-xs" style={{ fontSize: "12px" }}
+                          className="h-7 text-xs"
                         />
                         <Button
                           type="button"
@@ -483,7 +483,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                       const newOption = { label: "", value: "" };
                       updateSettings({ options: [...(localSettings.options || []), newOption] });
                     }}
-                    className="h-7 text-xs" style={{ fontSize: "12px" }}
+                    className="h-7 text-xs"
                   >
                     <Plus className="mr-1 h-3 w-3" />
                     옵션 추가
@@ -548,7 +548,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                     value={localSettings.min || ""}
                     onChange={(e) => updateSettings({ min: e.target.value ? Number(e.target.value) : undefined })}
                     placeholder="최소값"
-                    className="h-7 text-xs" style={{ fontSize: "12px" }}
+                    className="h-7 text-xs"
                   />
                 </div>
                 <div className="space-y-1">
@@ -558,7 +558,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                     value={localSettings.max || ""}
                     onChange={(e) => updateSettings({ max: e.target.value ? Number(e.target.value) : undefined })}
                     placeholder="최대값"
-                    className="h-7 text-xs" style={{ fontSize: "12px" }}
+                    className="h-7 text-xs"
                   />
                 </div>
               </div>
@@ -571,7 +571,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                     value={localSettings.step || "0.01"}
                     onChange={(e) => updateSettings({ step: e.target.value })}
                     placeholder="0.01"
-                    className="h-7 text-xs" style={{ fontSize: "12px" }}
+                    className="h-7 text-xs"
                   />
                 </div>
               )}
@@ -589,7 +589,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                     type="date"
                     value={localSettings.minDate || ""}
                     onChange={(e) => updateSettings({ minDate: e.target.value })}
-                    className="h-7 text-xs" style={{ fontSize: "12px" }}
+                    className="h-7 text-xs"
                   />
                 </div>
                 <div className="space-y-1">
@@ -598,7 +598,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                     type="date"
                     value={localSettings.maxDate || ""}
                     onChange={(e) => updateSettings({ maxDate: e.target.value })}
-                    className="h-7 text-xs" style={{ fontSize: "12px" }}
+                    className="h-7 text-xs"
                   />
                 </div>
               </div>
@@ -626,7 +626,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                   value={localSettings.maxLength || ""}
                   onChange={(e) => updateSettings({ maxLength: e.target.value ? Number(e.target.value) : undefined })}
                   placeholder="최대 문자 수"
-                  className="h-7 text-xs" style={{ fontSize: "12px" }}
+                  className="h-7 text-xs"
                 />
               </div>
               <div className="space-y-1">
@@ -635,7 +635,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                   value={localSettings.placeholder || ""}
                   onChange={(e) => updateSettings({ placeholder: e.target.value })}
                   placeholder="입력 안내 텍스트"
-                  className="h-7 text-xs" style={{ fontSize: "12px" }}
+                  className="h-7 text-xs"
                 />
               </div>
             </div>
@@ -652,7 +652,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                     value={localSettings.rows || "3"}
                     onChange={(e) => updateSettings({ rows: Number(e.target.value) })}
                     placeholder="3"
-                    className="h-7 text-xs" style={{ fontSize: "12px" }}
+                    className="h-7 text-xs"
                   />
                 </div>
                 <div className="space-y-1">
@@ -662,7 +662,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                     value={localSettings.maxLength || ""}
                     onChange={(e) => updateSettings({ maxLength: e.target.value ? Number(e.target.value) : undefined })}
                     placeholder="최대 문자 수"
-                    className="h-7 text-xs" style={{ fontSize: "12px" }}
+                    className="h-7 text-xs"
                   />
                 </div>
               </div>
@@ -678,7 +678,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                   value={localSettings.accept || ""}
                   onChange={(e) => updateSettings({ accept: e.target.value })}
                   placeholder=".jpg,.png,.pdf"
-                  className="h-7 text-xs" style={{ fontSize: "12px" }}
+                  className="h-7 text-xs"
                 />
               </div>
               <div className="space-y-1">
@@ -688,7 +688,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                   value={localSettings.maxSize ? localSettings.maxSize / 1024 / 1024 : "10"}
                   onChange={(e) => updateSettings({ maxSize: Number(e.target.value) * 1024 * 1024 })}
                   placeholder="10"
-                  className="h-7 text-xs" style={{ fontSize: "12px" }}
+                  className="h-7 text-xs"
                 />
               </div>
               <div className="flex items-center space-x-2">
@@ -1132,7 +1132,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
           {/* 기본 설정 */}
           <Card>
             <CardHeader>
-              <CardTitle className="flex items-center space-x-2 text-xs" style={{ fontSize: "12px" }}>
+              <CardTitle className="flex items-center space-x-2 text-xs">
                 <Settings className="h-4 w-4" />
                 <span>기본 설정</span>
               </CardTitle>
@@ -1184,7 +1184,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                         onUpdateComponent({ enableAdd: checked as boolean });
                       }}
                     />
-                    <Label htmlFor="enable-add" className="text-xs" style={{ fontSize: "12px" }}>
+                    <Label htmlFor="enable-add" className="text-xs">
                       데이터 추가 기능
                     </Label>
                   </div>
@@ -1198,7 +1198,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                         onUpdateComponent({ enableEdit: checked as boolean });
                       }}
                     />
-                    <Label htmlFor="enable-edit" className="text-xs" style={{ fontSize: "12px" }}>
+                    <Label htmlFor="enable-edit" className="text-xs">
                       데이터 수정 기능
                     </Label>
                   </div>
@@ -1212,7 +1212,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                         onUpdateComponent({ enableDelete: checked as boolean });
                       }}
                     />
-                    <Label htmlFor="enable-delete" className="text-xs" style={{ fontSize: "12px" }}>
+                    <Label htmlFor="enable-delete" className="text-xs">
                       데이터 삭제 기능
                     </Label>
                   </div>
@@ -1220,7 +1220,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
 
                 <div className="grid grid-cols-3 gap-4">
                   <div className="space-y-2">
-                    <Label htmlFor="add-button-text" className="text-xs" style={{ fontSize: "12px" }}>
+                    <Label htmlFor="add-button-text" className="text-xs">
                       추가 버튼 텍스트
                     </Label>
                     <Input
@@ -1233,12 +1233,12 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                       }}
                       placeholder="추가"
                       disabled={!localValues.enableAdd}
-                      className="h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}
+                      className="h-6 w-full px-2 py-0 text-xs"
                     />
                   </div>
 
                   <div className="space-y-2">
-                    <Label htmlFor="edit-button-text" className="text-xs" style={{ fontSize: "12px" }}>
+                    <Label htmlFor="edit-button-text" className="text-xs">
                       수정 버튼 텍스트
                     </Label>
                     <Input
@@ -1251,12 +1251,12 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                       }}
                       placeholder="수정"
                       disabled={!localValues.enableEdit}
-                      className="h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}
+                      className="h-6 w-full px-2 py-0 text-xs"
                     />
                   </div>
 
                   <div className="space-y-2">
-                    <Label htmlFor="delete-button-text" className="text-xs" style={{ fontSize: "12px" }}>
+                    <Label htmlFor="delete-button-text" className="text-xs">
                       삭제 버튼 텍스트
                     </Label>
                     <Input
@@ -1269,7 +1269,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                       }}
                       placeholder="삭제"
                       disabled={!localValues.enableDelete}
-                      className="h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}
+                      className="h-6 w-full px-2 py-0 text-xs"
                     />
                   </div>
                 </div>
@@ -1284,7 +1284,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
 
                   <div className="grid grid-cols-2 gap-4">
                     <div className="space-y-2">
-                      <Label htmlFor="modal-title" className="text-xs" style={{ fontSize: "12px" }}>
+                      <Label htmlFor="modal-title" className="text-xs">
                         모달 제목
                       </Label>
                       <Input
@@ -1298,12 +1298,12 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                           });
                         }}
                         placeholder="새 데이터 추가"
-                        className="h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}
+                        className="h-6 w-full px-2 py-0 text-xs"
                       />
                     </div>
 
                     <div className="space-y-2">
-                      <Label htmlFor="modal-width" className="text-xs" style={{ fontSize: "12px" }}>
+                      <Label htmlFor="modal-width" className="text-xs">
                         모달 크기
                       </Label>
                       <select
@@ -1328,7 +1328,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                   </div>
 
                   <div className="space-y-2">
-                    <Label htmlFor="modal-description" className="text-xs" style={{ fontSize: "12px" }}>
+                    <Label htmlFor="modal-description" className="text-xs">
                       모달 설명
                     </Label>
                     <Input
@@ -1342,13 +1342,13 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                         });
                       }}
                       placeholder="모달에 표시될 설명을 입력하세요"
-                      className="h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}
+                      className="h-6 w-full px-2 py-0 text-xs"
                     />
                   </div>
 
                   <div className="grid grid-cols-2 gap-4">
                     <div className="space-y-2">
-                      <Label htmlFor="modal-layout" className="text-xs" style={{ fontSize: "12px" }}>
+                      <Label htmlFor="modal-layout" className="text-xs">
                         레이아웃
                       </Label>
                       <select
@@ -1370,7 +1370,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
 
                     {localValues.modalLayout === "grid" && (
                       <div className="space-y-2">
-                        <Label htmlFor="modal-grid-columns" className="text-xs" style={{ fontSize: "12px" }}>
+                        <Label htmlFor="modal-grid-columns" className="text-xs">
                           그리드 컬럼 수
                         </Label>
                         <select
@@ -1394,7 +1394,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
 
                   <div className="grid grid-cols-2 gap-4">
                     <div className="space-y-2">
-                      <Label htmlFor="modal-submit-text" className="text-xs" style={{ fontSize: "12px" }}>
+                      <Label htmlFor="modal-submit-text" className="text-xs">
                         제출 버튼 텍스트
                       </Label>
                       <Input
@@ -1408,12 +1408,12 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                           });
                         }}
                         placeholder="추가"
-                        className="h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}
+                        className="h-6 w-full px-2 py-0 text-xs"
                       />
                     </div>
 
                     <div className="space-y-2">
-                      <Label htmlFor="modal-cancel-text" className="text-xs" style={{ fontSize: "12px" }}>
+                      <Label htmlFor="modal-cancel-text" className="text-xs">
                         취소 버튼 텍스트
                       </Label>
                       <Input
@@ -1427,7 +1427,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                           });
                         }}
                         placeholder="취소"
-                        className="h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}
+                        className="h-6 w-full px-2 py-0 text-xs"
                       />
                     </div>
                   </div>
@@ -1441,7 +1441,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
 
                   <div className="space-y-3">
                     <div className="space-y-2">
-                      <Label htmlFor="edit-modal-title" className="text-xs" style={{ fontSize: "12px" }}>
+                      <Label htmlFor="edit-modal-title" className="text-xs">
                         모달 제목
                       </Label>
                       <Input
@@ -1455,13 +1455,13 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                           });
                         }}
                         placeholder="데이터 수정"
-                        className="h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}
+                        className="h-6 w-full px-2 py-0 text-xs"
                       />
                       <p className="text-xs text-gray-500">비워두면 기본 제목이 표시됩니다</p>
                     </div>
 
                     <div className="space-y-2">
-                      <Label htmlFor="edit-modal-description" className="text-xs" style={{ fontSize: "12px" }}>
+                      <Label htmlFor="edit-modal-description" className="text-xs">
                         모달 설명
                       </Label>
                       <Input
@@ -1475,7 +1475,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                           });
                         }}
                         placeholder="선택한 데이터를 수정합니다"
-                        className="h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}
+                        className="h-6 w-full px-2 py-0 text-xs"
                       />
                       <p className="text-xs text-gray-500">비워두면 설명이 표시되지 않습니다</p>
                     </div>
@@ -1494,7 +1494,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                       onUpdateComponent({ showSearchButton: checked as boolean });
                     }}
                   />
-                  <Label htmlFor="show-search-button" className="text-xs" style={{ fontSize: "12px" }}>
+                  <Label htmlFor="show-search-button" className="text-xs">
                     검색 버튼 표시
                   </Label>
                 </div>
@@ -1509,7 +1509,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                       onUpdateComponent({ enableExport: checked as boolean });
                     }}
                   />
-                  <Label htmlFor="enable-export" className="text-xs" style={{ fontSize: "12px" }}>
+                  <Label htmlFor="enable-export" className="text-xs">
                     내보내기 기능
                   </Label>
                 </div>
@@ -1521,7 +1521,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
         <TabsContent value="columns" className="mt-4 max-h-[70vh] overflow-y-auto">
           <Card>
             <CardHeader>
-              <CardTitle className="flex items-center space-x-2 text-xs" style={{ fontSize: "12px" }}>
+              <CardTitle className="flex items-center space-x-2 text-xs">
                 <Columns className="h-4 w-4" />
                 <span>컬럼 설정</span>
               </CardTitle>
@@ -1654,7 +1654,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                             }
                           }}
                           placeholder="표시명을 입력하세요"
-                          className="h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}
+                          className="h-6 w-full px-2 py-0 text-xs"
                         />
                       </div>
 
@@ -1947,7 +1947,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                                         });
                                       }}
                                       placeholder="고정값 입력..."
-                                      className="h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}
+                                      className="h-6 w-full px-2 py-0 text-xs"
                                     />
                                   </div>
                                 )}
@@ -1967,7 +1967,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
         <TabsContent value="filters" className="mt-4 max-h-[70vh] overflow-y-auto">
           <Card>
             <CardHeader>
-              <CardTitle className="flex items-center space-x-2 text-xs" style={{ fontSize: "12px" }}>
+              <CardTitle className="flex items-center space-x-2 text-xs">
                 <Filter className="h-4 w-4" />
                 <span>필터 설정</span>
               </CardTitle>
@@ -1995,7 +1995,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
               {component.filters.length === 0 ? (
                 <div className="text-muted-foreground py-8 text-center">
                   <Filter className="mx-auto mb-2 h-8 w-8 opacity-50" />
-                  <p className="text-xs" style={{ fontSize: "12px" }}>필터가 없습니다</p>
+                  <p className="text-xs">필터가 없습니다</p>
                   <p className="text-xs">컬럼을 추가하면 자동으로 필터가 생성됩니다</p>
                 </div>
               ) : (
@@ -2073,7 +2073,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                                       updateFilter(index, { label: newValue });
                                     }}
                                     placeholder="필터 이름 입력..."
-                                    className="h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}
+                                    className="h-6 w-full px-2 py-0 text-xs"
                                   />
                                 </div>
                                 <p className="text-muted-foreground mt-1 text-xs">
@@ -2192,7 +2192,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
         <TabsContent value="modal" className="mt-4 max-h-[70vh] overflow-y-auto">
           <Card>
             <CardHeader>
-              <CardTitle className="flex items-center space-x-2 text-xs" style={{ fontSize: "12px" }}>
+              <CardTitle className="flex items-center space-x-2 text-xs">
                 <Settings className="h-4 w-4" />
                 <span>모달 및 페이징 설정</span>
               </CardTitle>
@@ -2342,7 +2342,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                             });
                           }}
                         />
-                        <Label htmlFor="show-page-size-selector" className="text-xs" style={{ fontSize: "12px" }}>
+                        <Label htmlFor="show-page-size-selector" className="text-xs">
                           페이지 크기 선택기 표시
                         </Label>
                       </div>
@@ -2362,7 +2362,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                             });
                           }}
                         />
-                        <Label htmlFor="show-page-info" className="text-xs" style={{ fontSize: "12px" }}>
+                        <Label htmlFor="show-page-info" className="text-xs">
                           페이지 정보 표시
                         </Label>
                       </div>
@@ -2382,7 +2382,7 @@ const DataTableConfigPanelComponent: React.FC<DataTableConfigPanelProps> = ({
                             });
                           }}
                         />
-                        <Label htmlFor="show-first-last" className="text-xs" style={{ fontSize: "12px" }}>
+                        <Label htmlFor="show-first-last" className="text-xs">
                           처음/마지막 버튼 표시
                         </Label>
                       </div>

frontend/components/screen/panels/DetailSettingsPanel.tsx

@@ -158,7 +158,6 @@ export const DetailSettingsPanel: React.FC<DetailSettingsPanelProps> = ({
                       }
                     }}
                     className="w-full rounded border border-gray-300 px-2 py-1 text-xs"
-                    style={{ fontSize: "12px" }}
                   />
                 </div>
                 <div>
@@ -196,7 +195,6 @@ export const DetailSettingsPanel: React.FC<DetailSettingsPanelProps> = ({
                       }
                     }}
                     className="w-full rounded border border-gray-300 px-2 py-1 text-xs"
-                    style={{ fontSize: "12px" }}
                   />
                 </div>
               </div>
@@ -211,7 +209,6 @@ export const DetailSettingsPanel: React.FC<DetailSettingsPanelProps> = ({
                     onUpdateProperty(layoutComponent.id, "layoutConfig.grid.gap", parseInt(e.target.value))
                   }
                   className="w-full rounded border border-gray-300 px-2 py-1 text-xs"
-                  style={{ fontSize: "12px" }}
                 />
               </div>
             </div>
@@ -256,7 +253,6 @@ export const DetailSettingsPanel: React.FC<DetailSettingsPanelProps> = ({
                     }
                   }}
                   className="w-full rounded border border-gray-300 px-2 py-1 text-xs"
-                  style={{ fontSize: "12px" }}
                 >
                   <option value="row">가로 (row)</option>
                   <option value="column">세로 (column)</option>
@@ -316,7 +312,6 @@ export const DetailSettingsPanel: React.FC<DetailSettingsPanelProps> = ({
                       }
                     }}
                     className="w-20 rounded border border-gray-300 px-2 py-1 text-xs"
-                    style={{ fontSize: "12px" }}
                   />
                   <span className="text-xs text-gray-500">개</span>
                 </div>
@@ -332,7 +327,6 @@ export const DetailSettingsPanel: React.FC<DetailSettingsPanelProps> = ({
                     onUpdateProperty(layoutComponent.id, "layoutConfig.flexbox.gap", parseInt(e.target.value))
                   }
                   className="w-full rounded border border-gray-300 px-2 py-1 text-xs"
-                  style={{ fontSize: "12px" }}
                 />
               </div>
             </div>
@@ -348,7 +342,6 @@ export const DetailSettingsPanel: React.FC<DetailSettingsPanelProps> = ({
                   value={layoutComponent.layoutConfig?.split?.direction || "horizontal"}
                   onChange={(e) => onUpdateProperty(layoutComponent.id, "layoutConfig.split.direction", e.target.value)}
                   className="w-full rounded border border-gray-300 px-2 py-1 text-xs"
-                  style={{ fontSize: "12px" }}
                 >
                   <option value="horizontal">가로 분할</option>
                   <option value="vertical">세로 분할</option>
@@ -398,7 +391,6 @@ export const DetailSettingsPanel: React.FC<DetailSettingsPanelProps> = ({
                           )
                         }
                         className="w-full rounded border border-gray-300 px-2 py-1 text-xs"
-                        style={{ fontSize: "12px" }}
                       >
                         <option value="">컬럼을 선택하세요</option>
                         {currentTable.columns?.map((column) => (
@@ -421,7 +413,6 @@ export const DetailSettingsPanel: React.FC<DetailSettingsPanelProps> = ({
                           )
                         }
                         className="w-full rounded border border-gray-300 px-2 py-1 text-xs"
-                        style={{ fontSize: "12px" }}
                       >
                         <option value="">컬럼을 선택하세요</option>
                         {currentTable.columns?.map((column) => (
@@ -444,7 +435,6 @@ export const DetailSettingsPanel: React.FC<DetailSettingsPanelProps> = ({
                           )
                         }
                         className="w-full rounded border border-gray-300 px-2 py-1 text-xs"
-                        style={{ fontSize: "12px" }}
                       >
                         <option value="">컬럼을 선택하세요</option>
                         {currentTable.columns?.map((column) => (
@@ -467,7 +457,6 @@ export const DetailSettingsPanel: React.FC<DetailSettingsPanelProps> = ({
                           )
                         }
                         className="w-full rounded border border-gray-300 px-2 py-1 text-xs"
-                        style={{ fontSize: "12px" }}
                       >
                         <option value="">컬럼을 선택하세요</option>
                         {currentTable.columns?.map((column) => (
@@ -495,7 +484,6 @@ export const DetailSettingsPanel: React.FC<DetailSettingsPanelProps> = ({
                             );
                           }}
                           className="bg-primary text-primary-foreground hover:bg-primary/90 rounded px-2 py-1 text-xs"
-                          style={{ fontSize: "12px" }}
                         >
                           + 컬럼 추가
                         </button>
@@ -519,7 +507,6 @@ export const DetailSettingsPanel: React.FC<DetailSettingsPanelProps> = ({
                                   );
                                 }}
                                 className="flex-1 rounded border border-gray-300 px-2 py-1 text-xs"
-                                style={{ fontSize: "12px" }}
                               >
                                 <option value="">컬럼을 선택하세요</option>
                                 {currentTable.columns?.map((col) => (
@@ -542,7 +529,6 @@ export const DetailSettingsPanel: React.FC<DetailSettingsPanelProps> = ({
                                   );
                                 }}
                                 className="bg-destructive text-destructive-foreground hover:bg-destructive/90 rounded px-2 py-1 text-xs"
-                                style={{ fontSize: "12px" }}
                               >
                                 삭제
                               </button>
@@ -578,7 +564,6 @@ export const DetailSettingsPanel: React.FC<DetailSettingsPanelProps> = ({
                         onUpdateProperty(layoutComponent.id, "layoutConfig.card.cardsPerRow", parseInt(e.target.value))
                       }
                       className="w-full rounded border border-gray-300 px-2 py-1 text-xs"
-                      style={{ fontSize: "12px" }}
                     />
                   </div>
 
@@ -593,7 +578,6 @@ export const DetailSettingsPanel: React.FC<DetailSettingsPanelProps> = ({
                         onUpdateProperty(layoutComponent.id, "layoutConfig.card.cardSpacing", parseInt(e.target.value))
                       }
                       className="w-full rounded border border-gray-300 px-2 py-1 text-xs"
-                      style={{ fontSize: "12px" }}
                     />
                   </div>
                 </div>
@@ -683,7 +667,6 @@ export const DetailSettingsPanel: React.FC<DetailSettingsPanelProps> = ({
                       )
                     }
                     className="w-full rounded border border-gray-300 px-2 py-1 text-xs"
-                    style={{ fontSize: "12px" }}
                   />
                 </div>
               </div>
@@ -711,7 +694,6 @@ export const DetailSettingsPanel: React.FC<DetailSettingsPanelProps> = ({
                             onUpdateProperty(layoutComponent.id, `zones.${index}.size.width`, e.target.value)
                           }
                           className="w-full rounded border border-gray-300 px-2 py-1 text-xs"
-                          style={{ fontSize: "12px" }}
                           placeholder="100%"
                         />
                       </div>
@@ -724,7 +706,6 @@ export const DetailSettingsPanel: React.FC<DetailSettingsPanelProps> = ({
                             onUpdateProperty(layoutComponent.id, `zones.${index}.size.height`, e.target.value)
                           }
                           className="w-full rounded border border-gray-300 px-2 py-1 text-xs"
-                          style={{ fontSize: "12px" }}
                           placeholder="auto"
                         />
                       </div>
@@ -1007,7 +988,7 @@ export const DetailSettingsPanel: React.FC<DetailSettingsPanelProps> = ({
             <h3 className="font-medium text-gray-900">컴포넌트 설정</h3>
           </div>
           <div className="mt-2 flex items-center space-x-2">
-            <span className="text-muted-foreground text-xs" style={{ fontSize: "12px" }}>
+            <span className="text-muted-foreground text-xs">
               타입:
             </span>
             <span className="rounded bg-green-100 px-2 py-1 text-xs font-medium text-green-800">{componentType}</span>
@@ -1057,7 +1038,7 @@ export const DetailSettingsPanel: React.FC<DetailSettingsPanelProps> = ({
             <h3 className="font-medium text-gray-900">파일 컴포넌트 설정</h3>
           </div>
           <div className="mt-2 flex items-center space-x-2">
-            <span className="text-muted-foreground text-xs" style={{ fontSize: "12px" }}>
+            <span className="text-muted-foreground text-xs">
               타입:
             </span>
             <span className="rounded bg-purple-100 px-2 py-1 text-xs font-medium text-purple-800">파일 업로드</span>
@@ -1146,14 +1127,14 @@ export const DetailSettingsPanel: React.FC<DetailSettingsPanelProps> = ({
           {/* 컴포넌트 정보 */}
           <div className="mb-4 space-y-2">
             <div className="flex items-center space-x-2">
-              <span className="text-muted-foreground text-xs" style={{ fontSize: "12px" }}>
+              <span className="text-muted-foreground text-xs">
                 컴포넌트:
               </span>
               <span className="rounded bg-green-100 px-2 py-1 text-xs font-medium text-green-800">{componentId}</span>
             </div>
             {webType && currentBaseInputType && (
               <div className="flex items-center space-x-2">
-                <span className="text-muted-foreground text-xs" style={{ fontSize: "12px" }}>
+                <span className="text-muted-foreground text-xs">
                   입력 타입:
                 </span>
                 <span className="rounded bg-blue-100 px-2 py-1 text-xs font-medium text-blue-800">
@@ -1163,7 +1144,7 @@ export const DetailSettingsPanel: React.FC<DetailSettingsPanelProps> = ({
             )}
             {selectedComponent.columnName && (
               <div className="flex items-center space-x-2">
-                <span className="text-muted-foreground text-xs" style={{ fontSize: "12px" }}>
+                <span className="text-muted-foreground text-xs">
                   컬럼:
                 </span>
                 <span className="text-xs text-gray-700">{selectedComponent.columnName}</span>
@@ -1375,7 +1356,7 @@ export const DetailSettingsPanel: React.FC<DetailSettingsPanelProps> = ({
           <h3 className="font-medium text-gray-900">상세 설정</h3>
         </div>
         <div className="mt-2 flex items-center space-x-2">
-          <span className="text-muted-foreground text-xs" style={{ fontSize: "12px" }}>
+          <span className="text-muted-foreground text-xs">
             입력 타입:
           </span>
           <span className="rounded bg-blue-100 px-2 py-1 text-xs font-medium text-blue-800">
@@ -1390,7 +1371,7 @@ export const DetailSettingsPanel: React.FC<DetailSettingsPanelProps> = ({
         <div className="space-y-2">
           <label className="block text-sm font-medium text-gray-700">세부 타입 선택</label>
           <Select value={localDetailType} onValueChange={handleDetailTypeChange}>
-            <SelectTrigger className="h-6 w-full px-2 py-0 bg-white text-xs" style={{ fontSize: "12px" }}>
+            <SelectTrigger className="h-6 w-full px-2 py-0 bg-white text-xs">
               <SelectValue placeholder="세부 타입을 선택하세요" />
             </SelectTrigger>
             <SelectContent>

frontend/components/screen/panels/FlowButtonGroupPanel.tsx

@@ -98,7 +98,7 @@ export const FlowButtonGroupPanel: React.FC<FlowButtonGroupPanelProps> = ({
                     size="sm"
                     variant="ghost"
                     onClick={() => onSelectGroup(groupInfo.buttons.map((b) => b.id))}
-                    className="h-7 px-2 text-xs" style={{ fontSize: "12px" }}
+                    className="h-7 px-2 text-xs"
                   >
                     선택
                   </Button>
@@ -152,7 +152,7 @@ export const FlowButtonGroupPanel: React.FC<FlowButtonGroupPanelProps> = ({
                 {groupInfo.buttons.map((button) => (
                   <div
                     key={button.id}
-                    className="flex items-center gap-2 rounded bg-white px-2 py-1.5 text-xs" style={{ fontSize: "12px" }}
+                    className="flex items-center gap-2 rounded bg-white px-2 py-1.5 text-xs"
                   >
                     <div className="h-2 w-2 rounded-full bg-blue-500" />
                     <span className="flex-1 truncate font-medium">

frontend/components/screen/panels/LayoutsPanel.tsx

@@ -214,7 +214,7 @@ export default function LayoutsPanel({
                             </Badge>
                           </div>
                         </div>
-                        <CardTitle className="text-xs" style={{ fontSize: "12px" }}>{layout.name}</CardTitle>
+                        <CardTitle className="text-xs">{layout.name}</CardTitle>
                       </CardHeader>
                       <CardContent className="pt-0">
                         {layout.description && (

frontend/components/screen/panels/PropertiesPanel.tsx

@@ -652,7 +652,7 @@ const PropertiesPanelComponent: React.FC<PropertiesPanelProps> = ({
                       }}
                       className="border-input bg-background text-primary focus:ring-ring h-4 w-4 rounded border focus:ring-2 focus:ring-offset-2"
                     />
-                    <Label htmlFor="required" className="text-xs" style={{ fontSize: "12px" }}>
+                    <Label htmlFor="required" className="text-xs">
                       필수 입력
                     </Label>
                   </div>
@@ -668,7 +668,7 @@ const PropertiesPanelComponent: React.FC<PropertiesPanelProps> = ({
                       }}
                       className="border-input bg-background text-primary focus:ring-ring h-4 w-4 rounded border focus:ring-2 focus:ring-offset-2"
                     />
-                    <Label htmlFor="readonly" className="text-xs" style={{ fontSize: "12px" }}>
+                    <Label htmlFor="readonly" className="text-xs">
                       읽기 전용
                     </Label>
                   </div>
@@ -990,7 +990,7 @@ const PropertiesPanelComponent: React.FC<PropertiesPanelProps> = ({
               </>
             ) : (
               <div className="bg-accent col-span-2 rounded-lg p-3 text-center">
-                <p className="text-primary text-xs" style={{ fontSize: "12px" }}>카드 레이아웃은 자동으로 크기가 계산됩니다</p>
+                <p className="text-primary text-xs">카드 레이아웃은 자동으로 크기가 계산됩니다</p>
                 <p className="mt-1 text-xs text-blue-500">카드 개수와 간격 설정은 상세설정에서 조정하세요</p>
               </div>
             )}

frontend/components/screen/panels/ResolutionPanel.tsx

@@ -84,7 +84,7 @@ const ResolutionPanel: React.FC<ResolutionPanelProps> = ({ currentResolution, on
       <div className="space-y-2">
         <Label className="text-xs font-medium">해상도 프리셋</Label>
         <Select value={selectedPreset} onValueChange={handlePresetChange}>
-          <SelectTrigger className="h-6 w-full px-2 py-0" style={{ fontSize: "12px" }}>
+          <SelectTrigger className=" text-xsh-6 w-full px-2 py-0">
             <SelectValue placeholder="해상도를 선택하세요" />
           </SelectTrigger>
           <SelectContent>
@@ -147,8 +147,7 @@ const ResolutionPanel: React.FC<ResolutionPanelProps> = ({ currentResolution, on
                 placeholder="1920"
                 min="1"
                 step="1"
-                className="h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}
-                style={{ fontSize: "12px" }}
+                className="h-6 w-full px-2 py-0 text-xs"
               />
             </div>
             <div className="space-y-1">
@@ -160,16 +159,14 @@ const ResolutionPanel: React.FC<ResolutionPanelProps> = ({ currentResolution, on
                 placeholder="1080"
                 min="1"
                 step="1"
-                className="h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}
-                style={{ fontSize: "12px" }}
+                className="h-6 w-full px-2 py-0 text-xs"
               />
             </div>
           </div>
           <Button
             onClick={handleCustomResolution}
             size="sm"
-            className="h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}
-            style={{ fontSize: "12px" }}
+            className="h-6 w-full px-2 py-0 text-xs"
           >
             적용
           </Button>

frontend/components/screen/panels/RowSettingsPanel.tsx

@@ -109,7 +109,7 @@ export const RowSettingsPanel: React.FC<RowSettingsPanelProps> = ({ row, onUpdat
               variant={row.gap === preset ? "default" : "outline"}
               size="sm"
               onClick={() => onUpdateRow({ gap: preset })}
-              className="text-xs" style={{ fontSize: "12px" }}
+              className="text-xs"
             >
               {GAP_PRESETS[preset].label}
             </Button>
@@ -130,7 +130,7 @@ export const RowSettingsPanel: React.FC<RowSettingsPanelProps> = ({ row, onUpdat
               variant={row.padding === preset ? "default" : "outline"}
               size="sm"
               onClick={() => onUpdateRow({ padding: preset })}
-              className="text-xs" style={{ fontSize: "12px" }}
+              className="text-xs"
             >
               {GAP_PRESETS[preset].label}
             </Button>

frontend/components/screen/panels/TemplatesPanel.tsx

@@ -528,7 +528,7 @@ export const TemplatesPanel: React.FC<TemplatesPanelProps> = ({ onDragStart }) =
         <div className="flex items-center justify-between rounded-xl bg-amber-50/80 border border-amber-200/60 p-3 text-amber-800 mb-4">
           <div className="flex items-center space-x-2">
             <Info className="h-4 w-4" />
-            <span className="text-xs" style={{ fontSize: "12px" }}>템플릿 로딩 실패, 기본 템플릿 사용 중</span>
+            <span className="text-xs">템플릿 로딩 실패, 기본 템플릿 사용 중</span>
           </div>
           <Button size="sm" variant="outline" onClick={() => refetch()} className="border-amber-300 text-amber-700 hover:bg-amber-100">
             <RefreshCw className="h-4 w-4" />

frontend/components/screen/panels/UnifiedPropertiesPanel.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect, Suspense } from "react";
 import { Label } from "@/components/ui/label";
 import { Input } from "@/components/ui/input";
 import { Button } from "@/components/ui/button";
@@ -341,14 +341,20 @@ export const UnifiedPropertiesPanel: React.FC<UnifiedPropertiesPanelProps> = ({
                 <Settings className="h-4 w-4 text-primary" />
                 <h3 className="text-sm font-semibold">{definition.name} 설정</h3>
               </div>
-              <ConfigPanelComponent 
-                config={config} 
-                onChange={handleConfigChange}
-                tables={tables} // 테이블 정보 전달
-                allTables={allTables} // 🆕 전체 테이블 목록 전달 (selected-items-detail-input 등에서 사용)
-                screenTableName={selectedComponent.tableName || currentTable?.tableName || currentTableName} // 🔧 화면 테이블명 전달
-                tableColumns={currentTable?.columns || []} // 🔧 테이블 컬럼 정보 전달
-              />
+              <Suspense fallback={
+                <div className="flex items-center justify-center py-8">
+                  <div className="text-sm text-muted-foreground">설정 패널 로딩 중...</div>
+                </div>
+              }>
+                <ConfigPanelComponent 
+                  config={config} 
+                  onChange={handleConfigChange}
+                  tables={tables} // 테이블 정보 전달
+                  allTables={allTables} // 🆕 전체 테이블 목록 전달 (selected-items-detail-input 등에서 사용)
+                  screenTableName={selectedComponent.tableName || currentTable?.tableName || currentTableName} // 🔧 화면 테이블명 전달
+                  tableColumns={currentTable?.columns || []} // 🔧 테이블 컬럼 정보 전달
+                />
+              </Suspense>
             </div>
           );
         };
@@ -712,8 +718,6 @@ export const UnifiedPropertiesPanel: React.FC<UnifiedPropertiesPanelProps> = ({
               onChange={(e) => handleUpdate("label", e.target.value)}
               placeholder="라벨"
               className="h-6 w-full px-2 py-0 text-xs"
-              style={{ fontSize: "12px" }}
-              style={{ fontSize: "12px" }}
             />
           </div>
           <div className="space-y-1">
@@ -749,7 +753,6 @@ export const UnifiedPropertiesPanel: React.FC<UnifiedPropertiesPanelProps> = ({
               step={1}
               placeholder="10"
               className="h-6 w-full px-2 py-0 text-xs"
-              style={{ fontSize: "12px" }}
             />
           </div>
         </div>
@@ -763,8 +766,6 @@ export const UnifiedPropertiesPanel: React.FC<UnifiedPropertiesPanelProps> = ({
               onChange={(e) => handleUpdate("placeholder", e.target.value)}
               placeholder="입력 안내 텍스트"
               className="h-6 w-full px-2 py-0 text-xs"
-              style={{ fontSize: "12px" }}
-              style={{ fontSize: "12px" }}
             />
           </div>
         )}
@@ -778,8 +779,6 @@ export const UnifiedPropertiesPanel: React.FC<UnifiedPropertiesPanelProps> = ({
               onChange={(e) => handleUpdate("title", e.target.value)}
               placeholder="제목"
               className="h-6 w-full px-2 py-0 text-xs"
-              style={{ fontSize: "12px" }}
-              style={{ fontSize: "12px" }}
             />
           </div>
         )}
@@ -793,8 +792,6 @@ export const UnifiedPropertiesPanel: React.FC<UnifiedPropertiesPanelProps> = ({
               onChange={(e) => handleUpdate("description", e.target.value)}
               placeholder="설명"
               className="h-6 w-full px-2 py-0 text-xs"
-              style={{ fontSize: "12px" }}
-              style={{ fontSize: "12px" }}
             />
           </div>
         )}
@@ -836,7 +833,6 @@ export const UnifiedPropertiesPanel: React.FC<UnifiedPropertiesPanelProps> = ({
                   }
                 }}
                 className="h-6 w-full px-2 py-0 text-xs"
-                style={{ fontSize: "12px" }}
               />
             </div>
           </div>
@@ -848,8 +844,7 @@ export const UnifiedPropertiesPanel: React.FC<UnifiedPropertiesPanelProps> = ({
               value={currentPosition.z || 1}
               onChange={(e) => handleUpdate("position.z", parseInt(e.target.value) || 1)}
               className="h-6 w-full px-2 py-0 text-xs"
-              style={{ fontSize: "12px" }}
-              style={{ fontSize: "12px" }}
+              className="text-xs"
             />
           </div>
         </div>
@@ -867,8 +862,7 @@ export const UnifiedPropertiesPanel: React.FC<UnifiedPropertiesPanelProps> = ({
                 value={selectedComponent.style?.labelText || selectedComponent.label || ""}
                 onChange={(e) => handleUpdate("style.labelText", e.target.value)}
                 className="h-6 w-full px-2 py-0 text-xs"
-                style={{ fontSize: "12px" }}
-                style={{ fontSize: "12px" }}
+                className="text-xs"
               />
             </div>
             <div className="grid grid-cols-2 gap-2">
@@ -878,8 +872,7 @@ export const UnifiedPropertiesPanel: React.FC<UnifiedPropertiesPanelProps> = ({
                   value={selectedComponent.style?.labelFontSize || "12px"}
                   onChange={(e) => handleUpdate("style.labelFontSize", e.target.value)}
                   className="h-6 w-full px-2 py-0 text-xs"
-                  style={{ fontSize: "12px" }}
-                  style={{ fontSize: "12px" }}
+                  className="text-xs"
                 />
               </div>
               <div className="space-y-1">
@@ -889,8 +882,7 @@ export const UnifiedPropertiesPanel: React.FC<UnifiedPropertiesPanelProps> = ({
                   value={selectedComponent.style?.labelColor || "#212121"}
                   onChange={(e) => handleUpdate("style.labelColor", e.target.value)}
                   className="h-6 w-full px-2 py-0 text-xs"
-                  style={{ fontSize: "12px" }}
-                  style={{ fontSize: "12px" }}
+                  className="text-xs"
                 />
               </div>
             </div>
@@ -901,8 +893,7 @@ export const UnifiedPropertiesPanel: React.FC<UnifiedPropertiesPanelProps> = ({
                   value={selectedComponent.style?.labelMarginBottom || "4px"}
                   onChange={(e) => handleUpdate("style.labelMarginBottom", e.target.value)}
                   className="h-6 w-full px-2 py-0 text-xs"
-                  style={{ fontSize: "12px" }}
-                  style={{ fontSize: "12px" }}
+                  className="text-xs"
                 />
               </div>
               <div className="flex items-center space-x-2 pt-5">
@@ -1053,7 +1044,7 @@ export const UnifiedPropertiesPanel: React.FC<UnifiedPropertiesPanelProps> = ({
             <div>
               <Label>세부 타입</Label>
               <Select value={localComponentDetailType || webType} onValueChange={handleDetailTypeChange}>
-                <SelectTrigger className="h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}>
+                <SelectTrigger className="h-6 w-full px-2 py-0 text-xs">
                   <SelectValue placeholder="세부 타입 선택" />
                 </SelectTrigger>
                 <SelectContent>
@@ -1260,7 +1251,7 @@ export const UnifiedPropertiesPanel: React.FC<UnifiedPropertiesPanelProps> = ({
             <div>
               <Label>입력 타입</Label>
               <Select value={widget.webType} onValueChange={(value) => handleUpdate("webType", value)}>
-                <SelectTrigger className="h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}>
+                <SelectTrigger className="h-6 w-full px-2 py-0 text-xs">
                   <SelectValue />
                 </SelectTrigger>
                 <SelectContent>

frontend/components/screen/panels/WebTypeConfigPanel.tsx

@@ -109,7 +109,7 @@ export const WebTypeConfigPanel: React.FC<WebTypeConfigPanelProps> = ({ webType,
           <>
             <Separator />
             <div className="flex items-center justify-between">
-              <Label htmlFor="multiple" className="text-xs" style={{ fontSize: "12px" }}>
+              <Label htmlFor="multiple" className="text-xs">
                 다중 선택
               </Label>
               <Checkbox
@@ -121,7 +121,7 @@ export const WebTypeConfigPanel: React.FC<WebTypeConfigPanelProps> = ({ webType,
               />
             </div>
             <div className="flex items-center justify-between">
-              <Label htmlFor="searchable" className="text-xs" style={{ fontSize: "12px" }}>
+              <Label htmlFor="searchable" className="text-xs">
                 검색 가능
               </Label>
               <Checkbox
@@ -259,7 +259,7 @@ export const WebTypeConfigPanel: React.FC<WebTypeConfigPanelProps> = ({ webType,
 
         {baseType === "date" && (
           <div className="flex items-center justify-between">
-            <Label htmlFor="showTime" className="text-xs" style={{ fontSize: "12px" }}>
+            <Label htmlFor="showTime" className="text-xs">
               시간 입력 포함
             </Label>
             <Checkbox
@@ -395,7 +395,7 @@ export const WebTypeConfigPanel: React.FC<WebTypeConfigPanelProps> = ({ webType,
         </div>
 
         <div className="flex items-center justify-between">
-          <Label htmlFor="fileMultiple" className="text-xs" style={{ fontSize: "12px" }}>
+          <Label htmlFor="fileMultiple" className="text-xs">
             다중 파일 선택
           </Label>
           <Checkbox

frontend/components/screen/panels/webtype-configs/CheckboxTypeConfigPanel.tsx

@@ -122,7 +122,7 @@ export const CheckboxTypeConfigPanel: React.FC<CheckboxTypeConfigPanelProps> = (
           라벨 위치
         </Label>
         <Select value={localValues.labelPosition} onValueChange={(value) => updateConfig("labelPosition", value)}>
-          <SelectTrigger className="mt-1 h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}>
+          <SelectTrigger className="mt-1 h-6 w-full px-2 py-0 text-xs">
             <SelectValue placeholder="라벨 위치 선택" />
           </SelectTrigger>
           <SelectContent>
@@ -194,18 +194,18 @@ export const CheckboxTypeConfigPanel: React.FC<CheckboxTypeConfigPanelProps> = (
         <Label className="text-sm font-medium text-gray-700">미리보기</Label>
         <div className="mt-2 flex items-center space-x-2">
           {localValues.labelPosition === "left" && localValues.checkboxText && (
-            <span className="text-xs" style={{ fontSize: "12px" }}>{localValues.checkboxText}</span>
+            <span className="text-xs">{localValues.checkboxText}</span>
           )}
           {localValues.labelPosition === "top" && localValues.checkboxText && (
             <div className="w-full">
-              <div className="text-xs" style={{ fontSize: "12px" }}>{localValues.checkboxText}</div>
+              <div className="text-xs">{localValues.checkboxText}</div>
               <Checkbox checked={localValues.defaultChecked} className="mt-1" />
             </div>
           )}
           {(localValues.labelPosition === "right" || localValues.labelPosition === "bottom") && (
             <>
               <Checkbox checked={localValues.defaultChecked} />
-              {localValues.checkboxText && <span className="text-xs" style={{ fontSize: "12px" }}>{localValues.checkboxText}</span>}
+              {localValues.checkboxText && <span className="text-xs">{localValues.checkboxText}</span>}
             </>
           )}
           {localValues.labelPosition === "left" && <Checkbox checked={localValues.defaultChecked} />}

frontend/components/screen/panels/webtype-configs/CodeTypeConfigPanel.tsx

@@ -121,7 +121,7 @@ export const CodeTypeConfigPanel: React.FC<CodeTypeConfigPanelProps> = ({ config
           프로그래밍 언어
         </Label>
         <Select value={localValues.language} onValueChange={(value) => updateConfig("language", value)}>
-          <SelectTrigger className="mt-1 h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}>
+          <SelectTrigger className="mt-1 h-6 w-full px-2 py-0 text-xs">
             <SelectValue placeholder="언어 선택" />
           </SelectTrigger>
           <SelectContent className="max-h-60">
@@ -140,7 +140,7 @@ export const CodeTypeConfigPanel: React.FC<CodeTypeConfigPanelProps> = ({ config
           테마
         </Label>
         <Select value={localValues.theme} onValueChange={(value) => updateConfig("theme", value)}>
-          <SelectTrigger className="mt-1 h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}>
+          <SelectTrigger className="mt-1 h-6 w-full px-2 py-0 text-xs">
             <SelectValue placeholder="테마 선택" />
           </SelectTrigger>
           <SelectContent>

frontend/components/screen/panels/webtype-configs/DateTypeConfigPanel.tsx

@@ -193,7 +193,7 @@ export const DateTypeConfigPanel: React.FC<DateTypeConfigPanelProps> = ({ config
             }, 0);
           }}
         >
-          <SelectTrigger className="mt-1 h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}>
+          <SelectTrigger className="mt-1 h-6 w-full px-2 py-0 text-xs">
             <SelectValue placeholder="날짜 형식 선택" />
           </SelectTrigger>
           <SelectContent>

frontend/components/screen/panels/webtype-configs/EntityTypeConfigPanel.tsx

@@ -233,7 +233,7 @@ export const EntityTypeConfigPanel: React.FC<EntityTypeConfigPanelProps> = ({ co
           표시 형식
         </Label>
         <Select value={localValues.displayFormat} onValueChange={(value) => updateConfig("displayFormat", value)}>
-          <SelectTrigger className="mt-1 h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}>
+          <SelectTrigger className="mt-1 h-6 w-full px-2 py-0 text-xs">
             <SelectValue placeholder="형식 선택" />
           </SelectTrigger>
           <SelectContent>
@@ -267,7 +267,7 @@ export const EntityTypeConfigPanel: React.FC<EntityTypeConfigPanelProps> = ({ co
         {/* 기존 필터 목록 */}
         <div className="max-h-40 space-y-2 overflow-y-auto">
           {Object.entries(safeConfig.filters || {}).map(([field, value]) => (
-            <div key={field} className="flex items-center space-x-2 rounded border p-2 text-xs" style={{ fontSize: "12px" }}>
+            <div key={field} className="flex items-center space-x-2 rounded border p-2 text-xs">
               <Input
                 value={field}
                 onChange={(e) => updateFilter(field, e.target.value, value as string)}
@@ -317,7 +317,7 @@ export const EntityTypeConfigPanel: React.FC<EntityTypeConfigPanelProps> = ({ co
         <div className="mt-2">
           <div className="flex items-center space-x-2 rounded border bg-white p-2">
             <Search className="h-4 w-4 text-gray-400" />
-            <div className="text-muted-foreground flex-1 text-xs" style={{ fontSize: "12px" }}>
+            <div className="text-muted-foreground flex-1 text-xs">
               {localValues.placeholder || `${localValues.referenceTable || "엔터티"}를 선택하세요`}
             </div>
             <Database className="h-4 w-4 text-gray-400" />

frontend/components/screen/panels/webtype-configs/NumberTypeConfigPanel.tsx

@@ -111,7 +111,7 @@ export const NumberTypeConfigPanel: React.FC<NumberTypeConfigPanelProps> = ({ co
           숫자 형식
         </Label>
         <Select value={localValues.format} onValueChange={(value) => updateConfig("format", value)}>
-          <SelectTrigger className="mt-1 h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}>
+          <SelectTrigger className="mt-1 h-6 w-full px-2 py-0 text-xs">
             <SelectValue placeholder="숫자 형식 선택" />
           </SelectTrigger>
           <SelectContent>

frontend/components/screen/panels/webtype-configs/RadioTypeConfigPanel.tsx

@@ -259,7 +259,7 @@ export const RadioTypeConfigPanel: React.FC<RadioTypeConfigPanelProps> = ({ conf
               {(safeConfig.options || []).map((option) => (
                 <div key={option.value} className="flex items-center space-x-2">
                   <RadioGroupItem value={option.value} id={`preview-${option.value}`} />
-                  <Label htmlFor={`preview-${option.value}`} className="text-xs" style={{ fontSize: "12px" }}>
+                  <Label htmlFor={`preview-${option.value}`} className="text-xs">
                     {option.label}
                   </Label>
                 </div>

frontend/components/screen/panels/webtype-configs/SelectTypeConfigPanel.tsx

@@ -170,7 +170,7 @@ export const SelectTypeConfigPanel: React.FC<SelectTypeConfigPanelProps> = ({ co
             value={localValues.placeholder}
             onChange={(e) => updateConfig("placeholder", e.target.value)}
             placeholder="옵션을 선택하세요"
-            className="mt-1 h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }} style={{ fontSize: "12px" }}
+            className="mt-1 h-6 w-full px-2 py-0 text-xs"
           />
         </div>
 

frontend/components/screen/panels/webtype-configs/TextTypeConfigPanel.tsx

@@ -218,7 +218,7 @@ export const TextTypeConfigPanel: React.FC<TextTypeConfigPanelProps> = ({
           입력 형식
         </Label>
         <Select value={localValues.format} onValueChange={(value) => updateConfig("format", value)}>
-          <SelectTrigger className="mt-1 h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}>
+          <SelectTrigger className="mt-1 h-6 w-full px-2 py-0 text-xs">
             <SelectValue placeholder="입력 형식 선택" />
           </SelectTrigger>
           <SelectContent>
@@ -332,7 +332,7 @@ export const TextTypeConfigPanel: React.FC<TextTypeConfigPanelProps> = ({
                 자동값 타입
               </Label>
               <Select value={localValues.autoValueType} onValueChange={(value) => updateConfig("autoValueType", value)}>
-                <SelectTrigger className="mt-1 h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}>
+                <SelectTrigger className="mt-1 h-6 w-full px-2 py-0 text-xs">
                   <SelectValue placeholder="자동값 타입 선택" />
                 </SelectTrigger>
                 <SelectContent>

frontend/components/screen/panels/webtype-configs/TextareaTypeConfigPanel.tsx

@@ -202,7 +202,7 @@ export const TextareaTypeConfigPanel: React.FC<TextareaTypeConfigPanelProps> = (
         <Label className="text-sm font-medium text-gray-700">미리보기</Label>
         <div className="mt-2">
           <textarea
-            className="w-full rounded border border-gray-300 p-2 text-xs" style={{ fontSize: "12px" }}
+            className="w-full rounded border border-gray-300 p-2 text-xs"
             rows={localValues.rows}
             placeholder={localValues.placeholder || "텍스트를 입력하세요..."}
             style={{

frontend/components/screen/widgets/FlowWidget.tsx

@@ -1194,7 +1194,7 @@ export function FlowWidget({
                         setStepDataPage(1); // 페이지 크기 변경 시 첫 페이지로
                       }}
                     >
-                      <SelectTrigger className="h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}>
+                      <SelectTrigger className="h-6 w-full px-2 py-0 text-xs">
                         <SelectValue />
                       </SelectTrigger>
                       <SelectContent>

frontend/components/screen/widgets/InputWidget.tsx

@@ -34,7 +34,7 @@ export default function InputWidget({ widget, value, onChange, className }: Inpu
         required={widget.required}
         readOnly={widget.readonly}
         className={cn("h-6 w-full text-xs", widget.readonly && "bg-muted/50 cursor-not-allowed")}
-        style={{ fontSize: "12px" }}
+        className="text-xs"
       />
     </div>
   );

frontend/components/screen/widgets/SelectWidget.tsx

@@ -53,7 +53,7 @@ export default function SelectWidget({ widget, value, onChange, options = [], cl
         </Label>
       )}
       <Select value={value} onValueChange={handleChange} disabled={widget.readonly}>
-        <SelectTrigger className="h-6 w-full px-2 py-0 text-xs" style={{ fontSize: "12px" }}>
+        <SelectTrigger className="h-6 w-full px-2 py-0 text-xs">
           <SelectValue placeholder={widget.placeholder || "선택해주세요"} />
         </SelectTrigger>
         <SelectContent>

frontend/components/screen/widgets/TabsWidget.tsx

@@ -1,210 +1,258 @@
 "use client";
 
 import React, { useState, useEffect } from "react";
-import { TabsComponent, TabItem, ScreenDefinition } from "@/types";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
-import { Card } from "@/components/ui/card";
-import { Badge } from "@/components/ui/badge";
-import { Loader2, FileQuestion } from "lucide-react";
-import { screenApi } from "@/lib/api/screen";
+import { Button } from "@/components/ui/button";
+import { X, Loader2 } from "lucide-react";
+import type { TabsComponent, TabItem } from "@/types/screen-management";
 import { InteractiveScreenViewerDynamic } from "@/components/screen/InteractiveScreenViewerDynamic";
 
 interface TabsWidgetProps {
   component: TabsComponent;
-  isPreview?: boolean;
+  className?: string;
+  style?: React.CSSProperties;
 }
 
-/**
- * 탭 위젯 컴포넌트
- * 각 탭에 다른 화면을 표시할 수 있습니다
- */
-export const TabsWidget: React.FC<TabsWidgetProps> = ({ component, isPreview = false }) => {
-  // componentConfig에서 설정 읽기 (새 컴포넌트 시스템)
-  const config = (component as any).componentConfig || component;
-  const { tabs = [], defaultTab, orientation = "horizontal", variant = "default" } = config;
-  
-  // console.log("🔍 TabsWidget 렌더링:", {
-  //   component,
-  //   componentConfig: (component as any).componentConfig,
-  //   tabs,
-  //   tabsLength: tabs.length
-  // });
+export function TabsWidget({ component, className, style }: TabsWidgetProps) {
+  const {
+    tabs = [],
+    defaultTab,
+    orientation = "horizontal",
+    variant = "default",
+    allowCloseable = false,
+    persistSelection = false,
+  } = component;
 
-  const [activeTab, setActiveTab] = useState<string>(defaultTab || tabs[0]?.id || "");
-  const [loadedScreens, setLoadedScreens] = useState<Record<string, any>>({});
+  console.log("🎨 TabsWidget 렌더링:", {
+    componentId: component.id,
+    tabs,
+    tabsLength: tabs.length,
+    component,
+  });
+
+  const storageKey = `tabs-${component.id}-selected`;
+
+  // 초기 선택 탭 결정
+  const getInitialTab = () => {
+    if (persistSelection && typeof window !== "undefined") {
+      const saved = localStorage.getItem(storageKey);
+      if (saved && tabs.some((t) => t.id === saved)) {
+        return saved;
+      }
+    }
+    return defaultTab || tabs[0]?.id || "";
+  };
+
+  const [selectedTab, setSelectedTab] = useState<string>(getInitialTab());
+  const [visibleTabs, setVisibleTabs] = useState<TabItem[]>(tabs);
   const [loadingScreens, setLoadingScreens] = useState<Record<string, boolean>>({});
-  const [screenErrors, setScreenErrors] = useState<Record<string, string>>({});
+  const [screenLayouts, setScreenLayouts] = useState<Record<number, any>>({});
 
-  // 탭 변경 시 화면 로드
+  // 컴포넌트 탭 목록 변경 시 동기화
   useEffect(() => {
-    if (!activeTab) return;
+    setVisibleTabs(tabs.filter((tab) => !tab.disabled));
+  }, [tabs]);
 
-    const currentTab = tabs.find((tab) => tab.id === activeTab);
-    if (!currentTab || !currentTab.screenId) return;
+  // 선택된 탭 변경 시 localStorage에 저장
+  useEffect(() => {
+    if (persistSelection && typeof window !== "undefined") {
+      localStorage.setItem(storageKey, selectedTab);
+    }
+  }, [selectedTab, persistSelection, storageKey]);
 
-    // 이미 로드된 화면이면 스킵
-    if (loadedScreens[activeTab]) return;
+  // 초기 로드 시 선택된 탭의 화면 불러오기
+  useEffect(() => {
+    const currentTab = visibleTabs.find((t) => t.id === selectedTab);
+    console.log("🔄 초기 탭 로드:", {
+      selectedTab,
+      currentTab,
+      hasScreenId: !!currentTab?.screenId,
+      screenId: currentTab?.screenId,
+    });
+    
+    if (currentTab && currentTab.screenId && !screenLayouts[currentTab.screenId]) {
+      console.log("📥 초기 화면 로딩 시작:", currentTab.screenId);
+      loadScreenLayout(currentTab.screenId);
+    }
+  }, [selectedTab, visibleTabs]);
 
-    // 이미 로딩 중이면 스킵
-    if (loadingScreens[activeTab]) return;
+  // 화면 레이아웃 로드
+  const loadScreenLayout = async (screenId: number) => {
+    if (screenLayouts[screenId]) {
+      console.log("✅ 이미 로드된 화면:", screenId);
+      return; // 이미 로드됨
+    }
 
-    // 화면 로드 시작
-    loadScreen(activeTab, currentTab.screenId);
-  }, [activeTab, tabs]);
-
-  const loadScreen = async (tabId: string, screenId: number) => {
-    setLoadingScreens((prev) => ({ ...prev, [tabId]: true }));
-    setScreenErrors((prev) => ({ ...prev, [tabId]: "" }));
+    console.log("📥 화면 레이아웃 로딩 시작:", screenId);
+    setLoadingScreens((prev) => ({ ...prev, [screenId]: true }));
 
     try {
-      const layoutData = await screenApi.getLayout(screenId);
-
-      if (layoutData) {
-        setLoadedScreens((prev) => ({
-          ...prev,
-          [tabId]: {
-            screenId,
-            layout: layoutData,
-          },
-        }));
-      } else {
-        setScreenErrors((prev) => ({
-          ...prev,
-          [tabId]: "화면을 불러올 수 없습니다",
-        }));
-      }
-    } catch (error: any) {
-      setScreenErrors((prev) => ({
-        ...prev,
-        [tabId]: error.message || "화면 로드 중 오류가 발생했습니다",
-      }));
-    } finally {
-      setLoadingScreens((prev) => ({ ...prev, [tabId]: false }));
-    }
-  };
-
-  // 탭 콘텐츠 렌더링
-  const renderTabContent = (tab: TabItem) => {
-    const isLoading = loadingScreens[tab.id];
-    const error = screenErrors[tab.id];
-    const screenData = loadedScreens[tab.id];
-
-    // 로딩 중
-    if (isLoading) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center space-y-4">
-          <Loader2 className="h-8 w-8 animate-spin text-primary" />
-          <p className="text-muted-foreground text-sm">화면을 불러오는 중...</p>
-        </div>
-      );
-    }
-
-    // 에러 발생
-    if (error) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center space-y-4">
-          <FileQuestion className="h-12 w-12 text-destructive" />
-          <div className="text-center">
-            <p className="mb-2 font-medium text-destructive">화면 로드 실패</p>
-            <p className="text-muted-foreground text-sm">{error}</p>
-          </div>
-        </div>
-      );
-    }
-
-    // 화면 ID가 없는 경우
-    if (!tab.screenId) {
-      return (
-        <div className="flex h-full flex-col items-center justify-center space-y-4">
-          <FileQuestion className="text-muted-foreground h-12 w-12" />
-          <div className="text-center">
-            <p className="text-muted-foreground mb-2 text-sm">화면이 할당되지 않았습니다</p>
-            <p className="text-xs text-gray-400">상세설정에서 화면을 선택하세요</p>
-          </div>
-        </div>
-      );
-    }
-
-    // 화면 렌더링 - 원본 화면의 모든 컴포넌트를 그대로 렌더링
-    if (screenData && screenData.layout && screenData.layout.components) {
-      const components = screenData.layout.components;
-      const screenResolution = screenData.layout.screenResolution || { width: 1920, height: 1080 };
+      const { apiClient } = await import("@/lib/api/client");
+      const response = await apiClient.get(`/screen-management/screens/${screenId}/layout`);
+      console.log("📦 API 응답:", { screenId, success: response.data.success, hasData: !!response.data.data });
       
-      return (
-        <div className="bg-white" style={{ width: `${screenResolution.width}px`, height: '100%' }}>
-          <div className="relative h-full">
-            {components.map((comp) => (
-              <InteractiveScreenViewerDynamic
-                key={comp.id}
-                component={comp}
-                allComponents={components}
-                screenInfo={{ id: tab.screenId }}
-              />
-            ))}
-          </div>
-        </div>
-      );
+      if (response.data.success && response.data.data) {
+        console.log("✅ 화면 레이아웃 로드 완료:", screenId);
+        setScreenLayouts((prev) => ({ ...prev, [screenId]: response.data.data }));
+      } else {
+        console.error("❌ 화면 레이아웃 로드 실패 - success false");
+      }
+    } catch (error) {
+      console.error(`❌ 화면 레이아웃 로드 실패 ${screenId}:`, error);
+    } finally {
+      setLoadingScreens((prev) => ({ ...prev, [screenId]: false }));
     }
-
-    return (
-      <div className="flex h-full flex-col items-center justify-center space-y-4">
-        <FileQuestion className="text-muted-foreground h-12 w-12" />
-        <div className="text-center">
-          <p className="text-muted-foreground text-sm">화면 데이터를 불러올 수 없습니다</p>
-        </div>
-      </div>
-    );
   };
 
-  // 빈 탭 목록
-  if (tabs.length === 0) {
+  // 탭 변경 핸들러
+  const handleTabChange = (tabId: string) => {
+    console.log("🔄 탭 변경:", tabId);
+    setSelectedTab(tabId);
+
+    // 해당 탭의 화면 로드
+    const tab = visibleTabs.find((t) => t.id === tabId);
+    console.log("🔍 선택된 탭 정보:", { tab, hasScreenId: !!tab?.screenId, screenId: tab?.screenId });
+    
+    if (tab && tab.screenId && !screenLayouts[tab.screenId]) {
+      console.log("📥 탭 변경 시 화면 로딩:", tab.screenId);
+      loadScreenLayout(tab.screenId);
+    }
+  };
+
+  // 탭 닫기 핸들러
+  const handleCloseTab = (tabId: string, e: React.MouseEvent) => {
+    e.stopPropagation();
+
+    const updatedTabs = visibleTabs.filter((tab) => tab.id !== tabId);
+    setVisibleTabs(updatedTabs);
+
+    // 닫은 탭이 선택된 탭이었다면 다음 탭 선택
+    if (selectedTab === tabId && updatedTabs.length > 0) {
+      setSelectedTab(updatedTabs[0].id);
+    }
+  };
+
+  // 탭 스타일 클래스
+  const getTabsListClass = () => {
+    const baseClass = orientation === "vertical" ? "flex-col" : "";
+    const variantClass =
+      variant === "pills"
+        ? "bg-muted p-1 rounded-lg"
+        : variant === "underline"
+          ? "border-b"
+          : "bg-muted p-1";
+    return `${baseClass} ${variantClass}`;
+  };
+
+  if (visibleTabs.length === 0) {
+    console.log("⚠️ 보이는 탭이 없음");
     return (
-      <Card className="flex h-full w-full items-center justify-center">
-        <div className="text-center">
-          <p className="text-muted-foreground text-sm">탭이 없습니다</p>
-          <p className="text-xs text-gray-400">상세설정에서 탭을 추가하세요</p>
-        </div>
-      </Card>
+      <div className="flex h-full w-full items-center justify-center rounded border-2 border-dashed border-gray-300 bg-gray-50">
+        <p className="text-muted-foreground text-sm">탭이 없습니다</p>
+      </div>
     );
   }
 
+  console.log("🎨 TabsWidget 최종 렌더링:", {
+    visibleTabsCount: visibleTabs.length,
+    selectedTab,
+    screenLayoutsKeys: Object.keys(screenLayouts),
+    loadingScreensKeys: Object.keys(loadingScreens),
+  });
+
   return (
-    <div className="h-full w-full overflow-auto">
+    <div className="flex h-full w-full flex-col pt-4" style={style}>
       <Tabs
-        value={activeTab}
-        onValueChange={setActiveTab}
+        value={selectedTab}
+        onValueChange={handleTabChange}
         orientation={orientation}
         className="flex h-full w-full flex-col"
       >
-        <TabsList className={orientation === "horizontal" ? "justify-start shrink-0" : "flex-col shrink-0"}>
-          {tabs.map((tab) => (
-            <TabsTrigger
-              key={tab.id}
-              value={tab.id}
-              disabled={tab.disabled}
-              className={orientation === "horizontal" ? "" : "w-full justify-start"}
-            >
-              <span>{tab.label}</span>
-              {tab.screenName && (
-                <Badge variant="secondary" className="ml-2 text-[10px]">
-                  {tab.screenName}
-                </Badge>
-              )}
-            </TabsTrigger>
-          ))}
-        </TabsList>
+        <div className="relative z-10">
+          <TabsList className={getTabsListClass()}>
+            {visibleTabs.map((tab) => (
+              <div key={tab.id} className="relative">
+                <TabsTrigger value={tab.id} disabled={tab.disabled} className="relative pr-8">
+                  {tab.label}
+                </TabsTrigger>
+                {allowCloseable && (
+                  <Button
+                    onClick={(e) => handleCloseTab(tab.id, e)}
+                    variant="ghost"
+                    size="sm"
+                    className="absolute right-1 top-1/2 h-5 w-5 -translate-y-1/2 p-0 hover:bg-destructive/10"
+                  >
+                    <X className="h-3 w-3" />
+                  </Button>
+                )}
+              </div>
+            ))}
+          </TabsList>
+        </div>
 
-        {tabs.map((tab) => (
-          <TabsContent 
-            key={tab.id} 
-            value={tab.id} 
-            className="flex-1 mt-0 data-[state=inactive]:hidden"
-          >
-            {renderTabContent(tab)}
-          </TabsContent>
-        ))}
+        <div className="relative flex-1 overflow-hidden">
+          {visibleTabs.map((tab) => (
+            <TabsContent key={tab.id} value={tab.id} className="h-full">
+              {tab.screenId ? (
+                loadingScreens[tab.screenId] ? (
+                  <div className="flex h-full w-full items-center justify-center">
+                    <Loader2 className="h-8 w-8 animate-spin text-primary" />
+                    <span className="text-muted-foreground ml-2">화면 로딩 중...</span>
+                  </div>
+                ) : screenLayouts[tab.screenId] ? (
+                  (() => {
+                    const layoutData = screenLayouts[tab.screenId];
+                    const { components = [], screenResolution } = layoutData;
+                    
+                    console.log("🎯 렌더링할 화면 데이터:", {
+                      screenId: tab.screenId,
+                      componentsCount: components.length,
+                      screenResolution,
+                    });
+
+                    const designWidth = screenResolution?.width || 1920;
+                    const designHeight = screenResolution?.height || 1080;
+
+                    return (
+                      <div 
+                        className="relative h-full w-full overflow-auto bg-background"
+                        style={{
+                          minHeight: `${designHeight}px`,
+                        }}
+                      >
+                        <div
+                          className="relative"
+                          style={{
+                            width: `${designWidth}px`,
+                            height: `${designHeight}px`,
+                            margin: "0 auto",
+                          }}
+                        >
+                          {components.map((component: any) => (
+                            <InteractiveScreenViewerDynamic
+                              key={component.id}
+                              component={component}
+                              allComponents={components}
+                            />
+                          ))}
+                        </div>
+                      </div>
+                    );
+                  })()
+                ) : (
+                  <div className="flex h-full w-full items-center justify-center">
+                    <p className="text-muted-foreground text-sm">화면을 불러올 수 없습니다</p>
+                  </div>
+                )
+              ) : (
+                <div className="flex h-full w-full items-center justify-center rounded border-2 border-dashed border-gray-300 bg-gray-50">
+                  <p className="text-muted-foreground text-sm">연결된 화면이 없습니다</p>
+                </div>
+              )}
+            </TabsContent>
+          ))}
+        </div>
       </Tabs>
     </div>
   );
-};
-
+}

frontend/components/ui/resizable-dialog.tsx

@@ -122,6 +122,10 @@ const ResizableDialogContent = React.forwardRef<
       
       // 1순위: userStyle에서 크기 추출 (화면관리에서 지정한 크기 - 항상 초기값으로 사용)
       if (userStyle) {
+        console.log("🔍 userStyle 감지:", userStyle);
+        console.log("🔍 userStyle.width 타입:", typeof userStyle.width, "값:", userStyle.width);
+        console.log("🔍 userStyle.height 타입:", typeof userStyle.height, "값:", userStyle.height);
+        
         const styleWidth = typeof userStyle.width === 'string' 
           ? parseInt(userStyle.width) 
           : userStyle.width;
@@ -129,24 +133,41 @@ const ResizableDialogContent = React.forwardRef<
           ? parseInt(userStyle.height) 
           : userStyle.height;
         
+        console.log("📏 파싱된 크기:", { 
+          styleWidth, 
+          styleHeight, 
+          "styleWidth truthy?": !!styleWidth,
+          "styleHeight truthy?": !!styleHeight,
+          minWidth, 
+          maxWidth, 
+          minHeight, 
+          maxHeight 
+        });
+        
         if (styleWidth && styleHeight) {
-          return {
+          const finalSize = {
             width: Math.max(minWidth, Math.min(maxWidth, styleWidth)),
             height: Math.max(minHeight, Math.min(maxHeight, styleHeight)),
           };
+          console.log("✅ userStyle 크기 사용:", finalSize);
+          return finalSize;
+        } else {
+          console.log("❌ styleWidth 또는 styleHeight가 falsy:", { styleWidth, styleHeight });
         }
       }
       
-      // 2순위: 현재 렌더링된 크기 사용
-      if (contentRef.current) {
-        const rect = contentRef.current.getBoundingClientRect();
-        if (rect.width > 0 && rect.height > 0) {
-          return {
-            width: Math.max(minWidth, Math.min(maxWidth, rect.width)),
-            height: Math.max(minHeight, Math.min(maxHeight, rect.height)),
-          };
-        }
-      }
+      console.log("⚠️ userStyle 없음, defaultWidth/defaultHeight 사용:", { defaultWidth, defaultHeight });
+      
+      // 2순위: 현재 렌더링된 크기 사용 (주석처리 - 모달이 열린 후 늘어나는 현상 방지)
+      // if (contentRef.current) {
+      //   const rect = contentRef.current.getBoundingClientRect();
+      //   if (rect.width > 0 && rect.height > 0) {
+      //     return {
+      //       width: Math.max(minWidth, Math.min(maxWidth, rect.width)),
+      //       height: Math.max(minHeight, Math.min(maxHeight, rect.height)),
+      //     };
+      //   }
+      // }
       
       // 3순위: defaultWidth/defaultHeight 사용
       return { width: defaultWidth, height: defaultHeight };
@@ -156,6 +177,58 @@ const ResizableDialogContent = React.forwardRef<
     const [isResizing, setIsResizing] = React.useState(false);
     const [resizeDirection, setResizeDirection] = React.useState<string>("");
     const [isInitialized, setIsInitialized] = React.useState(false);
+    
+    // userStyle이 변경되면 크기 업데이트 (화면 데이터 로딩 완료 시)
+    React.useEffect(() => {
+      // 1. localStorage에서 사용자가 리사이징한 크기 확인
+      let savedSize: { width: number; height: number; userResized: boolean } | null = null;
+      
+      if (effectiveModalId && typeof window !== 'undefined') {
+        try {
+          const storageKey = `modal_size_${effectiveModalId}_${userId}`;
+          const saved = localStorage.getItem(storageKey);
+          
+          if (saved) {
+            const parsed = JSON.parse(saved);
+            if (parsed.userResized) {
+              savedSize = {
+                width: Math.max(minWidth, Math.min(maxWidth, parsed.width)),
+                height: Math.max(minHeight, Math.min(maxHeight, parsed.height)),
+                userResized: true,
+              };
+              console.log("💾 사용자가 리사이징한 크기 복원:", savedSize);
+            }
+          }
+        } catch (error) {
+          console.error("❌ 모달 크기 복원 실패:", error);
+        }
+      }
+      
+      // 2. 우선순위: 사용자 리사이징 > userStyle > 기본값
+      if (savedSize && savedSize.userResized) {
+        // 사용자가 리사이징한 크기 우선
+        setSize({ width: savedSize.width, height: savedSize.height });
+        setUserResized(true);
+        console.log("✅ 사용자 리사이징 크기 적용:", savedSize);
+      } else if (userStyle && userStyle.width && userStyle.height) {
+        // 화면관리에서 설정한 크기
+        const styleWidth = typeof userStyle.width === 'string' 
+          ? parseInt(userStyle.width) 
+          : userStyle.width;
+        const styleHeight = typeof userStyle.height === 'string' 
+          ? parseInt(userStyle.height) 
+          : userStyle.height;
+        
+        if (styleWidth && styleHeight) {
+          const newSize = {
+            width: Math.max(minWidth, Math.min(maxWidth, styleWidth)),
+            height: Math.max(minHeight, Math.min(maxHeight, styleHeight)),
+          };
+          console.log("🔄 userStyle 크기 적용:", newSize);
+          setSize(newSize);
+        }
+      }
+    }, [userStyle, minWidth, maxWidth, minHeight, maxHeight, effectiveModalId, userId]);
     const [lastModalId, setLastModalId] = React.useState<string | null>(null);
     const [userResized, setUserResized] = React.useState(false); // 사용자가 실제로 리사이징했는지 추적
     
@@ -192,97 +265,98 @@ const ResizableDialogContent = React.forwardRef<
     }, [effectiveModalId, lastModalId, isInitialized]);
 
     // 모달이 열릴 때 초기 크기 설정 (localStorage와 내용 크기 중 큰 값 사용)
-    React.useEffect(() => {
-      // console.log("🔍 초기 크기 설정 useEffect 실행:", { isInitialized, hasContentRef: !!contentRef.current, effectiveModalId });
-      
-      if (!isInitialized) {
-        // 내용의 실제 크기 측정 (약간의 지연 후, contentRef가 준비될 때까지 대기)
-        // 여러 번 시도하여 contentRef가 준비될 때까지 대기
-        let attempts = 0;
-        const maxAttempts = 10;
-        
-        const measureContent = () => {
-          attempts++;
-          
-          // scrollHeight/scrollWidth를 사용하여 실제 내용 크기 측정 (스크롤 포함)
-          let contentWidth = defaultWidth;
-          let contentHeight = defaultHeight;
-          
-          if (contentRef.current) {
-            // scrollHeight/scrollWidth 그대로 사용 (여유 공간 제거)
-            contentWidth = contentRef.current.scrollWidth || defaultWidth;
-            contentHeight = contentRef.current.scrollHeight || defaultHeight;
-            
-            // console.log("📏 모달 내용 크기 측정:", { attempt: attempts, scrollWidth: contentRef.current.scrollWidth, scrollHeight: contentRef.current.scrollHeight, clientWidth: contentRef.current.clientWidth, clientHeight: contentRef.current.clientHeight, contentWidth, contentHeight });
-          } else {
-            // console.log("⚠️ contentRef 없음, 재시도:", { attempt: attempts, maxAttempts, defaultWidth, defaultHeight });
-            
-            // contentRef가 아직 없으면 재시도
-            if (attempts < maxAttempts) {
-              setTimeout(measureContent, 100);
-              return;
-            }
-          }
-          
-          // 패딩 추가 (p-6 * 2 = 48px)
-          const paddingAndMargin = 48;
-          const initialSize = getInitialSize();
-          
-          // 내용 크기 기반 최소 크기 계산
-          const contentBasedSize = {
-            width: Math.max(minWidth, Math.min(maxWidth, Math.max(contentWidth + paddingAndMargin, initialSize.width))),
-            height: Math.max(minHeight, Math.min(maxHeight, Math.max(contentHeight + paddingAndMargin, initialSize.height))),
-          };
-          
-          // console.log("📐 내용 기반 크기:", contentBasedSize);
-          
-          // localStorage에서 저장된 크기 확인
-          let finalSize = contentBasedSize;
-          
-          if (effectiveModalId && typeof window !== 'undefined') {
-            try {
-              const storageKey = `modal_size_${effectiveModalId}_${userId}`;
-              const saved = localStorage.getItem(storageKey);
-              
-              // console.log("📦 localStorage 확인:", { effectiveModalId, userId, storageKey, saved: saved ? "있음" : "없음" });
-              
-              if (saved) {
-                const parsed = JSON.parse(saved);
-                
-                // userResized 플래그 확인
-                if (parsed.userResized) {
-                  const savedSize = {
-                    width: Math.max(minWidth, Math.min(maxWidth, parsed.width)),
-                    height: Math.max(minHeight, Math.min(maxHeight, parsed.height)),
-                  };
-                  
-                  // console.log("💾 사용자가 리사이징한 크기 복원:", savedSize);
-                  
-                  // ✅ 중요: 사용자가 명시적으로 리사이징한 경우, 사용자 크기를 우선 사용
-                  // (사용자가 의도적으로 작게 만든 것을 존중)
-                  finalSize = savedSize;
-                  setUserResized(true);
-                  
-                  // console.log("✅ 최종 크기 (사용자가 설정한 크기 우선 적용):", { savedSize, contentBasedSize, finalSize, note: "사용자가 리사이징한 크기를 그대로 사용합니다" });
-                } else {
-                  // console.log("ℹ️ 자동 계산된 크기는 무시, 내용 크기 사용");
-                }
-              } else {
-                // console.log("ℹ️ localStorage에 저장된 크기 없음, 내용 크기 사용");
-              }
-            } catch (error) {
-              // console.error("❌ 모달 크기 복원 실패:", error);
-            }
-          }
-          
-          setSize(finalSize);
-          setIsInitialized(true);
-        };
-        
-        // 첫 시도는 300ms 후에 시작
-        setTimeout(measureContent, 300);
-      }
-    }, [isInitialized, getInitialSize, effectiveModalId, userId, minWidth, maxWidth, minHeight, maxHeight, defaultWidth, defaultHeight]);
+    // 주석처리 - 사용자가 설정한 크기(userStyle)만 사용하도록 변경
+    // React.useEffect(() => {
+    //   // console.log("🔍 초기 크기 설정 useEffect 실행:", { isInitialized, hasContentRef: !!contentRef.current, effectiveModalId });
+    //   
+    //   if (!isInitialized) {
+    //     // 내용의 실제 크기 측정 (약간의 지연 후, contentRef가 준비될 때까지 대기)
+    //     // 여러 번 시도하여 contentRef가 준비될 때까지 대기
+    //     let attempts = 0;
+    //     const maxAttempts = 10;
+    //     
+    //     const measureContent = () => {
+    //       attempts++;
+    //       
+    //       // scrollHeight/scrollWidth를 사용하여 실제 내용 크기 측정 (스크롤 포함)
+    //       let contentWidth = defaultWidth;
+    //       let contentHeight = defaultHeight;
+    //       
+    //       // if (contentRef.current) {
+    //       //   // scrollHeight/scrollWidth 그대로 사용 (여유 공간 제거)
+    //       //   contentWidth = contentRef.current.scrollWidth || defaultWidth;
+    //       //   contentHeight = contentRef.current.scrollHeight || defaultHeight;
+    //       //   
+    //       //   // console.log("📏 모달 내용 크기 측정:", { attempt: attempts, scrollWidth: contentRef.current.scrollWidth, scrollHeight: contentRef.current.scrollHeight, clientWidth: contentRef.current.clientWidth, clientHeight: contentRef.current.clientHeight, contentWidth, contentHeight });
+    //       // } else {
+    //       //   // console.log("⚠️ contentRef 없음, 재시도:", { attempt: attempts, maxAttempts, defaultWidth, defaultHeight });
+    //       //   
+    //       //   // contentRef가 아직 없으면 재시도
+    //       //   if (attempts < maxAttempts) {
+    //       //     setTimeout(measureContent, 100);
+    //       //     return;
+    //       //   }
+    //       // }
+    //       
+    //       // 패딩 추가 (p-6 * 2 = 48px)
+    //       const paddingAndMargin = 48;
+    //       const initialSize = getInitialSize();
+    //       
+    //       // 내용 크기 기반 최소 크기 계산
+    //       const contentBasedSize = {
+    //         width: Math.max(minWidth, Math.min(maxWidth, Math.max(contentWidth + paddingAndMargin, initialSize.width))),
+    //         height: Math.max(minHeight, Math.min(maxHeight, Math.max(contentHeight + paddingAndMargin, initialSize.height))),
+    //       };
+    //       
+    //       // console.log("📐 내용 기반 크기:", contentBasedSize);
+    //       
+    //       // localStorage에서 저장된 크기 확인
+    //       let finalSize = contentBasedSize;
+    //       
+    //       if (effectiveModalId && typeof window !== 'undefined') {
+    //         try {
+    //           const storageKey = `modal_size_${effectiveModalId}_${userId}`;
+    //           const saved = localStorage.getItem(storageKey);
+    //           
+    //           // console.log("📦 localStorage 확인:", { effectiveModalId, userId, storageKey, saved: saved ? "있음" : "없음" });
+    //           
+    //           if (saved) {
+    //             const parsed = JSON.parse(saved);
+    //             
+    //             // userResized 플래그 확인
+    //             if (parsed.userResized) {
+    //               const savedSize = {
+    //                 width: Math.max(minWidth, Math.min(maxWidth, parsed.width)),
+    //                 height: Math.max(minHeight, Math.min(maxHeight, parsed.height)),
+    //               };
+    //               
+    //               // console.log("💾 사용자가 리사이징한 크기 복원:", savedSize);
+    //               
+    //               // ✅ 중요: 사용자가 명시적으로 리사이징한 경우, 사용자 크기를 우선 사용
+    //               // (사용자가 의도적으로 작게 만든 것을 존중)
+    //               finalSize = savedSize;
+    //               setUserResized(true);
+    //               
+    //               // console.log("✅ 최종 크기 (사용자가 설정한 크기 우선 적용):", { savedSize, contentBasedSize, finalSize, note: "사용자가 리사이징한 크기를 그대로 사용합니다" });
+    //             } else {
+    //               // console.log("ℹ️ 자동 계산된 크기는 무시, 내용 크기 사용");
+    //             }
+    //           } else {
+    //             // console.log("ℹ️ localStorage에 저장된 크기 없음, 내용 크기 사용");
+    //           }
+    //         } catch (error) {
+    //           // console.error("❌ 모달 크기 복원 실패:", error);
+    //         }
+    //       }
+    //       
+    //       setSize(finalSize);
+    //       setIsInitialized(true);
+    //     };
+    //     
+    //     // 첫 시도는 300ms 후에 시작
+    //     setTimeout(measureContent, 300);
+    //   }
+    // }, [isInitialized, getInitialSize, effectiveModalId, userId, minWidth, maxWidth, minHeight, maxHeight, defaultWidth, defaultHeight]);
 
     const startResize = (direction: string) => (e: React.MouseEvent) => {
       e.preventDefault();
@@ -433,6 +507,37 @@ const ResizableDialogContent = React.forwardRef<
             onMouseDown={startResize("nw")}
           />
 
+          {/* 리셋 버튼 (사용자가 리사이징한 경우만 표시) */}
+          {userResized && (
+            <button
+              onClick={() => {
+                // localStorage에서 저장된 크기 삭제
+                if (effectiveModalId && typeof window !== 'undefined') {
+                  const storageKey = `modal_size_${effectiveModalId}_${userId}`;
+                  localStorage.removeItem(storageKey);
+                  console.log("🗑️ 저장된 모달 크기 삭제:", storageKey);
+                }
+                
+                // 화면관리 설정 크기로 복원
+                const initialSize = getInitialSize();
+                setSize(initialSize);
+                setUserResized(false);
+                console.log("🔄 기본 크기로 리셋:", initialSize);
+              }}
+              className="absolute right-12 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2"
+              style={{ zIndex: 20 }}
+              title="기본 크기로 리셋"
+            >
+              <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
+                <path d="M3 12a9 9 0 0 1 9-9 9.75 9.75 0 0 1 6.74 2.74L21 8"/>
+                <path d="M21 3v5h-5"/>
+                <path d="M21 12a9 9 0 0 1-9 9 9.75 9.75 0 0 1-6.74-2.74L3 16"/>
+                <path d="M3 21v-5h5"/>
+              </svg>
+              <span className="sr-only">기본 크기로 리셋</span>
+            </button>
+          )}
+          
           <DialogPrimitive.Close 
             className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground"
             style={{ zIndex: 20 }}

frontend/lib/api/digitalTwin.ts

@@ -19,6 +19,21 @@ interface ApiResponse<T> {
   error?: string;
 }
 
+// 매핑 템플릿 타입
+export interface DigitalTwinMappingTemplate {
+  id: string;
+  company_code: string;
+  name: string;
+  description?: string;
+  external_db_connection_id: number;
+  layout_type: string;
+  config: any;
+  created_by: string;
+  created_at: string;
+  updated_by: string;
+  updated_at: string;
+}
+
 // ========== 레이아웃 관리 API ==========
 
 // 레이아웃 목록 조회
@@ -281,3 +296,60 @@ export const getChildrenData = async (
     };
   }
 };
+
+// ========== 매핑 템플릿 API ==========
+
+// 템플릿 목록 조회 (회사 단위, 현재 사용자 기준)
+export const getMappingTemplates = async (params?: {
+  externalDbConnectionId?: number;
+  layoutType?: string;
+}): Promise<ApiResponse<DigitalTwinMappingTemplate[]>> => {
+  try {
+    const response = await apiClient.get("/digital-twin/mapping-templates", {
+      params: {
+        externalDbConnectionId: params?.externalDbConnectionId,
+        layoutType: params?.layoutType,
+      },
+    });
+    return response.data;
+  } catch (error: any) {
+    return {
+      success: false,
+      error: error.response?.data?.message || error.message,
+    };
+  }
+};
+
+// 템플릿 생성
+export const createMappingTemplate = async (data: {
+  name: string;
+  description?: string;
+  externalDbConnectionId: number;
+  layoutType?: string;
+  config: any;
+}): Promise<ApiResponse<DigitalTwinMappingTemplate>> => {
+  try {
+    const response = await apiClient.post("/digital-twin/mapping-templates", data);
+    return response.data;
+  } catch (error: any) {
+    return {
+      success: false,
+      error: error.response?.data?.message || error.message,
+    };
+  }
+};
+
+// 템플릿 단건 조회
+export const getMappingTemplateById = async (
+  id: string,
+): Promise<ApiResponse<DigitalTwinMappingTemplate>> => {
+  try {
+    const response = await apiClient.get(`/digital-twin/mapping-templates/${id}`);
+    return response.data;
+  } catch (error: any) {
+    return {
+      success: false,
+      error: error.response?.data?.message || error.message,
+    };
+  }
+};

frontend/lib/api/externalDbConnection.ts

@@ -290,8 +290,13 @@ export class ExternalDbConnectionAPI {
   static async getTableColumns(connectionId: number, tableName: string): Promise<ApiResponse<any[]>> {
     try {
       console.log("컬럼 정보 API 요청:", `${this.BASE_PATH}/${connectionId}/tables/${tableName}/columns`);
+      // 컬럼 메타데이터 조회는 외부 DB 성능/네트워크 영향으로 오래 걸릴 수 있으므로
+      // 기본 30초보다 넉넉한 타임아웃을 사용
       const response = await apiClient.get<ApiResponse<any[]>>(
         `${this.BASE_PATH}/${connectionId}/tables/${tableName}/columns`,
+        {
+          timeout: 120000, // 120초
+        },
       );
       console.log("컬럼 정보 API 응답:", response.data);
       return response.data;

frontend/lib/registry/DynamicComponentRenderer.tsx

@@ -105,8 +105,13 @@ export interface DynamicComponentRendererProps {
   companyCode?: string; // 🆕 현재 사용자의 회사 코드
   onRefresh?: () => void;
   onClose?: () => void;
+  onSave?: () => Promise<void>; // 🆕 EditModal의 handleSave 콜백
   // 테이블 선택된 행 정보 (다중 선택 액션용)
   selectedRows?: any[];
+  // 🆕 그룹 데이터 (EditModal → ModalRepeaterTable)
+  groupedData?: Record<string, any>[];
+  // 🆕 비활성화할 필드 목록 (EditModal → 각 컴포넌트)
+  disabledFields?: string[];
   selectedRowsData?: any[];
   onSelectedRowsChange?: (selectedRows: any[], selectedRowsData: any[], sortBy?: string, sortOrder?: "asc" | "desc", columnOrder?: string[], tableDisplayData?: any[]) => void;
   // 테이블 정렬 정보 (엑셀 다운로드용)
@@ -165,6 +170,9 @@ export const DynamicComponentRenderer: React.FC<DynamicComponentRendererProps> =
         }
       };
 
+      // 🆕 disabledFields 체크
+      const isFieldDisabled = props.disabledFields?.includes(columnName) || (component as any).readonly;
+
       return (
         <CategorySelectComponent
           tableName={tableName}
@@ -173,7 +181,7 @@ export const DynamicComponentRenderer: React.FC<DynamicComponentRendererProps> =
           onChange={handleChange}
           placeholder={component.componentConfig?.placeholder || "선택하세요"}
           required={(component as any).required}
-          disabled={(component as any).readonly}
+          disabled={isFieldDisabled}
           className="w-full"
         />
       );
@@ -242,6 +250,7 @@ export const DynamicComponentRenderer: React.FC<DynamicComponentRendererProps> =
           selectedScreen, // 🆕 화면 정보
           onRefresh,
           onClose,
+          onSave, // 🆕 EditModal의 handleSave 콜백
           screenId,
           userId, // 🆕 사용자 ID
           userName, // 🆕 사용자 이름
@@ -267,6 +276,7 @@ export const DynamicComponentRenderer: React.FC<DynamicComponentRendererProps> =
           onConfigChange,
           isPreview,
           autoGeneration,
+          disabledFields, // 🆕 비활성화 필드 목록
           ...restProps
         } = props;
 
@@ -279,7 +289,17 @@ export const DynamicComponentRenderer: React.FC<DynamicComponentRendererProps> =
         // modal-repeater-table은 배열 데이터를 다루므로 빈 배열로 초기화
         let currentValue;
         if (componentType === "modal-repeater-table") {
-          currentValue = formData?.[fieldName] || [];
+          // 🆕 EditModal에서 전달된 groupedData가 있으면 우선 사용
+          currentValue = props.groupedData || formData?.[fieldName] || [];
+          
+          // 디버깅 로그
+          console.log("🔍 [DynamicComponentRenderer] ModalRepeaterTable value 설정:", {
+            hasGroupedData: !!props.groupedData,
+            groupedDataLength: props.groupedData?.length || 0,
+            fieldName,
+            formDataValue: formData?.[fieldName],
+            finalValueLength: Array.isArray(currentValue) ? currentValue.length : 0,
+          });
         } else {
           currentValue = formData?.[fieldName] || "";
         }
@@ -346,6 +366,7 @@ export const DynamicComponentRenderer: React.FC<DynamicComponentRendererProps> =
           selectedScreen, // 🆕 화면 정보
           onRefresh,
           onClose,
+          onSave, // 🆕 EditModal의 handleSave 콜백
           screenId,
           userId, // 🆕 사용자 ID
           userName, // 🆕 사용자 이름
@@ -353,7 +374,8 @@ export const DynamicComponentRenderer: React.FC<DynamicComponentRendererProps> =
           mode,
           isInModal,
           readonly: component.readonly,
-          disabled: component.readonly,
+          // 🆕 disabledFields 체크 또는 기존 readonly
+          disabled: disabledFields?.includes(fieldName) || component.readonly,
           originalData,
           allComponents,
           onUpdateLayout,
@@ -380,6 +402,8 @@ export const DynamicComponentRenderer: React.FC<DynamicComponentRendererProps> =
           isPreview,
           // 디자인 모드 플래그 전달 - isPreview와 명확히 구분
           isDesignMode: props.isDesignMode !== undefined ? props.isDesignMode : false,
+          // 🆕 그룹 데이터 전달 (EditModal → ConditionalContainer → ModalRepeaterTable)
+          groupedData: props.groupedData,
         };
 
         // 렌더러가 클래스인지 함수인지 확인

frontend/lib/registry/components/autocomplete-search-input/AutocompleteSearchInputComponent.tsx

@@ -175,7 +175,7 @@ export function AutocompleteSearchInputComponent({
           onFocus={handleInputFocus}
           placeholder={placeholder}
           disabled={disabled}
-          className="h-8 pr-16 text-xs sm:h-10 sm:text-sm"
+          className="h-8 pr-16 text-xs sm:h-10 sm:text-sm !bg-background"
         />
         <div className="absolute right-1 top-1/2 flex -translate-y-1/2 items-center gap-1">
           {loading && (
@@ -198,7 +198,7 @@ export function AutocompleteSearchInputComponent({
 
       {/* 드롭다운 결과 */}
       {isOpen && (results.length > 0 || loading) && (
-        <div className="absolute z-50 mt-1 max-h-[300px] w-full overflow-y-auto rounded-md border bg-background shadow-lg">
+        <div className="absolute z-[100] mt-1 max-h-[300px] w-full overflow-y-auto rounded-md border bg-background shadow-lg">
           {loading && results.length === 0 ? (
             <div className="p-4 text-center text-sm text-muted-foreground">
               <Loader2 className="mx-auto mb-2 h-4 w-4 animate-spin" />

frontend/lib/registry/components/button-primary/ButtonPrimaryComponent.tsx

@@ -35,6 +35,7 @@ export interface ButtonPrimaryComponentProps extends ComponentRendererProps {
   onRefresh?: () => void;
   onClose?: () => void;
   onFlowRefresh?: () => void;
+  onSave?: () => Promise<void>; // 🆕 EditModal의 handleSave 콜백
 
   // 폼 데이터 관련
   originalData?: Record<string, any>; // 부분 업데이트용 원본 데이터
@@ -83,6 +84,7 @@ export const ButtonPrimaryComponent: React.FC<ButtonPrimaryComponentProps> = ({
   onRefresh,
   onClose,
   onFlowRefresh,
+  onSave, // 🆕 EditModal의 handleSave 콜백
   sortBy, // 🆕 정렬 컬럼
   sortOrder, // 🆕 정렬 방향
   columnOrder, // 🆕 컬럼 순서
@@ -95,6 +97,10 @@ export const ButtonPrimaryComponent: React.FC<ButtonPrimaryComponentProps> = ({
   ...props
 }) => {
   const { isPreviewMode } = useScreenPreview(); // 프리뷰 모드 확인
+  
+  // 🆕 props에서 onSave 추출 (명시적으로 선언되지 않은 경우 ...props에서 추출)
+  const propsOnSave = (props as any).onSave as (() => Promise<void>) | undefined;
+  const finalOnSave = onSave || propsOnSave;
 
   // 🆕 플로우 단계별 표시 제어
   const flowConfig = (component as any).webTypeConfig?.flowVisibilityConfig;
@@ -415,6 +421,7 @@ export const ButtonPrimaryComponent: React.FC<ButtonPrimaryComponentProps> = ({
         onRefresh,
         onClose,
         onFlowRefresh, // 플로우 새로고침 콜백 추가
+        onSave: finalOnSave, // 🆕 EditModal의 handleSave 콜백 (props에서도 추출)
         // 테이블 선택된 행 정보 추가
         selectedRows,
         selectedRowsData,

frontend/lib/registry/components/conditional-container/ConditionalContainerComponent.tsx

@@ -40,6 +40,8 @@ export function ConditionalContainerComponent({
   componentId,
   style,
   className,
+  groupedData, // 🆕 그룹 데이터
+  onSave, // 🆕 EditModal의 handleSave 콜백
 }: ConditionalContainerProps) {
   console.log("🎯 ConditionalContainerComponent 렌더링!", {
     isDesignMode,
@@ -177,6 +179,8 @@ export function ConditionalContainerComponent({
                 showBorder={showBorder}
                 formData={formData}
                 onFormDataChange={onFormDataChange}
+                groupedData={groupedData}
+                onSave={onSave}
               />
             ))}
           </div>
@@ -196,6 +200,8 @@ export function ConditionalContainerComponent({
                 showBorder={showBorder}
                 formData={formData}
                 onFormDataChange={onFormDataChange}
+                groupedData={groupedData}
+                onSave={onSave}
               />
             ) : null
           )

frontend/lib/registry/components/conditional-container/ConditionalSectionViewer.tsx

@@ -3,6 +3,7 @@
 import React, { useState, useEffect } from "react";
 import { ConditionalSectionViewerProps } from "./types";
 import { RealtimePreview } from "@/components/screen/RealtimePreviewDynamic";
+import { DynamicComponentRenderer } from "@/lib/registry/DynamicComponentRenderer";
 import { cn } from "@/lib/utils";
 import { Loader2 } from "lucide-react";
 import { screenApi } from "@/lib/api/screen";
@@ -24,6 +25,8 @@ export function ConditionalSectionViewer({
   showBorder = true,
   formData,
   onFormDataChange,
+  groupedData, // 🆕 그룹 데이터
+  onSave, // 🆕 EditModal의 handleSave 콜백
 }: ConditionalSectionViewerProps) {
   const { userId, userName, user } = useAuth();
   const [isLoading, setIsLoading] = useState(false);
@@ -135,13 +138,24 @@ export function ConditionalSectionViewer({
                   minHeight: "200px",
                 }}
               >
-                {components.map((component) => (
-                  <RealtimePreview
+                {components.map((component) => {
+                  const { position = { x: 0, y: 0, z: 1 }, size = { width: 200, height: 40 } } = component;
+                  
+                  return (
+                    <div
                     key={component.id}
+                      className="absolute"
+                      style={{
+                        left: position.x || 0,
+                        top: position.y || 0,
+                        width: size.width || 200,
+                        height: size.height || 40,
+                        zIndex: position.z || 1,
+                      }}
+                    >
+                      <DynamicComponentRenderer
                     component={component}
-                    isSelected={false}
-                    isDesignMode={false}
-                    onClick={() => {}}
+                        isInteractive={true}
                     screenId={screenInfo?.id}
                     tableName={screenInfo?.tableName}
                     userId={userId}
@@ -149,8 +163,12 @@ export function ConditionalSectionViewer({
                     companyCode={user?.companyCode}
                     formData={formData}
                     onFormDataChange={onFormDataChange}
+                        groupedData={groupedData}
+                        onSave={onSave}
                   />
-                ))}
+                    </div>
+                  );
+                })}
               </div>
             </div>
           )}

frontend/lib/registry/components/conditional-container/types.ts

@@ -45,6 +45,8 @@ export interface ConditionalContainerProps {
   onChange?: (value: string) => void;
   formData?: Record<string, any>;
   onFormDataChange?: (fieldName: string, value: any) => void;
+  groupedData?: Record<string, any>[]; // 🆕 그룹 데이터 (EditModal → ModalRepeaterTable)
+  onSave?: () => Promise<void>; // 🆕 EditModal의 handleSave 콜백
   
   // 화면 편집기 관련
   isDesignMode?: boolean; // 디자인 모드 여부
@@ -75,5 +77,7 @@ export interface ConditionalSectionViewerProps {
   // 폼 데이터 전달
   formData?: Record<string, any>;
   onFormDataChange?: (fieldName: string, value: any) => void;
+  groupedData?: Record<string, any>[]; // 🆕 그룹 데이터
+  onSave?: () => Promise<void>; // 🆕 EditModal의 handleSave 콜백
 }
 

frontend/lib/registry/components/index.ts

@@ -59,6 +59,9 @@ import "./selected-items-detail-input/SelectedItemsDetailInputRenderer";
 import "./section-paper/SectionPaperRenderer"; // Section Paper (색종이 - 배경색 기반 그룹화) - Renderer 방식
 import "./section-card/SectionCardRenderer";  // Section Card (제목+테두리 기반 그룹화) - Renderer 방식
 
+// 🆕 탭 컴포넌트
+import "./tabs/tabs-component"; // 탭 기반 화면 전환 컴포넌트
+
 /**
  * 컴포넌트 초기화 함수
  */

frontend/lib/registry/components/modal-repeater-table/ModalRepeaterTableComponent.tsx

@@ -195,13 +195,18 @@ export function ModalRepeaterTableComponent({
   const columnName = component?.columnName;
   const value = (columnName && formData?.[columnName]) || componentConfig?.value || propValue || [];
   
-  // ✅ onChange 래퍼 (기존 onChange 콜백만 호출, formData는 beforeFormSave에서 처리)
+  // ✅ onChange 래퍼 (기존 onChange 콜백 + onFormDataChange 호출)
   const handleChange = (newData: any[]) => {
     // 기존 onChange 콜백 호출 (호환성)
     const externalOnChange = componentConfig?.onChange || propOnChange;
     if (externalOnChange) {
       externalOnChange(newData);
     }
+    
+    // 🆕 onFormDataChange 호출하여 EditModal의 groupData 업데이트
+    if (onFormDataChange && columnName) {
+      onFormDataChange(columnName, newData);
+    }
   };
   
   // uniqueField 자동 보정: order_no는 item_info 테이블에 없으므로 item_number로 변경
@@ -291,13 +296,47 @@ export function ModalRepeaterTableComponent({
         return;
       }
       
+      // 🔥 sourceColumns에 포함된 컬럼 제외 (조인된 컬럼 제거)
+      console.log("🔍 [ModalRepeaterTable] 필터링 전 데이터:", {
+        sourceColumns,
+        sourceTable,
+        targetTable,
+        sampleItem: value[0],
+        itemKeys: value[0] ? Object.keys(value[0]) : [],
+      });
+      
+      const filteredData = value.map((item: any) => {
+        const filtered: Record<string, any> = {};
+        
+        Object.keys(item).forEach((key) => {
+          // sourceColumns에 포함된 컬럼은 제외 (item_info 테이블의 컬럼)
+          if (sourceColumns.includes(key)) {
+            console.log(`  ⛔ ${key} 제외 (sourceColumn)`);
+            return;
+          }
+          // 메타데이터 필드도 제외
+          if (key.startsWith("_")) {
+            console.log(`  ⛔ ${key} 제외 (메타데이터)`);
+            return;
+          }
+          filtered[key] = item[key];
+        });
+        
+        return filtered;
+      });
+      
+      console.log("✅ [ModalRepeaterTable] 필터링 후 데이터:", {
+        filteredItemKeys: filteredData[0] ? Object.keys(filteredData[0]) : [],
+        sampleFilteredItem: filteredData[0],
+      });
+      
       // 🔥 targetTable 메타데이터를 배열 항목에 추가
       const dataWithTargetTable = targetTable 
-        ? value.map(item => ({
+        ? filteredData.map((item: any) => ({
             ...item,
             _targetTable: targetTable, // 백엔드가 인식할 메타데이터
           }))
-        : value;
+        : filteredData;
       
       // ✅ CustomEvent의 detail에 데이터 추가
       if (event instanceof CustomEvent && event.detail) {
@@ -333,9 +372,10 @@ export function ModalRepeaterTableComponent({
       const calculated = calculateAll(value);
       // 값이 실제로 변경된 경우만 업데이트
       if (JSON.stringify(calculated) !== JSON.stringify(value)) {
-        onChange(calculated);
+        handleChange(calculated);
       }
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   const handleAddItems = async (items: any[]) => {

frontend/lib/registry/components/modal-repeater-table/RepeaterTable.tsx

@@ -118,10 +118,10 @@ export function RepeaterTable({
   };
 
   return (
-    <div className="border rounded-md overflow-hidden">
-      <div className="overflow-x-auto">
+    <div className="border rounded-md overflow-hidden bg-background">
+      <div className="overflow-x-auto max-h-[240px] overflow-y-auto">
         <table className="w-full text-xs sm:text-sm">
-          <thead className="bg-muted">
+          <thead className="bg-muted sticky top-0 z-10">
             <tr>
               <th className="px-4 py-2 text-left font-medium text-muted-foreground w-12">
                 #
@@ -141,7 +141,7 @@ export function RepeaterTable({
               </th>
             </tr>
           </thead>
-          <tbody>
+          <tbody className="bg-background">
             {data.length === 0 ? (
               <tr>
                 <td

frontend/lib/registry/components/section-paper/SectionPaperComponent.tsx

@@ -40,10 +40,10 @@ export function SectionPaperComponent({
 
   // 배경색 매핑
   const backgroundColorMap = {
-    default: "bg-muted/20",
-    muted: "bg-muted/30",
-    accent: "bg-accent/20",
-    primary: "bg-primary/5",
+    default: "bg-muted/40",
+    muted: "bg-muted/50",
+    accent: "bg-accent/30",
+    primary: "bg-primary/10",
     custom: "",
   };
 
@@ -74,7 +74,7 @@ export function SectionPaperComponent({
   const padding = config.padding || "md";
   const rounded = config.roundedCorners || "md";
   const shadow = config.shadow || "none";
-  const showBorder = config.showBorder || false;
+  const showBorder = config.showBorder !== undefined ? config.showBorder : true;
   const borderStyle = config.borderStyle || "subtle";
 
   // 커스텀 배경색 처리
@@ -87,7 +87,7 @@ export function SectionPaperComponent({
     <div
       className={cn(
         // 기본 스타일
-        "relative transition-colors",
+        "relative transition-colors overflow-visible",
 
         // 배경색
         backgroundColor !== "custom" && backgroundColorMap[backgroundColor],

frontend/lib/registry/components/table-list/TableListComponent.tsx

@@ -322,6 +322,7 @@ export const TableListComponent: React.FC<TableListComponentProps> = ({
   const [searchTerm, setSearchTerm] = useState("");
   const [sortColumn, setSortColumn] = useState<string | null>(null);
   const [sortDirection, setSortDirection] = useState<"asc" | "desc">("asc");
+  const hasInitializedSort = useRef(false);
   const [columnLabels, setColumnLabels] = useState<Record<string, string>>({});
   const [tableLabel, setTableLabel] = useState<string>("");
   const [localPageSize, setLocalPageSize] = useState<number>(tableConfig.pagination?.pageSize || 20);
@@ -508,6 +509,28 @@ export const TableListComponent: React.FC<TableListComponentProps> = ({
     unregisterTable,
   ]);
 
+  // 🎯 초기 로드 시 localStorage에서 정렬 상태 불러오기
+  useEffect(() => {
+    if (!tableConfig.selectedTable || !userId || hasInitializedSort.current) return;
+
+    const storageKey = `table_sort_state_${tableConfig.selectedTable}_${userId}`;
+    const savedSort = localStorage.getItem(storageKey);
+
+    if (savedSort) {
+      try {
+        const { column, direction } = JSON.parse(savedSort);
+        if (column && direction) {
+          setSortColumn(column);
+          setSortDirection(direction);
+          hasInitializedSort.current = true;
+          console.log("📂 localStorage에서 정렬 상태 복원:", { column, direction });
+        }
+      } catch (error) {
+        console.error("❌ 정렬 상태 복원 실패:", error);
+      }
+    }
+  }, [tableConfig.selectedTable, userId]);
+
   // 🆕 초기 로드 시 localStorage에서 컬럼 순서 불러오기
   useEffect(() => {
     if (!tableConfig.selectedTable || !userId) return;
@@ -955,6 +978,20 @@ export const TableListComponent: React.FC<TableListComponentProps> = ({
       newSortDirection = "asc";
     }
 
+    // 🎯 정렬 상태를 localStorage에 저장 (사용자별)
+    if (tableConfig.selectedTable && userId) {
+      const storageKey = `table_sort_state_${tableConfig.selectedTable}_${userId}`;
+      try {
+        localStorage.setItem(storageKey, JSON.stringify({
+          column: newSortColumn,
+          direction: newSortDirection
+        }));
+        console.log("💾 정렬 상태 저장:", { column: newSortColumn, direction: newSortDirection });
+      } catch (error) {
+        console.error("❌ 정렬 상태 저장 실패:", error);
+      }
+    }
+
     console.log("📊 새로운 정렬 정보:", { newSortColumn, newSortDirection });
     console.log("🔍 onSelectedRowsChange 존재 여부:", !!onSelectedRowsChange);
 
@@ -1876,11 +1913,59 @@ export const TableListComponent: React.FC<TableListComponentProps> = ({
     };
   }, [tableConfig.selectedTable, isDesignMode]);
 
-  // 초기 컬럼 너비 측정 (한 번만)
+  // 🎯 컬럼 너비 자동 계산 (내용 기반)
+  const calculateOptimalColumnWidth = useCallback((columnName: string, displayName: string): number => {
+    // 기본 너비 설정
+    const MIN_WIDTH = 100;
+    const MAX_WIDTH = 400;
+    const PADDING = 48; // 좌우 패딩 + 여유 공간
+    const HEADER_PADDING = 60; // 헤더 추가 여유 (정렬 아이콘 등)
+
+    // 헤더 텍스트 너비 계산 (대략 8px per character)
+    const headerWidth = (displayName?.length || columnName.length) * 10 + HEADER_PADDING;
+
+    // 데이터 셀 너비 계산 (상위 50개 샘플링)
+    const sampleSize = Math.min(50, data.length);
+    let maxDataWidth = headerWidth;
+
+    for (let i = 0; i < sampleSize; i++) {
+      const cellValue = data[i]?.[columnName];
+      if (cellValue !== null && cellValue !== undefined) {
+        const cellText = String(cellValue);
+        // 숫자는 좁게, 텍스트는 넓게 계산
+        const isNumber = !isNaN(Number(cellValue)) && cellValue !== "";
+        const charWidth = isNumber ? 8 : 9;
+        const cellWidth = cellText.length * charWidth + PADDING;
+        maxDataWidth = Math.max(maxDataWidth, cellWidth);
+      }
+    }
+
+    // 최소/최대 범위 내로 제한
+    return Math.max(MIN_WIDTH, Math.min(MAX_WIDTH, Math.ceil(maxDataWidth)));
+  }, [data]);
+
+  // 🎯 localStorage에서 컬럼 너비 불러오기 및 초기 계산
   useEffect(() => {
-    if (!hasInitializedWidths.current && visibleColumns.length > 0) {
-      // 약간의 지연을 두고 DOM이 완전히 렌더링된 후 측정
+    if (!hasInitializedWidths.current && visibleColumns.length > 0 && data.length > 0) {
       const timer = setTimeout(() => {
+        const storageKey = tableConfig.selectedTable && userId 
+          ? `table_column_widths_${tableConfig.selectedTable}_${userId}`
+          : null;
+
+        // 1. localStorage에서 저장된 너비 불러오기
+        let savedWidths: Record<string, number> = {};
+        if (storageKey) {
+          try {
+            const saved = localStorage.getItem(storageKey);
+            if (saved) {
+              savedWidths = JSON.parse(saved);
+            }
+          } catch (error) {
+            console.error("컬럼 너비 불러오기 실패:", error);
+          }
+        }
+
+        // 2. 자동 계산 또는 저장된 너비 적용
         const newWidths: Record<string, number> = {};
         let hasAnyWidth = false;
 
@@ -1888,13 +1973,18 @@ export const TableListComponent: React.FC<TableListComponentProps> = ({
           // 체크박스 컬럼은 제외 (고정 48px)
           if (column.columnName === "__checkbox__") return;
 
-          const thElement = columnRefs.current[column.columnName];
-          if (thElement) {
-            const measuredWidth = thElement.offsetWidth;
-            if (measuredWidth > 0) {
-              newWidths[column.columnName] = measuredWidth;
-              hasAnyWidth = true;
-            }
+          // 저장된 너비가 있으면 우선 사용
+          if (savedWidths[column.columnName]) {
+            newWidths[column.columnName] = savedWidths[column.columnName];
+            hasAnyWidth = true;
+          } else {
+            // 저장된 너비가 없으면 자동 계산
+            const optimalWidth = calculateOptimalColumnWidth(
+              column.columnName, 
+              columnLabels[column.columnName] || column.displayName
+            );
+            newWidths[column.columnName] = optimalWidth;
+            hasAnyWidth = true;
           }
         });
 
@@ -1902,11 +1992,11 @@ export const TableListComponent: React.FC<TableListComponentProps> = ({
           setColumnWidths(newWidths);
           hasInitializedWidths.current = true;
         }
-      }, 100);
+      }, 150); // DOM 렌더링 대기
 
       return () => clearTimeout(timer);
     }
-  }, [visibleColumns]);
+  }, [visibleColumns, data, tableConfig.selectedTable, userId, calculateOptimalColumnWidth, columnLabels]);
 
   // ========================================
   // 페이지네이션 JSX
@@ -2241,7 +2331,21 @@ export const TableListComponent: React.FC<TableListComponentProps> = ({
                                 // 최종 너비를 state에 저장
                                 if (thElement) {
                                   const finalWidth = Math.max(80, thElement.offsetWidth);
-                                  setColumnWidths((prev) => ({ ...prev, [column.columnName]: finalWidth }));
+                                  setColumnWidths((prev) => {
+                                    const newWidths = { ...prev, [column.columnName]: finalWidth };
+                                    
+                                    // 🎯 localStorage에 컬럼 너비 저장 (사용자별)
+                                    if (tableConfig.selectedTable && userId) {
+                                      const storageKey = `table_column_widths_${tableConfig.selectedTable}_${userId}`;
+                                      try {
+                                        localStorage.setItem(storageKey, JSON.stringify(newWidths));
+                                      } catch (error) {
+                                        console.error("컬럼 너비 저장 실패:", error);
+                                      }
+                                    }
+                                    
+                                    return newWidths;
+                                  });
                                 }
 
                                 // 텍스트 선택 복원

frontend/lib/registry/components/tabs/tabs-component.tsx

@@ -0,0 +1,165 @@
+"use client";
+
+import React from "react";
+import { ComponentRegistry } from "../../ComponentRegistry";
+import { ComponentCategory } from "@/types/component";
+import { Folder } from "lucide-react";
+import type { TabsComponent, TabItem } from "@/types/screen-management";
+
+// TabsWidget 래퍼 컴포넌트
+const TabsWidgetWrapper: React.FC<any> = (props) => {
+  const { component, ...restProps } = props;
+  
+  // componentConfig에서 탭 정보 추출
+  const tabsConfig = component.componentConfig || {};
+  const tabsComponent = {
+    ...component,
+    type: "tabs" as const,
+    tabs: tabsConfig.tabs || [],
+    defaultTab: tabsConfig.defaultTab,
+    orientation: tabsConfig.orientation || "horizontal",
+    variant: tabsConfig.variant || "default",
+    allowCloseable: tabsConfig.allowCloseable || false,
+    persistSelection: tabsConfig.persistSelection || false,
+  };
+
+  console.log("🎨 TabsWidget 렌더링:", {
+    componentId: component.id,
+    tabs: tabsComponent.tabs,
+    tabsLength: tabsComponent.tabs.length,
+    component,
+  });
+
+  // TabsWidget 동적 로드
+  const TabsWidget = require("@/components/screen/widgets/TabsWidget").TabsWidget;
+  
+  return (
+    <div className="h-full w-full">
+      <TabsWidget component={tabsComponent} {...restProps} />
+    </div>
+  );
+};
+
+/**
+ * 탭 컴포넌트 정의
+ * 
+ * 여러 화면을 탭으로 구분하여 전환할 수 있는 컴포넌트
+ */
+ComponentRegistry.registerComponent({
+  id: "tabs-widget",
+  name: "탭 컴포넌트",
+  description: "화면을 탭으로 전환할 수 있는 컴포넌트입니다. 각 탭마다 다른 화면을 연결할 수 있습니다.",
+  category: ComponentCategory.LAYOUT,
+  webType: "text" as any, // 레이아웃 컴포넌트이므로 임시값
+  component: TabsWidgetWrapper, // ✅ 실제 TabsWidget 렌더러
+  defaultConfig: {},
+  tags: ["tabs", "navigation", "layout", "screen"],
+  icon: Folder,
+  version: "1.0.0",
+  
+  defaultSize: {
+    width: 800,
+    height: 600,
+  },
+  
+  defaultProps: {
+    type: "tabs" as const,
+    tabs: [
+      {
+        id: "tab-1",
+        label: "탭 1",
+        order: 0,
+        disabled: false,
+      },
+      {
+        id: "tab-2",
+        label: "탭 2",
+        order: 1,
+        disabled: false,
+      },
+    ] as TabItem[],
+    defaultTab: "tab-1",
+    orientation: "horizontal" as const,
+    variant: "default" as const,
+    allowCloseable: false,
+    persistSelection: false,
+  },
+  
+  // 에디터 모드에서의 렌더링
+  renderEditor: ({ component, isSelected, onClick, onDragStart, onDragEnd, children }) => {
+    const tabsComponent = component as TabsComponent;
+    const tabs = tabsComponent.tabs || [];
+    
+    return (
+      <div
+        className="flex h-full w-full items-center justify-center rounded border-2 border-dashed border-gray-300 bg-gray-50"
+        onClick={onClick}
+        onDragStart={onDragStart}
+        onDragEnd={onDragEnd}
+      >
+        <div className="text-center">
+          <div className="flex items-center justify-center">
+            <Folder className="h-8 w-8 text-gray-400" />
+          </div>
+          <p className="text-muted-foreground mt-2 text-sm font-medium">탭 컴포넌트</p>
+          <p className="text-xs text-gray-400">
+            {tabs.length > 0
+              ? `${tabs.length}개의 탭 (실제 화면에서 표시됩니다)`
+              : "탭이 없습니다. 설정 패널에서 탭을 추가하세요"}
+          </p>
+          {tabs.length > 0 && (
+            <div className="mt-2 flex flex-wrap justify-center gap-1">
+              {tabs.map((tab: TabItem, index: number) => (
+                <span
+                  key={tab.id}
+                  className="rounded-md border bg-white px-2 py-1 text-xs"
+                >
+                  {tab.label || `탭 ${index + 1}`}
+                </span>
+              ))}
+            </div>
+          )}
+        </div>
+      </div>
+    );
+  },
+  
+  // 인터랙티브 모드에서의 렌더링 (실제 동작)
+  renderInteractive: ({ component }) => {
+    // InteractiveScreenViewer에서 TabsWidget을 사용하므로 여기서는 null 반환
+    return null;
+  },
+  
+  // 설정 패널 (동적 로딩)
+  configPanel: React.lazy(() => 
+    import("@/components/screen/config-panels/TabsConfigPanel").then(module => ({
+      default: module.TabsConfigPanel
+    }))
+  ),
+  
+  // 검증 함수
+  validate: (component) => {
+    const tabsComponent = component as TabsComponent;
+    const errors: string[] = [];
+    
+    if (!tabsComponent.tabs || tabsComponent.tabs.length === 0) {
+      errors.push("최소 1개 이상의 탭이 필요합니다.");
+    }
+    
+    if (tabsComponent.tabs) {
+      const tabIds = tabsComponent.tabs.map((t) => t.id);
+      const uniqueIds = new Set(tabIds);
+      if (tabIds.length !== uniqueIds.size) {
+        errors.push("탭 ID가 중복되었습니다.");
+      }
+    }
+    
+    return {
+      isValid: errors.length === 0,
+      errors,
+    };
+  },
+});
+
+console.log("✅ 탭 컴포넌트 등록 완료");
+

frontend/lib/utils/buttonActions.ts

@@ -41,7 +41,8 @@ export interface ButtonActionConfig {
 
   // 모달/팝업 관련
   modalTitle?: string;
-  modalTitleBlocks?: Array<{ // 🆕 블록 기반 제목 (우선순위 높음)
+  modalTitleBlocks?: Array<{
+    // 🆕 블록 기반 제목 (우선순위 높음)
     id: string;
     type: "text" | "field";
     value: string; // type=text: 텍스트 내용, type=field: 컬럼명
@@ -88,6 +89,12 @@ export interface ButtonActionConfig {
   // 코드 병합 관련
   mergeColumnName?: string; // 병합할 컬럼명 (예: "item_code")
   mergeShowPreview?: boolean; // 병합 전 미리보기 표시 여부 (기본: true)
+
+  // 편집 관련 (수주관리 등 그룹별 다중 레코드 편집)
+  editMode?: "modal" | "navigate" | "inline"; // 편집 모드
+  editModalTitle?: string; // 편집 모달 제목
+  editModalDescription?: string; // 편집 모달 설명
+  groupByColumns?: string[]; // 같은 그룹의 여러 행을 함께 편집 (예: ["order_no"])
 }
 
 /**
@@ -105,6 +112,7 @@ export interface ButtonActionContext {
   onClose?: () => void;
   onRefresh?: () => void;
   onFlowRefresh?: () => void; // 플로우 새로고침 콜백
+  onSave?: () => Promise<void>; // 🆕 EditModal의 handleSave 콜백
 
   // 테이블 선택된 행 정보 (다중 선택 액션용)
   selectedRows?: any[];
@@ -206,9 +214,23 @@ export class ButtonActionExecutor {
    * 저장 액션 처리 (INSERT/UPDATE 자동 판단 - DB 기반)
    */
   private static async handleSave(config: ButtonActionConfig, context: ButtonActionContext): Promise<boolean> {
-    const { formData, originalData, tableName, screenId } = context;
+    const { formData, originalData, tableName, screenId, onSave } = context;
 
-    console.log("💾 [handleSave] 저장 시작:", { formData, tableName, screenId });
+    console.log("💾 [handleSave] 저장 시작:", { formData, tableName, screenId, hasOnSave: !!onSave });
+    
+    // 🆕 EditModal 등에서 전달된 onSave 콜백이 있으면 우선 사용
+    if (onSave) {
+      console.log("✅ [handleSave] onSave 콜백 발견 - 콜백 실행");
+      try {
+        await onSave();
+        return true;
+      } catch (error) {
+        console.error("❌ [handleSave] onSave 콜백 실행 오류:", error);
+        throw error;
+      }
+    }
+    
+    console.log("⚠️ [handleSave] onSave 콜백 없음 - 기본 저장 로직 실행");
 
     // 🆕 저장 전 이벤트 발생 (SelectedItemsDetailInput 등에서 최신 데이터 수집)
     // context.formData를 이벤트 detail에 포함하여 직접 수정 가능하게 함
@@ -1256,14 +1278,6 @@ export class ButtonActionExecutor {
     // 플로우 선택 데이터 우선 사용
     let dataToEdit = flowSelectedData && flowSelectedData.length > 0 ? flowSelectedData : selectedRowsData;
 
-    console.log("🔍 handleEdit - 데이터 소스 확인:", {
-      hasFlowSelectedData: !!(flowSelectedData && flowSelectedData.length > 0),
-      flowSelectedDataLength: flowSelectedData?.length || 0,
-      hasSelectedRowsData: !!(selectedRowsData && selectedRowsData.length > 0),
-      selectedRowsDataLength: selectedRowsData?.length || 0,
-      dataToEditLength: dataToEdit?.length || 0,
-    });
-
     // 선택된 데이터가 없는 경우
     if (!dataToEdit || dataToEdit.length === 0) {
       toast.error("수정할 항목을 선택해주세요.");
@@ -1276,26 +1290,15 @@ export class ButtonActionExecutor {
       return false;
     }
 
-    console.log(`📝 편집 액션 실행: ${dataToEdit.length}개 항목`, {
-      dataToEdit,
-      targetScreenId: config.targetScreenId,
-      editMode: config.editMode,
-    });
-
     if (dataToEdit.length === 1) {
       // 단일 항목 편집
       const rowData = dataToEdit[0];
-      console.log("📝 단일 항목 편집:", rowData);
 
       await this.openEditForm(config, rowData, context);
     } else {
       // 다중 항목 편집 - 현재는 단일 편집만 지원
       toast.error("현재 단일 항목 편집만 지원됩니다. 하나의 항목만 선택해주세요.");
       return false;
-
-      // TODO: 향후 다중 편집 지원
-      // console.log("📝 다중 항목 편집:", selectedRowsData);
-      // this.openBulkEditForm(config, selectedRowsData, context);
     }
 
     return true;
@@ -1329,7 +1332,7 @@ export class ButtonActionExecutor {
 
       default:
         // 기본값: 모달
-        this.openEditModal(config, rowData, context);
+        await this.openEditModal(config, rowData, context);
     }
   }
 
@@ -1341,11 +1344,17 @@ export class ButtonActionExecutor {
     rowData: any,
     context: ButtonActionContext,
   ): Promise<void> {
-    console.log("🎭 편집 모달 열기:", {
-      targetScreenId: config.targetScreenId,
-      modalSize: config.modalSize,
-      rowData,
-    });
+    const { groupByColumns = [] } = config;
+
+    // PK 값 추출 (우선순위: id > ID > 첫 번째 필드)
+    let primaryKeyValue: any;
+    if (rowData.id !== undefined && rowData.id !== null) {
+      primaryKeyValue = rowData.id;
+    } else if (rowData.ID !== undefined && rowData.ID !== null) {
+      primaryKeyValue = rowData.ID;
+    } else {
+      primaryKeyValue = Object.values(rowData)[0];
+    }
 
     // 1. config에 editModalDescription이 있으면 우선 사용
     let description = config.editModalDescription || "";
@@ -1360,7 +1369,7 @@ export class ButtonActionExecutor {
       }
     }
 
-    // 모달 열기 이벤트 발생
+    // 🔧 항상 EditModal 사용 (groupByColumns는 EditModal에서 처리)
     const modalEvent = new CustomEvent("openEditModal", {
       detail: {
         screenId: config.targetScreenId,
@@ -1368,16 +1377,15 @@ export class ButtonActionExecutor {
         description: description,
         modalSize: config.modalSize || "lg",
         editData: rowData,
+        groupByColumns: groupByColumns.length > 0 ? groupByColumns : undefined, // 🆕 그룹핑 컬럼 전달
+        tableName: context.tableName, // 🆕 테이블명 전달
         onSave: () => {
-          // 저장 후 테이블 새로고침
-          console.log("💾 편집 저장 완료 - 테이블 새로고침");
           context.onRefresh?.();
         },
       },
     });
 
     window.dispatchEvent(modalEvent);
-    // 편집 모달 열기는 조용히 처리 (토스트 없음)
   }
 
   /**
@@ -1673,7 +1681,11 @@ export class ButtonActionExecutor {
       });
 
       // 🔥 새로운 버튼 액션 실행 시스템 사용
-      if (config.dataflowConfig?.controlMode === "flow" && config.dataflowConfig?.flowConfig) {
+      // flowConfig가 있으면 controlMode가 명시되지 않아도 플로우 모드로 간주
+      const hasFlowConfig = config.dataflowConfig?.flowConfig && config.dataflowConfig.flowConfig.flowId;
+      const isFlowMode = config.dataflowConfig?.controlMode === "flow" || hasFlowConfig;
+      
+      if (isFlowMode && config.dataflowConfig?.flowConfig) {
         console.log("🎯 노드 플로우 실행:", config.dataflowConfig.flowConfig);
 
         const { flowId, executionTiming } = config.dataflowConfig.flowConfig;
@@ -1711,6 +1723,8 @@ export class ButtonActionExecutor {
                 });
               } else {
                 console.warn("⚠️ flow-selection 모드이지만 선택된 플로우 데이터가 없습니다.");
+                toast.error("플로우에서 데이터를 먼저 선택해주세요.");
+                return false;
               }
               break;
 
@@ -1723,6 +1737,8 @@ export class ButtonActionExecutor {
                 });
               } else {
                 console.warn("⚠️ table-selection 모드이지만 선택된 행이 없습니다.");
+                toast.error("테이블에서 처리할 항목을 먼저 선택해주세요.");
+                return false;
               }
               break;
 

frontend/lib/utils/getComponentConfigPanel.tsx

@@ -42,6 +42,8 @@ const CONFIG_PANEL_MAP: Record<string, () => Promise<any>> = {
   // 🆕 섹션 그룹화 레이아웃
   "section-card": () => import("@/lib/registry/components/section-card/SectionCardConfigPanel"),
   "section-paper": () => import("@/lib/registry/components/section-paper/SectionPaperConfigPanel"),
+  // 🆕 탭 컴포넌트
+  "tabs-widget": () => import("@/components/screen/config-panels/TabsConfigPanel"),
 };
 
 // ConfigPanel 컴포넌트 캐시
@@ -76,6 +78,7 @@ export async function getComponentConfigPanel(componentId: string): Promise<Reac
       module.ButtonConfigPanel || // button-primary의 export명
       module.SectionCardConfigPanel || // section-card의 export명
       module.SectionPaperConfigPanel || // section-paper의 export명
+      module.TabsConfigPanel || // tabs-widget의 export명
       module.default;
 
     if (!ConfigPanelComponent) {

frontend/lib/utils/getConfigPanelComponent.tsx

@@ -14,6 +14,7 @@ import { RatingTypeConfigPanel } from "@/components/screen/panels/webtype-config
 import { ButtonConfigPanel as OriginalButtonConfigPanel } from "@/components/screen/config-panels/ButtonConfigPanel";
 import { CardConfigPanel } from "@/components/screen/config-panels/CardConfigPanel";
 import { DashboardConfigPanel } from "@/components/screen/config-panels/DashboardConfigPanel";
+import { TabsConfigPanel } from "@/components/screen/config-panels/TabsConfigPanel";
 
 // 설정 패널 컴포넌트 타입
 export type ConfigPanelComponent = React.ComponentType<{
@@ -83,6 +84,26 @@ const DashboardConfigPanelWrapper: ConfigPanelComponent = ({ config, onConfigCha
   return <DashboardConfigPanel component={mockComponent as any} onUpdateProperty={handleUpdateProperty} />;
 };
 
+// TabsConfigPanel 래퍼
+const TabsConfigPanelWrapper: ConfigPanelComponent = ({ config, onConfigChange }) => {
+  const mockComponent = {
+    id: "temp",
+    type: "tabs" as const,
+    tabs: config.tabs || [],
+    defaultTab: config.defaultTab,
+    orientation: config.orientation || "horizontal",
+    variant: config.variant || "default",
+    allowCloseable: config.allowCloseable || false,
+    persistSelection: config.persistSelection || false,
+  };
+
+  const handleUpdate = (updates: any) => {
+    onConfigChange({ ...config, ...updates });
+  };
+
+  return <TabsConfigPanel component={mockComponent as any} onUpdate={handleUpdate} />;
+};
+
 // 설정 패널 이름으로 직접 매핑하는 함수 (DB의 config_panel 필드용)
 export const getConfigPanelComponent = (panelName: string): ConfigPanelComponent | null => {
   console.log(`🔧 getConfigPanelComponent 호출: panelName="${panelName}"`);
@@ -128,6 +149,9 @@ export const getConfigPanelComponent = (panelName: string): ConfigPanelComponent
     case "DashboardConfigPanel":
       console.log(`🔧 DashboardConfigPanel 래퍼 컴포넌트 반환`);
       return DashboardConfigPanelWrapper;
+    case "TabsConfigPanel":
+      console.log(`🔧 TabsConfigPanel 래퍼 컴포넌트 반환`);
+      return TabsConfigPanelWrapper;
     default:
       console.warn(`🔧 알 수 없는 설정 패널: ${panelName}, 기본 설정 사용`);
       return null; // 기본 설정 (패널 없음)