@ticatec/batch-data-uploader 0.1.0 → 0.1.2

package/dist/BaseEncodingTemplate.d.ts

@@ -1,5 +1,4 @@
 import BaseTemplate from "./BaseTemplate";
-import type DataColumn from "./DataColumn";
 import type { DataColumn as TableColumn } from "@ticatec/uniface-element/DataTable";
 export interface ValidationResult {
     valid: boolean;
@@ -9,7 +8,6 @@ export interface ValidationResult {
 export default abstract class BaseEncodingTemplate extends BaseTemplate {
     private hintColumn;
     private validColumn;
-    protected constructor(columns: Array<DataColumn>, rowOffset?: number);
     /**
      *
      * @param rows

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 {
@@ -17,9 +17,6 @@ export default class BaseEncodingTemplate extends BaseTemplate {
         escapeHTML: false, // 修复：需要渲染HTML
         formatter: valid => valid ? ValidData : InvalidData
     };
-    constructor(columns, rowOffset = 1) {
-        super(columns, rowOffset);
-    }
     /**
      * 数据集是否有效
      */

package/dist/BaseTemplate.d.ts

@@ -1,48 +1,34 @@
 import type DataColumn from "./DataColumn";
 import type { DataColumn as TableColumn } from "@ticatec/uniface-element/DataTable";
+import * as XLSX from 'xlsx';
 export default abstract class BaseTemplate {
-    protected readonly _columns: Array<DataColumn>;
-    protected readonly rowOffset: number;
     protected _list: Array<any>;
+    protected _file: File | null;
+    protected _workbook: XLSX.WorkBook | null;
+    protected _currentSheetName: string | null;
+    protected abstract getMetaColumns(): Array<DataColumn>;
+    protected getRowOffset(): number;
     /**
-     *
-     * @param columns
-     * @param rowOffset
-     * @protected
-     */
-    protected constructor(columns: Array<DataColumn>, rowOffset?: number);
-    /**
-     * 整理数据，在子类可以通过重载完成数据的二次处理
-     * @param rows
-     * @protected
+     * 整理数据，在子类可重载进行二次处理
      */
     protected consolidateData(rows: Array<any>): Promise<Array<any>>;
     /**
-     * 解析一个excel文件
+     * 设置要解析的 Excel 文件
      * @param file
      */
-    parseExcelFile(file: File): Promise<void>;
+    setFile(file: File): Promise<string[]>;
     /**
-     * 获取实际待上传的数据
-     * @param arr
+     * 解析指定的工作表
+     * @param sheetName 如果不传则使用第一个工作表
      */
+    parseSheet(sheetName?: string): Promise<void>;
     protected extractData(arr: Array<any>): any[];
-    /**
-     * 包裹数据
-     * @param data
-     * @protected
-     */
     protected wrapData(data: any): any;
-    /**
-     * 获取表格的列定义
-     */
     get columns(): Array<TableColumn>;
-    /**
-     * 获取数据
-     */
     get list(): Array<any>;
+    get dataList(): Array<any>;
     /**
-     * 获取实际的数据列表
+     * 获取当前解析的工作表名称
      */
-    get dataList(): Array<any>;
+    get currentSheetName(): string | null;
 }

package/dist/BaseTemplate.js

@@ -1,143 +1,147 @@
 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;
+    _file = null;
+    _workbook = null;
+    _currentSheetName = null;
+    getRowOffset() {
+        return 1;
     }
     /**
-     * 整理数据，在子类可以通过重载完成数据的二次处理
-     * @param rows
-     * @protected
+     * 整理数据，在子类可重载进行二次处理
      */
     async consolidateData(rows) {
         return rows;
     }
     /**
-     * 解析一个excel文件
+     * 设置要解析的 Excel 文件
      * @param file
      */
-    async parseExcelFile(file) {
+    async setFile(file) {
+        this._file = file;
+        this._workbook = null;
+        this._currentSheetName = null;
+        this._list = [];
         try {
             const buffer = await file.arrayBuffer();
-            const workbook = XLSX.read(buffer, { type: 'array' });
-            // 验证工作簿是否有工作表
-            if (!workbook.SheetNames || workbook.SheetNames.length === 0) {
+            this._workbook = XLSX.read(buffer, { type: 'array' });
+            if (!this._workbook.SheetNames || this._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 < this.rowOffset) {
-                throw new Error(`Not enough rows in file. Expected at least ${this.rowOffset + 1} rows`);
+            return [...this._workbook.SheetNames];
+        }
+        catch (error) {
+            console.error('Failed to load Excel file:', error);
+            throw new Error(`Failed to load Excel file: ${error instanceof Error ? error.message : 'Unknown error'}`);
+        }
+    }
+    /**
+     * 解析指定的工作表
+     * @param sheetName 如果不传则使用第一个工作表
+     */
+    async parseSheet(sheetName) {
+        if (!this._workbook) {
+            throw new Error('No Excel file has been set. Call setFile() first.');
+        }
+        const targetSheetName = sheetName || this._workbook.SheetNames[0];
+        if (!this._workbook.SheetNames.includes(targetSheetName)) {
+            throw new Error(`Sheet "${targetSheetName}" not found in the workbook`);
+        }
+        const sheet = this._workbook.Sheets[targetSheetName];
+        if (!sheet || !sheet['!ref']) {
+            throw new Error(`Sheet "${targetSheetName}" is empty or invalid`);
+        }
+        this._currentSheetName = targetSheetName;
+        this._list = [];
+        try {
+            const columns = this.getMetaColumns();
+            const rowOffset = this.getRowOffset();
+            const range = XLSX.utils.decode_range(sheet['!ref']);
+            if (range.e.r < rowOffset) {
+                throw new Error(`Not enough rows in sheet "${targetSheetName}". 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++;
+                        continue;
                     }
-                    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;
+                    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;
+                        if (colDef.setValue) {
+                            colDef.setValue(rowObject, formattedValue);
                         }
-                        try {
-                            const formattedValue = colDef.parser ? colDef.parser(rawValue) : rawValue;
+                        else {
                             utils.setNestedValue(rowObject, colDef.field, formattedValue);
                         }
-                        catch (parseError) {
-                            console.warn(`Failed to parse cell ${cellRef}:`, parseError);
-                            utils.setNestedValue(rowObject, colDef.field, rawValue);
-                        }
+                    }
+                    catch (parseError) {
+                        console.warn(`Failed to parse cell ${cellRef} in sheet "${targetSheetName}":`, parseError);
+                        utils.setNestedValue(rowObject, colDef.field, rawValue);
                     }
                 }
-                // 只添加有数据的行
                 if (hasData) {
                     rows.push(this.wrapData(rowObject));
                 }
             }
             if (rows.length === 0) {
-                throw new Error('No valid data rows found in the file');
+                throw new Error(`No valid data rows found in sheet "${targetSheetName}"`);
             }
             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'}`);
+            console.error(`Failed to parse sheet "${targetSheetName}":`, error);
+            throw new Error(`Failed to parse sheet "${targetSheetName}": ${error instanceof Error ? error.message : 'Unknown error'}`);
         }
     }
-    /**
-     * 获取实际待上传的数据
-     * @param arr
-     */
     extractData(arr) {
-        let list = arr.map(item => {
+        return arr.map(item => {
             let result = {};
-            for (let col of this._columns) {
-                // 修复逻辑错误：ignore应该为true时才忽略，visible为false时才隐藏
-                if (col.visible != false && col.ignore != true && !col.dummy) {
+            for (let col of this.getMetaColumns()) {
+                if (col.visible != false && col.ignore != true) {
                     let data = item.data;
                     utils.setNestedValue(result, col.field, utils.getNestedValue(data, col.field));
                 }
             }
             return result;
         });
-        return list;
     }
-    /**
-     * 包裹数据
-     * @param data
-     * @protected
-     */
     wrapData(data) {
         return { data };
     }
-    /**
-     * 获取表格的列定义
-     */
     get columns() {
-        return this._columns
+        return this.getMetaColumns()
             .filter(col => col.visible !== false)
             .map(col => ({ ...col, field: `data.${col.field}` }));
     }
-    /**
-     * 获取数据
-     */
     get list() {
         return [...this._list];
     }
-    /**
-     * 获取实际的数据列表
-     */
     get dataList() {
         return this._list.map(row => row.data);
     }
+    /**
+     * 获取当前解析的工作表名称
+     */
+    get currentSheetName() {
+        return this._currentSheetName;
+    }
 }

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/DataColumn.d.ts

@@ -1,8 +1,9 @@
 import type { DataColumn as TableColumn } from "@ticatec/uniface-element/DataTable";
 export type ParserText = (text: string) => any;
+export type SetAttributeValue = (data: string, value: any) => void;
 export default interface DataColumn extends TableColumn {
     /**
-     * 字段名
+     * 对应的字段
      */
     field: string;
     /**
@@ -17,4 +18,8 @@ export default interface DataColumn extends TableColumn {
      * 伪列，不解析，仅用于回显
      */
     dummy?: boolean;
+    /**
+     * 手工设定值
+     */
+    setValue?: SetAttributeValue;
 }

package/dist/EncodingWizard.svelte

@@ -1,18 +1,18 @@
 <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 IndicatorColumn, type DataColumn as TableColumn} from "@ticatec/uniface-element/DataTable";
     import Box from "@ticatec/uniface-element/Box"
     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";
+    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: BaseEncodingTemplate;
     export let confirmCallback: any;
 
@@ -20,7 +20,7 @@
     const btnChoose: ButtonAction = {
         label: i18nRes.button.open,
         type: 'primary',
-        handler: () => {
+        handler: async () => {
             uploadField.value = '';
             uploadField.click();
         }
@@ -29,38 +29,73 @@
     const btnConfirm: ButtonAction = {
         label: i18nRes.button.confirm,
         type: 'primary',
-        handler: ()=> {
-            confirmCallback?.(template.dataList);
-            closeHandler?.();
+        disabled: true,
+        handler: async () => {
+            let result = await confirmCallback?.(template.dataList);
+            console.log("处理结果",result);
+            return true;
         }
     }
 
-    let actions: ButtonActions = [btnChoose];
+    let actions: ButtonActions = [btnChoose, btnConfirm];
     let uploadField: any;
     let list: Array<any> = [];
-    let filename: string;
+
+    $: {
+        btnConfirm.disabled = list.length == 0;
+        actions = [...actions]
+    }
+
+    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) {
-            filename = excelFile.name;
-            window.Indicator.show(i18nRes.parsing);
-            try {
-                await template.parseExcelFile(excelFile);
-                list = template.list;
-                if (template.valid) {
-                    actions = [btnConfirm, ...actions]
+            const sheetNames = await openExcelFile(excelFile);
+            console.log('sheets', sheetNames)
+            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;
+                } catch (ex) {
+                    console.error('Parse file error:', ex);
+                    window.Toast.show(i18nUtils.formatText(i18nRes.parseFailure, {name: excelFile.name}));
+                } finally {
+                    window.Indicator.hide();
                 }
-            } catch (ex) {
-                console.error(ex);
-                window.Toast.show(i18nUtils.formatText(i18nRes.parseFailure, {name: excelFile.name}));
-            } finally {
-                window.Indicator.hide();
             }
         }
     }
 
 
-    let columns: Array<DataColumn>;
+    let columns: Array<TableColumn>;
 
     onMount(async () => {
         columns = template.columns;
@@ -76,7 +111,7 @@
 
 </script>
 
-<Dialog {title} {closeHandler} {actions}
+<Dialog {title} {actions}
         content$style="width: {width}; height: {height}; padding: 12px;">
     <Box style="border: 1px solid var(--uniface-editor-border-color, #F8FAFC); width: 100%; height: 100%; "
          round>

package/dist/EncodingWizard.svelte.d.ts

@@ -16,7 +16,6 @@ declare const EncodingWizard: $$__sveltets_2_IsomorphicComponent<{
     title: string;
     width?: string;
     height?: string;
-    closeHandler: any;
     template: BaseEncodingTemplate;
     confirmCallback: any;
 }, {