From 93b73c57d8e050050d95a523b67c5f4864cda948 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E8=AF=97=E6=B4=A5?= <2723065175@qq.com>
Date: Thu, 30 Sep 2021 05:59:15 +0000
Subject: [PATCH] =?UTF-8?q?!1648=20=E4=BF=AE=E5=A4=8D:=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E6=A0=8F=E8=8F=9C=E5=8D=95=E3=80=81=E8=A7=86=E5=9B=BE=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E3=80=81=E5=AF=B9=E8=B1=A1=E6=8D=95=E6=8D=89=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=97=A0=E6=B3=95=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Editor/SnapMenuFixed.tsx                  |  44 ++-----
 .../CameraControlButton/CameraControlBtn.tsx  | 123 +++++-------------
 .../SourceManage/ReplaceOrRename.tsx          |   1 -
 3 files changed, 45 insertions(+), 123 deletions(-)

diff --git a/src/Editor/SnapMenuFixed.tsx b/src/Editor/SnapMenuFixed.tsx
index 98f16c845..c3f68bb4a 100644
--- a/src/Editor/SnapMenuFixed.tsx
+++ b/src/Editor/SnapMenuFixed.tsx
@@ -3,10 +3,9 @@ import { observable } from "mobx";
 import { observer } from "mobx-react";
 import * as React from "react";
 import { app } from "../ApplicationServices/Application";
-import { KeyBoard } from "../Common/KeyEnum";
 import { SnapModal } from "../UI/Components/Modal/SnapModal";
-import { SNAPMODE } from "./ShowSnapMenu";
 import { DownPanelStore } from "../UI/Store/DownPanelStore";
+import { SNAPMODE } from "./ShowSnapMenu";
 
 /**
  * 底部状态栏的捕捉按钮.
@@ -14,27 +13,27 @@ import { DownPanelStore } from "../UI/Store/DownPanelStore";
 @observer
 export class SnapMenuFixed extends React.Component<{}>
 {
-    @observable private isMenuShow: boolean = false;
-
     /**
      * 模态框呼出标记,当呼出模态框时,关闭菜单不关闭蒙板.
      */
     @observable private isModalShow: boolean = false;
+
+    public state = {
+        isOpenObjectSnap: false,
+    };
     render()
     {
         return (
             <Popover
-                isOpen={this.isMenuShow}
+                isOpen={this.state.isOpenObjectSnap ? true : undefined}
                 modifiers={{ arrow: { enabled: false } }}
-                content={this.RenderMenu()}
                 onClosed={this.close}
             >
                 <Button
                     style={{ fontSize: "11px", textAlign: "center", minHeight: "15px", height: "15px", lineHeight: "1px" }}
                     text="对象捕捉"
-                    onContextMenu={this.ShowMenu}
-                    onClick={this.ShowMenu}
                 />
+                {this.RenderMenu()}
             </Popover >
         );
     }
@@ -46,18 +45,6 @@ export class SnapMenuFixed extends React.Component<{}>
                 className="snapMenu-fixed"
                 style={{ minWidth: "120px" }}
                 tabIndex={-1}
