图标更新

src/Add-on/SwitchVisualStyles.ts

@@ -17,3 +17,11 @@ export class CMD_Conceptual implements Command
         userConfig.RenderType = RenderType.Conceptual;
     }
 }
+
+export class CMD_Physical implements Command
+{
+    exec()
+    {
+        userConfig.RenderType = RenderType.Physical;
+    }
+}

src/Editor/CommandRegister.ts

@@ -96,7 +96,7 @@ import { Command_Ssget } from '../Add-on/ssget';
 import { Stretch } from '../Add-on/Stretch';
 import { Sweep } from '../Add-on/Sweep';
 import { Command_SwitchCamera } from '../Add-on/SwitchCamera';
-import { CMD_Conceptual, CMD_Wireframe } from '../Add-on/SwitchVisualStyles';
+import { CMD_Conceptual, CMD_Wireframe, CMD_Physical } from '../Add-on/SwitchVisualStyles';
 import { DrawTangentLine } from '../Add-on/Tangent';
 import { ShowTopLine } from '../Add-on/Template/ShowTopline';
 // import { DrawFloor } from '../Add-on/DrawFloor';
@@ -321,6 +321,7 @@ export function registerCommand()
     //视觉样式
     commandMachine.RegisterCommand("Wireframe", new CMD_Wireframe());
     commandMachine.RegisterCommand("Conceptual", new CMD_Conceptual());
+    commandMachine.RegisterCommand("Physical", new CMD_Physical());
 
     //导入导出排钻配置
     commandMachine.RegisterCommand("downloaddrconfig", new DownLoadDrillConfig());

src/UI/Components/TopToolBar/TemplateAndModulePanel.tsx

@@ -0,0 +1,31 @@
+import React = require("react");
+import { ToolsBlockStore, ToolsBlock } from "./ToolsBlock";
+import { inject } from "mobx-react";
+
+//文件相关操作 命令块
+inject("store")
+export class TemplateAndModulePanel extends React.Component<{ store: ToolsBlockStore }, {}>
+{
+    render()
+    {
+        const { m_iconList: {
+            iconList_TEMPLATE: iconList_temp,
+            iconList_MODULE: iconList_module }, execFun } = this.props.store;
+        return (
+            <div className="tool-block">
+                <ToolsBlock
+                    blockId={"template"}
+                    list={iconList_temp}
+                    execFun={execFun}
+                    btnTitile="模版"
+                />
+                <ToolsBlock
+                    blockId={"module"}
+                    list={iconList_module}
+                    execFun={execFun}
+                    btnTitile="模块"
+                />
+            </div>
+        );
+    }
+}

src/UI/Components/TopToolBar/ToolsBlock.tsx

@@ -30,6 +30,8 @@ export interface ToolsBlockOption
     iconList_VIEW: ICommandIconInfo[];
     iconList_VISUALSTYLE: ICommandIconInfo[];
     iconList_PRODUCE: ICommandIconInfo[];
+    iconList_MODULE: ICommandIconInfo[];
+    iconList_TEMPLATE: ICommandIconInfo[];
 
 }
 export class ToolsBlockStore extends Singleton
@@ -47,6 +49,8 @@ export class ToolsBlockStore extends Singleton
         iconList_VIEW: [],
         iconList_PRODUCE: [],
         iconList_VISUALSTYLE: [],
+        iconList_MODULE: [],
+        iconList_TEMPLATE: [],
     }
     historyCmds: string[] = app.Editor.CommandStore.historyCmdList;
 }

src/UI/Components/TopToolBar/TopToolBar.tsx

@@ -11,6 +11,7 @@ import { ViewPanel } from "./ViewPanel"
 import { DimensionPanel } from "./DimensionPanel";
 import { TopPanelStore } from "../../Store/TopPanelStore";
 import { FileOperationPanel } from "./FileOperationPanel";
+import { TemplateAndModulePanel } from "./TemplateAndModulePanel";
 
 @observer
 export class TopToolBar extends React.Component<{}, {}>
