!297 新增删除排钻图标在顶部的工具栏

Merge pull request !297 from 肖诗雅/icon_update
pull/297/MERGE
肖诗雅 5 years ago committed by ChenX
parent 1f2163a129
commit 2c3a415de7

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

@ -45,6 +45,7 @@ export class TopToolBar extends React.Component<{}, {}>
{ svg: IconEnum.CB, title: "层板", command: "CB" }, { svg: IconEnum.CB, title: "层板", command: "CB" },
{ svg: IconEnum.SKT, title: "收口条", command: "SKT" }, { svg: IconEnum.SKT, title: "收口条", command: "SKT" },
{ svg: IconEnum.YX, title: "异形板", command: "YX" }, { svg: IconEnum.YX, title: "异形板", command: "YX" },
{ svg: IconEnum.YXLK, title: "异形轮廓", command: "YXLK" },
{ svg: IconEnum.WineRack, title: "酒格", command: "WINERACK" }, { svg: IconEnum.WineRack, title: "酒格", command: "WINERACK" },
{ svg: IconEnum.Door, title: "门板", command: "DOOR" }, { svg: IconEnum.Door, title: "门板", command: "DOOR" },
{ svg: IconEnum.Drawer, title: "抽屉", command: "DRAWER" }, { svg: IconEnum.Drawer, title: "抽屉", command: "DRAWER" },
@ -77,6 +78,7 @@ export class TopToolBar extends React.Component<{}, {}>
store.m_iconList.iconList_DRILL = [ store.m_iconList.iconList_DRILL = [
{ svg: IconEnum.Drill, title: "排钻", command: "PZ" }, { svg: IconEnum.Drill, title: "排钻", command: "PZ" },
{ svg: IconEnum.DrillConfig, title: "排钻配置", command: "DRILLCONFIG" }, { svg: IconEnum.DrillConfig, title: "排钻配置", command: "DRILLCONFIG" },
{ svg: IconEnum.DeleteDrill, title: "删除排钻", command: "DELETEDRILL" }
] ]
store.m_iconList.iconList_VIEW = [ store.m_iconList.iconList_VIEW = [
{ svg: IconEnum.UCS, title: "UCS", command: "UCS" }, { svg: IconEnum.UCS, title: "UCS", command: "UCS" },

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

@ -91,6 +91,7 @@ export enum IconEnum
Mirror = 'Mirror.svg', Mirror = 'Mirror.svg',
Drill = 'Drill.svg', Drill = 'Drill.svg',
DrillConfig = 'DrillConfig.svg', DrillConfig = 'DrillConfig.svg',
DeleteDrill = 'DeleteDrill.svg',
BottomView = 'UI细-61.svg', BottomView = 'UI细-61.svg',
FrontView = 'UI细-62.svg', FrontView = 'UI细-62.svg',
LeftView = 'UI细-63.svg', LeftView = 'UI细-63.svg',

Loading…
Cancel
Save