diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index 7732d5c4f..42db7ef46 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -1022,6 +1022,10 @@ const cn = { fromArrow:"起点箭头", toArrow:"终点箭头", arrowColor:"箭头颜色", + fontSize:'字体大小', + fontColor:'字体颜色', + align:'对齐', + opacity:'透明度', }, }, date:{ diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index d5ef58c24..a46f40af1 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -1028,6 +1028,10 @@ const en = { fromArrow:"From arrow", toArrow:"To arrow", arrowColor:"Arrow color", + fontSize:'Font Size', + fontColor:'Font Color', + align:'Align', + opacity:'Opacity', }, }, date:{ diff --git a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue index 454680d19..20a7fe383 100644 --- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue +++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue @@ -820,6 +820,78 @@ @change="changeTopologyOpt"> + +
+ +
+ +
+
+ +
+ +
+
+
+ {{topologyData.data.fontColor}} + + + + +
+
+ + +
+
+
+ +
+ +
+ + left + center + right + +
+
+ +
+ +
+ +
+
@@ -858,82 +930,7 @@
-
- -
- - -
-
- -
- -
- - -
-
- -
- -
- -
-
- -
- -
-
-
- {{topologyData.data.gridColor}} - - - - -
-
- - -
- - -
-
- -
+
@@ -1212,6 +1187,10 @@ projectInfo:true, alertInfo:true, url:'', + fontSize:14, + align:'left', + fontColor:"#000000", + opacity:1, } }, pen:{ @@ -1379,12 +1358,11 @@ }, created(){ let dataOption=getTopology(this.index).data; - console.log(dataOption); if(!dataOption.data){ dataOption.data={} } Object.keys(this.topologyData.data).forEach((key)=>{ - if(key === 'projectInfo' || key === 'alertInfo'){ + if(key === 'projectInfo' || key === 'alertInfo' || key==='fontSize' || key === 'align' || key === 'fontColor' || key === 'opacity'){ this.topologyData.data[key]=(JSON.stringify(dataOption.data[key])?dataOption.data[key]:this.topologyData.data[key]); } else { this.topologyData.data[key]=(JSON.stringify(dataOption[key])?dataOption[key]:this.topologyData.data[key]); @@ -1397,9 +1375,8 @@ // this.topologyData.data.rule= !!dataOption.rule; // this.topologyData.data.projectInfo= !!dataOption.projectInfo; // this.topologyData.data.alertInfo= !!dataOption.alertInfo; - console.log(this.topologyData); }, - updated(){ + updated(n,o){ if(!this.selection.pen){//没选中node line返回 return; } @@ -1455,7 +1432,6 @@ }) }, tabClick(n){ - console.log(n); if(this.selection.pen&&this.tab=='1'){ } @@ -1473,7 +1449,6 @@ this.onChange() }, onChange(value){ - console.log(value,this.selection.pen.lineWidth) if(value==='lineWidth'){ this.selection.pen.lineWidth=this.selection.pen.data.lineWidth; } @@ -1538,8 +1513,6 @@ colorPickerClickTable(ref,row){ row.showColor=row.color.fill; row.showType='fill'; - console.log(row); - console.log(this.$refs[ref]); this.$nextTick(()=>{ this.$refs[ref][0].showPicker=true; }) @@ -1577,7 +1550,6 @@ flag=true } }) - console.log(obj,flag); if(flag){ return } @@ -1594,13 +1566,12 @@ this.topologyData.data[key]=val; } Object.keys(this.topologyData.data).forEach((key1)=>{ - if(key1 === 'projectInfo' || key1 === 'alertInfo'){ + if(key1 === 'projectInfo' || key1 === 'alertInfo' || key1==='fontSize' || key1 === 'align' || key1 === 'fontColor' || key1 === 'opacity'){ getTopology(this.index).data.data[key1]=this.topologyData.data[key1]; } else { getTopology(this.index).data[key1]=this.topologyData.data[key1]; } }); - // console.log(dataOption[key]); getTopology(this.index).render(); }, colorRGBtoHex(color){//获取颜色16进制数 @@ -1673,7 +1644,7 @@ }); }, valueMappingValueChange(index,row){ - console.log(index,row) + }, valueMappingDel(index,row){ this.selection.pen.data.valueMapping.splice(index,1); @@ -1682,7 +1653,6 @@ }); }, inputFocus(e){ - console.log(e.path[2].children[0],e.path[2].children[1]); e.path[2].children[0].setAttribute("tabindex","0"); e.path[2].children[1].setAttribute("tabindex","1"); }, @@ -1772,6 +1742,9 @@ .half.project-content-item { width: calc(50% - 15px); height: 64px; + label{ + width: auto; + } } .project-content-item { diff --git a/nezha-fronted/src/components/common/project/L5/services/canvas.js b/nezha-fronted/src/components/common/project/L5/services/canvas.js index 2c78974d4..32aaaf110 100644 --- a/nezha-fronted/src/components/common/project/L5/services/canvas.js +++ b/nezha-fronted/src/components/common/project/L5/services/canvas.js @@ -312,6 +312,7 @@ export function myCubeAnchors(node) {//立方体锚点 export function onChangeAnimate(node,animateType,fillStyle,strokeStyle) { + node.animateType=animateType; if (node.animateType === 'custom') { return; } diff --git a/nezha-fronted/src/components/common/project/L5/topoTooltip.vue b/nezha-fronted/src/components/common/project/L5/topoTooltip.vue index 15d87ef84..a893988c4 100644 --- a/nezha-fronted/src/components/common/project/L5/topoTooltip.vue +++ b/nezha-fronted/src/components/common/project/L5/topoTooltip.vue @@ -2,10 +2,10 @@
- +
- - - - - - - - - -
@@ -33,6 +31,7 @@ @@ -242,6 +268,12 @@ margin-right: 5px; } } + .top-tool-item-switch{ + padding: 5px 11px; + label{ + vertical-align: middle; + } + } .top-tool-item-disabled{ color: #CECECE; opacity: 0.3; diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue index 50ee4781f..455560c43 100644 --- a/nezha-fronted/src/components/common/project/topologyL5.vue +++ b/nezha-fronted/src/components/common/project/topologyL5.vue @@ -5,63 +5,6 @@