From 26445b7ee4d9a74aa65104596dc299568abfddb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=AD=90=E6=B6=B5?= <2067519648@qq.com>
Date: Fri, 28 Jun 2024 01:43:50 +0000
Subject: [PATCH] =?UTF-8?q?!2846=20=E4=BF=AE=E5=A4=8D:=20=E5=9B=BE?=
 =?UTF-8?q?=E5=B1=82=E4=B8=8A=E6=96=B9UI=E7=9A=84=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=8C=E9=97=A8=E6=B4=9E=E6=94=AF=E6=8C=81=E5=9B=BE=E5=B1=82?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=EF=BC=8C=E5=9B=BE=E5=B1=82=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E4=B9=9F=E6=9C=89=E6=8B=86=E5=8D=95=E6=8F=90=E7=A4=BA=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E5=8F=8C=E5=87=BB=E5=AE=9E=E4=BD=93=E7=89=B9=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Add-on/Erp/ErpCommands.ts                               | 2 +-
 .../Room/Entity/Wall/Hole/RoomHolePolyline.ts               | 6 +++---
 src/UI/Components/ToolBar/Layer/LayerPanel.css              | 4 ++--
 src/UI/Components/ToolBar/Layer/LayerPanel.tsx              | 5 +++++
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Add-on/Erp/ErpCommands.ts b/src/Add-on/Erp/ErpCommands.ts
index 9285f7434..118c265da 100644
--- a/src/Add-on/Erp/ErpCommands.ts
+++ b/src/Add-on/Erp/ErpCommands.ts
@@ -532,7 +532,7 @@ export async function GetProductsEntitys()
 
     if (selction.Status !== PromptStatus.OK) return;
 
-    if (app.Database.ModelSpace.Entitys.some(e => (e instanceof Board) && e.Id?.Object && !e.IsErase && !e.Visible))
+    if (app.Database.ModelSpace.Entitys.some(e => (e instanceof Board) && e.Id?.Object && !e.IsErase && !e.IsVisible))
     {
         let status = await AppConfirm.show({
             message: "图纸中有隐藏板件,是否继续拆单?"
diff --git a/src/DatabaseServices/Room/Entity/Wall/Hole/RoomHolePolyline.ts b/src/DatabaseServices/Room/Entity/Wall/Hole/RoomHolePolyline.ts
index 6b40fa55f..9ae98adda 100644
--- a/src/DatabaseServices/Room/Entity/Wall/Hole/RoomHolePolyline.ts
+++ b/src/DatabaseServices/Room/Entity/Wall/Hole/RoomHolePolyline.ts
@@ -592,8 +592,8 @@ export class RoomHolePolyline extends RoomHoleBase
         let obj = new Object3D;
         if (renderType === RenderType.Conceptual)
         {
-            let mesh = new Mesh(this.MeshGeometry, ColorMaterial.GetConceptualMaterial(this.ColorIndex));
-            let line = new LineSegments(this.EdgeGeometry, ColorMaterial.GetLineMaterial(this.ColorIndex));
+            let mesh = new Mesh(this.MeshGeometry, ColorMaterial.GetConceptualMaterial(this.DrawColorIndex));
+            let line = new LineSegments(this.EdgeGeometry, ColorMaterial.GetLineMaterial(this.DrawColorIndex));
             obj.add(mesh, line);
         }
         else if (renderType === RenderType.Print)
@@ -664,7 +664,7 @@ export class RoomHolePolyline extends RoomHoleBase
         else if (renderType === RenderType.Conceptual)
         {
             let mesh = obj.children[0] as Mesh;
-            mesh.material = ColorMaterial.GetConceptualMaterial(this.ColorIndex);
+            mesh.material = ColorMaterial.GetConceptualMaterial(this.DrawColorIndex);
         }
         else if (renderType === RenderType.Physical2)
         {
diff --git a/src/UI/Components/ToolBar/Layer/LayerPanel.css b/src/UI/Components/ToolBar/Layer/LayerPanel.css
index e2fa1e13c..261001896 100644
--- a/src/UI/Components/ToolBar/Layer/LayerPanel.css
+++ b/src/UI/Components/ToolBar/Layer/LayerPanel.css
@@ -1,7 +1,7 @@
 /* 图层特性 */
 .layer-feature {
     display: flex;
-    flex-direction: row;
+    flex-direction: row !important;
     flex-wrap: wrap;
     margin-bottom: 5px;
     padding-right: 20px;
@@ -20,7 +20,7 @@
 
 .layer-feature-logo {
     display: flex;
-    flex-direction: column;
+    flex-direction: column !important;
     align-items: center;
     justify-content: center;
     margin-left: 20px;
diff --git a/src/UI/Components/ToolBar/Layer/LayerPanel.tsx b/src/UI/Components/ToolBar/Layer/LayerPanel.tsx
index 6fea8de39..446cda331 100644
--- a/src/UI/Components/ToolBar/Layer/LayerPanel.tsx
+++ b/src/UI/Components/ToolBar/Layer/LayerPanel.tsx
@@ -130,6 +130,11 @@ export class LayerPanel extends React.Component<{}, {}>
         super(props);
         LayerPropertieStore.isShow = true;
     }
+    /** 组件注销时 */
+    componentWillUnmount()
+    {
+        LayerPropertieStore.isShow = false;
+    }
     render()
     {
         const propertiesStore = PropertiesStore.GetInstance();