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

style: 修改asset endpoint的表格的边框样式

Browse Source
This commit is contained in:
zhangyu
2021-08-26 15:05:26 +08:00
parent 7afc73effc
commit 191c8987fd
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nezha-fronted/src/components/common/table/nzDataList.vue
View File

@@ -25,7 +25,7 @@
<div v-if="showLayout.indexOf('clickSearch') > -1" class="search-box"> <div v-if="showLayout.indexOf('clickSearch') > -1" class="search-box">
<slot name="search"></slot> <slot name="search"></slot>
</div> </div>
<div v-show="bottomBox.mainResizeShow" class="nz-table2"> <div v-show="bottomBox.mainResizeShow" class="nz-table2" :style="showLayout.indexOf('clickSearch') > -1 ? `height:${tableBoxHeight}` : ''">
<slot v-bind:mainResizeShow="bottomBox.mainResizeShow"></slot> <slot v-bind:mainResizeShow="bottomBox.mainResizeShow"></slot>
</div> </div>
<div v-show="bottomBox.mainResizeShow" v-if="showLayout.indexOf('pagination') > -1" class="pagination-bottom"> <div v-show="bottomBox.mainResizeShow" v-if="showLayout.indexOf('pagination') > -1" class="pagination-bottom">
@@ -90,7 +90,8 @@ export default {
}, },
searchMsg: { searchMsg: {
type: Object type: Object
} },
tableBoxHeight: {}
}, },
data () { data () {
return { return {

5
nezha-fronted/src/components/page/asset/asset.vue
View File

@@ -7,6 +7,7 @@
:from="fromRoute.asset" :from="fromRoute.asset"
:layout="dataListLayout" :layout="dataListLayout"
:search-msg="searchMsg" :search-msg="searchMsg"
:table-box-height="assetTableHeight"
@search="search" @search="search"
@getTableData="getTableData" @getTableData="getTableData"
> >
@@ -53,7 +54,7 @@
v-loading="tools.loading" v-loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"
:height="dataListLayout.indexOf('clickSearch') > -1 ? assetTableHeight : mainTableHeight" :height="mainTableHeight"
:table-data="tableData" :table-data="tableData"
@cli="cli" @cli="cli"
@del="del" @del="del"
@@ -130,7 +131,7 @@ export default {
}, },
silenceBoxShow: false, silenceBoxShow: false,
dataListLayout: ['searchInput', 'elementSet', 'clickSearch', 'pagination'], dataListLayout: ['searchInput', 'elementSet', 'clickSearch', 'pagination'],
assetTableHeight: `calc(100% - ${48 + 201 + 20}px)`, assetTableHeight: `calc(100% - ${48 + 201 + 40}px)`,
blankObject: { blankObject: {
id: '', id: '',
name: '', name: '',

5
nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
View File

@@ -7,6 +7,7 @@
:from="fromRoute.endpoint" :from="fromRoute.endpoint"
:layout="dataListLayout" :layout="dataListLayout"
:search-msg="searchMsg" :search-msg="searchMsg"
:table-box-height="endpointTableHeight"
@search="search" @search="search"
@getTableData="getTableData" @getTableData="getTableData"
> >
@@ -55,7 +56,7 @@
v-loading="tools.loading" v-loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"
:height="dataListLayout.indexOf('clickSearch') > -1 ? endpointTableHeight : mainTableHeight" :height="mainTableHeight"
:table-data="tableData" :table-data="tableData"
:tableId="tableId" :tableId="tableId"
@del="del" @del="del"
@@ -233,7 +234,7 @@ export default {
silenceBoxShow: false, silenceBoxShow: false,
tableId: 'endpointTable', tableId: 'endpointTable',
queryPermission: 'account_view', queryPermission: 'account_view',
endpointTableHeight: 'calc(100% - 224px)', // 主列表table高度 endpointTableHeight: 'calc(100% - 244px)', // 主列表table高度
dataListLayout: ['searchInput', 'elementSet', 'clickSearch', 'pagination'], dataListLayout: ['searchInput', 'elementSet', 'clickSearch', 'pagination'],
searchMsg: { // 给搜索框子组件传递的信息 searchMsg: { // 给搜索框子组件传递的信息
zheze_none: true, zheze_none: true,