diff --git a/package.json b/package.json index a5cb9c1a9..099561bcd 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "detect-browser": "^5.3.0", "dwg2dxf": "^1.0.0", "dxf-parser": "^1.1.2", - "dxf-write": "^2.6.5", + "dxf-write": "^2.6.6", "flatbush": "^4.0.0", "hotkeys-js-ext": "^3.8.8", "immutability-helper": "^3.1.1", diff --git a/src/Add-on/ACAD/Entity2DxfEntity.ts b/src/Add-on/ACAD/Entity2DxfEntity.ts index a4c7fbb8c..a68b3bd99 100644 --- a/src/Add-on/ACAD/Entity2DxfEntity.ts +++ b/src/Add-on/ACAD/Entity2DxfEntity.ts @@ -21,13 +21,12 @@ import { Arc } from "../../DatabaseServices/Entity/Arc"; import { Board } from "../../DatabaseServices/Entity/Board"; import { Circle } from "../../DatabaseServices/Entity/Circle"; import { CompositeEntity } from "../../DatabaseServices/Entity/CompositeEntity"; -import { Curve } from "../../DatabaseServices/Entity/Curve"; import { Ellipse } from "../../DatabaseServices/Entity/Ellipse"; import { Entity } from "../../DatabaseServices/Entity/Entity"; import { Line } from "../../DatabaseServices/Entity/Line"; import { Polyline } from "../../DatabaseServices/Entity/Polyline"; import { Text } from "../../DatabaseServices/Text/Text"; -import { angle, AsVector3, polar } from "../../Geometry/GeUtils"; +import { angle, polar } from "../../Geometry/GeUtils"; import { Orbit } from "../../Geometry/Orbit"; @@ -238,20 +237,9 @@ export function Conver2DxfEntity(e: Entity, dxf: DxfWriter, blkName?: string) let subIndex = 0; for (let subE of e.Entitys) { - if (subE instanceof Curve)//块内曲线不支持非Z0 - { - let pts = subE.Shape.getPoints(subE.GetDrawCount()).map(AsVector3); - for (let p of pts) - p.applyMatrix4(subE.OCSNoClone); - for (let i = 0; i < pts.length - 1; i++) - block.addLine(pts[i], pts[i + 1], { colorNumber: subE.ColorIndex }); - } - else - { - let subInsert = Conver2DxfEntity(subE, dxf, `${name}_${subIndex}`); - if (subInsert) - block.addEntity(subInsert); - } + let subInsert = Conver2DxfEntity(subE, dxf, `${name}_${subIndex}`); + if (subInsert) + block.addEntity(subInsert); subIndex++; }