kjs
/
ERP-node
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

[agent-pipeline] pipe-20260311193053-kk9w round-2

This commit is contained in:
DDD1542 2026-03-12 04:45:02 +09:00
parent 196be8c926
commit e45f2d6dc6
1 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
frontend/components/v2/config-panels/V2SplitPanelLayoutConfigPanel.tsx
View File

@ -322,7 +322,7 @@ const PanelColumnSection: React.FC<{
{ {
name: colInfo.columnName, name: colInfo.columnName,
label: label:
colInfo.columnLabel || colInfo.columnName, colInfo.displayName || colInfo.columnName,
width: 120, width: 120,
}, },
]); ]);
@ -407,10 +407,10 @@ const PanelColumnSection: React.FC<{
/> />
<Database className="text-muted-foreground h-3 w-3 flex-shrink-0" /> <Database className="text-muted-foreground h-3 w-3 flex-shrink-0" />
<span className="truncate text-xs"> <span className="truncate text-xs">
{col.columnLabel || col.columnName} {col.displayName || col.columnName}
</span> </span>
<span className="ml-auto text-[10px] text-muted-foreground/70"> <span className="ml-auto text-[10px] text-muted-foreground/70">
{(col as any).input_type || col.dataType} {col.input_type || col.dataType}
</span> </span>
</div> </div>
); );
@ -822,20 +822,24 @@ export const V2SplitPanelLayoutConfigPanel: React.FC<
setLoadingColumns((prev) => ({ ...prev, [tableName]: true })); setLoadingColumns((prev) => ({ ...prev, [tableName]: true }));
try { try {
const columnsResponse = await tableTypeApi.getColumns(tableName); const columnsResponse = await tableTypeApi.getColumns(tableName);
const cols: ColumnInfo[] = (columnsResponse || []).map((col: any) => ({ const cols = (columnsResponse || []).map((col: any) => ({
tableName: col.tableName || tableName, tableName: col.tableName || tableName,
columnName: col.columnName || col.column_name, columnName: col.columnName || col.column_name,
columnLabel: displayName:
col.displayName || col.displayName ||
col.columnLabel || col.columnLabel ||
col.column_label || col.column_label ||
col.columnName || col.columnName ||
col.column_name, col.column_name,
dataType: col.dataType || col.data_type || col.dbType, dataType: col.dataType || col.data_type || col.dbType || "",
webType: col.webType || col.web_type, dbType: col.dbType || col.dataType || col.data_type || "",
input_type: col.inputType || col.input_type, webType: col.webType || col.web_type || "text",
inputType: col.inputType || "direct",
input_type: col.input_type || col.inputType,
isNullable: col.isNullable === true || col.isNullable === "Y",
isPrimaryKey: col.isPrimaryKey ?? false,
referenceTable: col.referenceTable || col.reference_table, referenceTable: col.referenceTable || col.reference_table,
})); })) as ColumnInfo[];
setLoadedTableColumns((prev) => ({ ...prev, [tableName]: cols })); setLoadedTableColumns((prev) => ({ ...prev, [tableName]: cols }));
await loadEntityJoinColumnsForTable(tableName); await loadEntityJoinColumnsForTable(tableName);
} catch (error) { } catch (error) {
@ -1234,12 +1238,7 @@ export const V2SplitPanelLayoutConfigPanel: React.FC<
<div className="mt-2 rounded-md border p-3"> <div className="mt-2 rounded-md border p-3">
<DataFilterConfigPanel <DataFilterConfigPanel
tableName={leftTableName} tableName={leftTableName}
columns={leftTableColumns.map((col) => ({ columns={leftTableColumns}
columnName: col.columnName,
columnLabel: col.columnLabel || col.columnName,
dataType: col.dataType,
input_type: (col as any).input_type,
}))}
config={config.leftPanel?.dataFilter} config={config.leftPanel?.dataFilter}
onConfigChange={(dataFilter) => onConfigChange={(dataFilter) =>
updateLeftPanel({ dataFilter }) updateLeftPanel({ dataFilter })
@ -1379,7 +1378,7 @@ export const V2SplitPanelLayoutConfigPanel: React.FC<
key={col.columnName} key={col.columnName}
value={col.columnName} value={col.columnName}
> >
{col.columnLabel || col.columnName} {col.displayName || col.columnName}
</SelectItem> </SelectItem>
))} ))}
</SelectContent> </SelectContent>
@ -1411,7 +1410,7 @@ export const V2SplitPanelLayoutConfigPanel: React.FC<
key={col.columnName} key={col.columnName}
value={col.columnName} value={col.columnName}
> >
{col.columnLabel || col.columnName} {col.displayName || col.columnName}
</SelectItem> </SelectItem>
))} ))}
</SelectContent> </SelectContent>
@ -1467,7 +1466,7 @@ export const V2SplitPanelLayoutConfigPanel: React.FC<
key={col.columnName} key={col.columnName}
value={col.columnName} value={col.columnName}
> >
{col.columnLabel || col.columnName} {col.displayName || col.columnName}
</SelectItem> </SelectItem>
))} ))}
</SelectContent> </SelectContent>
@ -1497,7 +1496,7 @@ export const V2SplitPanelLayoutConfigPanel: React.FC<
key={col.columnName} key={col.columnName}
value={col.columnName} value={col.columnName}
> >
{col.columnLabel || col.columnName} {col.displayName || col.columnName}
</SelectItem> </SelectItem>
))} ))}
</SelectContent> </SelectContent>
@ -1645,12 +1644,7 @@ export const V2SplitPanelLayoutConfigPanel: React.FC<
<div className="mt-2 rounded-md border p-3"> <div className="mt-2 rounded-md border p-3">
<DataFilterConfigPanel <DataFilterConfigPanel
tableName={rightTableName} tableName={rightTableName}
columns={rightTableColumns.map((col) => ({ columns={rightTableColumns}
columnName: col.columnName,
columnLabel: col.columnLabel || col.columnName,
dataType: col.dataType,
input_type: (col as any).input_type,
}))}
config={config.rightPanel?.dataFilter} config={config.rightPanel?.dataFilter}
onConfigChange={(dataFilter) => onConfigChange={(dataFilter) =>
updateRightPanel({ dataFilter }) updateRightPanel({ dataFilter })
@ -1730,7 +1724,7 @@ export const V2SplitPanelLayoutConfigPanel: React.FC<
key={col.columnName} key={col.columnName}
value={col.columnName} value={col.columnName}
> >
{col.columnLabel || col.columnName} {col.displayName || col.columnName}
</SelectItem> </SelectItem>
))} ))}
</SelectContent> </SelectContent>
@ -2202,7 +2196,7 @@ export const V2SplitPanelLayoutConfigPanel: React.FC<
key={col.columnName} key={col.columnName}
value={col.columnName} value={col.columnName}
> >
{col.columnLabel || col.columnName} {col.displayName || col.columnName}
</SelectItem> </SelectItem>
))} ))}
</SelectContent> </SelectContent>
@ -2229,7 +2223,7 @@ export const V2SplitPanelLayoutConfigPanel: React.FC<
key={col.columnName} key={col.columnName}
value={col.columnName} value={col.columnName}
> >
{col.columnLabel || col.columnName} {col.displayName || col.columnName}
</SelectItem> </SelectItem>
) )
)} )}