!2783 优化:渲染导出柜名数据

src/Add-on/ExportData.tsx

@@ -355,7 +355,6 @@ function ConvertBoard2Data(br: ExtrudeSolid): any
         ed.Type = "Board";
         ed.CabinetName = br.BoardProcessOption.cabinetName;
         ed.RoomName = br.BoardProcessOption.roomName;
-        ed.CabinetName = ed.RoomName;
         ed.UVType = br.BoardProcessOption.lines;
         ed.MaterialId = br.Material?.Object?.Id?.Index || 71;
     }
@@ -380,9 +379,8 @@ function ConverSweep2Data(e: SweepSolid)
     ed.Contour = Curve2Data(e.Contour);
     ed.Path = Array.isArray(e.Path) ? e.Path.map((v) => Curve2Data(v)) : Curve2Data(e.Path);
     ed.MaterialId = e.Material?.Object?.Id?.Index || 71;
-    let roomName = e instanceof HardwareTopline ? e.HardwareOption.roomName : "未命名";
-    ed.RoomName = roomName;
-    ed.CabinetName = ed.RoomName;
+    ed.RoomName = e instanceof HardwareTopline ? e.HardwareOption.roomName : "未命名";
+    ed.CabinetName = e instanceof HardwareTopline ? e.HardwareOption.cabinetName : "未命名";
 
     let f = new CADFiler;
     f.WriteObject(e);
@@ -590,12 +588,13 @@ function CompositeEntity2Data(comp: CompositeEntity)
 {
     let data = Entitys2Data(comp.Explode()).Entitys;
     let roomName = comp instanceof HardwareCompositeEntity ? comp.HardwareOption.roomName : "未命名";
+    let cabinetName = comp instanceof HardwareCompositeEntity ? comp.HardwareOption.cabinetName : "未命名";
     if (comp.Id)
         for (let i = 0; i < data.length; i++)
         {
             data[i].Id = comp.Id.Index * -100 - i;
             data[i].RoomName = roomName;
-            data[i].CabinetName = data[i].RoomName;
+            data[i].CabinetName = cabinetName;
         }
     return data;
 }