From 6415749140997fc3d547dec9896a3bff7f3246c7 Mon Sep 17 00:00:00 2001 From: lixiang <504331699@qq.com> Date: Wed, 27 Aug 2025 11:07:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=8B=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/index.ts | 1 - .../TransformProcessItemByPosition.ts | 16 ++++++++-------- .../conversion.test.ts | 12 ++++++------ 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 40ba9cc..3bbb677 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@imes-modelprocesspoints/libs", - "version": "1.1.0", + "version": "1.1.1", "description": "", "type": "module", "scripts": { diff --git a/src/index.ts b/src/index.ts index 1e95e39..4bacbfd 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,2 +1 @@ -// export * from "./processors/modelProcessPoints/modelProcessPoints"; export * from "./processors/TransformProcessItemByPosition/TransformProcessItemByPosition" \ No newline at end of file diff --git a/src/processors/TransformProcessItemByPosition/TransformProcessItemByPosition.ts b/src/processors/TransformProcessItemByPosition/TransformProcessItemByPosition.ts index d477258..1c8a32b 100644 --- a/src/processors/TransformProcessItemByPosition/TransformProcessItemByPosition.ts +++ b/src/processors/TransformProcessItemByPosition/TransformProcessItemByPosition.ts @@ -126,7 +126,7 @@ export class TransformProcessItemByPositionProc extends ProcessorBase 0) { models = await this.handleByPlaceXY(models, placeX, placeY) @@ -368,16 +368,16 @@ export class TransformProcessItemByPositionProc extends ProcessorBase 0) { - board = await this.handleByPlaceXY(board, placeX, placeY) + if (Array.isArray(border) && border.length > 0) { + border = await this.handleByPlaceXY(border, placeX, placeY) } else { - board = [] + border = [] } block = { ...block, holes: holes, models: models, - board: board + border: border } return block } @@ -425,7 +425,7 @@ export type TransformProcessItemByPositionInputBlock = { /** 孔数据 */ holes: TransformProcessingItem[], /** 轮廓数据 */ - board: TransformProcessingItem[], + border: TransformProcessingItem[], /** 板件的原放置方式 默认为正面(0) 不传则为正面 原 placestyle*/ positionType?: PositionType, /** 目标放置方式 优化后会有这个数据 或者是 手动排版 */ @@ -446,7 +446,7 @@ export type TransformProcessItemByPositionOutputBlock = { /** 孔数据 */ holes: TransformProcessingItem[], /** 轮廓数据 看需求 因为存在多种类型的轮廓 所有这里为数组 */ - board: TransformProcessingItem[], + border: TransformProcessingItem[], /** 板件(小板)长 */ length: number, /** 板件(小板)宽 */ diff --git a/src/processors/TransformProcessItemByPosition/conversion.test.ts b/src/processors/TransformProcessItemByPosition/conversion.test.ts index 1eacdb9..5cac35a 100644 --- a/src/processors/TransformProcessItemByPosition/conversion.test.ts +++ b/src/processors/TransformProcessItemByPosition/conversion.test.ts @@ -12,7 +12,7 @@ test('conversionTest', async () => { /** 孔数据集 */ let holes: TransformProcessingItem[] = [] /** 轮廓集合 */ - let board: TransformProcessingItem[] = [] + let border: TransformProcessingItem[] = [] //#region 业务数据转为处理器入参数据 // 造型 数据转换 @@ -44,14 +44,14 @@ test('conversionTest', async () => { /** 各种轮廓的集合 */ // 原始轮廓 - let orgBoard: TransformProcessingItem = { - id: `orgBoard_${block.blockNo}`, + let orgBorder: TransformProcessingItem = { + id: `orgBorder_${block.blockNo}`, pts: block.blockDetail.orgContourData?.pts || [], buls: block.blockDetail.orgContourData?.buls || [], face: 0 } - board.push(orgBoard) + border.push(orgBorder) // 开料轮廓 。。。。 若需要 按照原始轮廓的方式添加 let _block: TransformProcessItemByPositionInputBlock = { @@ -69,7 +69,7 @@ test('conversionTest', async () => { positionType: 0, models, holes, - board, + border, } blocks.push(_block) //#endregion @@ -87,7 +87,7 @@ test('conversionTest', async () => { } let proc = new TransformProcessItemByPositionProc() - proc.handleProcessItemPointsData + await proc.exec(context) console.log(context)