@ticatec/batch-data-uploader 0.0.9 → 0.0.12

package/dist/BaseEncodingTemplate.d.ts

@@ -2,24 +2,25 @@ import BaseTemplate from "./BaseTemplate";
 import type DataColumn from "./DataColumn";
 import type { DataColumn as TableColumn } from "@ticatec/uniface-element/DataTable";
 export default abstract class BaseEncodingTemplate extends BaseTemplate {
+    private hintColumn;
     private validColumn;
     protected constructor(columns: Array<DataColumn>, rowOffset?: number);
-    /**
-     * 检查一行的数据是否合法
-     * @param row
-     * @protected
-     */
-    protected abstract isDataValid(row: any): boolean;
     /**
      *
      * @param rows
      * @protected
      */
     protected abstract encodeData(rows: Array<any>): Promise<Array<any>>;
+    /**
+     * 检查数据
+     * @param row
+     * @protected
+     */
+    protected abstract validateData(row: any): Promise<any>;
     /**
      * 数据集是否有效
      */
-    abstract get valid(): boolean;
+    get valid(): boolean;
     /**
      * 从服务器抓取数据，然后根据主键进行数据合并
      * @param rows

package/dist/BaseEncodingTemplate.js

@@ -4,16 +4,29 @@ 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>`;
 export default class BaseEncodingTemplate extends BaseTemplate {
+    hintColumn = {
+        text: getI18nText(i18nKeys.labelHint),
+        field: "hint",
+        width: 150,
+        resizable: true
+    };
     validColumn = {
         text: getI18nText(i18nKeys.labelValid),
+        field: "valid",
         width: 90,
         align: 'center',
         escapeHTML: true,
-        formatter: row => this.isDataValid(row) ? ValidData : InvalidData
+        formatter: valid => valid ? ValidData : InvalidData
     };
     constructor(columns, rowOffset = 1) {
         super(columns, rowOffset);
     }
+    /**
+     * 数据集是否有效
+     */
+    get valid() {
+        return this._list.filter(row => !row.valid).length == 0;
+    }
     /**
      * 从服务器抓取数据，然后根据主键进行数据合并
      * @param rows
@@ -23,12 +36,16 @@ export default class BaseEncodingTemplate extends BaseTemplate {
         let list = await this.encodeData(this.extractData(rows));
         rows.forEach((item, idx) => {
             if (list[idx]) {
-                rows[idx] = { ...item, ...list[idx] };
+                let data = list[idx];
+                item.data = { ...item.data, ...data };
+                let result = this.validateData(data);
+                item.valid = result.valid;
+                item.hint = result.hint;
             }
         });
         return rows;
     }
     get columns() {
-        return [...this._columns, this.validColumn];
+        return [...super.columns, this.hintColumn, this.validColumn];
     }
 }

package/dist/BaseTemplate.d.ts

@@ -41,4 +41,8 @@ export default abstract class BaseTemplate {
      * 获取数据
      */
     get list(): Array<any>;
+    /**
+     * 获取实际的数据列表
+     */
+    get dataList(): Array<any>;
 }

package/dist/BaseTemplate.js

@@ -34,14 +34,20 @@ export default class BaseTemplate {
         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];
-                const cellAddress = { r: rowIndex, c: i };
-                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 (colDef.dummy) {
+                    dummyCount++;
+                }
+                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);
+                }
             }
             rows.push(this.wrapData(rowObject));
         }
