@ticatec/batch-data-uploader 0.0.12 → 0.1.1

package/dist/BaseUploadTemplate.js

@@ -1,25 +1,25 @@
+// 改进的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_res/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 +27,10 @@ const statusColumn = {
 export default class BaseUploadTemplate extends BaseTemplate {
     batchSize;
     updateProgressStatus = null;
-    constructor(columns, batchSize = 50, rowOffset = 1) {
-        super(columns, rowOffset);
-        this.batchSize = batchSize;
+    _uploadAborted = false;
+    constructor(batchSize = 50) {
+        super();
+        this.batchSize = Math.max(1, batchSize);
     }
     /**
      * 状态更新的监听器
@@ -38,25 +39,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 +133,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.getMetaColumns().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.getMetaColumns().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_res/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_res/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_res/i18nRes.d.ts

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

package/dist/i18n_res/i18nRes.js

@@ -0,0 +1,27 @@
+import { i18nUtils } from "@ticatec/i18n";
+const langRes = {
+    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, 'batchUploading');
+export default i18nRes;

package/dist/i18n_res/index.d.ts

@@ -0,0 +1,2 @@
+import i18nRes from "./i18nRes";
+export default i18nRes;

package/dist/i18n_res/index.js

@@ -0,0 +1,2 @@
+import i18nRes from "./i18nRes";
+export default i18nRes;