From 8b9101155c3a9cb249f6b2cb4ed85d616bce7e00 Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Sat, 1 Aug 2020 18:34:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=AE=A1=E7=90=86fixed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/index.css                      | 37 ++++++++++++++++++
 src/components/table/table-filter.vue         |  4 +-
 .../directed-push/directed-push-list.vue      | 38 +------------------
 .../message-alert/message-alert-list.vue      | 38 +------------------
 4 files changed, 42 insertions(+), 75 deletions(-)

diff --git a/src/assets/css/index.css b/src/assets/css/index.css
index 889b175..dbcd2f7 100644
--- a/src/assets/css/index.css
+++ b/src/assets/css/index.css
@@ -790,4 +790,41 @@ width: 620px!important;
 .filter_action > .el-button + .el-button {
   margin-left: 10px;
 }
+
+.meassage_detail_dialog {
+  display: flex;
+  flex-wrap: wrap;
+  text-align: left;
+}
+.meassage_detail_dialog .detail_item {
+  flex: 1 1 auto;
+  width: 50%;
+  margin-top: 20px;
+}
+.meassage_detail_dialog .detail_item.full_line {
+  width: 100%;
+}
+.meassage_detail_dialog .detail_item p {
+  padding: 0 15px;
+  font-size: 14px;
+  line-height: 22px;
+  color: #8890a7;
+}
+.meassage_detail_dialog .detail_item .item_content {
+  color: #000;
+  margin-top: 10px;
+}
+.meassage_detail_dialog .detail_item .full_content {
+  padding: 10px 0;
+  border-radius: 8px;
+  background-color: #f8f9fd;
+  margin-top: 5px;
+}
+.meassage_detail_dialog .detail_item .full_content > .apaas_scroll {
+  height: 176px;
+  overflow: auto;
+}
+.meassage_detail_dialog .detail_item .full_content .item_content {
+  margin: 0;
+}
 /* 详情页公共样式 by xuyiming ~~~end */
\ No newline at end of file
diff --git a/src/components/table/table-filter.vue b/src/components/table/table-filter.vue
index 0339a09..da0b9a4 100644
--- a/src/components/table/table-filter.vue
+++ b/src/components/table/table-filter.vue
@@ -59,7 +59,7 @@ export default {
   data: () => ({
     filterData: null, // 筛选条件
     filterToggle: null, // 控制筛选条件的展开和收起
-    showToggleBar: [],
+    showToggleBar: [], // 判定筛选列表是否有需要添加控制展开的按钮
   }),
   watch: {
     filterList: {
@@ -83,6 +83,8 @@ export default {
           this.$set(this.filterData, item.prop, []);
           this.$set(this.filterToggle, item.prop, false);
         });
+
+        this.resizePage(); // 数据更新也要刷新列表
       }
     },
     resizePage() {
diff --git a/src/pages/message-management/directed-push/directed-push-list.vue b/src/pages/message-management/directed-push/directed-push-list.vue
index 7b71628..6dac901 100644
--- a/src/pages/message-management/directed-push/directed-push-list.vue
+++ b/src/pages/message-management/directed-push/directed-push-list.vue
@@ -74,7 +74,7 @@
       @cancel="cancelAction"
       @submit="submitAction"
     >
-      <div class="detail_dialog" slot="content" v-if="templateDetail">
+      <div class="meassage_detail_dialog" slot="content" v-if="templateDetail">
         <div class="detail_item">
           <p class="item_title">
             消息模板名称：
@@ -326,40 +326,4 @@ export default {
 .list_container {
   height: 100%;
 }
-.detail_dialog {
-  display: flex;
-  flex-wrap: wrap;
-  text-align: left;
-}
-.detail_dialog .detail_item {
-  flex: 1 1 auto;
-  width: 50%;
-  margin-top: 20px;
-}
-.detail_dialog .detail_item.full_line {
-  width: 100%;
-}
-.detail_dialog .detail_item p {
-  padding: 0 15px;
-  font-size: 14px;
-  line-height: 22px;
-  color: #8890a7;
-}
-.detail_dialog .detail_item .item_content {
-  color: #000;
-  margin-top: 10px;
-}
-.detail_dialog .detail_item .full_content {
-  padding: 10px 0;
-  border-radius: 8px;
-  background-color: #f8f9fd;
-  margin-top: 5px;
-}
-.detail_dialog .detail_item .full_content > .apaas_scroll {
-  height: 176px;
-  overflow: auto;
-}
-.detail_dialog .detail_item .full_content .item_content {
-  margin: 0;
-}
 </style>
diff --git a/src/pages/message-management/message-alert/message-alert-list.vue b/src/pages/message-management/message-alert/message-alert-list.vue
index 9c65519..93c80b3 100644
--- a/src/pages/message-management/message-alert/message-alert-list.vue
+++ b/src/pages/message-management/message-alert/message-alert-list.vue
@@ -73,7 +73,7 @@
       @cancel="cancelAction"
       @submit="submitAction"
     >
-      <div class="detail_dialog" slot="content" v-if="templateDetail">
+      <div class="meassage_detail_dialog" slot="content" v-if="templateDetail">
         <div class="detail_item">
           <p class="item_title">
             消息模板名称：
@@ -325,40 +325,4 @@ export default {
 .list_container {
   height: 100%;
 }
-.detail_dialog {
-  display: flex;
-  flex-wrap: wrap;
-  text-align: left;
-}
-.detail_dialog .detail_item {
-  flex: 1 1 auto;
-  width: 50%;
-  margin-top: 20px;
-}
-.detail_dialog .detail_item.full_line {
-  width: 100%;
-}
-.detail_dialog .detail_item p {
-  padding: 0 15px;
-  font-size: 14px;
-  line-height: 22px;
-  color: #8890a7;
-}
-.detail_dialog .detail_item .item_content {
-  color: #000;
-  margin-top: 10px;
-}
-.detail_dialog .detail_item .full_content {
-  padding: 10px 0;
-  border-radius: 8px;
-  background-color: #f8f9fd;
-  margin-top: 5px;
-}
-.detail_dialog .detail_item .full_content > .apaas_scroll {
-  height: 176px;
-  overflow: auto;
-}
-.detail_dialog .detail_item .full_content .item_content {
-  margin: 0;
-}
 </style>
-- 
2.26.0