Support Didar activity Excel exports without header rows via positional columns.
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -34,47 +34,77 @@ function resolveFieldKey(
|
||||
return aliases[compact] ?? aliases[raw.trim()] ?? '';
|
||||
}
|
||||
|
||||
export type ClientExcelPositionalColumn = { key: string; label: string };
|
||||
|
||||
export type ClientExcelReadOptions = {
|
||||
positionalColumns?: ClientExcelPositionalColumn[];
|
||||
detectHeaderless?: (firstRowCells: string[]) => boolean;
|
||||
};
|
||||
|
||||
function readMatrix(fileBuffer: ArrayBuffer) {
|
||||
const wb = XLSX.read(fileBuffer, { type: 'array', cellDates: true });
|
||||
const sheetName = wb.SheetNames[0];
|
||||
if (!sheetName) throw new Error('شیت اکسل پیدا نشد');
|
||||
const sheet = wb.Sheets[sheetName]!;
|
||||
return XLSX.utils.sheet_to_json<unknown[]>(sheet, {
|
||||
header: 1,
|
||||
defval: '',
|
||||
raw: false,
|
||||
}) as unknown[][];
|
||||
}
|
||||
|
||||
/** خواندن اکسل در مرورگر — بدون آپلود فایل سنگین به API */
|
||||
export async function previewExcelClient(
|
||||
file: File,
|
||||
aliases: Record<string, string>,
|
||||
fields: ExcelFieldOption[],
|
||||
options?: ClientExcelReadOptions,
|
||||
): Promise<ExcelPreviewResult> {
|
||||
const buffer = await file.arrayBuffer();
|
||||
const wb = XLSX.read(buffer, { type: 'array', cellDates: true });
|
||||
const sheetName = wb.SheetNames[0];
|
||||
if (!sheetName) throw new Error('شیت اکسل پیدا نشد');
|
||||
const sheet = wb.Sheets[sheetName]!;
|
||||
const matrix = XLSX.utils.sheet_to_json<(string | number | boolean | Date | null)[]>(
|
||||
sheet,
|
||||
{ header: 1, defval: '', raw: false },
|
||||
) as unknown[][];
|
||||
|
||||
const matrix = readMatrix(await file.arrayBuffer());
|
||||
const headerRow = (matrix[0] ?? []).map((c) => cellToString(c));
|
||||
const headerless =
|
||||
Boolean(options?.positionalColumns?.length) &&
|
||||
Boolean(options?.detectHeaderless?.(headerRow));
|
||||
|
||||
const columns: ExcelPreviewResult['columns'] = [];
|
||||
const suggested: Record<string, string> = {};
|
||||
const used = new Set<string>();
|
||||
|
||||
headerRow.forEach((header, idx) => {
|
||||
if (!header) return;
|
||||
const samples: string[] = [];
|
||||
for (let r = 1; r < Math.min(matrix.length, 6); r += 1) {
|
||||
const value = cellToString(matrix[r]?.[idx]);
|
||||
if (value) samples.push(value);
|
||||
if (samples.length >= 3) break;
|
||||
}
|
||||
columns.push({ header, index: idx + 1, samples });
|
||||
const key = resolveFieldKey(header, aliases);
|
||||
if (key && !used.has(key)) {
|
||||
suggested[header] = key;
|
||||
used.add(key);
|
||||
}
|
||||
});
|
||||
if (headerless && options?.positionalColumns) {
|
||||
options.positionalColumns.forEach((colDef, idx) => {
|
||||
const samples: string[] = [];
|
||||
for (let r = 0; r < Math.min(matrix.length, 5); r += 1) {
|
||||
const value = cellToString(matrix[r]?.[idx]);
|
||||
if (value) samples.push(value);
|
||||
if (samples.length >= 3) break;
|
||||
}
|
||||
columns.push({ header: colDef.label, index: idx + 1, samples });
|
||||
suggested[colDef.label] = colDef.key;
|
||||
used.add(colDef.key);
|
||||
});
|
||||
} else {
|
||||
headerRow.forEach((header, idx) => {
|
||||
if (!header) return;
|
||||
const samples: string[] = [];
|
||||
for (let r = 1; r < Math.min(matrix.length, 6); r += 1) {
|
||||
const value = cellToString(matrix[r]?.[idx]);
|
||||
if (value) samples.push(value);
|
||||
if (samples.length >= 3) break;
|
||||
}
|
||||
columns.push({ header, index: idx + 1, samples });
|
||||
const key = resolveFieldKey(header, aliases);
|
||||
if (key && !used.has(key)) {
|
||||
suggested[header] = key;
|
||||
used.add(key);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
if (!columns.length) throw new Error('ستون عنوان در ردیف اول فایل پیدا نشد');
|
||||
|
||||
let rowCount = 0;
|
||||
for (let r = 1; r < matrix.length; r += 1) {
|
||||
const start = headerless ? 0 : 1;
|
||||
for (let r = start; r < matrix.length; r += 1) {
|
||||
const row = matrix[r] ?? [];
|
||||
if (row.some((c) => cellToString(c))) rowCount += 1;
|
||||
}
|
||||
@@ -88,7 +118,9 @@ export async function previewExcelClient(
|
||||
columns,
|
||||
fields,
|
||||
suggested,
|
||||
needsMapping: unrecognized || missingRequired || !mapped.size,
|
||||
needsMapping: headerless
|
||||
? false
|
||||
: unrecognized || missingRequired || !mapped.size,
|
||||
rowCount,
|
||||
largeFile: rowCount >= 80,
|
||||
};
|
||||
@@ -98,31 +130,37 @@ export async function readMappedRowsClient(
|
||||
file: File,
|
||||
aliases: Record<string, string>,
|
||||
mapping?: Record<string, string>,
|
||||
options?: ClientExcelReadOptions,
|
||||
): Promise<Record<string, string>[]> {
|
||||
const buffer = await file.arrayBuffer();
|
||||
const wb = XLSX.read(buffer, { type: 'array', cellDates: true });
|
||||
const sheetName = wb.SheetNames[0];
|
||||
if (!sheetName) throw new Error('شیت اکسل پیدا نشد');
|
||||
const sheet = wb.Sheets[sheetName]!;
|
||||
const matrix = XLSX.utils.sheet_to_json<unknown[]>(sheet, {
|
||||
header: 1,
|
||||
defval: '',
|
||||
raw: false,
|
||||
}) as unknown[][];
|
||||
|
||||
const matrix = readMatrix(await file.arrayBuffer());
|
||||
const headerRow = (matrix[0] ?? []).map((c) => cellToString(c));
|
||||
const headerless =
|
||||
!mapping &&
|
||||
Boolean(options?.positionalColumns?.length) &&
|
||||
Boolean(options?.detectHeaderless?.(headerRow));
|
||||
|
||||
const colMap = new Map<number, string>();
|
||||
headerRow.forEach((header, idx) => {
|
||||
if (!header) return;
|
||||
const key = resolveFieldKey(header, aliases, mapping);
|
||||
if (key) colMap.set(idx, key);
|
||||
});
|
||||
let dataStart = 1;
|
||||
|
||||
if (headerless && options?.positionalColumns) {
|
||||
options.positionalColumns.forEach((colDef, idx) => {
|
||||
colMap.set(idx, colDef.key);
|
||||
});
|
||||
dataStart = 0;
|
||||
} else {
|
||||
headerRow.forEach((header, idx) => {
|
||||
if (!header) return;
|
||||
const key = resolveFieldKey(header, aliases, mapping);
|
||||
if (key) colMap.set(idx, key);
|
||||
});
|
||||
}
|
||||
|
||||
if (!colMap.size) {
|
||||
throw new Error('ستونهای فایل شناسایی نشد. ستونهای فایل را با فیلدهای سیستم تطبیق دهید.');
|
||||
}
|
||||
|
||||
const rows: Record<string, string>[] = [];
|
||||
for (let r = 1; r < matrix.length; r += 1) {
|
||||
for (let r = dataStart; r < matrix.length; r += 1) {
|
||||
const line = matrix[r] ?? [];
|
||||
const item: Record<string, string> = {};
|
||||
let any = false;
|
||||
|
||||
Reference in New Issue
Block a user