-                onKeyDown={(e) =>
-                {
-                    if (e.keyCode === KeyBoard.Escape)
-                    {
-                        this.HideMenu();
-                        e.stopPropagation();
-                    }
-                }}
-                onBlur={() =>
-                {
-                    this.HideMenu();
-                }}
             >
                 {
                     downStore.snapData.map(
@@ -66,6 +53,7 @@ export class SnapMenuFixed extends React.Component<{}>
                                 key={data.mode}
                                 text={data.name}
                                 icon={data.enable ? "tick" : "blank"}
+                                shouldDismissPopover={false}
                                 onClick={() =>
                                 {
                                     let snapServices = app.Editor.GetPointServices.snapServices;
@@ -79,9 +67,9 @@ export class SnapMenuFixed extends React.Component<{}>
                 <MenuDivider />
                 <MenuItem
                     text={"对象捕捉设置..."}
+                    shouldDismissPopover={false}
                     onClick={() =>
                     {
-                        this.isModalShow = true;
                         app.Editor.ModalManage.RenderModal(SnapModal, { store: downStore });
                     }}
                 />
@@ -89,20 +77,6 @@ export class SnapMenuFixed extends React.Component<{}>
         );
     };
 
-    ShowMenu = (e: any) =>
-    {
-        this.isMenuShow = true;
-        this.isModalShow = false;
-        app.Editor.MaskManage.ShowMask();
-        e.preventDefault();
-    };
-
-    HideMenu = () =>
-    {
-        this.isMenuShow = false;
-        if (!this.isModalShow)
-            app.Editor.MaskManage.Clear();
-    };
     private close = () =>
     {
         let store = DownPanelStore.GetInstance() as DownPanelStore;
diff --git a/src/UI/Components/CameraControlButton/CameraControlBtn.tsx b/src/UI/Components/CameraControlButton/CameraControlBtn.tsx
index 7c2b3dadf..132261d09 100644
--- a/src/UI/Components/CameraControlButton/CameraControlBtn.tsx
+++ b/src/UI/Components/CameraControlButton/CameraControlBtn.tsx
@@ -6,7 +6,6 @@ import { OrthographicCamera, Vector3 } from "three";
 import { begin, end } from "xaop";
 import { app } from "../../../ApplicationServices/Application";
 import { CommandNames } from "../../../Common/CommandNames";
-import { KeyBoard } from "../../../Common/KeyEnum";
 import { Singleton } from "../../../Common/Singleton";
 import { commandMachine } from "../../../Editor/CommandMachine";
 import { equalv3 } from "../../../Geometry/GeUtils";
@@ -122,6 +121,10 @@ export class CameraControlBtnStore extends Singleton
 @observer
 export class CameraControlBtn extends React.Component<{ store: CameraControlBtnStore; }, {}>
 {
+    public state = {
+        isOpenToolbar: false,
+        isOpenViewMenu: false,
+    };
     render()
     {
         const { m_isMenuShow, m_ViewMenuTitle } = this.props.store;
@@ -139,43 +142,31 @@ export class CameraControlBtn extends React.Component<{ store: CameraControlBtnS
         return (
             <div>
                 <Popover
-                    isOpen={m_isMenuShow === MenuType.ControlsMenu}
+                    isOpen={this.state.isOpenToolbar === true ? true : undefined}
                     modifiers={{ arrow: { enabled: false } }}
-                    content={this.RenderControlsMenu()}
                 >
                     <Button
                         style={btnStyle}
                         minimal={true}
                         text="[-]"
-                        onContextMenu={() => this.ShowMenu(MenuType.ControlsMenu)}
-                        onClick={() =>
-                        {
-                            if (m_isMenuShow === MenuType.ControlsMenu)
-                                this.HideMenu();
-                            else
-                                this.ShowMenu(MenuType.ControlsMenu);
-                        }}
                     />
+                    {
+                        this.RenderControlsMenu()
+                    }
                 </Popover >
 
                 <Popover
-                    isOpen={m_isMenuShow === MenuType.ViewMenu}
+                    isOpen={this.state.isOpenViewMenu === true ? true : undefined}
                     modifiers={{ arrow: { enabled: false } }}
-                    content={this.RenderViewMenu()}
                 >
                     <Button
                         style={btnStyle}
                         minimal={true}
                         text={`[${m_ViewMenuTitle}]`}
-                        onContextMenu={() => this.ShowMenu(MenuType.ViewMenu)}
-                        onClick={() =>
-                        {
-                            if (m_isMenuShow === MenuType.ViewMenu)
-                                this.HideMenu();
-                            else
-                                this.ShowMenu(MenuType.ViewMenu);
-                        }}
                     />
+                    {
+                        this.RenderViewMenu()
+                    }
                 </Popover >
                 {
                     VisualStyleData.map(
@@ -231,47 +222,31 @@ export class CameraControlBtn extends React.Component<{ store: CameraControlBtnS
                 className="controlsMenu-fixed"
                 style={{ minWidth: "120px" }}
                 tabIndex={-1}
-                onKeyDown={(e) =>
-                {
-                    if (e.keyCode === KeyBoard.Escape)
-                    {
-                        this.HideMenu();
-                        e.stopPropagation();
-                    }
-                }}
-                onBlur={this.HideMenu}
             >
-                {
-                    <>
-                        <MenuItem
-                            text="顶部工具栏"
-                            icon={downStore.isTopToolBarShow ? "tick" : "blank"}
-                            onClick={() =>
-                            {
-                                downStore.toggleTopToolBarShow();
-                                this.HideMenu();
-                            }}
-                        />
-                        <MenuItem
-                            text="左侧工具栏"
-                            icon={downStore.isLeftToolBarShow ? "tick" : "blank"}
-                            onClick={() =>
-                            {
-                                downStore.toggleLeftToolBarShow();
-                                this.HideMenu();
-                            }}
-                        />
-                        <MenuItem
-                            text="底部工具栏"
-                            icon={downStore.isBottomToolBarShow ? "tick" : "blank"}
-                            onClick={() =>
-                            {
-                                downStore.toggleBottomToolBarShow();
-                                this.HideMenu();
-                            }}
-                        />
-                    </>
-                }
+                <MenuItem
+                    text="顶部工具栏"
+                    icon={downStore.isTopToolBarShow ? "tick" : "blank"}
+                    onClick={() =>
+                    {
+                        downStore.toggleTopToolBarShow();
+                    }}
+                />
+                <MenuItem
+                    text="左侧工具栏"
+                    icon={downStore.isLeftToolBarShow ? "tick" : "blank"}
+                    onClick={() =>
+                    {
+                        downStore.toggleLeftToolBarShow();
+                    }}
+                />
+                <MenuItem
+                    text="底部工具栏"
+                    icon={downStore.isBottomToolBarShow ? "tick" : "blank"}
+                    onClick={() =>
+                    {
+                        downStore.toggleBottomToolBarShow();
+                    }}
+                />
             </Menu>
         );
     };
@@ -284,18 +259,6 @@ export class CameraControlBtn extends React.Component<{ store: CameraControlBtnS
                 className="viewMenu-fixed"
                 style={{ minWidth: "120px" }}
                 tabIndex={-1}
-                onKeyDown={(e) =>
-                {
-                    if (e.keyCode === KeyBoard.Escape)
-                    {
-                        this.HideMenu();
-                        e.stopPropagation();
-                    }
-                }}
-                onBlur={() =>
-                {
-                    this.HideMenu();
-                }}
             >
                 {
                     viewData.map(
@@ -306,7 +269,6 @@ export class CameraControlBtn extends React.Component<{ store: CameraControlBtnS
                                 icon={data.name === m_ViewMenuTitle ? "tick" : "blank"}
                                 onClick={() =>
                                 {
-                                    this.HideMenu();
                                     m_ViewMenuTitle = data.name;
                                     commandMachine.ExecCommand(data.command);
                                 }}
@@ -319,7 +281,6 @@ export class CameraControlBtn extends React.Component<{ store: CameraControlBtnS
                     icon={m_CameraType === "正交" ? "tick" : "blank"}
                     onClick={() =>
                     {
-                        this.HideMenu();
                         if (m_CameraType !== "正交")
                             app.Viewer.CameraCtrl.SwitchCamera();
                     }}
@@ -329,7 +290,6 @@ export class CameraControlBtn extends React.Component<{ store: CameraControlBtnS
                     icon={m_CameraType === "透视" ? "tick" : "blank"}
                     onClick={() =>
                     {
-                        this.HideMenu();
                         if (m_CameraType !== "透视")
                             app.Viewer.CameraCtrl.SwitchCamera();
                     }}
@@ -338,15 +298,4 @@ export class CameraControlBtn extends React.Component<{ store: CameraControlBtnS
         );
     };
 
-    ShowMenu = (menuType: MenuType) =>
-    {
-        this.props.store.m_isMenuShow = menuType;
-        app.Editor.MaskManage.ShowMask();
-    };
-
-    HideMenu = () =>
-    {
-        this.props.store.m_isMenuShow = -1;
-        app.Editor.MaskManage.Clear();
-    };
 }
diff --git a/src/UI/Components/SourceManage/ReplaceOrRename.tsx b/src/UI/Components/SourceManage/ReplaceOrRename.tsx
index bfa089a3f..e900bed3f 100644
--- a/src/UI/Components/SourceManage/ReplaceOrRename.tsx
+++ b/src/UI/Components/SourceManage/ReplaceOrRename.tsx
@@ -18,7 +18,6 @@ export class ReplaceOrRename extends React.Component<Operation>{
                 isOpen={this.props.isOpen}
                 canOutsideClickClose={false}
                 onClose={this.props.cancel}
-                icon="key-tab"
             >
                 <div>
                     <div >