fix:颜色选择器 预值修改 以及修改点击节点后 出现tooltip的问题

This commit is contained in:
zhangyu
2021-02-25 18:01:06 +08:00
parent d6415ba031
commit 94d4654c4b
2 changed files with 20 additions and 5 deletions

View File

@@ -1169,7 +1169,14 @@
name:this.$t("project.topology.fade") name:this.$t("project.topology.fade")
} }
], ],
predefineColors:['#FF0000','#FF5300','#FFC900','#00B536','#00CAFF','#0092FF','#B600D9','#FF666C','#FF9348','#FFDD33','#00D063','#00deff','#62B9FF','#D55BE9'] predefineColors:[
'#19730E','#37872D','#73BF69',
'#CC9D00','#E0B400','#FADE2A',
'#AD0317','#C4162A','#F2495C',
'#1250B0','#1F60C4','#5794F2',
'#E55400','#FA6400','#FF9830',
'#7C2EA3','#8F3BB8','#B877D9',
]
} }
}, },
mixins:[rz], mixins:[rz],
@@ -1611,6 +1618,17 @@
width: 180px; width: 180px;
height: 100%; height: 100%;
} }
/deep/ .el-color-predefine__color-selector:nth-child(9n+1){
margin-left: 0;
}
/deep/ .el-color-predefine__color-selector:nth-child(10n+1){
margin-left: 8px;
}
/deep/ .el-color-predefine__color-selector {
margin: 0 0 8px 8px;
width: 24px;
height: 24px;
}
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
.project-title { .project-title {

View File

@@ -1126,9 +1126,6 @@
}) })
} }
if(!Array.isArray(data)&&data){//判断不是数组 提前个data配置好节点属性 if(!Array.isArray(data)&&data){//判断不是数组 提前个data配置好节点属性
// if(data.type===0){
// data.textRect=new Rect(data.rect.ex-10,data.rect.ey-10,data.rect.width,data.rect.height);
// }
if(data.type===0&& !data.data.moduleId){ if(data.type===0&& !data.data.moduleId){
data.data={ data.data={
...data.data, ...data.data,
@@ -1281,7 +1278,7 @@
case 'node': case 'node':
case 'addNode': case 'addNode':
this.modulesDiff(data); this.modulesDiff(data);
if(data.data.expressArr.length===0){ if(data.data.expressArr.length===0&&event!=='node'){
data.data.expressArr.push(''); data.data.expressArr.push('');
data.data.legends.push(''); data.data.legends.push('');
} }