chpark/vexplor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'mhkim-node' of http://39.117.244.52:3000/kjs/ERP-node into jskim-node

Browse Source
This commit is contained in:
kjs
2026-03-17 21:41:44 +09:00
parent 2cf5c8de32
commit 7e34b7bf35
3 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
frontend/components/common/MultiTableExcelUploadModal.tsx
View File

@@ -51,6 +51,20 @@ interface ColumnMapping {
targetColumn: string | null;
}
function flattenCategoryValues(
values: Array<{ valueCode: string; valueLabel: string; children?: any[] }>
): Array<{ valueCode: string; valueLabel: string }> {
const result: Array<{ valueCode: string; valueLabel: string }> = [];
const traverse = (items: any[]) => {
for (const item of items) {
result.push({ valueCode: item.valueCode, valueLabel: item.valueLabel });
if (item.children?.length > 0) traverse(item.children);
}
};
traverse(values);
return result;
}
export const MultiTableExcelUploadModal: React.FC<MultiTableExcelUploadModalProps> = ({
open,
onOpenChange,
@@ -356,10 +370,7 @@ export const MultiTableExcelUploadModal: React.FC<MultiTableExcelUploadModalProp
const valuesResponse = await getCategoryValues(level.tableName, catColName);
if (!valuesResponse.success || !valuesResponse.data) continue;
const validValues = valuesResponse.data as Array<{
valueCode: string;
valueLabel: string;
}>;
const validValues = flattenCategoryValues(valuesResponse.data as any[]);
const validCodes = new Set(validValues.map((v) => v.valueCode));
const validLabels = new Set(validValues.map((v) => v.valueLabel));