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

Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0

Browse Source
This commit is contained in:
zhangyu
2021-05-20 16:38:45 +08:00
parent bfab789bef 9ff0686fc8
commit 4f8a191224
8 changed files with 79 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
View File

@@ -88,7 +88,7 @@
<div class="table-list" id="tableList">
<div ref="dashboardScrollbar" style="height: 100%; overflow: auto;">
<div class="box-content">
<chart-list :additional-info="obj" :detail="detail" :draggable="draggable" :from="from" :is-model="from == $CONSTANTS.fromRoute.model" @on-edit-chart="editChart"
<chart-list :additional-info="obj" :draggable="draggable" :from="from" :is-model="from === fromRoute.model" :obj="obj" @on-edit-chart="editChart"
@on-refresh-time="refreshTime" @on-remove-chart="delChart" ref="chartList" :panel-lock="panelLock" :panel-data-list="panelDataList"
@on-add-group-item-chart="addGroupItem"></chart-list>
</div>
@@ -122,8 +122,7 @@ export default {
props: {
from: String,
obj: Object,
draggable: { type: Boolean, default: true },
detail: Object
draggable: { type: Boolean, default: true }
},
data () {
return {