jskim/vexplor_dev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into lhj - 충돌 해결

Browse Source
This commit is contained in:
leeheejin
2025-10-01 18:01:20 +09:00
parent 6d1fe625e4 63ee0fbb5a
commit 4202a5b310
106 changed files with 13320 additions and 10514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
frontend/components/dataflow/connection/redesigned/RightPanel/ActionConfig/ActionConditionBuilder.tsx
View File

@@ -268,17 +268,19 @@ const ActionConditionBuilder: React.FC<ActionConditionBuilderProps> = ({
{fromColumns.length > 0 && (
<>
<div className="text-muted-foreground px-2 py-1 text-xs font-medium">FROM 테이블</div>
{fromColumns.map((column) => (
<SelectItem key={`from_${column.columnName}`} value={`from.${column.columnName}`}>
<div className="flex items-center gap-2">
<span className="text-blue-600">📤</span>
<span>{column.displayName || column.columnName}</span>
<Badge variant="outline" className="text-xs">
{column.webType || column.dataType}
</Badge>
</div>
</SelectItem>
))}
{fromColumns
.filter((column) => column.columnName) // 빈 문자열 제외
.map((column) => (
<SelectItem key={`from_${column.columnName}`} value={`from.${column.columnName}`}>
<div className="flex items-center gap-2">
<span className="text-blue-600">📤</span>
<span>{column.displayName || column.columnName}</span>
<Badge variant="outline" className="text-xs">
{column.webType || column.dataType}
</Badge>
</div>
</SelectItem>
))}
</>
)}
@@ -286,15 +288,17 @@ const ActionConditionBuilder: React.FC<ActionConditionBuilderProps> = ({
{toColumns.length > 0 && (
<>
<div className="text-muted-foreground px-2 py-1 text-xs font-medium">TO 테이블</div>
{toColumns.map((column) => (
<SelectItem key={`to_${column.columnName}`} value={`to.${column.columnName}`}>
<div className="flex items-center gap-2">
<span className="text-green-600">📥</span>
<span>{column.displayName || column.columnName}</span>
<Badge variant="outline" className="text-xs">
{column.webType || column.dataType}
</Badge>
</div>
{toColumns
.filter((column) => column.columnName) // 빈 문자열 제외
.map((column) => (
<SelectItem key={`to_${column.columnName}`} value={`to.${column.columnName}`}>
<div className="flex items-center gap-2">
<span className="text-green-600">📥</span>
<span>{column.displayName || column.columnName}</span>
<Badge variant="outline" className="text-xs">
{column.webType || column.dataType}
</Badge>
</div>
</SelectItem>
))}
</>
@@ -488,14 +492,16 @@ const ActionConditionBuilder: React.FC<ActionConditionBuilderProps> = ({
{fromColumns.length > 0 && (
<>
<div className="text-muted-foreground px-2 py-1 text-xs font-medium">FROM 테이블</div>
{fromColumns.map((column) => (
<SelectItem key={`from_${column.columnName}`} value={`from.${column.columnName}`}>
<div className="flex items-center gap-2">
<span className="text-blue-600">📤</span>
<span>{column.displayName || column.columnName}</span>
</div>
</SelectItem>
))}
{fromColumns
.filter((column) => column.columnName) // 빈 문자열 제외
.map((column) => (
<SelectItem key={`from_${column.columnName}`} value={`from.${column.columnName}`}>
<div className="flex items-center gap-2">
<span className="text-blue-600">📤</span>
<span>{column.displayName || column.columnName}</span>
</div>
</SelectItem>
))}
</>
)}
@@ -503,14 +509,16 @@ const ActionConditionBuilder: React.FC<ActionConditionBuilderProps> = ({
{toColumns.length > 0 && (
<>
<div className="text-muted-foreground px-2 py-1 text-xs font-medium">TO 테이블</div>
{toColumns.map((column) => (
<SelectItem key={`to_${column.columnName}`} value={`to.${column.columnName}`}>
<div className="flex items-center gap-2">
<span className="text-green-600">📥</span>
<span>{column.displayName || column.columnName}</span>
</div>
</SelectItem>
))}
{toColumns
.filter((column) => column.columnName) // 빈 문자열 제외
.map((column) => (
<SelectItem key={`to_${column.columnName}`} value={`to.${column.columnName}`}>
<div className="flex items-center gap-2">
<span className="text-green-600">📥</span>
<span>{column.displayName || column.columnName}</span>
</div>
</SelectItem>
))}
</>
)}
</SelectContent>
@@ -612,14 +620,16 @@ const ActionConditionBuilder: React.FC<ActionConditionBuilderProps> = ({
<div className="text-muted-foreground px-2 py-1 text-xs font-medium">
FROM 테이블
</div>
{fromColumns.map((column) => (
<SelectItem key={`from_${column.columnName}`} value={`from.${column.columnName}`}>
<div className="flex items-center gap-2">
<span className="text-blue-600">📤</span>
<span>{column.displayName || column.columnName}</span>
</div>
</SelectItem>
))}
{fromColumns
.filter((column) => column.columnName) // 빈 문자열 제외
.map((column) => (
<SelectItem key={`from_${column.columnName}`} value={`from.${column.columnName}`}>
<div className="flex items-center gap-2">
<span className="text-blue-600">📤</span>
<span>{column.displayName || column.columnName}</span>
</div>
</SelectItem>
))}
</>
)}
@@ -627,13 +637,15 @@ const ActionConditionBuilder: React.FC<ActionConditionBuilderProps> = ({
{toColumns.length > 0 && (
<>
<div className="text-muted-foreground px-2 py-1 text-xs font-medium">TO 테이블</div>
{toColumns.map((column) => (
<SelectItem key={`to_${column.columnName}`} value={`to.${column.columnName}`}>
<div className="flex items-center gap-2">
<span className="text-green-600">📥</span>
<span>{column.displayName || column.columnName}</span>
</div>
</SelectItem>
{toColumns
.filter((column) => column.columnName) // 빈 문자열 제외
.map((column) => (
<SelectItem key={`to_${column.columnName}`} value={`to.${column.columnName}`}>
<div className="flex items-center gap-2">
<span className="text-green-600">📥</span>
<span>{column.displayName || column.columnName}</span>
</div>
</SelectItem>
))}
</>
)}
@@ -729,16 +741,18 @@ const ActionConditionBuilder: React.FC<ActionConditionBuilderProps> = ({
<SelectValue placeholder="대상 필드" />
</SelectTrigger>
<SelectContent>
{getAvailableFieldsForMapping(index).map((column) => (
<SelectItem key={column.columnName} value={column.columnName}>
<div className="flex items-center gap-2">
<span>{column.displayName || column.columnName}</span>
<Badge variant="outline" className="text-xs">
{column.webType || column.dataType}
</Badge>
</div>
</SelectItem>
))}
{getAvailableFieldsForMapping(index)
.filter((column) => column.columnName) // 빈 문자열 제외
.map((column) => (
<SelectItem key={column.columnName} value={column.columnName}>
<div className="flex items-center gap-2">
<span>{column.displayName || column.columnName}</span>
<Badge variant="outline" className="text-xs">
{column.webType || column.dataType}
</Badge>
</div>
</SelectItem>
))}
</SelectContent>
</Select>

1
frontend/components/dataflow/connection/redesigned/RightPanel/ControlConditionStep.tsx
View File

@@ -233,6 +233,7 @@ const ControlConditionStep: React.FC<ControlConditionStepProps> = ({ state, acti
{[...fromColumns, ...toColumns]
.filter(
(col, index, array) =>
col.columnName && // 빈 문자열 제외
array.findIndex((c) => c.columnName === col.columnName) === index,
)
.map((col) => (