!301 增加单板图标 ；替换最新图标；按要求修改排钻图标位置

Merge pull request !301 from 肖诗雅/icon_update2

src/UI/Components/TopToolBar/ToolsBlock.tsx

@@ -85,9 +85,9 @@ export class ToolsBlock extends React.Component<ToolsBlockProps, {}>
 
         const { list, blockId } = this.props;
         //命令块收缩规则
-        const matchMost = window.matchMedia(`(max-width: 1375px)`);
-        const matchMore = window.matchMedia(`(max-width: 1485px )`);
-        const matchLittle = window.matchMedia(`(max-width: 1705px )`);
+        const matchMost = window.matchMedia(`(max-width: 1435px)`);
+        const matchMore = window.matchMedia(`(max-width: 1540px )`);
+        const matchLittle = window.matchMedia(`(max-width: 1760px )`);
 
         //全都缩成一个
         const allInOne = window.matchMedia(`(max-width: 550px)`);
@@ -95,7 +95,7 @@ export class ToolsBlock extends React.Component<ToolsBlockProps, {}>
         //板件命令收缩规则 等别的都缩成一个了，板件绘图和板件编辑 才开始缩
         const brBlockMost = window.matchMedia(`(max-width: 880px)`);
         const brBlockMore = window.matchMedia(`(max-width: 1100px )`);
-        const brBlockLittle = window.matchMedia(`(max-width: 1255px)`);
+        const brBlockLittle = window.matchMedia(`(max-width: 1320px)`);
 
         if (allInOne.matches)
         {

src/UI/Components/TopToolBar/TopToolBar.tsx

@@ -38,6 +38,7 @@ export class TopToolBar extends React.Component<{}, {}>
             { svg: IconEnum.CSGintersect, title: "实体差集", command: "CSGSUB" },
         ]
         store.m_iconList.iconList_BR_draw = [
+            { svg: IconEnum.DB, title: "单板", command: "DB" },
             { svg: IconEnum.ZYC, title: "左右侧板", command: "ZYC" },
             { svg: IconEnum.DDB, title: "顶底板", command: "DD" },
             { svg: IconEnum.BB, title: "背板", command: "BB" },
@@ -55,7 +56,7 @@ export class TopToolBar extends React.Component<{}, {}>
             { svg: IconEnum.QG, title: "线性切割", command: "QG" },
             { svg: IconEnum.QG2, title: "板件相切", command: "QG2" },
             { svg: IconEnum.QG4, title: "参照切割", command: "QG4" },
-            { svg: IconEnum.Join, title: "板件合并", command: "JOIN" },
+            { svg: IconEnum.JoinBoard, title: "板件合并", command: "JOIN" },
             { svg: IconEnum.ObliqueCB, title: "斜层板", command: "ROTATELYBR" },
             { svg: IconEnum.Retraction, title: "批量内缩", command: "" },
             { svg: IconEnum.BoardFindModify, title: "查找修改", command: "BOARDFINDMODIFY" },
@@ -66,7 +67,7 @@ export class TopToolBar extends React.Component<{}, {}>
             { svg: IconEnum.DimAngle, title: "角度标注", command: "DAN" },
             { svg: IconEnum.DimContinued, title: "连续标注", command: "DCO" },
             { svg: IconEnum.Circle, title: "半径标注", command: "DIMRAD" },
-            { svg: IconEnum.Length, title: "直径标注", command: "DIMDIA" },
+            { svg: IconEnum.Diameter, title: "直径标注", command: "DIMDIA" },
         ]
         store.m_iconList.iconList_LIGHT = [
             { svg: IconEnum.SpotLamp, title: "射灯", command: "SL" },
@@ -77,12 +78,12 @@ export class TopToolBar extends React.Component<{}, {}>
         ]
         store.m_iconList.iconList_DRILL = [
             { svg: IconEnum.Drill, title: "排钻", command: "PZ" },
+            { svg: IconEnum.DeleteDrill, title: "删除排钻", command: "DELETEDRILL" },
             { svg: IconEnum.DrillConfig, title: "排钻配置", command: "DRILLCONFIG" },
-            { svg: IconEnum.DeleteDrill, title: "删除排钻", command: "DELETEDRILL" }
         ]
         store.m_iconList.iconList_VIEW = [
             { svg: IconEnum.UCS, title: "UCS", command: "UCS" },
-            { svg: IconEnum.BottomView, title: "俯视图", command: "FS" },
+            { svg: IconEnum.TopView, title: "俯视图", command: "FS" },
             { svg: IconEnum.RightView, title: "右视图", command: "YS" },
             { svg: IconEnum.LeftView, title: "左视图", command: "ZS" },
             { svg: IconEnum.FrontView, title: "前视图", command: "QS" },

src/UI/Css/style.less

@@ -434,7 +434,7 @@ input[type=radio] {
     }
 }
 // 媒体查询 ToolsBlock
-@media screen and (max-width: 1705px) {//当宽度为1705或者更小时
+@media screen and (max-width: 1760px) {//当宽度为1705或者更小时
     #TopToolBar .small-iconlist {
         width: 270px;
         &>.bp3-button{
@@ -442,7 +442,7 @@ input[type=radio] {
         }
     }
 }
-@media screen and (max-width: 1485px) {
+@media screen and (max-width: 1540px) {
     #TopToolBar .small-iconlist {
         width: 160px;
         &>.bp3-button{

src/UI/IconEnum.ts

@@ -95,7 +95,11 @@ export enum IconEnum
     BottomView = 'UI细-61.svg',
     FrontView = 'UI细-62.svg',
     LeftView = 'UI细-63.svg',
-    RightView = 'UI细-84.svg',
     Retraction = 'UI细-95.svg',
     Swiso = 'UI细-82.svg',
+    TopView = 'TopView.svg',
+    BackView = 'BackView.svg',
+    RightView = 'RightView.svg',
+    JoinBoard = 'JoinBoard.svg',
+    Diameter = 'Diameter.svg',
 }