From 0a4d1971bb8feb4cbadc0c473f73a02bdaf20614 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E4=B8=89?= <940119273@qq.com>
Date: Fri, 9 Dec 2022 07:16:39 +0000
Subject: [PATCH] =?UTF-8?q?!2036=20=E4=BC=98=E5=8C=96:L=E5=9E=8BU=E5=9E=8B?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=9C=80=E5=B0=8F=E9=95=BF=E5=BA=A6=E5=B0=BA?=
 =?UTF-8?q?=E5=AF=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Room/Entity/Wall/Hole/Window/WindowTempInfo.tsx          | 5 +++--
 src/UI/Components/ToolBar/ModifyModel/RoomBaseParamsStore.ts | 4 ++--
 src/UI/Components/TopToolBar/RoomDesignPanel.tsx             | 4 ++--
 src/UI/Store/UserConfigStore.tsx                             | 2 ++
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/DatabaseServices/Room/Entity/Wall/Hole/Window/WindowTempInfo.tsx b/src/DatabaseServices/Room/Entity/Wall/Hole/Window/WindowTempInfo.tsx
index 7da987703..56a453eb1 100644
--- a/src/DatabaseServices/Room/Entity/Wall/Hole/Window/WindowTempInfo.tsx
+++ b/src/DatabaseServices/Room/Entity/Wall/Hole/Window/WindowTempInfo.tsx
@@ -53,7 +53,7 @@ export class WindowTempInfo extends React.Component<WindowTempInfoProps>
                 </Card>
                 <div className="windowParamInfo">
                     <span>{this.props.doorWindowTemp?.Name || "默认"}</span>
-                    <span>{store.m_Option.Length}*{store.m_Option.Height}*{store.m_Option.Thick}</span>
+                    <span>{store.m_Option.Length}*{store.m_Option.Height}</span>
                 </div>
             </div>
         );
@@ -153,6 +153,7 @@ export class DrawWindowTempInfo extends React.Component<WindowTempInfoProps>
                     interactive={this.props.interactive}
                     elevation={Elevation.TWO}
                     onClick={this.startSelectTemplate}
+                    style={{ backgroundColor: this.props.interactive ? "#FFF" : "#DDD" }}
                 >
                     {
                         this.props.logo ? <img
@@ -164,7 +165,7 @@ export class DrawWindowTempInfo extends React.Component<WindowTempInfoProps>
                     this.props.showSizeInfo &&
                     <div className="windowParamInfo">
                         <span>默认</span>
-                        <span>{store.m_Option.Length}*{store.m_Option.Height}*{store.m_Option.Thick}</span>
+                        <span>{store.m_Option.Length}*{store.m_Option.Height}</span>
                     </div>
                 }
             </div>
diff --git a/src/UI/Components/ToolBar/ModifyModel/RoomBaseParamsStore.ts b/src/UI/Components/ToolBar/ModifyModel/RoomBaseParamsStore.ts
index f42efa7bb..efb2064e7 100644
--- a/src/UI/Components/ToolBar/ModifyModel/RoomBaseParamsStore.ts
+++ b/src/UI/Components/ToolBar/ModifyModel/RoomBaseParamsStore.ts
@@ -190,8 +190,8 @@ export default class RoomBaseParamsStore
                 this.holeTopDist = m.TopDist;
                 this.holeBottomDist = m.BottomDist;
                 this.holeMaxHightDist = m.MaxHightDist;
-                this.holeLeftDistSliderMin = m.MinLeftDist;
-                this.holeRightDistSliderMin = m.MinRightDist;
+                this.holeLeftDistSliderMin = Math.max(m.MinLeftDist, 200);
+                this.holeRightDistSliderMin = Math.max(m.MinRightDist, 200);
                 this.holeLeftDistSliderMax = m.MaxLeftDist;
                 this.holeRightDistSliderMax = m.MaxRightDist;
                 this.holeTopDistSliderMax = m.MaxTopDist;
diff --git a/src/UI/Components/TopToolBar/RoomDesignPanel.tsx b/src/UI/Components/TopToolBar/RoomDesignPanel.tsx
index 4e5961353..565d409aa 100644
--- a/src/UI/Components/TopToolBar/RoomDesignPanel.tsx
+++ b/src/UI/Components/TopToolBar/RoomDesignPanel.tsx
@@ -28,13 +28,13 @@ export class RoomDesignPanel extends React.Component<{ store: ToolsBlockStore; }
                     blockId={"roomDesign"}
                     list={iconList.roomWindow}
                     execFun={execFun}
-                    btnTitile="画窗"
+                    btnTitile="画门窗"
                 />
                 <ToolsBlock
                     blockId={"roomDesign"}
                     list={iconList.oneKeyDrawDoorWindow}
                     execFun={execFun}
-                    btnTitile="一键画门窗"
+                    btnTitile="一键画窗"
                 />
             </div>
         );
diff --git a/src/UI/Store/UserConfigStore.tsx b/src/UI/Store/UserConfigStore.tsx
index 4816d2429..67b50f571 100644
--- a/src/UI/Store/UserConfigStore.tsx
+++ b/src/UI/Store/UserConfigStore.tsx
@@ -14,6 +14,7 @@ import { CADFiler } from "../../DatabaseServices/CADFiler";
 import { CommandServer } from "../../DatabaseServices/CommandServer";
 import { FileServer } from "../../DatabaseServices/FileServer";
 import { Light } from "../../DatabaseServices/Lights/Light";
+import { DoorWindowPanelStore } from "../../DatabaseServices/Room/Entity/Wall/Hole/Window/WindowPanelStore";
 import { LimitCommand } from "../../Editor/CommandRegister";
 import { userConfig } from "../../Editor/UserConfig";
 import { RenderType } from "../../GraphicsSystem/RenderType";
@@ -214,6 +215,7 @@ export class UserConfigStore extends Singleton
         await this.InitModelingStore();
         await (DownPanelStore.GetInstance() as DownPanelStore).Update();
         RoomBaseParamsStore.GetSingleInstance();
+        DoorWindowPanelStore.GetSingleInstance().InitOption();
         await this.InitCustomCmd();
         await LimitCommand();