@ticatec/batch-data-uploader 0.1.0 → 0.1.1

package/dist/BaseEncodingTemplate.js

@@ -1,5 +1,5 @@
 import BaseTemplate from "./BaseTemplate";
-import i18nRes from "./i18n_resources/i18nRes";
+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 {

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,6 +24,8 @@ export default class BaseTemplate {
      * @param file
      */
     async parseExcelFile(file) {
+        const columns = this.getMetaColumns();
+        const rowOffset = this.getRowOffset();
         try {
             const buffer = await file.arrayBuffer();
             const workbook = XLSX.read(buffer, { type: 'array' });
@@ -41,16 +40,16 @@ export default class BaseTemplate {
             }
             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`);
+            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 + this.rowOffset; rowIndex <= range.e.r; rowIndex++) {
+            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 < this._columns.length; i++) {
-                    const colDef = this._columns[i];
+                for (let i = 0; i < columns.length; i++) {
+                    const colDef = columns[i];
                     if (colDef.dummy) {
                         dummyCount++;
                     }
@@ -101,7 +100,7 @@ export default class BaseTemplate {
     extractData(arr) {
         let list = arr.map(item => {
             let result = {};
-            for (let col of this._columns) {
+            for (let col of this.getMetaColumns()) {
                 // 修复逻辑错误：ignore应该为true时才忽略，visible为false时才隐藏
                 if (col.visible != false && col.ignore != true && !col.dummy) {
                     let data = item.data;
@@ -124,7 +123,7 @@ export default class BaseTemplate {
      * 获取表格的列定义
      */
     get columns() {
-        return this._columns
+        return this.getMetaColumns()
             .filter(col => col.visible !== false)
             .map(col => ({ ...col, field: `data.${col.field}` }));
     }

package/dist/BaseUploadTemplate.d.ts

@@ -1,6 +1,5 @@
 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 {
@@ -17,7 +16,7 @@ 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);
+    protected constructor(batchSize?: number);
     /**
      * 状态更新的监听器
      * @param value

package/dist/BaseUploadTemplate.js

@@ -1,9 +1,8 @@
 // 改进的BaseUploadTemplate.ts - 完全清理元数据相关代码
 import BaseTemplate from "./BaseTemplate";
-import i18nKeys from "./i18n_resources/i18nKeys";
 import utils from "./utils";
 import * as XLSX from 'xlsx';
-import i18nRes from "./i18n_resources/i18nRes";
+import i18nRes from "./i18n_res/i18nRes";
 const statusColumn = {
     text: i18nRes.labelStatus,
     width: 240,
@@ -29,8 +28,8 @@ export default class BaseUploadTemplate extends BaseTemplate {
     batchSize;
     updateProgressStatus = null;
     _uploadAborted = false;
-    constructor(columns, batchSize = 50, rowOffset = 1) {
-        super(columns, rowOffset);
+    constructor(batchSize = 50) {
+        super();
         this.batchSize = Math.max(1, batchSize);
     }
     /**
@@ -213,7 +212,7 @@ export default class BaseUploadTemplate extends BaseTemplate {
             return;
         }
         // 获取可见且非虚拟的列
-        const exportColumns = this._columns.filter(col => col.visible !== false && !col.dummy && !col.ignore);
+        const exportColumns = this.getMetaColumns().filter(col => col.visible !== false && !col.dummy && !col.ignore);
         // 创建标题行（与原始导入格式一致）
         const headers = exportColumns.map(col => col.text || col.field);
         // 创建数据行
@@ -242,7 +241,7 @@ export default class BaseUploadTemplate extends BaseTemplate {
             : 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 visibleColumns = this.getMetaColumns().filter(col => col.visible !== false && !col.dummy);
         const headers = [
             '行号',
             ...visibleColumns.map(col => col.text || col.field),

package/dist/EncodingWizard.svelte

@@ -6,7 +6,7 @@
     import {onMount} from "svelte";
     import type DataColumn from "./DataColumn";
     import type BaseEncodingTemplate from "./BaseEncodingTemplate";
-    import i18nRes from "./i18n_resources/i18nRes";
+    import i18nRes from "./i18n_res/i18nRes";
     import {i18nUtils} from "@ticatec/i18n";
 
     export let title: string;

package/dist/FileUploadWizard.svelte

@@ -7,7 +7,7 @@
     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";
 
     export let title: string;

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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ticatec/batch-data-uploader",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "A reusable Svelte component for batch uploading Excel data with support for error handling, multi-language, and preprocessing.",
   "scripts": {
     "dev": "vite dev",
@@ -74,7 +74,7 @@
     "@sveltejs/package": "^2.0.0",
     "@sveltejs/vite-plugin-svelte": "^4.0.0",
     "@ticatec/i18n": "^0.2.0",
-    "@ticatec/uniface-element": "^0.1.71",
+    "@ticatec/uniface-element": "^0.2.0",
     "@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;

package/dist/i18n_resources/i18nKeys.js

@@ -1,80 +0,0 @@
-import langRes from "./batch_en_resource";
-const i18nKeys = {
-    status: {
-        pending: {
-            key: "batchUploading.status.pending",
-            text: langRes.batchUploading.status.pending
-        },
-        uploading: {
-            key: "batchUploading.status.uploading",
-            text: langRes.batchUploading.status.uploading
-        },
-        successful: {
-            key: "batchUploading.status.successful",
-            text: langRes.batchUploading.status.successful
-        },
-        fail: {
-            key: "batchUploading.status.fail",
-            text: langRes.batchUploading.status.fail
-        }
-    },
-    labelValid: {
-        key: 'batchUploading.labelValid',
-        text: langRes.batchUploading.labelValid
-    },
-    labelHint: {
-        key: 'batchUploading.labelValid',
-        text: langRes.batchUploading.labelHint
-    },
-    labelStatus: {
-        key: 'batchUploading.labelStatus',
-        text: langRes.batchUploading.labelStatus
-    },
-    parsing: {
-        key: 'batchUploading.parsing',
-        text: langRes.batchUploading.parsing
-    },
-    parseFailure: {
-        key: 'batchUploading.parseFailure',
-        text: langRes.batchUploading.parseFailure
-    },
-    waitUploading: {
-        key: 'batchUploading.waitUploading',
-        text: langRes.batchUploading.waitUploading
-    },
-    button: {
-        upload: {
-            key: 'batchUploading.button.upload',
-            text: langRes.batchUploading.button.upload
-        },
-        save: {
-            key: 'batchUploading.button.save',
-            text: langRes.batchUploading.button.save
-        },
-        open: {
-            key: 'batchUploading.button.open',
-            text: langRes.batchUploading.button.open
-        },
-        confirm: {
-            key: 'batchUploading.button.confirm',
-            text: langRes.batchUploading.button.confirm
-        }
-    },
-    errorTitle: {
-        key: 'batchUploading.errorTitle',
-        text: langRes.batchUploading.errorTitle
-    },
-    sheetName: {
-        key: 'batchUploading.sheetName',
-        text: langRes.batchUploading.sheetName
-    },
-    textValid: {
-        key: 'batchUploading.textValid',
-        text: langRes.batchUploading.textValid
-    },
-    textInvalid: {
-        key: 'batchUploading.textInvalid',
-        text: langRes.batchUploading.textInvalid
-    }
-};
-export default i18nKeys;

package/dist/i18n_resources/i18nRes.js

@@ -1,29 +0,0 @@
-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/dist/i18n_resources/index.d.ts

@@ -1,3 +0,0 @@
-import cn_resource from "./batch_cn_resource";
-import en_resource from "./batch_en_resource";
-export { cn_resource, en_resource };

package/dist/i18n_resources/index.js

@@ -1,3 +0,0 @@
-import cn_resource from "./batch_cn_resource";
-import en_resource from "./batch_en_resource";
-export { cn_resource, en_resource };