From 4f0a4816491ffe7cbd6147b678207fe19c5724f0 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Tue, 23 Jun 2020 17:54:15 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-333=20fix:alert=20list=20=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A4=A7=E5=B0=8Fbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/charts/chart-alert-list.vue    |  2 ++
 .../src/components/common/pagination.vue      | 33 ++++++++++---------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/nezha-fronted/src/components/charts/chart-alert-list.vue b/nezha-fronted/src/components/charts/chart-alert-list.vue
index 07470eebe..418bb5149 100644
--- a/nezha-fronted/src/components/charts/chart-alert-list.vue
+++ b/nezha-fronted/src/components/charts/chart-alert-list.vue
@@ -481,6 +481,8 @@ export default {
         immediate:true,
         handler(n,o){
           this.data=Object.assign({},n)
+          this.data.resizable=true;
+          this.data.editable=true;
         }
       },
       panelId:{
diff --git a/nezha-fronted/src/components/common/pagination.vue b/nezha-fronted/src/components/common/pagination.vue
index cae6f13e8..32e43952e 100644
--- a/nezha-fronted/src/components/common/pagination.vue
+++ b/nezha-fronted/src/components/common/pagination.vue
@@ -1,22 +1,22 @@
 <template>
   <div class="pagination">
-    <el-pagination
-      ref="page"
-      @size-change="size"
-      @prev-click="prev"
-      @next-click="next"
-      @current-change="current"
-      :current-page="pageObj.pageNo"
-      :page-sizes="pageSizes?pageSizes:[20, 50, 100]"
-      :page-size="pageSize"
-      layout="total, prev, pager, next, slot"
-      :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-option v-for="(item,index) in pageSizes" :key="item.value" :label="item.label" :value="item.value"></el-option>
-      </el-select>
+      <el-pagination
+        ref="page"
+        @size-change="size"
+        @prev-click="prev"
+        @next-click="next"
+        @current-change="current"
+        :current-page="pageObj.pageNo"
+        :page-sizes="pageSizes?pageSizes:[20, 50, 100]"
+        :page-size="pageSize"
+        layout="total, prev, pager, next, slot"
+        :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-option v-for="(item,index) in pageSizes" :key="item.value" :label="item.label" :value="item.value"></el-option>
+        </el-select>
 
-    </el-pagination>
+      </el-pagination>
   </div>
 </template>
 
@@ -182,6 +182,7 @@ export default {
   .pagination .el-pagination {
     max-height: 42px;
     padding-right: 0;
+    overflow-x: hidden;
   }
   .pagination-size-select .el-input--mini .el-input__inner{
     height: 20px;