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

This commit is contained in:
zhangyu
2021-10-19 09:47:35 +08:00
6 changed files with 72 additions and 21 deletions

View File

@@ -32,13 +32,16 @@
<!-- <div v-if="showLayout.indexOf('pagination') > -1" class="pagination-top pagination-top-hide display-none"></div>-->
</div>
<div :style="{ height: nzTableHeight }" class="nz-detail-view">
<div class="nz-detail-view-left">
<div class="nz-detail-view-left" v-if="dataLength">
<slot name="nz-detail-view-list"></slot>
<div v-if="showLayout.indexOf('pagination') > -1" class="nz-detail-view-pagination">
<slot name="pagination"></slot>
</div>
</div>
<div class="nz-detail-view-right">
<div v-else class="no-data">
No Data
</div>
<div class="nz-detail-view-right" v-if="detailViewRightObj">
<detailViewRight
@getTableData = 'getTableData'
ref="detailViewRight"
@@ -79,6 +82,10 @@ export default {
customTableTitle: {
type: Array
},
dataLength: {
type: Number,
default: 1
},
layout: {
type: Array,
default () { return [] }