@@ -27,6 +28,7 @@ export class TopToolBar extends React.Component<{}, {}>
             { svg: IconEnum.Cancel, title: "撤销", command: "U" },
             { svg: IconEnum.Undo, title: "重做", command: "REDO" },
             { svg: IconEnum.Open, title: "打开", command: "OPEN" },
+            { svg: IconEnum.DXF, title: "DXF", command: "DXF" },
         ]
         store.m_iconList.iconList_2D = [
             { svg: IconEnum.Point, title: "点", command: "PT" },
@@ -79,6 +81,7 @@ export class TopToolBar extends React.Component<{}, {}>
             { svg: IconEnum.DimContinued, title: "连续标注", command: "DCO" },
             { svg: IconEnum.Circle, title: "半径标注", command: "DIMRAD" },
             { svg: IconEnum.Diameter, title: "直径标注", command: "DIMDIA" },
+            { svg: IconEnum.AutoDim, title: "柜体标注", command: "AUTODIMBRS" },
         ]
         store.m_iconList.iconList_LIGHT = [
             { svg: IconEnum.SpotLamp, title: "射灯", command: "SL" },
@@ -106,11 +109,18 @@ export class TopToolBar extends React.Component<{}, {}>
         store.m_iconList.iconList_VISUALSTYLE = [
             { svg: IconEnum.WireframeView, title: "二维线框", command: "WIREFRAME" },
             { svg: IconEnum.ConceptView, title: "概念", command: "CONCEPTUAL" },
+            { svg: IconEnum.Reality, title: "真实", command: "PHYSICAL" },
         ]
         store.m_iconList.iconList_PRODUCE = [
-            { svg: IconEnum.BoardFindModify, title: "拆单", command: "" },
+            { svg: IconEnum.SplitOrder, title: "拆单", command: "" },
-            { svg: IconEnum.BoardFindModify, title: "报价", command: "" },
+            { svg: IconEnum.QuotePrice, title: "报价", command: "" },
-            { svg: IconEnum.BoardFindModify, title: "ERP", command: "" },
+            { svg: IconEnum.ERPManage, title: "ERP", command: "" },
+        ]
+        store.m_iconList.iconList_TEMPLATE = [
+            { svg: IconEnum.TemplateDesign, title: "模版设计", command: "" },
+        ]
+        store.m_iconList.iconList_MODULE = [
+            { svg: IconEnum.ModuleManage, title: "模块管理", command: "" },
         ]
 
         let topStore = TopPanelStore.GetInstance() as TopPanelStore;
@@ -125,6 +135,7 @@ export class TopToolBar extends React.Component<{}, {}>
             >
                 <Tab className="tab-unstyle" id="file" title="文件" panel={<FileOperationPanel store={store} />} />
                 <Tab className="tab-unstyle" id="draw" title="绘图" panel={<DrawingPanel store={store} />} />
+                <Tab className="tab-unstyle" id="temp" title="模版和模块" panel={<TemplateAndModulePanel store={store} />} />
                 <Tab className="tab-unstyle" id="entity" title="三维实体绘图" panel={<ThreeDEntityPanel store={store} />} />
                 <Tab className="tab-unstyle" id="dimension" title="拆单与标注" panel={<DimensionPanel store={store} />} />
                 <Tab className="tab-unstyle" id="render" title="渲染" panel={<RenderPanel store={store} />} />

src/UI/IconEnum.ts

@@ -111,4 +111,15 @@ export enum IconEnum
     SaveAs = "SaveAs.svg",
     ConceptView = "ConceptView.svg",
     New = "New.svg",
+    AutoDim = "AutoDim.svg",
+    Entity = "Entity.svg",
+    ERPManage = "ERPManage.svg",
+    ERPManage2 = "ERPManage2.svg",
+    DXF = "DXF.svg",
+    ModuleManage = "ModuleManage.svg",
+    QuotePrice = "QuotePrice.svg",
+    Reality = "Reality.svg",
+    TemplateDesign = "TemplateDesign.svg",
+    Wireframe = "Wireframe.svg",
+    SplitOrder = "SplitOrder.svg",
 }