diff --git a/frontend/components/screen/ScreenDesigner.tsx b/frontend/components/screen/ScreenDesigner.tsx index 8c2ac38c..43436307 100644 --- a/frontend/components/screen/ScreenDesigner.tsx +++ b/frontend/components/screen/ScreenDesigner.tsx @@ -1252,7 +1252,7 @@ export default function ScreenDesigner({ selectedScreen, onBackToList }: ScreenD newComponent = { id: generateComponentId(), type: "container", - label: table.tableName, + label: table.tableLabel || table.tableName, // 테이블 라벨 우선, 없으면 테이블명 tableName: table.tableName, position: { x, y, z: 1 } as Position, size: { width: 300, height: 200 }, @@ -1458,7 +1458,7 @@ export default function ScreenDesigner({ selectedScreen, onBackToList }: ScreenD newComponent = { id: generateComponentId(), type: "widget", - label: column.columnName, + label: column.columnLabel || column.columnName, // 컬럼 라벨 우선, 없으면 컬럼명 tableName: table.tableName, columnName: column.columnName, widgetType: column.widgetType, diff --git a/frontend/components/screen/ScreenDesigner_new.tsx b/frontend/components/screen/ScreenDesigner_new.tsx index 55b651b4..bbec213c 100644 --- a/frontend/components/screen/ScreenDesigner_new.tsx +++ b/frontend/components/screen/ScreenDesigner_new.tsx @@ -305,7 +305,7 @@ export default function ScreenDesigner({ selectedScreen, onBackToList }: ScreenD newComponent = { id: generateComponentId(), type: "container", - label: table.tableName, + label: table.tableLabel || table.tableName, // 테이블 라벨 우선, 없으면 테이블명 tableName: table.tableName, position: { x, y, z: 1 }, size: { width: 300, height: 200 }, @@ -315,7 +315,7 @@ export default function ScreenDesigner({ selectedScreen, onBackToList }: ScreenD newComponent = { id: generateComponentId(), type: "widget", - label: column.columnName, + label: column.columnLabel || column.columnName, // 컬럼 라벨 우선, 없으면 컬럼명 tableName: table.tableName, columnName: column.columnName, widgetType: column.widgetType, @@ -664,4 +664,3 @@ export default function ScreenDesigner({ selectedScreen, onBackToList }: ScreenD ); } -