@ticatec/batch-data-uploader 0.1.0 → 0.1.2

package/dist/FileUploadWizard.svelte

@@ -2,29 +2,28 @@
 <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 DataTable, {type DataColumn as TableColumn, type IndicatorColumn} from "@ticatec/uniface-element/DataTable";
     import Box from "@ticatec/uniface-element/Box"
     import {onMount} from "svelte";
-    import type DataColumn from "./DataColumn";
     import type BaseUploadTemplate from "./BaseUploadTemplate.js";
-    import i18nRes from "./i18n_resources/i18nRes";
+    import i18nRes from "./i18n_res/i18nRes";
     import {i18nUtils} from "@ticatec/i18n";
+    import {ProcessStatus} from "./ProcessStatus";
+    import SheetPickupDialog from "./SheetPickupDialog.svelte";
 
     export let title: string;
     export let width: string = "800px";
     export let height: string = "600px"
-    export let closeHandler: any;
     export let template: BaseUploadTemplate;
-    export let afterUploaded: ()=>Promise<void>;
+    export let afterUploaded: () => Promise<void>;
 
-    type ProcessStatus = 'Init' | 'Pending' | 'Uploading' | 'Done';  //初始状态，待上传，上传中，处理完成
 
-    let status: ProcessStatus = 'Init';
+    let status: ProcessStatus = ProcessStatus.Init;
 
     const btnChoose: ButtonAction = {
         label: i18nRes.button.open,
         type: 'primary',
-        handler: () => {
+        handler: async () => {
             uploadField.value = '';
             uploadField.click();
         }
@@ -33,13 +32,13 @@
     const btnUpload: ButtonAction = {
         label: i18nRes.button.upload,
         type: 'primary',
-        handler: async ()=> {
-            status = 'Uploading';
+        handler: async () => {
+            status = ProcessStatus.Uploading;
             try {
                 await template.upload();
                 await afterUploaded?.();
             } finally {
-                status = 'Done';
+                status = ProcessStatus.Done;
             }
         }
     }
@@ -48,7 +47,7 @@
     const btnSave: ButtonAction = {
         label: i18nRes.button.save,
         type: 'primary',
-        handler: async ()=> {
+        handler: async () => {
             const baseFilename = filename.replace(/\.[^/.]+$/, ""); // 移除扩展名
             template.exportErrorRowsToExcel(`error-${baseFilename}.xlsx`);
         }
@@ -56,11 +55,11 @@
 
     // 新增：导出用于重新上传的数据
     const btnExportForReupload: ButtonAction = {
-        label: '导出失败数据',
+        label: i18nRes.buttonExportException,
         type: 'secondary',
-        handler: async ()=> {
+        handler: async () => {
             const baseFilename = filename.replace(/\.[^/.]+$/, ""); // 移除扩展名
-            template.exportErrorData(`重传-${baseFilename}.xlsx`, {
+            template.exportErrorData(`${baseFilename}.xlsx`, {
                 includeAllData: false,
                 separateSheets: true,
                 originalFormat: true
@@ -70,11 +69,11 @@
 
     // 新增：导出完整报告
     const btnExportFullReport: ButtonAction = {
-        label: '导出完整报告',
+        label: i18nRes.buttonExportFull,
         type: 'secondary',
-        handler: async ()=> {
+        handler: async () => {
             const baseFilename = filename.replace(/\.[^/.]+$/, ""); // 移除扩展名
-            template.exportErrorData(`报告-${baseFilename}.xlsx`, {
+            template.exportErrorData(`report-${baseFilename}.xlsx`, {
                 includeAllData: true,
                 separateSheets: true,
                 originalFormat: true
@@ -84,12 +83,12 @@
 
     // 新增：重置失败数据状态
     const btnResetErrors: ButtonAction = {
-        label: '重置失败数据',
+        label: i18nRes.buttonReset,
         type: 'secondary',
-        handler: async ()=> {
+        handler: async () => {
             template.resetUploadStatus();
             list = template.list;
-            status = 'Pending';
+            status = ProcessStatus.Pending;
         }
     }
 
@@ -98,29 +97,63 @@
     let list: Array<any> = [];
     let filename: string;
 
+    const showSheetChooseDialog = (sheetNames: Array<any>): Promise<any> => {
+        return new Promise((resolve, reject) => {
+            window.Dialog.showModal(SheetPickupDialog, {
+                confirmCallback: (sheet: string) => {
+                    resolve(sheet);
+                }, onClose: () => {
+                    resolve(null);
+                }, sheets: sheetNames
+            })
+        });
+    }
+
+    const openExcelFile = async (excelFile: File) => {
+        window.Indicator.show(i18nRes.parsing.toString());
+        try {
+            return await template.setFile(excelFile);
+        } catch (ex) {
+            console.error('Parse file error:', ex);
+            window.Toast.show(i18nUtils.formatText(i18nRes.parseFailure, {name: excelFile.name}));
+            throw ex;
+        } finally {
+            window.Indicator.hide();
+        }
+    }
+
     const parseExcelFile = async (excelFile: File) => {
         if (excelFile) {
+            const sheetNames = await openExcelFile(excelFile);
             filename = excelFile.name;
-            window.Indicator.show(i18nRes.parsing);
-            try {
-                await template.parseExcelFile(excelFile);
-                list = template.list;
-                status = list.length > 0 ? 'Pending' : 'Init';
-            } catch (ex) {
-                console.error('Parse file error:', ex);
-                window.Toast.show(i18nUtils.formatText(i18nRes.parseFailure, {name: excelFile.name}));
-                status = 'Init'; // 确保解析失败时重置状态
-            } finally {
-                window.Indicator.hide();
+            let sheetName = sheetNames[0];
+            if (sheetNames.length > 1) {
+                sheetName = await showSheetChooseDialog(sheetNames)
+            }
+            if (sheetName) {
+                window.Indicator.show(i18nRes.parsing.toString());
+                try {
+                    await template.parseSheet(sheetName);
+                    list = template.list;
+                    status = list.length > 0 ? ProcessStatus.Pending : ProcessStatus.Init;
+                } catch (ex) {
+                    console.error('Parse file error:', ex);
+                    window.Toast.show(i18nUtils.formatText(i18nRes.parseFailure, {name: excelFile.name}));
+                    status = ProcessStatus.Init; // 确保解析失败时重置状态
+                } finally {
+                    window.Indicator.hide();
+                }
+            } else {
+                status = ProcessStatus.Init; // 没有选择退出重置状态
             }
         }
     }
 
-    let columns: Array<DataColumn>;
+    let columns: Array<TableColumn>;
 
     onMount(async () => {
         columns = template.columns;
-        template.setProgressStatusListener(()=> {
+        template.setProgressStatusListener(() => {
             list = template.list;
         })
     });
@@ -131,20 +164,20 @@
         displayNo: true
     }
 
-    $: {
-        switch (status) {
-            case 'Init':
+    const invalidateStatus = (ps: ProcessStatus) => {
+        switch (ps) {
+            case ProcessStatus.Init:
                 actions = [btnChoose];
                 break;
-            case 'Pending':
+            case ProcessStatus.Pending:
                 actions = [btnUpload, btnChoose];
                 break;
-            case 'Uploading':
+            case ProcessStatus.Uploading:
                 btnUpload.disabled = true;
                 btnChoose.disabled = true;
                 actions = [...actions];
                 break;
-            case 'Done':
+            case ProcessStatus.Done:
                 btnUpload.disabled = false;
                 btnChoose.disabled = false;
 
@@ -181,8 +214,10 @@
         }
     }
 
-    const confirmCloseDialog = async ():Promise<boolean> => {
-        if (status == 'Uploading') {
+    $: invalidateStatus(status);
+
+    const confirmCloseDialog = async (): Promise<boolean> => {
+        if (status == ProcessStatus.Uploading) {
             window.Toast.show(i18nRes.waitUploading);
             return false;
         } else {
@@ -192,26 +227,27 @@
 
     // 显示上传统计信息
     $: uploadStatsText = (() => {
-        if (status === 'Done' && list.length > 0) {
+        if (status === ProcessStatus.Done && list.length > 0) {
             const stats = template.uploadStats;
-            return `总计: ${stats.total}, 成功: ${stats.success}, 失败: ${stats.failed}`;
+            return i18nUtils.formatText(i18nRes.uploadStatText, stats);
         }
         return '';
     })();
 
 </script>
 
-<Dialog {title} {closeHandler} {actions} closeConfirm={confirmCloseDialog}
-        content$style="width: {width}; height: {height}; padding: 12px;">
+<Dialog {title} {actions} closeConfirm={confirmCloseDialog}
+        content$style="width: {width}; height: {height}; padding: 12px; display: flex; flex-direction: column;">
 
     <!-- 添加状态信息显示 -->
     {#if uploadStatsText}
-        <div style="margin-bottom: 8px; padding: 8px; background: #f5f5f5; border-radius: 4px; font-size: 14px;">
+        <div style="margin-bottom: 8px; padding: 8px; background: #f5f5f5; border-radius: 4px; font-size: 14px; flex: 0 0 auto">
             {uploadStatsText}
         </div>
     {/if}
 
-    <Box style="border: 1px solid var(--uniface-editor-border-color, #F8FAFC); width: 100%; height: 100%; cursor: {status == 'Uploading' ? 'progress' : 'default'}" round>
+    <Box style="flex: 1 1 auto; border: 1px solid var(--uniface-editor-border-color, #F8FAFC); width: 100%; height: 100%; cursor: {status == ProcessStatus.Uploading ? 'progress' : 'default'}"
+         round>
         <DataTable style="width: 100%; height: 100%" {list} {indicatorColumn} {columns}>
         </DataTable>
     </Box>

package/dist/FileUploadWizard.svelte.d.ts

@@ -16,7 +16,6 @@ declare const FileUploadWizard: $$__sveltets_2_IsomorphicComponent<{
     title: string;
     width?: string;
     height?: string;
-    closeHandler: any;
     template: BaseUploadTemplate;
     afterUploaded: () => Promise<void>;
 }, {

package/dist/ProcessStatus.d.ts

@@ -0,0 +1,6 @@
+export declare enum ProcessStatus {
+    Init = 0,
+    Pending = 1,
+    Uploading = 2,
+    Done = 3
+}

package/dist/ProcessStatus.js

@@ -0,0 +1,7 @@
+export var ProcessStatus;
+(function (ProcessStatus) {
+    ProcessStatus[ProcessStatus["Init"] = 0] = "Init";
+    ProcessStatus[ProcessStatus["Pending"] = 1] = "Pending";
+    ProcessStatus[ProcessStatus["Uploading"] = 2] = "Uploading";
+    ProcessStatus[ProcessStatus["Done"] = 3] = "Done";
+})(ProcessStatus || (ProcessStatus = {}));

package/dist/SheetNameViewRender.svelte

@@ -0,0 +1,6 @@
+<script lang="ts">
+    export let item;
+</script>
+<div style="padding: 0 12px; height: 42px; display: flex; align-items: center; ">
+    <span style="font-size: 1.15em">{item}</span>
+</div>

package/dist/SheetNameViewRender.svelte.d.ts

@@ -0,0 +1,20 @@
+interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> = any, Events extends Record<string, any> = any, Slots extends Record<string, any> = any, Exports = {}, Bindings = string> {
+    new (options: import('svelte').ComponentConstructorOptions<Props>): import('svelte').SvelteComponent<Props, Events, Slots> & {
+        $$bindings?: Bindings;
+    } & Exports;
+    (internal: unknown, props: Props & {
+        $$events?: Events;
+        $$slots?: Slots;
+    }): Exports & {
+        $set?: any;
+        $on?: any;
+    };
+    z_$$bindings?: Bindings;
+}
+declare const SheetNameViewRender: $$__sveltets_2_IsomorphicComponent<{
+    item: any;
+}, {
+    [evt: string]: CustomEvent<any>;
+}, {}, {}, string>;
+type SheetNameViewRender = InstanceType<typeof SheetNameViewRender>;
+export default SheetNameViewRender;

package/dist/SheetPickupDialog.svelte

@@ -0,0 +1,35 @@
+<!-- 更新的FileUploadWizard.svelte - 彻底清理includeMetadata -->
+<script lang="ts">
+    import CommonDialog from "@ticatec/uniface-element/CommonDialog";
+    import Box from "@ticatec/uniface-element/Box"
+    import i18nRes from "./i18n_res/i18nRes";
+    import ListBox from "@ticatec/uniface-element/ListBox";
+    import SheetNameViewRender from "./SheetNameViewRender.svelte";
+
+
+    export let confirmCallback: any;
+
+    export let sheets: Array<string>;
+
+    export let onClose: any;
+
+    let selectedSheet: any;
+
+    let width: string = "360px";
+    let height: string = "480px";
+
+    const confirmSelection = () => {
+        confirmCallback?.(selectedSheet);
+        return true;
+    }
+
+
+</script>
+
+<CommonDialog title={i18nRes.titleChooseSheet} {onClose} confirmHandler={confirmSelection} enableConfirm={selectedSheet != null}
+              content$style="width: {width}; height: {height}; padding: 12px;">
+    <Box style="border: 1px solid var(--uniface-editor-border-color, #F8FAFC); width: 100%; height: 100%;" round>
+        <ListBox style="width: 100%; height: 100%" list={sheets} selectMode="single" bind:selectedItem={selectedSheet}
+                 itemRender={SheetNameViewRender}/>
+    </Box>
+</CommonDialog>

package/dist/SheetPickupDialog.svelte.d.ts

@@ -0,0 +1,22 @@
+interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> = any, Events extends Record<string, any> = any, Slots extends Record<string, any> = any, Exports = {}, Bindings = string> {
+    new (options: import('svelte').ComponentConstructorOptions<Props>): import('svelte').SvelteComponent<Props, Events, Slots> & {
+        $$bindings?: Bindings;
+    } & Exports;
+    (internal: unknown, props: Props & {
+        $$events?: Events;
+        $$slots?: Slots;
+    }): Exports & {
+        $set?: any;
+        $on?: any;
+    };
+    z_$$bindings?: Bindings;
+}
+declare const SheetPickupDialog: $$__sveltets_2_IsomorphicComponent<{
+    confirmCallback: any;
+    sheets: Array<string>;
+    onClose: any;
+}, {
+    [evt: string]: CustomEvent<any>;
+}, {}, {}, string>;
+type SheetPickupDialog = InstanceType<typeof SheetPickupDialog>;
+export default SheetPickupDialog;

package/dist/i18n_res/i18nRes.js

@@ -0,0 +1,32 @@
+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"
+    },
+    titleChooseSheet: 'Choose a sheet',
+    errorTitle: "Error",
+    sheetName: "Abnormal data",
+    labelStatus: "Status",
+    labelValid: "Validity",
+    textValid: "Yes",
+    textInvalid: "No",
+    labelHint: "Hint",
+    uploadStatText: "Total: {{total}}, Success: {{success}}, Failed: {{failed}}",
+    buttonExportException: "Error report",
+    buttonExportFull: "Full report",
+    buttonReset: "Reset"
+};
+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;

package/dist/index.d.ts

@@ -1,2 +1,5 @@
 import FileUploadWizard from "./FileUploadWizard.svelte";
+import "@ticatec/uniface-element/Dialog";
+import "@ticatec/uniface-element/Toast";
+import "@ticatec/uniface-element/IndicatorBoard";
 export default FileUploadWizard;

package/dist/index.js

@@ -1,2 +1,5 @@
 import FileUploadWizard from "./FileUploadWizard.svelte";
+import "@ticatec/uniface-element/Dialog";
+import "@ticatec/uniface-element/Toast";
+import "@ticatec/uniface-element/IndicatorBoard";
 export default FileUploadWizard;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ticatec/batch-data-uploader",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "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.2.0",
-    "@ticatec/uniface-element": "^0.1.71",
+    "@ticatec/i18n": "^0.2.3",
+    "@ticatec/uniface-element": "^0.3.5",
     "@ticatec/uniface-google-material-icons": "^0.1.2",
     "dayjs": "^1.11.10",
     "publint": "^0.3.2",

package/dist/i18n_resources/batch_cn_resource.d.ts

@@ -1,22 +0,0 @@
-declare const langRes: {
-    batchUploading: {
-        status: {
-            pending: string;
-            uploading: string;
-            successful: string;
-            fail: string;
-        };
-        parsing: string;
-        parseFailure: string;
-        waitUploading: string;
-        button: {
-            upload: string;
-            save: string;
-            open: string;
-        };
-        errorTitle: string;
-        sheetName: string;
-        labelStatus: string;
-    };
-};
-export default langRes;

package/dist/i18n_resources/batch_cn_resource.js

@@ -1,22 +0,0 @@
-const langRes = {
-    batchUploading: {
-        status: {
-            pending: '待上传',
-            uploading: "上传中...",
-            successful: '处理成功',
-            fail: '处理失败'
-        },
-        parsing: '解析文件...',
-        parseFailure: '无法解析文件{{name}}',
-        waitUploading: '上传过程中无法退出!',
-        button: {
-            upload: '上传',
-            save: '导出异常',
-            open: '文件'
-        },
-        errorTitle: '异常原因',
-        sheetName: '错误数据',
-        labelStatus: "状态"
-    }
-};
-export default langRes;

package/dist/i18n_resources/batch_en_resource.d.ts

@@ -1,27 +0,0 @@
-declare const langRes: {
-    batchUploading: {
-        status: {
-            pending: string;
-            uploading: string;
-            successful: string;
-            fail: string;
-        };
-        parsing: string;
-        parseFailure: string;
-        waitUploading: string;
-        button: {
-            upload: string;
-            save: string;
-            open: string;
-            confirm: string;
-        };
-        errorTitle: string;
-        sheetName: string;
-        labelStatus: string;
-        labelValid: string;
-        textValid: string;
-        textInvalid: string;
-        labelHint: string;
-    };
-};
-export default langRes;

package/dist/i18n_resources/batch_en_resource.js

@@ -1,27 +0,0 @@
-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"
-    }
-};
-export default langRes;

package/dist/i18n_resources/i18nKeys.d.ts

@@ -1,79 +0,0 @@
-declare const i18nKeys: {
-    status: {
-        pending: {
-            key: string;
-            text: string;
-        };
-        uploading: {
-            key: string;
-            text: string;
-        };
-        successful: {
-            key: string;
-            text: string;
-        };
-        fail: {
-            key: string;
-            text: string;
-        };
-    };
-    labelValid: {
-        key: string;
-        text: string;
-    };
-    labelHint: {
-        key: string;
-        text: string;
-    };
-    labelStatus: {
-        key: string;
-        text: string;
-    };
-    parsing: {
-        key: string;
-        text: string;
-    };
-    parseFailure: {
-        key: string;
-        text: string;
-    };
-    waitUploading: {
-        key: string;
-        text: string;
-    };
-    button: {
-        upload: {
-            key: string;
-            text: string;
-        };
-        save: {
-            key: string;
-            text: string;
-        };
-        open: {
-            key: string;
-            text: string;
-        };
-        confirm: {
-            key: string;
-            text: string;
-        };
-    };
-    errorTitle: {
-        key: string;
-        text: string;
-    };
-    sheetName: {
-        key: string;
-        text: string;
-    };
-    textValid: {
-        key: string;
-        text: string;
-    };
-    textInvalid: {
-        key: string;
-        text: string;
-    };
-};
-export default i18nKeys;