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

NEZ-333 fix:alert list 无法调整大小bug修复

Browse Source
This commit is contained in:
wangwenrui
2020-06-23 17:54:15 +08:00
parent 4394db7920
commit 4f0a481649
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/components/charts/chart-alert-list.vue
View File

@@ -481,6 +481,8 @@ export default {
immediate:true, immediate:true,
handler(n,o){ handler(n,o){
this.data=Object.assign({},n) this.data=Object.assign({},n)
this.data.resizable=true;
this.data.editable=true;
} }
}, },
panelId:{ panelId:{

33
nezha-fronted/src/components/common/pagination.vue
View File

@@ -1,22 +1,22 @@
<template> <template>
<div class="pagination"> <div class="pagination">
<el-pagination <el-pagination
ref="page" ref="page"
@size-change="size" @size-change="size"
@prev-click="prev" @prev-click="prev"
@next-click="next" @next-click="next"
@current-change="current" @current-change="current"
:current-page="pageObj.pageNo" :current-page="pageObj.pageNo"
:page-sizes="pageSizes?pageSizes:[20, 50, 100]" :page-sizes="pageSizes?pageSizes:[20, 50, 100]"
:page-size="pageSize" :page-size="pageSize"
layout="total, prev, pager, next, slot" layout="total, prev, pager, next, slot"
:total="this.pageObj.total" :total="this.pageObj.total"
> >
<el-select v-model="pageSize" :placeholder="pageSize+$t('pageSize')" size="mini" :popper-append-to-body="appendToBody" class="pagination-size-select" @change="size" :popper-class="popClass" @visible-change="popperVisible"> <el-select v-model="pageSize" :placeholder="pageSize+$t('pageSize')" size="mini" :popper-append-to-body="appendToBody" class="pagination-size-select" @change="size" :popper-class="popClass" @visible-change="popperVisible">
<el-option v-for="(item,index) in pageSizes" :key="item.value" :label="item.label" :value="item.value"></el-option> <el-option v-for="(item,index) in pageSizes" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select> </el-select>
</el-pagination> </el-pagination>
</div> </div>
</template> </template>
@@ -182,6 +182,7 @@ export default {
.pagination .el-pagination { .pagination .el-pagination {
max-height: 42px; max-height: 42px;
padding-right: 0; padding-right: 0;
overflow-x: hidden;
} }
.pagination-size-select .el-input--mini .el-input__inner{ .pagination-size-select .el-input--mini .el-input__inner{
height: 20px; height: 20px;