gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix ： 修复 topology 无法修改背景色

Browse Source
This commit is contained in:
zhangyu
2022-09-02 13:49:04 +08:00
parent 7245354d78
commit e3732a2314
4 changed files with 41 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
nezha-fronted/src/components/common/ChartDiagram/diagram.vue
View File

@@ -377,6 +377,7 @@ export default {
icon: 'icon-rect', icon: 'icon-rect',
data: { data: {
text: 'rect', text: 'rect',
type: 0,
rect: { rect: {
width: 100, width: 100,
height: 100 height: 100
@@ -396,6 +397,7 @@ export default {
name: 'rectangleImg2', name: 'rectangleImg2',
icon: 'icon-rect', icon: 'icon-rect',
data: { data: {
type: 0,
text: 'rect', text: 'rect',
rect: { rect: {
width: 100, width: 100,
@@ -416,6 +418,7 @@ export default {
name: 'rectangleImg2', name: 'rectangleImg2',
icon: 'icon-rect', icon: 'icon-rect',
data: { data: {
type: 0,
text: 'rect', text: 'rect',
rect: { rect: {
width: 100, width: 100,
@@ -848,7 +851,7 @@ export default {
// data = JSON.parse(localStorage.getItem('topoData')) // data = JSON.parse(localStorage.getItem('topoData'))
if (!res.data.topo || !data.pens) { if (!res.data.topo || !data.pens) {
data = { data = {
bkColor: '#FFFFFF00', background: '#FFFFFF00',
gridSize: 10, gridSize: 10,
gridColor: '#ededed', gridColor: '#ededed',
lineWidth: 1, lineWidth: 1,
@@ -930,8 +933,8 @@ export default {
if (!data.bkImage) { if (!data.bkImage) {
data.bkImage = undefined data.bkImage = undefined
} }
if (data.bkColor === '#FFFFFF') { if (data.background === '#FFFFFF') {
data.bkColor = '#FFFFFF00' data.background = '#FFFFFF00'
} }
if (!res.data.topo.newData) { if (!res.data.topo.newData) {
data.pens = this.$loadsh.orderBy(data.pens, 'type', 'desc') // 先处理线 再处理点 因为新版本 将连线开始结束放在的 点上控制 data.pens = this.$loadsh.orderBy(data.pens, 'type', 'desc') // 先处理线 再处理点 因为新版本 将连线开始结束放在的 点上控制
@@ -1731,13 +1734,13 @@ export default {
// 联动 project // 联动 project
changeProjectTitle () { changeProjectTitle () {
const data = getTopology(this.topologyIndex).data() const data = getTopology(this.topologyIndex).data()
this.topologyInfo = { // this.topologyInfo = {
fontSize: data.data.fontSize, // fontSize: data.data.fontSize,
align: data.data.align, // align: data.data.align,
fontColor: data.data.fontColor, // fontColor: data.data.fontColor,
opacity: data.data.opacity, // opacity: data.data.opacity,
name: data.name // name: data.name
} // }
}, },
/* tools 方法 */ /* tools 方法 */

19
nezha-fronted/src/components/common/project/L5/CanvasProps.vue
View File

@@ -914,7 +914,7 @@
<div class="project-content-item half"> <div class="project-content-item half">
<label>{{ $t('project.topology.bac') }}</label> <label>{{ $t('project.topology.bac') }}</label>
<div class="full pr10 h32"> <div class="full pr10 h32">
<nezhaColor :isTopo="true" :value-arr="[{name:'bkColor',value:topologyData.data.bkColor}]" @colorChange="(val,key)=>{ <nezhaColor :isTopo="true" :value-arr="[{name:'background',value:topologyData.data.background}]" @colorChange="(val,key)=>{
changeTopologyOpt(val,key,true) changeTopologyOpt(val,key,true)
}"/> }"/>
</div> </div>
@@ -1174,7 +1174,7 @@ export default {
topologyData: { topologyData: {
data: { data: {
name: '', name: '',
bkColor: '#FFFFFF', background: '#FFFFFF',
bkImage: '', bkImage: '',
lineName: 'curve', lineName: 'curve',
lineWidth: 1, lineWidth: 1,
@@ -1701,13 +1701,14 @@ export default {
} else { } else {
this.topologyData.data[key] = val this.topologyData.data[key] = val
} }
Object.keys(this.topologyData.data).forEach((key1) => { // Object.keys(this.topologyData.data).forEach((key1) => {
if (key1 === 'projectInfo' || key1 === 'alertInfo' || key1 === 'fontSize' || key1 === 'align' || key1 === 'textColor' || key1 === 'opacity') { // if (key1 === 'projectInfo' || key1 === 'alertInfo' || key1 === 'fontSize' || key1 === 'align' || key1 === 'textColor' || key1 === 'opacity') {
getTopology(this.index).data().data[key1] = this.topologyData.data[key1] // getTopology(this.index).data().data[key1] = this.topologyData.data[key1]
} else { // } else {
getTopology(this.index).data()[key1] = this.topologyData.data[key1] // getTopology(this.index).data()[key1] = this.topologyData.data[key1]
} // }
}) // })
getTopology(this.index).setBackgroundColor(this.topologyData.data.background)
getTopology(this.index).render() getTopology(this.index).render()
this.$emit('changeProjectTitle') this.$emit('changeProjectTitle')
}, },

8
nezha-fronted/src/components/common/project/L5/services/canvas.js
View File

@@ -28,6 +28,7 @@ export const Tools = [
type: 0, type: 0,
data: { data: {
text: 'rect', text: 'rect',
type: 0,
width: 100, width: 100,
height: 100, height: 100,
paddingLeft: 10, paddingLeft: 10,
@@ -43,6 +44,7 @@ export const Tools = [
type: 0, type: 0,
data: { data: {
text: 'rectangle', text: 'rectangle',
type: 0,
width: 200, width: 200,
height: 50, height: 50,
paddingLeft: 10, paddingLeft: 10,
@@ -62,6 +64,7 @@ export const Tools = [
type: 0, type: 0,
data: { data: {
text: 'circle', text: 'circle',
type: 0,
width: 100, width: 100,
height: 100, height: 100,
name: 'circle', name: 'circle',
@@ -74,6 +77,7 @@ export const Tools = [
type: 0, type: 0,
data: { data: {
text: 'triangle', text: 'triangle',
type: 0,
width: 100, width: 100,
height: 100, height: 100,
name: 'triangle' name: 'triangle'
@@ -85,6 +89,7 @@ export const Tools = [
type: 0, type: 0,
data: { data: {
text: 'diamond', text: 'diamond',
type: 0,
width: 100, width: 100,
height: 100, height: 100,
name: 'diamond' name: 'diamond'
@@ -96,6 +101,7 @@ export const Tools = [
type: 0, type: 0,
data: { data: {
text: 'pentagon', text: 'pentagon',
type: 0,
width: 100, width: 100,
height: 100, height: 100,
name: 'pentagon' name: 'pentagon'
@@ -107,6 +113,7 @@ export const Tools = [
type: 0, type: 0,
data: { data: {
text: 'hexagon', text: 'hexagon',
type: 0,
width: 100, width: 100,
height: 100, height: 100,
paddingTop: 10, paddingTop: 10,
@@ -120,6 +127,7 @@ export const Tools = [
type: 0, type: 0,
data: { data: {
text: 'pentagram', text: 'pentagram',
type: 0,
width: 100, width: 100,
height: 100, height: 100,
name: 'pentagram' name: 'pentagram'

20
nezha-fronted/src/components/common/project/topologyL5.vue
View File

@@ -861,7 +861,7 @@ export default {
// data = JSON.parse(localStorage.getItem('topoData')) // data = JSON.parse(localStorage.getItem('topoData'))
if (!res.data.topo || !data.pens) { if (!res.data.topo || !data.pens) {
data = { data = {
bkColor: '#FFFFFF00', background: '#FFFFFF00',
gridSize: 10, gridSize: 10,
gridColor: '#ededed', gridColor: '#ededed',
lineWidth: 1, lineWidth: 1,
@@ -984,8 +984,8 @@ export default {
if (!data.bkImage) { if (!data.bkImage) {
data.bkImage = undefined data.bkImage = undefined
} }
if (data.bkColor === '#FFFFFF') { if (data.background === '#FFFFFF') {
data.bkColor = '#FFFFFF00' data.background = '#FFFFFF00'
} }
Promise.all(promiseArr).then(res => { Promise.all(promiseArr).then(res => {
res[0].data.list.forEach((module, index) => { res[0].data.list.forEach((module, index) => {
@@ -2206,13 +2206,13 @@ export default {
// 联动 project // 联动 project
changeProjectTitle () { changeProjectTitle () {
const data = getTopology(this.topologyIndex).data() const data = getTopology(this.topologyIndex).data()
this.topologyInfo = { // this.topologyInfo = {
fontSize: data.data.fontSize, // fontSize: data.data.fontSize,
align: data.data.align, // align: data.data.align,
fontColor: data.data.fontColor, // fontColor: data.data.fontColor,
opacity: data.data.opacity, // opacity: data.data.opacity,
name: data.name // name: data.name
} // }
}, },
/* tools 方法 */ /* tools 方法 */