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-10-14 14:54:00 +08:00
parent 0558619ad6
commit aaae74c01a
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1779,12 +1779,9 @@ export default {
const delObj = this.selection.pen ? this.selection.pen.id : this.selection.pens const delObj = this.selection.pen ? this.selection.pen.id : this.selection.pens
this.$emit('del', delObj) this.$emit('del', delObj)
}, },
<<<<<<< HEAD
=======
getMetricOptions () { getMetricOptions () {
return this.metricOptions return this.metricOptions
}, },
>>>>>>> 4b4994f59cfffd4aad8579464b56be2c5e523769
addExpression () { addExpression () {
this.selection.pen.data.expressAllArr.push('') this.selection.pen.data.expressAllArr.push('')
this.selection.pen.data.legendsAll.push('') this.selection.pen.data.legendsAll.push('')