@ticatec/batch-data-uploader 0.0.12 → 0.1.0

package/dist/BaseEncodingTemplate.d.ts

@@ -1,6 +1,11 @@
 import BaseTemplate from "./BaseTemplate";
 import type DataColumn from "./DataColumn";
 import type { DataColumn as TableColumn } from "@ticatec/uniface-element/DataTable";
+export interface ValidationResult {
+    valid: boolean;
+    hint?: string;
+    error?: string;
+}
 export default abstract class BaseEncodingTemplate extends BaseTemplate {
     private hintColumn;
     private validColumn;
@@ -16,11 +21,15 @@ export default abstract class BaseEncodingTemplate extends BaseTemplate {
      * @param row
      * @protected
      */
-    protected abstract validateData(row: any): Promise<any>;
+    protected abstract validateData(row: any): ValidationResult | Promise<ValidationResult>;
     /**
      * 数据集是否有效
      */
     get valid(): boolean;
+    /**
+     * 获取无效数据的数量
+     */
+    get invalidCount(): number;
     /**
      * 从服务器抓取数据，然后根据主键进行数据合并
      * @param rows
@@ -28,4 +37,12 @@ export default abstract class BaseEncodingTemplate extends BaseTemplate {
      */
     protected consolidateData(rows: Array<any>): Promise<Array<any>>;
     get columns(): Array<TableColumn>;
+    /**
+     * 获取所有有效的数据
+     */
+    get validDataList(): Array<any>;
+    /**
+     * 获取所有无效的数据
+     */
+    get invalidDataList(): Array<any>;
 }

package/dist/BaseEncodingTemplate.js

@@ -1,21 +1,20 @@
 import BaseTemplate from "./BaseTemplate";
-import { getI18nText } from "@ticatec/i18n";
-import i18nKeys from "./i18n_resources/i18nKeys";
-const ValidData = `<span style="color: #76FF03">${getI18nText(i18nKeys.textValid)}</span>`;
-const InvalidData = `<span style="color: #ff3e00">${getI18nText(i18nKeys.textInvalid)}</span>`;
+import i18nRes from "./i18n_resources/i18nRes";
+const ValidData = `<span style="color: #76FF03">${i18nRes.textValid}</span>`;
+const InvalidData = `<span style="color: #ff3e00">${i18nRes.textInvalid.key}</span>`;
 export default class BaseEncodingTemplate extends BaseTemplate {
     hintColumn = {
-        text: getI18nText(i18nKeys.labelHint),
+        text: i18nRes.labelHint,
         field: "hint",
         width: 150,
         resizable: true
     };
     validColumn = {
-        text: getI18nText(i18nKeys.labelValid),
+        text: i18nRes.labelValid,
         field: "valid",
         width: 90,
         align: 'center',
-        escapeHTML: true,
+        escapeHTML: false, // 修复：需要渲染HTML
         formatter: valid => valid ? ValidData : InvalidData
     };
     constructor(columns, rowOffset = 1) {
@@ -27,25 +26,80 @@ export default class BaseEncodingTemplate extends BaseTemplate {
     get valid() {
         return this._list.filter(row => !row.valid).length == 0;
     }
+    /**
+     * 获取无效数据的数量
+     */
+    get invalidCount() {
+        return this._list.filter(row => row.valid !== true).length;
+    }
     /**
      * 从服务器抓取数据，然后根据主键进行数据合并
      * @param rows
      * @protected
      */
     async consolidateData(rows) {
-        let list = await this.encodeData(this.extractData(rows));
-        rows.forEach((item, idx) => {
-            if (list[idx]) {
-                let data = list[idx];
-                item.data = { ...item.data, ...data };
-                let result = this.validateData(data);
-                item.valid = result.valid;
-                item.hint = result.hint;
+        try {
+            let list = await this.encodeData(this.extractData(rows));
+            // 验证返回数据长度是否匹配
+            if (list.length !== rows.length) {
+                console.warn(`Encoded data length (${list.length}) doesn't match input length (${rows.length})`);
             }
-        });
-        return rows;
+            // 并行处理验证以提高性能
+            const validationPromises = rows.map(async (item, idx) => {
+                if (list[idx]) {
+                    let data = list[idx];
+                    item.data = { ...item.data, ...data };
+                    try {
+                        let result = await Promise.resolve(this.validateData(data));
+                        item.valid = result.valid;
+                        item.hint = result.hint || '';
+                        item.error = result.error;
+                    }
+                    catch (validationError) {
+                        console.error(`Validation error for row ${idx}:`, validationError);
+                        item.valid = false;
+                        item.hint = 'Validation failed';
+                        item.error = validationError instanceof Error ? validationError.message : 'Unknown validation error';
+                    }
+                }
+                else {
+                    // 没有对应的编码数据
+                    item.valid = false;
+                    item.hint = 'No encoded data available';
+                    item.error = 'Missing encoded data';
+                }
+                return item;
+            });
+            return await Promise.all(validationPromises);
+        }
+        catch (error) {
+            console.error('Error during data consolidation:', error);
+            // 标记所有行为无效
+            return rows.map(item => ({
+                ...item,
+                valid: false,
+                hint: 'Encoding failed',
+                error: error instanceof Error ? error.message : 'Unknown encoding error'
+            }));
+        }
     }
     get columns() {
         return [...super.columns, this.hintColumn, this.validColumn];
     }
+    /**
+     * 获取所有有效的数据
+     */
+    get validDataList() {
+        return this._list
+            .filter(row => row.valid === true)
+            .map(row => row.data);
+    }
+    /**
+     * 获取所有无效的数据
+     */
+    get invalidDataList() {
+        return this._list
+            .filter(row => row.valid !== true)
+            .map(row => ({ ...row.data, _error: row.error, _hint: row.hint }));
+    }
 }

package/dist/BaseTemplate.js

@@ -27,31 +27,72 @@ export default class BaseTemplate {
      * @param file
      */
     async parseExcelFile(file) {
-        const buffer = await file.arrayBuffer();
-        const workbook = XLSX.read(buffer, { type: 'array' });
-        const sheet = workbook.Sheets[workbook.SheetNames[0]];
-        const range = XLSX.utils.decode_range(sheet['!ref'] || ''); // 获取范围
-        const rows = [];
-        for (let rowIndex = range.s.r + this.rowOffset; rowIndex <= range.e.r; rowIndex++) {
-            const rowObject = {};
-            let dummyCount = 0;
-            for (let i = 0; i < this._columns.length; i++) {
-                const colDef = this._columns[i];
-                if (colDef.dummy) {
-                    dummyCount++;
+        try {
+            const buffer = await file.arrayBuffer();
+            const workbook = XLSX.read(buffer, { type: 'array' });
+            // 验证工作簿是否有工作表
+            if (!workbook.SheetNames || workbook.SheetNames.length === 0) {
+                throw new Error('Excel file contains no worksheets');
+            }
+            const sheet = workbook.Sheets[workbook.SheetNames[0]];
+            // 验证工作表是否存在且有数据
+            if (!sheet || !sheet['!ref']) {
+                throw new Error('Worksheet is empty or invalid');
+            }
+            const range = XLSX.utils.decode_range(sheet['!ref']); // 获取范围
+            // 验证是否有足够的行数
+            if (range.e.r < this.rowOffset) {
+                throw new Error(`Not enough rows in file. Expected at least ${this.rowOffset + 1} rows`);
+            }
+            const rows = [];
+            for (let rowIndex = range.s.r + this.rowOffset; rowIndex <= range.e.r; rowIndex++) {
+                const rowObject = {};
+                let dummyCount = 0;
+                let hasData = false;
+                for (let i = 0; i < this._columns.length; i++) {
+                    const colDef = this._columns[i];
+                    if (colDef.dummy) {
+                        dummyCount++;
+                    }
+                    else {
+                        // 确保列索引不会为负数
+                        const actualColIndex = i - dummyCount;
+                        if (actualColIndex < 0) {
+                            console.warn(`Invalid column index for ${colDef.field}: ${actualColIndex}`);
+                            continue;
+                        }
+                        const cellAddress = { r: rowIndex, c: actualColIndex };
+                        const cellRef = XLSX.utils.encode_cell(cellAddress);
+                        const cell = sheet[cellRef];
+                        const rawValue = cell?.v;
+                        // 检查是否有实际数据
+                        if (rawValue !== undefined && rawValue !== null && rawValue !== '') {
+                            hasData = true;
+                        }
+                        try {
+                            const formattedValue = colDef.parser ? colDef.parser(rawValue) : rawValue;
+                            utils.setNestedValue(rowObject, colDef.field, formattedValue);
+                        }
+                        catch (parseError) {
+                            console.warn(`Failed to parse cell ${cellRef}:`, parseError);
+                            utils.setNestedValue(rowObject, colDef.field, rawValue);
+                        }
+                    }
                 }
-                else {
-                    const cellAddress = { r: rowIndex, c: i - dummyCount };
-                    const cellRef = XLSX.utils.encode_cell(cellAddress);
-                    const cell = sheet[cellRef];
-                    const rawValue = cell?.v;
-                    const formattedValue = colDef.parser ? colDef.parser(rawValue) : rawValue;
-                    utils.setNestedValue(rowObject, colDef.field, formattedValue);
+                // 只添加有数据的行
+                if (hasData) {
+                    rows.push(this.wrapData(rowObject));
                 }
             }
-            rows.push(this.wrapData(rowObject));
+            if (rows.length === 0) {
+                throw new Error('No valid data rows found in the file');
+            }
+            this._list = await this.consolidateData(rows);
+        }
+        catch (error) {
+            console.error('Failed to parse Excel file:', error);
+            throw new Error(`Failed to parse Excel file: ${error instanceof Error ? error.message : 'Unknown error'}`);
         }
-        this._list = await this.consolidateData(rows);
     }
     /**
      * 获取实际待上传的数据
@@ -61,7 +102,8 @@ export default class BaseTemplate {
         let list = arr.map(item => {
             let result = {};
             for (let col of this._columns) {
-                if (col.visible != false && col.ignore != false) {
+                // 修复逻辑错误：ignore应该为true时才忽略，visible为false时才隐藏
+                if (col.visible != false && col.ignore != true && !col.dummy) {
                     let data = item.data;
                     utils.setNestedValue(result, col.field, utils.getNestedValue(data, col.field));
                 }
@@ -82,7 +124,9 @@ export default class BaseTemplate {
      * 获取表格的列定义
      */
     get columns() {
-        return this._columns.map(col => ({ ...col, field: `data.${col.field}` }));
+        return this._columns
+            .filter(col => col.visible !== false)
+            .map(col => ({ ...col, field: `data.${col.field}` }));
     }
     /**
      * 获取数据

package/dist/BaseUploadTemplate.d.ts

@@ -3,9 +3,20 @@ import type { DataColumn as TableColumn } from "@ticatec/uniface-element/DataTab
 import type DataColumn from "./DataColumn";
 export type UploadFun = (arr: Array<any>) => Promise<Array<any>>;
 export type UpdateProgressStatus = () => void;
+export interface UploadResult {
+    error?: any;
+    errorText?: string;
+    success?: boolean;
+}
+export interface ExportErrorOptions {
+    includeAllData?: boolean;
+    separateSheets?: boolean;
+    originalFormat?: boolean;
+}
 export default abstract class BaseUploadTemplate extends BaseTemplate {
     protected batchSize: number;
     protected updateProgressStatus: UpdateProgressStatus | null;
+    private _uploadAborted;
     protected constructor(columns: Array<DataColumn>, batchSize?: number, rowOffset?: number);
     /**
      * 状态更新的监听器
@@ -13,6 +24,14 @@ export default abstract class BaseUploadTemplate extends BaseTemplate {
      */
     setProgressStatusListener(value: UpdateProgressStatus): void;
     protected abstract uploadData(list: Array<any>): Promise<Array<any>>;
+    /**
+     * 中止上传
+     */
+    abortUpload(): void;
+    /**
+     * 重置上传状态
+     */
+    resetUploadStatus(): void;
     /**
      * 上传数据
      */
@@ -28,8 +47,55 @@ export default abstract class BaseUploadTemplate extends BaseTemplate {
      */
     get columns(): Array<TableColumn>;
     /**
-     * 导出处理异常的数据
+     * 获取上传统计信息
+     */
+    get uploadStats(): {
+        total: number;
+        pending: number;
+        uploading: number;
+        completed: number;
+        success: number;
+        failed: number;
+    };
+    /**
+     * 导出处理异常的数据 - 基础版本（保持向后兼容）
      * @param filename
      */
     exportErrorRowsToExcel(filename: string): void;
+    /**
+     * 导出错误数据 - 增强版本
+     * @param filename
+     * @param options 导出选项
+     */
+    exportErrorData(filename: string, options?: ExportErrorOptions): void;
+    /**
+     * 导出原始格式 - 可以重新导入和上传
+     * @private
+     */
+    private _exportOriginalFormat;
+    /**
+     * 导出错误详情 - 作为第二个工作表
+     * @private
+     */
+    private _exportErrorDetails;
+    /**
+     * 格式化值用于导出
+     * @private
+     */
+    private _formatValueForExport;
+    /**
+     * 设置列宽
+     * @private
+     */
+    private _setColumnWidths;
+    /**
+     * 快速导出错误数据用于重新上传
+     * @param filename
+     */
+    exportErrorsForReupload(filename: string): void;
+    /**
+     * 导出完整报告（包含所有数据和详情）
+     * @param filename
+     */
+    exportFullReport(filename: string): void;
 }

package/dist/BaseUploadTemplate.js

@@ -1,25 +1,26 @@
+// 改进的BaseUploadTemplate.ts - 完全清理元数据相关代码
 import BaseTemplate from "./BaseTemplate";
-import { getI18nText } from "@ticatec/i18n";
 import i18nKeys from "./i18n_resources/i18nKeys";
 import utils from "./utils";
 import * as XLSX from 'xlsx';
+import i18nRes from "./i18n_resources/i18nRes";
 const statusColumn = {
-    text: getI18nText(i18nKeys.labelStatus),
+    text: i18nRes.labelStatus,
     width: 240,
     resizable: true,
     formatter: row => {
         if (row.status == 'P') {
-            return getI18nText(i18nKeys.status.pending);
+            return i18nRes.status.pending;
         }
         else if (row.status == 'U') {
-            return getI18nText(i18nKeys.status.uploading);
+            return i18nRes.status.uploading;
         }
         else {
             if (row.error) {
                 return row.errorText;
             }
             else {
-                return getI18nText(i18nKeys.status.successful);
+                return i18nRes.status.successful;
             }
         }
     }
@@ -27,9 +28,10 @@ const statusColumn = {
 export default class BaseUploadTemplate extends BaseTemplate {
     batchSize;
     updateProgressStatus = null;
+    _uploadAborted = false;
     constructor(columns, batchSize = 50, rowOffset = 1) {
         super(columns, rowOffset);
-        this.batchSize = batchSize;
+        this.batchSize = Math.max(1, batchSize);
     }
     /**
      * 状态更新的监听器
@@ -38,25 +40,83 @@ export default class BaseUploadTemplate extends BaseTemplate {
     setProgressStatusListener(value) {
         this.updateProgressStatus = value;
     }
+    /**
+     * 中止上传
+     */
+    abortUpload() {
+        this._uploadAborted = true;
+    }
+    /**
+     * 重置上传状态
+     */
+    resetUploadStatus() {
+        this._uploadAborted = false;
+        this._list.forEach(item => {
+            if (item.status !== 'D') {
+                item.status = 'P';
+                delete item.error;
+                delete item.errorText;
+            }
+        });
+    }
     /**
      * 上传数据
      */
     async upload() {
+        this._uploadAborted = false;
         for (let i = 0; i < this._list.length; i += this.batchSize) {
+            // 检查是否需要中止
+            if (this._uploadAborted) {
+                console.log('Upload aborted by user');
+                break;
+            }
             const chunk = this._list.slice(i, i + this.batchSize);
-            chunk.forEach(item => item.status = 'U');
+            chunk.forEach(item => {
+                if (item.status !== 'D') { // 不重复处理已完成的项目
+                    item.status = 'U';
+                    delete item.error;
+                    delete item.errorText;
+                }
+            });
             this.updateProgressStatus?.();
-            let list = await this.uploadData(this.extractData(chunk));
-            for (let j = 0; j < chunk.length; j++) {
-                this._list[i + j].status = 'D';
-                if (list[j]) {
-                    if (list[j].error) {
-                        this._list[i + j].error = list[j].error;
-                        this._list[i + j].errorText = list[j].errorText;
+            try {
+                // 只上传未完成的项目
+                const pendingItems = chunk.filter(item => item.status === 'U');
+                if (pendingItems.length === 0) {
+                    continue; // 跳过已完成的批次
+                }
+                let list = await this.uploadData(this.extractData(pendingItems));
+                // 验证结果长度是否匹配
+                if (list.length !== pendingItems.length) {
+                    console.warn(`Upload results length (${list.length}) doesn't match pending items (${pendingItems.length})`);
+                }
+                for (let j = 0; j < pendingItems.length; j++) {
+                    const item = pendingItems[j];
+                    item.status = 'D';
+                    if (list[j]) {
+                        if (list[j].error) {
+                            item.error = list[j].error;
+                            item.errorText = list[j].errorText;
+                        }
                     }
                 }
             }
+            catch (batchError) {
+                console.error(`Batch upload error for items ${i}-${i + this.batchSize - 1}:`, batchError);
+                // 标记整个批次为失败
+                chunk.forEach(item => {
+                    if (item.status === 'U') {
+                        item.status = 'D';
+                        item.error = batchError;
+                        item.errorText = batchError instanceof Error ? batchError.message : 'Batch upload failed';
+                    }
+                });
+            }
             this.updateProgressStatus?.();
+            // 添加小延迟以避免过快的请求
+            if (i + this.batchSize < this._list.length && !this._uploadAborted) {
+                await new Promise(resolve => setTimeout(resolve, 100));
+            }
         }
     }
     /**
@@ -74,40 +134,212 @@ export default class BaseUploadTemplate extends BaseTemplate {
         return [...super.columns, statusColumn];
     }
     /**
-     * 导出处理异常的数据
+     * 获取上传统计信息
+     */
+    get uploadStats() {
+        const pending = this._list.filter(item => item.status === 'P').length;
+        const uploading = this._list.filter(item => item.status === 'U').length;
+        const completed = this._list.filter(item => item.status === 'D').length;
+        const success = this._list.filter(item => item.status === 'D' && !item.error).length;
+        const failed = this._list.filter(item => item.status === 'D' && item.error).length;
+        return {
+            total: this._list.length,
+            pending,
+            uploading,
+            completed,
+            success,
+            failed
+        };
+    }
+    /**
+     * 导出处理异常的数据 - 基础版本（保持向后兼容）
      * @param filename
      */
     exportErrorRowsToExcel(filename) {
-        // 筛选出有错误的行
-        const errorRows = this._list.filter(row => row.error != null);
-        // 生成 Excel 数据（第一行为标题）
-        const header = [...this._columns.map(col => col.text), getI18nText(i18nKeys.errorTitle)];
-        const data = errorRows.map(row => {
-            const values = this._columns.map(col => {
+        this.exportErrorData(filename, { originalFormat: false });
+    }
+    /**
+     * 导出错误数据 - 增强版本
+     * @param filename
+     * @param options 导出选项
+     */
+    exportErrorData(filename, options = {}) {
+        const { includeAllData = false, separateSheets = true, // 默认分离工作表
+        originalFormat = true } = options;
+        try {
+            const workbook = XLSX.utils.book_new();
+            // 第一页：重传数据（原始格式）- 用户可以直接修改和重新导入
+            if (originalFormat) {
+                this._exportOriginalFormat(workbook, includeAllData);
+            }
+            // 第二页：异常详情 - 用于查看错误信息
+            if (separateSheets) {
+                this._exportErrorDetails(workbook, includeAllData);
+            }
+            const wbout = XLSX.write(workbook, {
+                bookType: 'xlsx',
+                type: 'array'
+            });
+            // 创建 Blob 并触发下载
+            const blob = new Blob([wbout], {
+                type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+            });
+            const url = URL.createObjectURL(blob);
+            const a = document.createElement('a');
+            a.href = url;
+            a.download = filename.endsWith('.xlsx') ? filename : `${filename}.xlsx`;
+            a.style.display = 'none';
+            document.body.appendChild(a);
+            a.click();
+            document.body.removeChild(a);
+            URL.revokeObjectURL(url);
+        }
+        catch (error) {
+            console.error('Failed to export error data:', error);
+            throw new Error(`Failed to export error data: ${error instanceof Error ? error.message : 'Unknown error'}`);
+        }
+    }
+    /**
+     * 导出原始格式 - 可以重新导入和上传
+     * @private
+     */
+    _exportOriginalFormat(workbook, includeAllData) {
+        // 获取需要导出的数据
+        const dataToExport = includeAllData
+            ? this._list
+            : this._list.filter(row => row.status === 'D' && row.error);
+        if (dataToExport.length === 0) {
+            console.warn('No data to export in original format');
+            return;
+        }
+        // 获取可见且非虚拟的列
+        const exportColumns = this._columns.filter(col => col.visible !== false && !col.dummy && !col.ignore);
+        // 创建标题行（与原始导入格式一致）
+        const headers = exportColumns.map(col => col.text || col.field);
+        // 创建数据行
+        const rows = dataToExport.map(item => {
+            return exportColumns.map(col => {
+                const value = utils.getNestedValue(item.data, col.field);
+                // 如果有格式化函数的逆向操作，在这里处理
+                return this._formatValueForExport(value, col);
+            });
+        });
+        const worksheetData = [headers, ...rows];
+        const worksheet = XLSX.utils.aoa_to_sheet(worksheetData);
+        // 设置列宽
+        this._setColumnWidths(worksheet, [headers, ...rows]);
+        // 添加到工作簿 - 重传数据作为第一个工作表
+        const sheetName = includeAllData ? '全部数据重传' : '失败数据重传';
+        XLSX.utils.book_append_sheet(workbook, worksheet, sheetName);
+    }
+    /**
+     * 导出错误详情 - 作为第二个工作表
+     * @private
+     */
+    _exportErrorDetails(workbook, includeAllData) {
+        const errorRows = includeAllData
+            ? this._list
+            : this._list.filter(row => row.status === 'D' && row.error);
+        if (errorRows.length === 0)
+            return;
+        const visibleColumns = this._columns.filter(col => col.visible !== false && !col.dummy);
+        const headers = [
+            '行号',
+            ...visibleColumns.map(col => col.text || col.field),
+            '结果',
+            '错误原因'
+        ];
+        const rows = errorRows.map((row, index) => {
+            const values = visibleColumns.map(col => {
                 return utils.getNestedValue(row.data, col.field);
             });
-            return [...values, row.error];
+            // 简化状态：只有成功或失败
+            const result = row.error ? '✗ 失败' : '✓ 成功';
+            return [
+                index + 1, // 行号
+                ...values,
+                result,
+                row.errorText || row.error || ''
+            ];
         });
-        const worksheetData = [header, ...data];
+        const worksheetData = [headers, ...rows];
         const worksheet = XLSX.utils.aoa_to_sheet(worksheetData);
-        const workbook = XLSX.utils.book_new();
-        XLSX.utils.book_append_sheet(workbook, worksheet, getI18nText(i18nKeys.sheetName));
-        const wbout = XLSX.write(workbook, {
-            bookType: 'xlsx',
-            type: 'array'
+        // 设置列宽 - 错误原因列设置更宽
+        const colWidths = headers.map((header, colIndex) => {
+            let maxLength = header.length;
+            // 计算该列的最大长度
+            rows.forEach(row => {
+                const cellValue = String(row[colIndex] || '');
+                maxLength = Math.max(maxLength, cellValue.length);
+            });
+            // 错误原因列设置更宽
+            if (header === '错误原因') {
+                return { wch: Math.min(Math.max(maxLength, 20), 60) };
+            }
+            return { wch: Math.min(Math.max(maxLength + 2, 10), 30) };
+        });
+        worksheet['!cols'] = colWidths;
+        const sheetName = includeAllData ? '上传详情' : '异常详情';
+        XLSX.utils.book_append_sheet(workbook, worksheet, sheetName);
+    }
+    /**
+     * 格式化值用于导出
+     * @private
+     */
+    _formatValueForExport(value, column) {
+        // 如果列有解析器，可能需要逆向格式化
+        // 这里可以根据具体的parser类型进行逆向处理
+        if (value === null || value === undefined) {
+            return '';
+        }
+        // 日期格式化
+        if (value instanceof Date) {
+            return value.toISOString().split('T')[0]; // YYYY-MM-DD格式
+        }
+        // 数字格式化
+        if (typeof value === 'number') {
+            return value;
+        }
+        // 布尔值格式化
+        if (typeof value === 'boolean') {
+            return value ? '是' : '否';
+        }
+        return String(value);
+    }
+    /**
+     * 设置列宽
+     * @private
+     */
+    _setColumnWidths(worksheet, data) {
+        const colWidths = data[0]?.map((_, colIndex) => {
+            const maxLength = Math.max(...data.map(row => {
+                const cellValue = row[colIndex];
+                return String(cellValue || '').length;
+            }));
+            return { wch: Math.min(Math.max(maxLength + 2, 10), 50) };
+        }) || [];
+        worksheet['!cols'] = colWidths;
+    }
+    /**
+     * 快速导出错误数据用于重新上传
+     * @param filename
+     */
+    exportErrorsForReupload(filename) {
+        this.exportErrorData(filename, {
+            includeAllData: false,
+            separateSheets: false,
+            originalFormat: true
         });
-        // 创建 Blob 并触发下载
-        const blob = new Blob([wbout], {
-            type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+    }
+    /**
+     * 导出完整报告（包含所有数据和详情）
+     * @param filename
+     */
+    exportFullReport(filename) {
+        this.exportErrorData(filename, {
+            includeAllData: true,
+            separateSheets: true,
+            originalFormat: true
         });
-        const url = URL.createObjectURL(blob);
-        const a = document.createElement('a');
-        a.href = url;
-        a.download = filename;
-        a.style.display = 'none';
-        document.body.appendChild(a);
-        a.click();
-        document.body.removeChild(a);
-        URL.revokeObjectURL(url);
     }
 }

package/dist/EncodingWizard.svelte

@@ -2,12 +2,12 @@
     import Dialog from "@ticatec/uniface-element/Dialog";
     import type {ButtonAction, ButtonActions} from "@ticatec/uniface-element/ActionBar";
     import DataTable, {type IndicatorColumn} from "@ticatec/uniface-element/DataTable";
-    import {getI18nText} from "@ticatec/i18n";
     import Box from "@ticatec/uniface-element/Box"
     import {onMount} from "svelte";
     import type DataColumn from "./DataColumn";
-    import i18nKeys from "./i18n_resources/i18nKeys";
     import type BaseEncodingTemplate from "./BaseEncodingTemplate";
+    import i18nRes from "./i18n_resources/i18nRes";
+    import {i18nUtils} from "@ticatec/i18n";
 
     export let title: string;
     export let width: string = "800px";
@@ -18,7 +18,7 @@
 
 
     const btnChoose: ButtonAction = {
-        label: getI18nText(i18nKeys.button.open),
+        label: i18nRes.button.open,
         type: 'primary',
         handler: () => {
             uploadField.value = '';
@@ -27,7 +27,7 @@
     }
 
     const btnConfirm: ButtonAction = {
-        label: getI18nText(i18nKeys.button.confirm),
+        label: i18nRes.button.confirm,
         type: 'primary',
         handler: ()=> {
             confirmCallback?.(template.dataList);
@@ -43,7 +43,7 @@
     const parseExcelFile = async (excelFile: File) => {
         if (excelFile) {
             filename = excelFile.name;
-            window.Indicator.show(getI18nText(i18nKeys.parsing));
+            window.Indicator.show(i18nRes.parsing);
             try {
                 await template.parseExcelFile(excelFile);
                 list = template.list;
@@ -52,7 +52,7 @@
                 }
             } catch (ex) {
                 console.error(ex);
-                window.Toast.show(getI18nText(i18nKeys.parseFailure, {name: excelFile.name}));
+                window.Toast.show(i18nUtils.formatText(i18nRes.parseFailure, {name: excelFile.name}));
             } finally {
                 window.Indicator.hide();
             }

package/dist/FileUploadWizard.svelte

@@ -1,13 +1,14 @@
+<!-- 更新的FileUploadWizard.svelte - 彻底清理includeMetadata -->
 <script lang="ts">
     import Dialog from "@ticatec/uniface-element/Dialog";
     import type {ButtonAction, ButtonActions} from "@ticatec/uniface-element/ActionBar";
     import DataTable, {type IndicatorColumn} from "@ticatec/uniface-element/DataTable";
-    import {getI18nText} from "@ticatec/i18n";
     import Box from "@ticatec/uniface-element/Box"
     import {onMount} from "svelte";
     import type DataColumn from "./DataColumn";
-    import i18nKeys from "./i18n_resources/i18nKeys";
     import type BaseUploadTemplate from "./BaseUploadTemplate.js";
+    import i18nRes from "./i18n_resources/i18nRes";
+    import {i18nUtils} from "@ticatec/i18n";
 
     export let title: string;
     export let width: string = "800px";
@@ -20,9 +21,8 @@
 
     let status: ProcessStatus = 'Init';
 
-
     const btnChoose: ButtonAction = {
-        label: getI18nText(i18nKeys.button.open),
+        label: i18nRes.button.open,
         type: 'primary',
         handler: () => {
             uploadField.value = '';
@@ -31,7 +31,7 @@
     }
 
     const btnUpload: ButtonAction = {
-        label: getI18nText(i18nKeys.button.upload),
+        label: i18nRes.button.upload,
         type: 'primary',
         handler: async ()=> {
             status = 'Uploading';
@@ -44,11 +44,52 @@
         }
     }
 
+    // 原有的保存按钮（向后兼容）
     const btnSave: ButtonAction = {
-        label: getI18nText(i18nKeys.button.save),
+        label: i18nRes.button.save,
         type: 'primary',
         handler: async ()=> {
-            template.exportErrorRowsToExcel(`error-${filename}`);
+            const baseFilename = filename.replace(/\.[^/.]+$/, ""); // 移除扩展名
+            template.exportErrorRowsToExcel(`error-${baseFilename}.xlsx`);
+        }
+    }
+
+    // 新增：导出用于重新上传的数据
+    const btnExportForReupload: ButtonAction = {
+        label: '导出失败数据',
+        type: 'secondary',
+        handler: async ()=> {
+            const baseFilename = filename.replace(/\.[^/.]+$/, ""); // 移除扩展名
+            template.exportErrorData(`重传-${baseFilename}.xlsx`, {
+                includeAllData: false,
+                separateSheets: true,
+                originalFormat: true
+            });
+        }
+    }
+
+    // 新增：导出完整报告
+    const btnExportFullReport: ButtonAction = {
+        label: '导出完整报告',
+        type: 'secondary',
+        handler: async ()=> {
+            const baseFilename = filename.replace(/\.[^/.]+$/, ""); // 移除扩展名
+            template.exportErrorData(`报告-${baseFilename}.xlsx`, {
+                includeAllData: true,
+                separateSheets: true,
+                originalFormat: true
+            });
+        }
+    }
+
+    // 新增：重置失败数据状态
+    const btnResetErrors: ButtonAction = {
+        label: '重置失败数据',
+        type: 'secondary',
+        handler: async ()=> {
+            template.resetUploadStatus();
+            list = template.list;
+            status = 'Pending';
         }
     }
 
@@ -60,20 +101,21 @@
     const parseExcelFile = async (excelFile: File) => {
         if (excelFile) {
             filename = excelFile.name;
-            window.Indicator.show(getI18nText(i18nKeys.parsing));
+            window.Indicator.show(i18nRes.parsing);
             try {
                 await template.parseExcelFile(excelFile);
                 list = template.list;
                 status = list.length > 0 ? 'Pending' : 'Init';
             } catch (ex) {
-                window.Toast.show(getI18nText(i18nKeys.parseFailure, {name: excelFile.name}));
+                console.error('Parse file error:', ex);
+                window.Toast.show(i18nUtils.formatText(i18nRes.parseFailure, {name: excelFile.name}));
+                status = 'Init'; // 确保解析失败时重置状态
             } finally {
                 window.Indicator.hide();
             }
         }
     }
 
-
     let columns: Array<DataColumn>;
 
     onMount(async () => {
@@ -83,15 +125,12 @@
         })
     });
 
-
-
     const indicatorColumn: IndicatorColumn = {
         width: 40,
         selectable: false,
         displayNo: true
     }
 
-
     $: {
         switch (status) {
             case 'Init':
@@ -108,32 +147,76 @@
             case 'Done':
                 btnUpload.disabled = false;
                 btnChoose.disabled = false;
-                const hasError = list.filter(item => item.error == null).length != list.length;
-                actions = hasError ? [btnSave, btnChoose] : [btnChoose];
+
+                // 只有在Done状态时才获取统计信息并判断按钮显示
+                const stats = template.uploadStats;
+                const hasError = stats.failed > 0;
+                const hasSuccess = stats.success > 0;
+
+                // 根据上传结果提供不同的操作选项
+                if (hasError && hasSuccess) {
+                    // 部分成功：提供重传错误数据、导出报告等选项
+                    actions = [
+                        btnExportForReupload,
+                        btnExportFullReport,
+                        btnResetErrors,
+                        btnSave, // 保持向后兼容
+                        btnChoose
+                    ];
+                } else if (hasError && !hasSuccess) {
+                    // 全部失败：提供重传和导出选项
+                    actions = [
+                        btnExportForReupload,
+                        btnSave,
+                        btnChoose
+                    ];
+                } else if (hasSuccess && !hasError) {
+                    // 全部成功：只提供导出报告和重新上传
+                    actions = [btnExportFullReport, btnChoose];
+                } else {
+                    // 没有数据或其他情况
+                    actions = [btnChoose];
+                }
                 break;
         }
     }
 
-
     const confirmCloseDialog = async ():Promise<boolean> => {
         if (status == 'Uploading') {
-            window.Toast.show(getI18nText(i18nKeys.waitUploading));
+            window.Toast.show(i18nRes.waitUploading);
             return false;
         } else {
             return true;
         }
     }
 
+    // 显示上传统计信息
+    $: uploadStatsText = (() => {
+        if (status === 'Done' && list.length > 0) {
+            const stats = template.uploadStats;
+            return `总计: ${stats.total}, 成功: ${stats.success}, 失败: ${stats.failed}`;
+        }
+        return '';
+    })();
+
 </script>
 
 <Dialog {title} {closeHandler} {actions} closeConfirm={confirmCloseDialog}
         content$style="width: {width}; height: {height}; padding: 12px;">
+
+    <!-- 添加状态信息显示 -->
+    {#if uploadStatsText}
+        <div style="margin-bottom: 8px; padding: 8px; background: #f5f5f5; border-radius: 4px; font-size: 14px;">
+            {uploadStatsText}
+        </div>
+    {/if}
+
     <Box style="border: 1px solid var(--uniface-editor-border-color, #F8FAFC); width: 100%; height: 100%; cursor: {status == 'Uploading' ? 'progress' : 'default'}" round>
         <DataTable style="width: 100%; height: 100%" {list} {indicatorColumn} {columns}>
-
         </DataTable>
     </Box>
+
     <input type="file" bind:this={uploadField} on:change={(e) => parseExcelFile(e.target.files?.[0])} style="display: none"
            accept=".xls,.xlsx,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet">
 
-</Dialog>
+</Dialog>

package/dist/i18n_resources/i18nRes.d.ts

@@ -0,0 +1,2 @@
+declare const i18nRes: any;
+export default i18nRes;

package/dist/i18n_resources/i18nRes.js

@@ -0,0 +1,29 @@
+import { i18nUtils } from "@ticatec/i18n";
+const langRes = {
+    batchUploading: {
+        status: {
+            pending: "To upload",
+            uploading: "Uploading...",
+            successful: "Success",
+            fail: "Failure"
+        },
+        parsing: "Parsing file...",
+        parseFailure: "Cannot parse file: {{name}}",
+        waitUploading: "Cannot exit during uploading!",
+        button: {
+            upload: "Upload",
+            save: "Save error data",
+            open: "Open",
+            confirm: "Confirm"
+        },
+        errorTitle: "Error",
+        sheetName: "Abnormal data",
+        labelStatus: "Status",
+        labelValid: "Validity",
+        textValid: "Yes",
+        textInvalid: "No",
+        labelHint: "Hint"
+    }
+};
+const i18nRes = i18nUtils.createResourceProxy(langRes, 'omni');
+export default i18nRes;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ticatec/batch-data-uploader",
-  "version": "0.0.12",
+  "version": "0.1.0",
   "description": "A reusable Svelte component for batch uploading Excel data with support for error handling, multi-language, and preprocessing.",
   "scripts": {
     "dev": "vite dev",
@@ -73,8 +73,8 @@
     "@sveltejs/kit": "^2.0.0",
     "@sveltejs/package": "^2.0.0",
     "@sveltejs/vite-plugin-svelte": "^4.0.0",
-    "@ticatec/i18n": "^0.0.8",
-    "@ticatec/uniface-element": "^0.1.52",
+    "@ticatec/i18n": "^0.2.0",
+    "@ticatec/uniface-element": "^0.1.71",
     "@ticatec/uniface-google-material-icons": "^0.1.2",
     "dayjs": "^1.11.10",
     "publint": "^0.3.2",