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

fix：修改从当前连线更换到其他连线 颜色选择器颜色不对的问题

Browse Source
This commit is contained in:
zhangyu
2021-03-29 10:42:54 +08:00
parent 39306477ee
commit fbeec0964e
5 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/assets/stylus/main.scss
View File

@@ -2495,3 +2495,7 @@ li{
outline: none; outline: none;
} }
/deep/ .el-switch.is-checked .el-switch__core{
border-color: #ee9d3f;
background-color: #ee9d3f;
}

4
nezha-fronted/src/components/common/nezhaColor.vue
View File

@@ -63,9 +63,9 @@ export default {
} }
}, },
watch: { watch: {
// valueArr:{ // valueArr: {
// immediate: true, // immediate: true,
// handler(n) { // handler (n) {
// console.log(n); // console.log(n);
// if(n.length){ // if(n.length){
// //

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

@@ -580,7 +580,7 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<!-- 选中为空 --> <!-- 选中为空 -->
<div v-if="!selection.pen && !selection.pens" style="height: 100%"> <div v-else style="height: 100%">
<div class="project-title"> <div class="project-title">
Project Project
</div> </div>

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

@@ -414,7 +414,7 @@ registerNode('myCube', myCubec, myCubeAnchors, null, null)
const canvasOptions = { const canvasOptions = {
rotateCursor: '/img/rotate.cur', rotateCursor: '/img/rotate.cur',
translateKey: 'None', translateKey: 'None',
disableEmptyLine: false, disableEmptyLine: true,
autoExpandDistance: 0, autoExpandDistance: 0,
minScale: 0.01 minScale: 0.01
} }
@@ -830,15 +830,15 @@ export default {
clearInterval(timer) clearInterval(timer)
const promiseArr = [] const promiseArr = []
const self = this const self = this
// for(let i=0;i<data.pens.length;i++){ for (let i = 0; i < data.pens.length; i++) {
// let line=data.pens[i] const line = data.pens[i]
// if(line.type===1){ if (line.type === 1) {
// if(!data.pens.find(item=>item.id===line.from.id) || !data.pens.find(item=>item.id===line.to.id)){ if (!data.pens.find(item => item.id === line.from.id) || !data.pens.find(item => item.id === line.to.id)) {
// data.pens.splice(i, 1); data.pens.splice(i, 1)
// i--; i--
// } }
// } }
// } }
data.pens.forEach(item => { data.pens.forEach(item => {
if (item.type === 0 && item.data.imageId) { if (item.type === 0 && item.data.imageId) {
item.image = this.iconArray.find(item1 => item1.id == item.data.imageId).image item.image = this.iconArray.find(item1 => item1.id == item.data.imageId).image
@@ -1166,6 +1166,10 @@ export default {
// console.log('onMessage',event,data); // console.log('onMessage',event,data);
// console.log(getTopology(this.topologyIndex)) // console.log(getTopology(this.topologyIndex))
// this.notModuleIDArr=[]; // this.notModuleIDArr=[];
this.toolShow.attr = false
this.$nextTick(()=>{
this.toolShow.attr = true
})
if (data) { if (data) {
this.notModuleIDArr.forEach(item => { this.notModuleIDArr.forEach(item => {
if (item.id === data.id) { if (item.id === data.id) {
@@ -1220,9 +1224,9 @@ export default {
animatePlay: false, animatePlay: false,
strokeStyle: data.strokeStyle, strokeStyle: data.strokeStyle,
animateColor: data.animateColor, animateColor: data.animateColor,
arrowColor: '#00000', arrowColor: '#000000',
fromArrowColor: '#00000', fromArrowColor: '#000000',
toArrowColor: '#00000', toArrowColor: '#000000',
lineWidth: 1, lineWidth: 1,
// chart 配置项 // chart 配置项
valueMapping: [{ valueMapping: [{

30
nezha-fronted/src/components/common/project/topologyPrev.vue
View File

@@ -414,7 +414,7 @@
const canvasOptions = { const canvasOptions = {
rotateCursor: '/img/rotate.cur', rotateCursor: '/img/rotate.cur',
translateKey: 'None', translateKey: 'None',
disableEmptyLine: false, disableEmptyLine: true,
autoExpandDistance: 0, autoExpandDistance: 0,
minScale: 0.01 minScale: 0.01
} }
@@ -830,15 +830,15 @@
clearInterval(timer) clearInterval(timer)
const promiseArr = [] const promiseArr = []
const self = this const self = this
// for(let i=0;i<data.pens.length;i++){ for (let i = 0; i < data.pens.length; i++) {
// let line=data.pens[i] const line = data.pens[i]
// if(line.type===1){ if (line.type === 1) {
// if(!data.pens.find(item=>item.id===line.from.id) || !data.pens.find(item=>item.id===line.to.id)){ if (!data.pens.find(item => item.id === line.from.id) || !data.pens.find(item => item.id === line.to.id)) {
// data.pens.splice(i, 1); data.pens.splice(i, 1)
// i--; i--
// } }
// } }
// } }
data.pens.forEach(item => { data.pens.forEach(item => {
if (item.type === 0 && item.data.imageId) { if (item.type === 0 && item.data.imageId) {
item.image = this.iconArray.find(item1 => item1.id == item.data.imageId).image item.image = this.iconArray.find(item1 => item1.id == item.data.imageId).image
@@ -1166,6 +1166,10 @@
// console.log('onMessage',event,data); // console.log('onMessage',event,data);
// console.log(getTopology(this.topologyIndex)) // console.log(getTopology(this.topologyIndex))
// this.notModuleIDArr=[]; // this.notModuleIDArr=[];
this.toolShow.attr = false
this.$nextTick(()=>{
this.toolShow.attr = true
})
if (data) { if (data) {
this.notModuleIDArr.forEach(item => { this.notModuleIDArr.forEach(item => {
if (item.id === data.id) { if (item.id === data.id) {
@@ -1220,9 +1224,9 @@
animatePlay: false, animatePlay: false,
strokeStyle: data.strokeStyle, strokeStyle: data.strokeStyle,
animateColor: data.animateColor, animateColor: data.animateColor,
arrowColor: '#00000', arrowColor: '#000000',
fromArrowColor: '#00000', fromArrowColor: '#000000',
toArrowColor: '#00000', toArrowColor: '#000000',
lineWidth: 1, lineWidth: 1,
// chart 配置项 // chart 配置项
valueMapping: [{ valueMapping: [{