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

fix： 优化Topology 选择legend的操作

Browse Source
This commit is contained in:
zhangyu
2023-04-13 11:43:30 +08:00
parent 626fdbd1e0
commit 1cc1cb1f85
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js
View File

@@ -434,6 +434,9 @@ export default {
} }
}, },
beforeEdit () { beforeEdit () {
const endTime = new Date().getTime()
const startTime = endTime - 60 * this.params.timeType * 1000
this.getQueryValues(this.querysArray, startTime, endTime)
this.editFlag = true this.editFlag = true
this.contextmenu = { this.contextmenu = {
left: null, left: null,

14
nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue
View File

@@ -767,12 +767,12 @@
</div> </div>
<div class="form-row-value"> <div class="form-row-value">
<div style="display: inline-block;width: calc(30% - 3px)"> <div style="display: inline-block;width: calc(30% - 3px)">
<el-select v-model="pen.data.parent" size="small"> <el-select v-model="pen.data.parent" size="small" clearable @change="penDataParentChange">
<el-option v-for="item in queryValues.filter(query => query.type === 'title')" :key="item.id" :value="item.name" :label='item.name'></el-option> <el-option v-for="item in queryValues.filter(query => query.type === 'title')" :key="item.id" :value="item.name" :label='item.name'></el-option>
</el-select> </el-select>
</div> </div>
<div style="display: inline-block;width: calc(70% - 13px);margin-left: 10px"> <div style="display: inline-block;width: calc(70% - 13px);margin-left: 10px">
<el-select v-model="pen.data.legend" size="small"> <el-select v-model="pen.data.legend" size="small" clearable>
<el-option v-for="item in queryValues.filter(query => (query.parent === pen.data.parent) && query.type === 'item')" :key="item.id" :value="item.name" :label='item.name'></el-option> <el-option v-for="item in queryValues.filter(query => (query.parent === pen.data.parent) && query.type === 'item')" :key="item.id" :value="item.name" :label='item.name'></el-option>
</el-select> </el-select>
</div> </div>
@@ -1016,12 +1016,12 @@
</div> </div>
<div class="form-row-value" style="margin-bottom: 10px;display: flex;justify-content: space-between" v-for="(legend, index) in pen.data.tooltip.legends" :key="legend.parent + legend.legend"> <div class="form-row-value" style="margin-bottom: 10px;display: flex;justify-content: space-between" v-for="(legend, index) in pen.data.tooltip.legends" :key="legend.parent + legend.legend">
<div style="display: inline-block;width: calc(20% - 10px)"> <div style="display: inline-block;width: calc(20% - 10px)">
<el-select v-model="legend.parent" size="small" style="width: 100%"> <el-select v-model="legend.parent" size="small" style="width: 100%" clearable @change="legendParentChange(legend)">
<el-option v-for="item in queryValues.filter(query => query.type === 'title')" :key="item.id" :value="item.name" :label='item.name'></el-option> <el-option v-for="item in queryValues.filter(query => query.type === 'title')" :key="item.id" :value="item.name" :label='item.name'></el-option>
</el-select> </el-select>
</div> </div>
<div style="display: inline-block;width: calc(40% - 10px)"> <div style="display: inline-block;width: calc(40% - 10px)">
<el-select v-model="legend.legend" size="small" style="width: 100%"> <el-select v-model="legend.legend" size="small" style="width: 100%" clearable>
<el-option v-for="item in queryValues.filter(query => (query.parent === legend.parent) && query.type === 'item')" :key="item.id" :value="item.name" :label='item.name'></el-option> <el-option v-for="item in queryValues.filter(query => (query.parent === legend.parent) && query.type === 'item')" :key="item.id" :value="item.name" :label='item.name'></el-option>
</el-select> </el-select>
</div> </div>
@@ -1338,6 +1338,12 @@ export default {
this.$refs[item].update() this.$refs[item].update()
} }
}) })
},
penDataParentChange () {
this.pen.data.legend = ''
},
legendParentChange (legend) {
legend.legend = ''
} }
} }