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

# Conflicts:
#	nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
This commit is contained in:
zhangyu
2021-10-21 10:05:37 +08:00
4 changed files with 11 additions and 5 deletions

View File

@@ -1,6 +1,6 @@
<template>
<div class="full-width-height">
<nz-bottom-data-list
<div class="full-width-height endpoint-tab-new">
<nz-bottom-data-list
:showTitle='showTitle'
:api="url"
:layout="['searchInput', 'elementSet']"