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

feat：从endpoint 预览chart 不添加蒙层

Browse Source
This commit is contained in:
zhangyu
2021-02-24 18:21:55 +08:00
parent e0a11ca408
commit 60bac4efac
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/components/charts/chartPreview.vue
View File

@@ -39,6 +39,7 @@
:visible.sync="screenModal" :visible.sync="screenModal"
:width="dailogWidth" :width="dailogWidth"
:modal-append-to-body='false' :modal-append-to-body='false'
:modal="!fromEndpoint"
@close="handleClose" @close="handleClose"
@opened="initDialog"> @opened="initDialog">
<el-popover <el-popover
@@ -194,6 +195,7 @@
}, },
props: { props: {
panelId:Number, panelId:Number,
fromEndpoint:Boolean,
}, },
data() { data() {
return { return {

2
nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
View File

@@ -118,7 +118,7 @@
<chart ref="endpointChart" :unit="chartUnit"></chart> <chart ref="endpointChart" :unit="chartUnit"></chart>
</el-dialog> </el-dialog>
<transition name="right-box"> <transition name="right-box">
<chart-box :chart="chart" :panel-data="panelData" :show-panel="{id: -1, name: '', type: 'endpointQuery'}" @close="rightBox.show = false" @on-create-success="createSuccess" @reload="getPanelData" @reloadOnlyPanel="getPanelData" box-class="save-chart-box" from="project_endpoint_query" ref="addChartModal" v-if="rightBox.show" style="z-index: 2900"></chart-box> <chart-box :chart="chart" :panel-data="panelData" :show-panel="{id: -1, name: '', type: 'endpointQuery'}" @close="rightBox.show = false" @on-create-success="createSuccess" @reload="getPanelData" @reloadOnlyPanel="getPanelData" box-class="save-chart-box" from="project_endpoint_query" ref="addChartModal" v-if="rightBox.show" style="z-index: 2900" :fromEndpoint="true"></chart-box>
</transition> </transition>
</span> </span>
</template> </template>

8
nezha-fronted/src/components/page/dashboard/chartBox.vue
View File

@@ -490,7 +490,7 @@
</button> </button>
</div> </div>
<!--preview --> <!--preview -->
<chart-preview :panelId="panelId" ref="chartsPreview" ></chart-preview> <chart-preview :panelId="panelId" ref="chartsPreview" :fromEndpoint="fromEndpoint"></chart-preview>
</div> </div>
</div> </div>
</template> </template>
@@ -522,7 +522,11 @@
panelData: Array, panelData: Array,
showPanel: Object, showPanel: Object,
chart: Object, chart: Object,
from: {type: String} from: {type: String},
fromEndpoint:{
type:Boolean,
default:false,
}
}, },
mixins: [rz], mixins: [rz],
data() { data() {