!359 展开视觉样式按钮

Merge pull request !359 from 肖诗雅/visualStyleBtn_unfold

src/UI/Components/CameraControlButton/CameraControlBtn.tsx

@@ -8,7 +8,6 @@ import { app } from "../../../ApplicationServices/Application";
 import { KeyBoard } from "../../../Common/KeyEnum";
 import { commandMachine } from "../../../Editor/CommandMachine";
 import { userConfig } from "../../../Editor/UserConfig";
-import { RenderType } from "../../../GraphicsSystem/RenderType";
 import { DownPanelStore } from "../../Store/DownPanelStore";
 import { VisualStyleData } from "./IVisualType";
 
@@ -55,9 +54,7 @@ export class CameraControlBtn extends React.Component<{}, {}>
 {
     @observable private m_isMenuShow: number = -1;
     @observable private m_ViewMenuTitle: string = "西南等轴测";
-    @observable private m_VisualStyleMenuTitle: string = "二维线框";
     @observable private m_CameraType: string = "平行";
-    @observable private _RenderType: RenderType;
 
     constructor(p, s)
     {
@@ -77,14 +74,6 @@ export class CameraControlBtn extends React.Component<{}, {}>
             }
         });
 
-        const updateRenderType = () =>
-        {
-            this._RenderType = userConfig.RenderType;
-            this.m_VisualStyleMenuTitle = VisualStyleData.find(v => v.type === this._RenderType).title;
-        }
-        updateRenderType();
-        begin(userConfig, userConfig.SetRenderTypeEvent, updateRenderType);
-
         end(app.Viewer.CameraCtrl, app.Viewer.CameraCtrl.Rotate, () =>
         {
             this.m_ViewMenuTitle = "自定义视图";
@@ -154,25 +143,17 @@ export class CameraControlBtn extends React.Component<{}, {}>
                     />
                 </Popover >
 
-                <Popover
-                    isOpen={this.m_isMenuShow === MenuType.VisualStyleMenu}
-                    modifiers={{ arrow: { enabled: false } }}
-                    content={this.RenderVisualStyleMenu()}
-                >
-                    <Button
-                        style={btnStyle}
-                        minimal={true}
-                        text={`[${this.m_VisualStyleMenuTitle}]`}
-                        onContextMenu={() => this.ShowMenu(MenuType.VisualStyleMenu)}
-                        onClick={() =>
-                        {
-                            if (this.m_isMenuShow === MenuType.VisualStyleMenu)
-                                this.HideMenu();
-                            else
-                                this.ShowMenu(MenuType.VisualStyleMenu);
-                        }}
-                    />
-                </Popover >
+                {
+                    VisualStyleData.map(
+                        (data) =>
+                            <Button
+                                minimal
+                                style={btnStyle}
+                                text={`[${data.title}]`}
+                                onClick={() => userConfig.RenderType = data.type}
+                            />
+                    )
+                }
             </>
         );
     }
@@ -269,45 +250,6 @@ export class CameraControlBtn extends React.Component<{}, {}>
         )
     }
 
-    RenderVisualStyleMenu = () =>
-    {
-        return (
-            <Menu
-                className="visualStyleMenu-fixed"
-                style={{ minWidth: "120px" }}
-                tabIndex={-1}
-                onKeyDown={(e) =>
-                {
-                    if (e.keyCode === KeyBoard.Escape)
-                    {
-                        this.HideMenu();
-                        e.stopPropagation();
-                    }
-                }}
-                onBlur={() =>
-                {
-                    this.HideMenu();
-                }}
-            >
-                {
-                    VisualStyleData.map(
-                        (data) =>
-                            <MenuItem
-                                text={data.title}
-                                icon={userConfig.RenderType === data.type ? "tick" : "blank"}
-                                onClick={() =>
-                                {
-                                    this.HideMenu();
-                                    this.m_VisualStyleMenuTitle = data.title;
-                                    userConfig.RenderType = data.type;
-                                }}
-                            />
-                    )
-                }
-            </Menu>
-        )
-    }
-
     ShowMenu = (menuType: MenuType) =>
     {
         this.m_isMenuShow = menuType;