@@ -56,7 +62,8 @@ export default class BaseTemplate {
             let result = {};
             for (let col of this._columns) {
                 if (col.visible != false && col.ignore != false) {
-                    utils.setNestedValue(result, col.field, utils.getNestedValue(item.data, col.field));
+                    let data = item.data;
+                    utils.setNestedValue(result, col.field, utils.getNestedValue(data, col.field));
                 }
             }
             return result;
@@ -69,13 +76,13 @@ export default class BaseTemplate {
      * @protected
      */
     wrapData(data) {
-        return data;
+        return { data };
     }
     /**
      * 获取表格的列定义
      */
     get columns() {
-        return this._columns.map(col => ({ ...col }));
+        return this._columns.map(col => ({ ...col, field: `data.${col.field}` }));
     }
     /**
      * 获取数据
@@ -83,4 +90,10 @@ export default class BaseTemplate {
     get list() {
         return [...this._list];
     }
+    /**
+     * 获取实际的数据列表
+     */
+    get dataList() {
+        return this._list.map(row => row.data);
+    }
 }

package/dist/BaseUploadTemplate.js

@@ -71,7 +71,7 @@ export default class BaseUploadTemplate extends BaseTemplate {
      * 获取表格的列定义
      */
     get columns() {
-        return [...this._columns.map(col => ({ ...col, field: `data.${col.field}` })), statusColumn];
+        return [...super.columns, statusColumn];
     }
     /**
      * 导出处理异常的数据

package/dist/DataColumn.d.ts

@@ -13,4 +13,8 @@ export default interface DataColumn extends TableColumn {
      * 解析函数
      */
     parser?: ParserText;
+    /**
+     * 伪列，不解析，仅用于回显
+     */
+    dummy?: boolean;
 }

package/dist/EncodingWizard.svelte

@@ -30,7 +30,7 @@
         label: getI18nText(i18nKeys.button.confirm),
         type: 'primary',
         handler: ()=> {
-            confirmCallback?.(template.list);
+            confirmCallback?.(template.dataList);
             closeHandler?.();
         }
     }
@@ -51,6 +51,7 @@
                     actions = [btnConfirm, ...actions]
                 }
             } catch (ex) {
+                console.error(ex);
                 window.Toast.show(getI18nText(i18nKeys.parseFailure, {name: excelFile.name}));
             } finally {
                 window.Indicator.hide();

package/dist/i18n_resources/batch_en_resource.d.ts

@@ -21,6 +21,7 @@ declare const langRes: {
         labelValid: string;
         textValid: string;
         textInvalid: string;
+        labelHint: string;
     };
 };
 export default langRes;

package/dist/i18n_resources/batch_en_resource.js

@@ -20,7 +20,8 @@ const langRes = {
         labelStatus: "Status",
         labelValid: "Validity",
         textValid: "Yes",
-        textInvalid: "No"
+        textInvalid: "No",
+        labelHint: "Hint"
     }
 };
 export default langRes;

package/dist/i18n_resources/i18nKeys.d.ts

@@ -21,6 +21,10 @@ declare const i18nKeys: {
         key: string;
         text: string;
     };
+    labelHint: {
+        key: string;
+        text: string;
+    };
     labelStatus: {
         key: string;
         text: string;

package/dist/i18n_resources/i18nKeys.js

@@ -22,6 +22,10 @@ const i18nKeys = {
         key: 'batchUploading.labelValid',
         text: langRes.batchUploading.labelValid
     },
+    labelHint: {
+        key: 'batchUploading.labelValid',
+        text: langRes.batchUploading.labelHint
+    },
     labelStatus: {
         key: 'batchUploading.labelStatus',
         text: langRes.batchUploading.labelStatus

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ticatec/batch-data-uploader",
-  "version": "0.0.9",
+  "version": "0.0.12",
   "description": "A reusable Svelte component for batch uploading Excel data with support for error handling, multi-language, and preprocessing.",
   "scripts": {
     "dev": "vite dev",
@@ -48,18 +48,18 @@
       "import": "./dist/BaseUploadTemplate.js"
     },
     "./BaseEncodingTemplate": {
-      "types": "./dist/BaseEncodingTemplate.ts.d.ts",
-      "import": "./dist/BaseEncodingTemplate.ts.js"
+      "types": "./dist/BaseEncodingTemplate.d.ts",
+      "import": "./dist/BaseEncodingTemplate.js"
     },
     "./DataColumn": {
       "types": "./dist/DataColumn.d.ts",
       "import": "./dist/DataColumn.js"
     },
-    "./FileUploadWizard.svelte": {
+    "./FileUploadWizard": {
       "types": "./dist/FileUploadWizard.svelte.d.ts",
       "import": "./dist/FileUploadWizard.svelte"
     },
-    "./EncodingWizard.svelte.svelte": {
+    "./EncodingWizard": {
       "types": "./dist/EncodingWizard.svelte.d.ts",
       "import": "./dist/EncodingWizard.svelte"
     }