@ticatec/batch-data-uploader 0.0.12 → 0.1.1

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_res";
+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.d.ts

@@ -1,16 +1,14 @@
 import type DataColumn from "./DataColumn";
 import type { DataColumn as TableColumn } from "@ticatec/uniface-element/DataTable";
 export default abstract class BaseTemplate {
-    protected readonly _columns: Array<DataColumn>;
-    protected readonly rowOffset: number;
     protected _list: Array<any>;
     /**
      *
-     * @param columns
-     * @param rowOffset
      * @protected
      */
-    protected constructor(columns: Array<DataColumn>, rowOffset?: number);
+    protected constructor();
+    protected abstract getMetaColumns(): Array<DataColumn>;
+    protected getRowOffset(): number;
     /**
      * 整理数据，在子类可以通过重载完成数据的二次处理
      * @param rows

package/dist/BaseTemplate.js

@@ -1,18 +1,15 @@
 import * as XLSX from 'xlsx';
 import utils from "./utils";
 export default class BaseTemplate {
-    _columns;
-    rowOffset;
     _list = [];
     /**
      *
-     * @param columns
-     * @param rowOffset
      * @protected
      */
-    constructor(columns, rowOffset = 1) {
-        this._columns = columns;
-        this.rowOffset = rowOffset;
+    constructor() {
+    }
+    getRowOffset() {
+        return 1;
     }
     /**
      * 整理数据，在子类可以通过重载完成数据的二次处理
@@ -27,31 +24,74 @@ 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++;
+        const columns = this.getMetaColumns();
+        const rowOffset = this.getRowOffset();
+        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 < rowOffset) {
+                throw new Error(`Not enough rows in file. Expected at least ${rowOffset + 1} rows`);
+            }
+            const rows = [];
+            for (let rowIndex = range.s.r + rowOffset; rowIndex <= range.e.r; rowIndex++) {
+                const rowObject = {};
+                let dummyCount = 0;
+                let hasData = false;
+                for (let i = 0; i < columns.length; i++) {
+                    const colDef = 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);
     }
     /**
      * 获取实际待上传的数据
@@ -60,8 +100,9 @@ export default class BaseTemplate {
     extractData(arr) {
         let list = arr.map(item => {
             let result = {};
-            for (let col of this._columns) {
-                if (col.visible != false && col.ignore != false) {
+            for (let col of this.getMetaColumns()) {
+                // 修复逻辑错误：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 +123,9 @@ export default class BaseTemplate {
      * 获取表格的列定义
      */
     get columns() {
-        return this._columns.map(col => ({ ...col, field: `data.${col.field}` }));
+        return this.getMetaColumns()
+            .filter(col => col.visible !== false)
+            .map(col => ({ ...col, field: `data.${col.field}` }));
     }
     /**
      * 获取数据

package/dist/BaseUploadTemplate.d.ts

@@ -1,18 +1,36 @@
 import BaseTemplate from "./BaseTemplate";
 import type { DataColumn as TableColumn } from "@ticatec/uniface-element/DataTable";
-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;
-    protected constructor(columns: Array<DataColumn>, batchSize?: number, rowOffset?: number);
+    private _uploadAborted;
+    protected constructor(batchSize?: number);
     /**
      * 状态更新的监听器
      * @param value
      */
     setProgressStatusListener(value: UpdateProgressStatus): void;
     protected abstract uploadData(list: Array<any>): Promise<Array<any>>;
+    /**
+     * 中止上传
+     */
+    abortUpload(): void;
+    /**
+     * 重置上传状态
+     */
+    resetUploadStatus(): void;
     /**
      * 上传数据
      */
@@ -28,8 +46,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;
 }