fix(app): 修复 Oracle 表结构已有字段识别

Co-authored-by: staff <staff@qimaos-MacBook-Pro.local>
This commit is contained in:
zipgandstaff authored and GitHub committed 2026-07-01 16:05:01 +08:00
1 parent f75597b26a
commit 4da237d955
6 files changed
+488 -6

No files matched your search

@@ -606,6 +606,74 @@ export function createColumnDrafts(columns: ColumnInfo[], databaseType?: Databas
});
}
function existingColumnIdName(id: string): string | undefined {
const prefix = "existing:";
return id.startsWith(prefix) ? id.slice(prefix.length) : undefined;
}
function isNewColumnDraftId(id: string): boolean {
return id.startsWith("new:");
}
function uniqueNames(names: Array<string | undefined>): string[] {
const seen = new Set<string>();
const result: string[] = [];
for (const name of names) {
if (!name) continue;
if (seen.has(name)) continue;
seen.add(name);
result.push(name);
}
return result;
}
function findColumnDraftByName(columns: EditableStructureColumn[], names: string[], usedIndexes: Set<number>): number | undefined {
for (const name of names) {
const exactIndex = columns.findIndex((column, index) => !usedIndexes.has(index) && column.name === name);
if (exactIndex >= 0) return exactIndex;
}
for (const name of names) {
const lowerName = name.toLowerCase();
const matches = columns.map((column, index) => ({ column, index })).filter(({ column, index }) => !usedIndexes.has(index) && column.name.toLowerCase() === lowerName);
if (matches.length === 1) return matches[0]!.index;
}
return undefined;
}
export function rehydrateColumnDraftsFromMetadata(draftColumns: EditableStructureColumn[], columns: ColumnInfo[], databaseType?: DatabaseType): EditableStructureColumn[] {
const metadataDrafts = createColumnDrafts(columns, databaseType);
if (!metadataDrafts.length) return draftColumns;
if (!draftColumns.length) return metadataDrafts;
const usedMetadataIndexes = new Set<number>();
const nextColumns = draftColumns.map((column) => {
if (!column.original && isNewColumnDraftId(column.id)) return column;
const needsHydration = !column.original || column.originalPosition === undefined;
const candidates = uniqueNames([column.original?.name, existingColumnIdName(column.id), column.name]);
const metadataIndex = findColumnDraftByName(metadataDrafts, candidates, usedMetadataIndexes);
if (metadataIndex === undefined) return column;
usedMetadataIndexes.add(metadataIndex);
if (!needsHydration) return column;
const metadataDraft = metadataDrafts[metadataIndex]!;
return {
...column,
original: column.original ?? metadataDraft.original,
originalPosition: column.originalPosition ?? metadataDraft.originalPosition,
};
});
if (usedMetadataIndexes.size === 0) {
return [...metadataDrafts, ...draftColumns];
}
const missingMetadataDrafts = metadataDrafts.filter((_, index) => !usedMetadataIndexes.has(index));
return [...nextColumns, ...missingMetadataDrafts];
}
export function createIndexDrafts(indexes: IndexInfo[]): EditableStructureIndex[] {
return indexes.map((index) => ({
id: `existing:${index.name}`,