优化:更新显示隐藏户型的代码实现,避免错误

pull/2213/MERGE
ChenX 1 year ago
parent 9e80388dba
commit e70382a55b

@ -344,18 +344,8 @@ export class Entity extends CADObject
let obj = this.GetDrawObjectFromRenderType(HostApplicationServices._renderType);
if (obj) this._drawObject.add(obj);
}
Object.defineProperty(this._drawObject, "visible", {
get: () =>
{
let now = this.IsVisible;
let pre = this._drawObject["__visible__"];
this._drawObject["__visible__"] = now;
if (now !== pre) this.UpdateVisible();
return now;
}
});
else
this._drawObject.visible = false;
return this._drawObject;
}
@ -574,8 +564,7 @@ export class Entity extends CADObject
{
if (this._drawObject)
{
// 可视化属性已经被定义,所以无需更新
// this._drawObject.visible = this.IsVisible;
this._drawObject.visible = this.IsVisible;
if (this.IsVisible)
this.UpdateRenderType(HostApplicationServices._renderType);
}

@ -230,13 +230,7 @@ export class CameraControlBtn extends React.Component<{}, {}>
minimal
className="btn-style"
text={store.IsRoomEntityVisible ? "[隐藏户型]" : "[显示户型]"}
onClick={() =>
{
store.m_VisualStylesMenuTitle = store.IsRoomEntityVisible ? "隐藏户型" : "显示户型";
HostApplicationServices.IsRoomEntityVisible = !HostApplicationServices.IsRoomEntityVisible;
store.IsRoomEntityVisible = !store.IsRoomEntityVisible;
app.Editor.UpdateScreen();
}}
onClick={() => this.ShowHideRoomEntity()}
/>
<Button
minimal
@ -270,6 +264,20 @@ export class CameraControlBtn extends React.Component<{}, {}>
);
}
//显示户型 隐藏户型
ShowHideRoomEntity()
{
let store = CameraControlBtnStore.GetInstance();
HostApplicationServices.IsRoomEntityVisible = !HostApplicationServices.IsRoomEntityVisible;
store.IsRoomEntityVisible = !store.IsRoomEntityVisible;
for (let e of app.Database.ModelSpace.Entitys)
{
if (!e.IsErase)
e.UpdateVisible();
}
app.Editor.UpdateScreen();
}
RenderControlsMenu = () =>
{
let downStore = DownPanelStore.GetInstance() as DownPanelStore;
@ -398,13 +406,7 @@ export class CameraControlBtn extends React.Component<{}, {}>
<MenuItem
text={roomEntityVisibleText}
icon={roomEntityVisibleText === store.m_VisualStylesMenuTitle ? "tick" : "blank"}
onClick={() =>
{
store.m_VisualStylesMenuTitle = roomEntityVisibleText;
store.IsRoomEntityVisible = !store.IsRoomEntityVisible;
HostApplicationServices.IsRoomEntityVisible = !HostApplicationServices.IsRoomEntityVisible;
app.Editor.UpdateScreen();
}}
onClick={() => this.ShowHideRoomEntity()}
/>
</>
: null

Loading…
Cancel
Save