From b0ba68ec5a0a29afc1e342a9e9871f321cf028c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=AF=97=E6=B4=A5?= <2723065175@qq.com> Date: Fri, 22 Dec 2023 03:44:22 +0000 Subject: [PATCH] =?UTF-8?q?!2530=20=E5=98=89=E5=B1=85=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=A7=BD=E5=8A=A0=E9=95=BF,=E6=A7=BD=E5=8A=A0=E5=AE=BD,?= =?UTF-8?q?=E6=A7=BD=E5=8A=A0=E6=B7=B1,=E5=88=80=E5=8D=8A=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Add-on/JiaJu/Import/JiaJuImport.ts | 6 ++++++ src/Add-on/JiaJu/Import/JiaJuInterface.ts | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/src/Add-on/JiaJu/Import/JiaJuImport.ts b/src/Add-on/JiaJu/Import/JiaJuImport.ts index 306f4b0cd..15e1c7814 100644 --- a/src/Add-on/JiaJu/Import/JiaJuImport.ts +++ b/src/Add-on/JiaJu/Import/JiaJuImport.ts @@ -8,6 +8,7 @@ import { MakeMirrorMtx, NormalMatrix } from "../../../Common/Matrix4Utils"; import { DuplicateRecordCloning } from "../../../Common/Status"; import { Intent, ToasterShowEntityMsg } from "../../../Common/Toaster"; import { FixDigits } from "../../../Common/Utils"; +import { safeEval } from "../../../Common/eval"; import { Contour } from "../../../DatabaseServices/Contour"; import { Database } from "../../../DatabaseServices/Database"; import { Arc } from "../../../DatabaseServices/Entity/Arc"; @@ -395,6 +396,11 @@ class JiaJuParse if (paramTable.AZBZ) br.BoardProcessOption.remarks.push(["安装备注", paramTable.AZBZ]); + br.GroovesAddLength = safeEval(paramTable.GroovesAddLength) || 0; + br.GroovesAddWidth = safeEval(paramTable.GroovesAddWidth) || 0; + br.GroovesAddDepth = safeEval(paramTable.GroovesAddDepth) || 0; + br.KnifeRadius = safeEval(paramTable.KnifeRadius) || 3; + if (paramTable.MTL) { const materialParam = this.Code_MaterialInfo.get(paramTable.MTL); diff --git a/src/Add-on/JiaJu/Import/JiaJuInterface.ts b/src/Add-on/JiaJu/Import/JiaJuInterface.ts index 0f4b9f632..294280469 100644 --- a/src/Add-on/JiaJu/Import/JiaJuInterface.ts +++ b/src/Add-on/JiaJu/Import/JiaJuInterface.ts @@ -240,5 +240,9 @@ namespace JiaJu CavityLink2?: string; CavityLink3?: string; CavityLink4?: string; + GroovesAddLength?: string; + GroovesAddWidth?: string; + GroovesAddDepth?: string; + KnifeRadius?: string; } }