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
{this.props.doorWindowTemp?.Name || "默认"} - {store.m_Option.Length}*{store.m_Option.Height}*{store.m_Option.Thick} + {store.m_Option.Length}*{store.m_Option.Height}
); @@ -153,6 +153,7 @@ export class DrawWindowTempInfo extends React.Component interactive={this.props.interactive} elevation={Elevation.TWO} onClick={this.startSelectTemplate} + style={{ backgroundColor: this.props.interactive ? "#FFF" : "#DDD" }} > { this.props.logo ? this.props.showSizeInfo &&
默认 - {store.m_Option.Length}*{store.m_Option.Height}*{store.m_Option.Thick} + {store.m_Option.Length}*{store.m_Option.Height}
} 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="画门窗" /> ); 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();