Public
/
WebCAD
mirror of https://gitee.com/cf-fz/WebCAD.git
7
1
Fork 0
Code Issues Projects Releases Wiki Activity

!2182 优化:替换部分图标

Browse Source
pull/2193/head
林三 1 year ago committed by ChenX
parent 46f5611446
commit 9733342efd
4 changed files with 59 additions and 31 deletions
Show Stats Download Patch File Download Diff File

22
src/UI/Components/CommandPanel/CommandList.ts
Unescape View File

@ -112,6 +112,7 @@ export const CommandList: ICommand[] = [
chDes: "画一个多边形",
},
{
icon: IconEnum.Ellipse,
typeId: "i2d",
link: `#`,
defaultCustom: "EL",
@ -389,6 +390,7 @@ export const CommandList: ICommand[] = [
chDes: "批量应用异形轮廓到板",
},
{
icon: IconEnum.ZXLK,
typeId: "hb",
link: `#`,
defaultCustom: "ZXLK",
@ -768,6 +770,7 @@ export const CommandList: ICommand[] = [
chDes: "根据排版面改颜色",
},
{
icon: IconEnum.TextModifyTool,
typeId: "bjbj",
link: `#`,
defaultCustom: CommandNames.TextModifyTool,
@ -1474,6 +1477,7 @@ export const CommandList: ICommand[] = [
chDes: "标注直径",
},
{
icon: IconEnum.DimArc,
typeId: "dim",
defaultCustom: CommandNames.DimArc,
command: CommandNames.DimArc,
@ -1556,7 +1560,7 @@ export const CommandList: ICommand[] = [
chDes: "切换视觉样式到概念模式",
},
{
icon: IconEnum.ConceptView,
icon: IconEnum.ConceptualTransparent,
typeId: "VisualStyle",
link: `#`,
defaultCustom: "GNTM",
@ -1576,7 +1580,7 @@ export const CommandList: ICommand[] = [
chDes: "切换视觉样式到真实模式",
},
{
icon: IconEnum.Reality,
icon: IconEnum.PhysicalFrame,
typeId: "VisualStyle",
link: `#`,
defaultCustom: "PHYSICAL2",
@ -1586,7 +1590,7 @@ export const CommandList: ICommand[] = [
chDes: "切换视觉样式到真实模式",
},
{
icon: IconEnum.Reality,
icon: IconEnum.VSCustomNumber,
typeId: "VisualStyle",
link: `#`,
defaultCustom: CommandNames.VisualStyle_CustomNumber,
@ -2239,7 +2243,7 @@ export const CommandList: ICommand[] = [
chDes: "修正板件自交轮廓",
},
{
icon: IconEnum.Group,
icon: IconEnum.Freeze,
typeId: "util",
link: `#`,
defaultCustom: CommandNames.Freeze,
@ -2249,7 +2253,7 @@ export const CommandList: ICommand[] = [
chDes: "使实体变成冻结状态,令实体无法被选中",
},
{
icon: IconEnum.UnGroup,
icon: IconEnum.UnFreeze,
typeId: "util",
link: `#`,
defaultCustom: CommandNames.UnFreeze,
@ -2259,7 +2263,7 @@ export const CommandList: ICommand[] = [
chDes: "解冻冻结的实体",
},
{
icon: IconEnum.Group,
icon: IconEnum.VisibleInRender,
typeId: "util",
link: `#`,
defaultCustom: CommandNames.VisibleInRender,
@ -2269,7 +2273,7 @@ export const CommandList: ICommand[] = [
chDes: "在渲染器中显示选中的实体",
},
{
icon: IconEnum.UnGroup,
icon: IconEnum.UnVisibleInRender,
typeId: "util",
link: `#`,
defaultCustom: CommandNames.UnVisibleInRender,
@ -2279,6 +2283,7 @@ export const CommandList: ICommand[] = [
chDes: "渲染器中隐藏选中的实体",
},
{
icon: IconEnum.ToggleSyncData,
typeId: "util",
link: `#`,
defaultCustom: CommandNames.EnableSyncData,
@ -2515,7 +2520,7 @@ export const CommandList: ICommand[] = [
chDes: "导入Dwg或者DXF文件",
},
{
icon: IconEnum.DXF,
icon: IconEnum.SaveToDxf,
typeId: "file",
link: `#`,
defaultCustom: CommandNames.SaveToDxf,
@ -2708,6 +2713,7 @@ export const CommandList: ICommand[] = [
chDes: "共享材质",
},
{
icon: IconEnum.ShareView,
typeId: "share",
link: `#`,
defaultCustom: "SHAREVIEW",

26
src/UI/Components/ToolBar/ToolbarContainer.tsx
Unescape View File

@ -44,10 +44,10 @@ export class ToolbarContainer extends React.Component<{}, {}> {
{ svg: IconEnum.ExportData, title: "效果图", command: CommandNames.ExportData },
{ svg: IconEnum.Group, title: "编组", command: CommandNames.Group },
{ svg: IconEnum.UnGroup, title: "解组", command: CommandNames.UnGroup },
{ svg: IconEnum.Group, title: "冻结", command: CommandNames.Freeze },
{ svg: IconEnum.UnGroup, title: "解冻", command: CommandNames.UnFreeze },
{ svg: IconEnum.Group, title: "显示", command: CommandNames.VisibleInRender },
{ svg: IconEnum.UnGroup, title: "隐藏", command: CommandNames.UnVisibleInRender },
{ svg: IconEnum.Freeze, title: "冻结", command: CommandNames.Freeze },
{ svg: IconEnum.UnFreeze, title: "解冻", command: CommandNames.UnFreeze },
{ svg: IconEnum.VisibleInRender, title: "显示", command: CommandNames.VisibleInRender },
{ svg: IconEnum.UnVisibleInRender, title: "隐藏", command: CommandNames.UnVisibleInRender },
];
componentDidMount()
{
@ -65,16 +65,16 @@ export class ToolbarContainer extends React.Component<{}, {}> {
if (userConfig.synchronousEnable)
{
console.log("已经连接到渲染器");
this.iconList.push({ svg: IconEnum.Synchronizing, title: "同步中", command: CommandNames.ToggleSyncData });
this.iconList.push({ svg: IconEnum.ToggleSyncData, title: "同步中", command: CommandNames.ToggleSyncData });
}
else
this.iconList.push({ svg: IconEnum.Synchronous, title: "未同步", command: CommandNames.ToggleSyncData });
this.iconList.push({ svg: IconEnum.UnToggleSyncData, title: "未同步", command: CommandNames.ToggleSyncData });
//增加视角跟随图标
if (app.Viewer.RendererFollowView)
this.iconList.push({ svg: IconEnum.Synchronizing, title: "跟随视角", command: CommandNames.ToggleViewFollow });
this.iconList.push({ svg: IconEnum.ToggleViewFollow, title: "跟随视角", command: CommandNames.ToggleViewFollow });
else
this.iconList.push({ svg: IconEnum.Synchronous, title: "未跟随视角", command: CommandNames.ToggleViewFollow });
this.iconList.push({ svg: IconEnum.UnToggleViewFollow, title: "未跟随视角", command: CommandNames.ToggleViewFollow });
}
});
@ -83,7 +83,7 @@ export class ToolbarContainer extends React.Component<{}, {}> {
{
if (gws.IsLink)
{
this.iconList.push({ svg: IconEnum.Synchronous, title: "服务器", command: CommandNames.SwitchServers });
this.iconList.push({ svg: IconEnum.SwitchServers, title: "服务器", command: CommandNames.SwitchServers });
console.log("已经连接到跳板服务器");
}
else
@ -100,12 +100,12 @@ export class ToolbarContainer extends React.Component<{}, {}> {
if (icon)
if (userConfig.synchronousEnable)
{
icon.svg = IconEnum.Synchronizing;
icon.svg = IconEnum.ToggleSyncData;
icon.title = "同步中";
}
else
{
icon.svg = IconEnum.Synchronous;
icon.svg = IconEnum.UnToggleSyncData;
icon.title = "未同步";
}
}
@ -115,12 +115,12 @@ export class ToolbarContainer extends React.Component<{}, {}> {
if (icon)
if (app.Viewer.RendererFollowView)
{
icon.svg = IconEnum.Synchronizing;
icon.svg = IconEnum.ToggleViewFollow;
icon.title = "跟随视角";
}
else
{
icon.svg = IconEnum.Synchronous;
icon.svg = IconEnum.UnToggleViewFollow;
icon.title = "未跟随视角";
}
}

17
src/UI/Components/TopToolBar/TopToolBar.tsx
Unescape View File

@ -39,6 +39,7 @@ export class TopToolBar extends React.Component<{}, {}>
{ svg: IconEnum.PolyLine, title: "多段线", command: CommandNames.Polyline },
{ svg: IconEnum.Rectangle, title: "矩形", command: CommandNames.RECTANG },
{ svg: IconEnum.Polygon, title: "多边形", command: CommandNames.Polygon },
{ svg: IconEnum.Ellipse, title: "椭圆", command: CommandNames.Ellipse },
{ svg: IconEnum.Point, title: "点", command: CommandNames.Point },
// { svg: IconEnum.SpLine, title: "样条曲线", command:CommandNames.Spline },
{ svg: IconEnum.Region, title: "面域", command: CommandNames.Reg },
@ -108,7 +109,7 @@ export class TopToolBar extends React.Component<{}, {}>
{ svg: IconEnum.DimContinued, title: "线性标注", command: CommandNames.LinearDim },
{ svg: IconEnum.DimAngle, title: "角度标注", command: CommandNames.AngleDim },
{ svg: IconEnum.DimLinear, title: "连续标注", command: CommandNames.DimContinue },
{ svg: IconEnum.Arc, title: "弧长标注", command: CommandNames.DimArc },
{ svg: IconEnum.DimArc, title: "弧长标注", command: CommandNames.DimArc },
{ svg: IconEnum.Circle, title: "半径标注", command: CommandNames.RadiusDim },
{ svg: IconEnum.Diameter, title: "直径标注", command: CommandNames.DiaDim },
{ svg: IconEnum.AutoDim, title: "柜体标注", command: CommandNames.AutoDimBrs },
@ -145,9 +146,9 @@ export class TopToolBar extends React.Component<{}, {}>
store.iconList.visualStyle = [
{ svg: IconEnum.WireframeView, title: "二维线框", command: CommandNames.Wireframe },
{ svg: IconEnum.ConceptView, title: "概念", command: CommandNames.Conceptual },
{ svg: IconEnum.ConceptView, title: "概念透明", command: CommandNames.ConceptualTransparent },
{ svg: IconEnum.ConceptualTransparent, title: "概念透明", command: CommandNames.ConceptualTransparent },
{ svg: IconEnum.Reality, title: "真实", command: CommandNames.Physical },
{ svg: IconEnum.Reality, title: "真实带线框", command: CommandNames.Physical2 },
{ svg: IconEnum.PhysicalFrame, title: "真实带线框", command: CommandNames.Physical2 },
];
store.iconList.render = [
{ svg: IconEnum.ExportView, title: "单柜效果图", command: CommandNames.ExportView },
@ -166,7 +167,7 @@ export class TopToolBar extends React.Component<{}, {}>
{ svg: IconEnum.DrawVSBox, title: "绘制空间", command: CommandNames.DrawVSBOX },
{ svg: IconEnum.Curve2VSBox, title: "线框变空间", command: CommandNames.Curve2VSBox },
{ svg: IconEnum.CutSpace, title: "切割空间", command: CommandNames.SpliteTemplate },
{ svg: IconEnum.CutSpace, title: "收藏模板", command: CommandNames.TemplateCollection },
{ svg: IconEnum.TemplateCollection, title: "收藏模板", command: CommandNames.TemplateCollection },
];
store.iconList.module = [
{ svg: IconEnum.ModuleManage, title: "模块管理", command: CommandNames.Template },
@ -207,13 +208,13 @@ export class TopToolBar extends React.Component<{}, {}>
store.iconList.roomWindow = [
{ svg: IconEnum.DrawWindow, title: "画窗", command: CommandNames.DrawIWindow },
{ svg: IconEnum.DrawLWindow, title: "L型窗", command: CommandNames.DrawLWindow },
{ svg: IconEnum.DrawUWindow2, title: "U型窗", command: CommandNames.DrawUWindow },
{ svg: IconEnum.DrawUWindow, title: "U型窗", command: CommandNames.DrawUWindow },
{ svg: IconEnum.DrawDoor, title: "门", command: CommandNames.DrawIDoor },
];
store.iconList.oneKeyDrawDoorWindow = [
{ svg: IconEnum.DrawWindow, title: "一字窗", command: CommandNames.YZC },
{ svg: IconEnum.DrawWindow, title: "落地窗", command: CommandNames.LDC },
{ svg: IconEnum.DrawLWindow, title: "转角窗", command: CommandNames.ZJC },
{ svg: IconEnum.DrawStraightWindow, title: "一字窗", command: CommandNames.YZC },
{ svg: IconEnum.FrenchWindow, title: "落地窗", command: CommandNames.LDC },
{ svg: IconEnum.CornerWindow, title: "转角窗", command: CommandNames.ZJC },
{ svg: IconEnum.DrawPWindow, title: "飘窗", command: CommandNames.PC },
{ svg: IconEnum.DrawLPWindow, title: "转角飘窗", command: CommandNames.ZJPC },
];

25
src/UI/IconEnum.ts
Unescape View File

@ -14,6 +14,7 @@ export enum IconEnum
Circle = 'Circle.svg',
PolyLine = 'Polyline.svg',
Rectangle = 'Rectangle.svg',
Ellipse = 'Ellipse.svg', //椭圆
Polygon = 'polygon.svg',
Text = 'Text.svg',
SpLine = 'Spline.svg',
@ -31,10 +32,12 @@ export enum IconEnum
Door = 'Door.svg',
YX = 'YX.svg',
YXLK = 'YXLK.svg',
ZXLK = 'ZXLK.svg',
WineRack = 'WineRack.svg',
SKT = 'SKT.svg',
DimALigned = 'DimAligned.svg',
DimLinear = 'DimLinear.svg',
DimArc = "DimArc.svg",
DimAngle = 'DimAngle.svg',
DimContinued = 'DimContinued.svg',
Copy = 'Copy.svg',
@ -110,15 +113,18 @@ export enum IconEnum
WireframeView = "WireframeView.svg",
SaveAs = "SaveAs.svg",
ConceptView = "ConceptView.svg",
ConceptualTransparent = "ConceptualTransparent.svg",
New = "New.svg",
AutoDim = "AutoDim.svg",
Entity = "Entity.svg",
ERPManage = "ERPManage.svg",
ERPManage2 = "ERPManage2.svg",
DXF = "DXF.svg",
SaveToDxf = "SaveToDxf.svg",
ModuleManage = "ModuleManage.svg",
QuotePrice = "QuotePrice.svg",
Reality = "Reality.svg",
PhysicalFrame = "PhysicalFrame.svg",
TemplateDesign = "TemplateDesign.svg",
Wireframe = "Wireframe.svg",
SplitOrder = "SplitOrder.svg",
@ -202,7 +208,22 @@ export enum IconEnum
DrawLWindow = "DrawLWindow.svg",
DrawLPWindow = "DrawLPCWindow.svg",//转角飘窗
DrawUWindow = "DrawUWindow.svg",
DrawUWindow2 = "DrawUWindow2.svg",
DrawPWindow = "DrawPWindow.svg",
Gallery = "Gallery.svg"
DrawStraightWindow = "DrawStraightWindow.svg", //一字窗
FrenchWindow = "FrenchWindow.svg",//落地窗
CornerWindow = "CornerWindow.svg",//转角窗
Gallery = "Gallery.svg",
Freeze = "Freeze.svg", //冻结
UnFreeze = "UnFreeze.svg", //解冻
ShareView = "ShareView.svg", //分享图纸
VSCustomNumber = "VSCustomNumber.svg", //自定义编号
TextModifyTool = "TextModifyTool.svg", //文字替换
SwitchServers = "SwitchServers.svg", //服务器
ToggleViewFollow = "ToggleViewFollow.svg", //渲染器跟随视角
UnToggleViewFollow = "UnToggleViewFollow.svg", //渲染器不跟随视角
ToggleSyncData = "ToggleSyncData.svg", //渲染器同步
UnToggleSyncData = "UnToggleSyncData.svg", //渲染器不同步
VisibleInRender = "VisibleInRender.svg", //渲染器显示实体
UnVisibleInRender = "UnVisibleInRender.svg", //渲染器隐藏实体
TemplateCollection = "TemplateCollection.svg", //收藏
}

Write Preview
Loading…
Cancel
Save