feat: 출고관리 수정 모달 저장 기능 개선 및 그룹화 컬럼 설정 UI 추가

ButtonConfigPanel: 수정 액션에 그룹화 컬럼 선택 드롭다운 추가 (영문/한글 검색 지원)
ScreenSplitPanel/EmbeddedScreen: groupedData prop 전달 경로 추가
buttonActions: RepeaterFieldGroup 저장 시 공통 필드 우선 적용되도록 병합 순서 변경
This commit is contained in:
SeongHyun Kim 2026-01-07 10:24:01 +09:00
parent c365f06ed7
commit 7c165a724e
5 changed files with 149 additions and 7 deletions

View File

@ -27,13 +27,14 @@ interface EmbeddedScreenProps {
onSelectionChanged?: (selectedRows: any[]) => void;
position?: SplitPanelPosition; // 분할 패널 내 위치 (left/right)
initialFormData?: Record<string, any>; // 🆕 수정 모드에서 전달되는 초기 데이터
groupedData?: Record<string, any>[]; // 🆕 그룹 데이터 (수정 모드에서 원본 데이터 추적용)
}
/**
*
*/
export const EmbeddedScreen = forwardRef<EmbeddedScreenHandle, EmbeddedScreenProps>(
({ embedding, onSelectionChanged, position, initialFormData }, ref) => {
({ embedding, onSelectionChanged, position, initialFormData, groupedData }, ref) => {
const [layout, setLayout] = useState<ComponentData[]>([]);
const [selectedRows, setSelectedRows] = useState<any[]>([]);
const [loading, setLoading] = useState(true);
@ -430,6 +431,8 @@ export const EmbeddedScreen = forwardRef<EmbeddedScreenHandle, EmbeddedScreenPro
userId={userId}
userName={userName}
companyCode={companyCode}
groupedData={groupedData}
initialData={initialFormData}
/>
</div>
);

View File

@ -17,13 +17,14 @@ interface ScreenSplitPanelProps {
screenId?: number;
config?: any; // 설정 패널에서 오는 config (leftScreenId, rightScreenId, splitRatio, resizable)
initialFormData?: Record<string, any>; // 🆕 수정 모드에서 전달되는 초기 데이터
groupedData?: Record<string, any>[]; // 🆕 그룹 데이터 (수정 모드에서 원본 데이터 추적용)
}
/**
*
* .
*/
export function ScreenSplitPanel({ screenId, config, initialFormData }: ScreenSplitPanelProps) {
export function ScreenSplitPanel({ screenId, config, initialFormData, groupedData }: ScreenSplitPanelProps) {
// config에서 splitRatio 추출 (기본값 50)
const configSplitRatio = config?.splitRatio ?? 50;
@ -117,7 +118,7 @@ export function ScreenSplitPanel({ screenId, config, initialFormData }: ScreenSp
{/* 좌측 패널 */}
<div style={{ width: `${splitRatio}%` }} className="h-full flex-shrink-0 overflow-hidden border-r">
{hasLeftScreen ? (
<EmbeddedScreen embedding={leftEmbedding!} position="left" initialFormData={initialFormData} />
<EmbeddedScreen embedding={leftEmbedding!} position="left" initialFormData={initialFormData} groupedData={groupedData} />
) : (
<div className="flex h-full items-center justify-center bg-muted/30">
<p className="text-muted-foreground text-sm"> </p>
@ -157,7 +158,7 @@ export function ScreenSplitPanel({ screenId, config, initialFormData }: ScreenSp
{/* 우측 패널 */}
<div style={{ width: `${100 - splitRatio}%` }} className="h-full flex-shrink-0 overflow-hidden">
{hasRightScreen ? (
<EmbeddedScreen embedding={rightEmbedding!} position="right" initialFormData={initialFormData} />
<EmbeddedScreen embedding={rightEmbedding!} position="right" initialFormData={initialFormData} groupedData={groupedData} />
) : (
<div className="flex h-full items-center justify-center bg-muted/30">
<p className="text-muted-foreground text-sm"> </p>

View File

@ -60,6 +60,7 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
editModalTitle: String(config.action?.editModalTitle || ""),
editModalDescription: String(config.action?.editModalDescription || ""),
targetUrl: String(config.action?.targetUrl || ""),
groupByColumn: String(config.action?.groupByColumns?.[0] || ""),
});
const [screens, setScreens] = useState<ScreenOption[]>([]);
@ -97,6 +98,11 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
const [modalTargetColumns, setModalTargetColumns] = useState<Array<{ name: string; label: string }>>([]);
const [modalSourcePopoverOpen, setModalSourcePopoverOpen] = useState<Record<number, boolean>>({});
const [modalTargetPopoverOpen, setModalTargetPopoverOpen] = useState<Record<number, boolean>>({});
// 🆕 그룹화 컬럼 선택용 상태
const [currentTableColumns, setCurrentTableColumns] = useState<Array<{ name: string; label: string }>>([]);
const [groupByColumnOpen, setGroupByColumnOpen] = useState(false);
const [groupByColumnSearch, setGroupByColumnSearch] = useState("");
const [modalSourceSearch, setModalSourceSearch] = useState<Record<number, string>>({});
const [modalTargetSearch, setModalTargetSearch] = useState<Record<number, string>>({});
@ -130,6 +136,7 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
editModalTitle: String(latestAction.editModalTitle || ""),
editModalDescription: String(latestAction.editModalDescription || ""),
targetUrl: String(latestAction.targetUrl || ""),
groupByColumn: String(latestAction.groupByColumns?.[0] || ""),
});
// 🆕 제목 블록 초기화
@ -327,6 +334,35 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
loadColumns();
}, [config.action?.dataTransfer?.sourceTable, config.action?.dataTransfer?.targetTable]);
// 🆕 현재 테이블 컬럼 로드 (그룹화 컬럼 선택용)
useEffect(() => {
if (!currentTableName) return;
const loadCurrentTableColumns = async () => {
try {
const response = await apiClient.get(`/table-management/tables/${currentTableName}/columns`);
if (response.data.success) {
let columnData = response.data.data;
if (!Array.isArray(columnData) && columnData?.columns) columnData = columnData.columns;
if (!Array.isArray(columnData) && columnData?.data) columnData = columnData.data;
if (Array.isArray(columnData)) {
const columns = columnData.map((col: any) => ({
name: col.name || col.columnName,
label: col.displayName || col.label || col.columnLabel || col.name || col.columnName,
}));
setCurrentTableColumns(columns);
console.log(`✅ 현재 테이블 ${currentTableName} 컬럼 로드 성공:`, columns.length, "개");
}
}
} catch (error) {
console.error("현재 테이블 컬럼 로드 실패:", error);
}
};
loadCurrentTableColumns();
}, [currentTableName]);
// 🆕 openModalWithData 소스/타겟 테이블 컬럼 로드
useEffect(() => {
const actionType = config.action?.type;
@ -1529,6 +1565,106 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
</div>
</>
)}
<div>
<Label htmlFor="edit-group-by-column"> </Label>
<Popover open={groupByColumnOpen} onOpenChange={setGroupByColumnOpen}>
<PopoverTrigger asChild>
<Button
variant="outline"
role="combobox"
aria-expanded={groupByColumnOpen}
className="h-8 w-full justify-between text-xs"
>
{localInputs.groupByColumn ? (
<span>
{localInputs.groupByColumn}
{currentTableColumns.find((col) => col.name === localInputs.groupByColumn)?.label &&
currentTableColumns.find((col) => col.name === localInputs.groupByColumn)?.label !== localInputs.groupByColumn && (
<span className="ml-1 text-muted-foreground">
({currentTableColumns.find((col) => col.name === localInputs.groupByColumn)?.label})
</span>
)}
</span>
) : (
<span className="text-muted-foreground"> </span>
)}
<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
</Button>
</PopoverTrigger>
<PopoverContent className="p-0" align="start" style={{ width: "var(--radix-popover-trigger-width)" }}>
<div className="flex flex-col">
<div className="flex items-center border-b px-3 py-2">
<Search className="mr-2 h-4 w-4 shrink-0 opacity-50" />
<Input
placeholder="컬럼명 또는 라벨 검색..."
value={groupByColumnSearch}
onChange={(e) => setGroupByColumnSearch(e.target.value)}
className="border-0 p-0 focus-visible:ring-0"
/>
</div>
<div className="max-h-[200px] overflow-auto">
{currentTableColumns.length === 0 ? (
<div className="p-3 text-sm text-muted-foreground">
{currentTableName ? "컬럼을 불러오는 중..." : "테이블이 설정되지 않았습니다"}
</div>
) : (
<>
{/* 선택 해제 옵션 */}
<div
className="flex cursor-pointer items-center px-3 py-2 hover:bg-muted"
onClick={() => {
setLocalInputs((prev) => ({ ...prev, groupByColumn: "" }));
onUpdateProperty("componentConfig.action.groupByColumns", undefined);
setGroupByColumnOpen(false);
setGroupByColumnSearch("");
}}
>
<Check className={cn("mr-2 h-4 w-4", !localInputs.groupByColumn ? "opacity-100" : "opacity-0")} />
<span className="text-muted-foreground"> </span>
</div>
{/* 컬럼 목록 */}
{currentTableColumns
.filter((col) => {
if (!groupByColumnSearch) return true;
const search = groupByColumnSearch.toLowerCase();
return (
col.name.toLowerCase().includes(search) ||
col.label.toLowerCase().includes(search)
);
})
.map((col) => (
<div
key={col.name}
className="flex cursor-pointer items-center px-3 py-2 hover:bg-muted"
onClick={() => {
setLocalInputs((prev) => ({ ...prev, groupByColumn: col.name }));
onUpdateProperty("componentConfig.action.groupByColumns", [col.name]);
setGroupByColumnOpen(false);
setGroupByColumnSearch("");
}}
>
<Check
className={cn("mr-2 h-4 w-4", localInputs.groupByColumn === col.name ? "opacity-100" : "opacity-0")}
/>
<div className="flex flex-col">
<span className="font-medium">{col.name}</span>
{col.label !== col.name && (
<span className="text-xs text-muted-foreground">{col.label}</span>
)}
</div>
</div>
))}
</>
)}
</div>
</div>
</PopoverContent>
</Popover>
<p className="mt-1 text-xs text-muted-foreground">
</p>
</div>
</div>
)}

View File

@ -66,7 +66,7 @@ class ScreenSplitPanelRenderer extends AutoRegisteringComponentRenderer {
};
render() {
const { component, style = {}, componentConfig, config, screenId, formData } = this.props as any;
const { component, style = {}, componentConfig, config, screenId, formData, groupedData } = this.props as any;
// componentConfig 또는 config 또는 component.componentConfig 사용
const finalConfig = componentConfig || config || component?.componentConfig || {};
@ -77,6 +77,7 @@ class ScreenSplitPanelRenderer extends AutoRegisteringComponentRenderer {
screenId={screenId || finalConfig.screenId}
config={finalConfig}
initialFormData={formData} // 🆕 수정 데이터 전달
groupedData={groupedData} // 🆕 그룹 데이터 전달 (수정 모드에서 원본 데이터 추적용)
/>
</div>
);

View File

@ -1036,10 +1036,11 @@ export class ButtonActionExecutor {
}
// 🆕 공통 필드 병합 + 사용자 정보 추가
// 공통 필드를 먼저 넣고, 개별 항목 데이터로 덮어씀 (개별 항목이 우선)
// 개별 항목 데이터를 먼저 넣고, 공통 필드로 덮어씀 (공통 필드가 우선)
// 이유: 사용자가 공통 필드(출고상태 등)를 변경하면 모든 항목에 적용되어야 함
const dataWithMeta: Record<string, unknown> = {
...commonFields, // 범용 폼 모달의 공통 필드 (order_no, manager_id 등)
...dataToSave, // RepeaterFieldGroup의 개별 항목 데이터
...commonFields, // 범용 폼 모달의 공통 필드 (outbound_status 등) - 공통 필드가 우선!
created_by: context.userId,
updated_by: context.userId,
company_code: context.companyCode,