From a0ef8e0a4c14518581c401cf16f1c825c567384c Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 7 Apr 2021 18:19:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/panel/edit/index.vue       |  4 +++-
 .../src/views/panel/filter/filterDialog.vue   | 22 ++++++++++++++-----
 frontend/src/views/panel/filter/index.vue     | 19 ----------------
 3 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 6229049246..058c591897 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -73,7 +73,9 @@
       :visible.sync="filterVisible"
       custom-class="de-filter-dialog"
     >
-      <filter-dialog />
+      <filter-dialog>
+        <h1>aaaaaaaaa</h1>
+      </filter-dialog>
     </el-dialog>
 
   </el-container>
diff --git a/frontend/src/views/panel/filter/filterDialog.vue b/frontend/src/views/panel/filter/filterDialog.vue
index 23e7b2b0d7..469b276624 100644
--- a/frontend/src/views/panel/filter/filterDialog.vue
+++ b/frontend/src/views/panel/filter/filterDialog.vue
@@ -89,7 +89,7 @@
                       group="dimension"
                       animation="300"
                       :move="onMove"
-                      style="width:100%;height: 100%;margin:0 10px;border-radius: 4px;border: 1px solid #DCDFE6;overflow-x: auto;display: flex;align-items: center;background-color: white;"
+                      style="width:100%;height: 100%;margin:0 10px;border-radius: 4px;overflow-x: auto;display: flex;align-items: center;background-color: white;"
                       @end="end2"
                     >
                       <transition-group class="draggable-group">
@@ -120,7 +120,12 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <div class="filter-content" />
+            <div class="filter-content">
+              <el-card class="box-card">
+                <slot />
+              </el-card>
+
+            </div>
           </el-col>
         </el-row>
       </div>
@@ -292,9 +297,10 @@ export default {
     min-width: 230px !important;
     max-width: 260px !important;
     height: 100%;
-    min-height: 400px;
+    min-height: 390px;
     padding: 5px;
     border: none;
+    padding-bottom: 20px !important;
   }
 
   .ms-main-container {
@@ -343,7 +349,7 @@ export default {
             display: table-cell;
             vertical-align: middle;
             margin: 0px;
-            padding: 0 0 0 10px;
+            padding: 0 0 0 0;
             height: 100%;
         }
     }
@@ -367,9 +373,9 @@ export default {
   }
 
   .filter-content {
-      height: calc(50vh - 150px);
+      height: calc(50vh - 130px);
       top: 160px;
-      background: #99a9bf;
+
   }
 
   .filter-dialog-tabs {
@@ -404,4 +410,8 @@ export default {
     width: 100%;
     height: calc(100% - 6px);
   }
+  .box-card {
+      width: 100%;
+      height: 100%;
+  }
 </style>
diff --git a/frontend/src/views/panel/filter/index.vue b/frontend/src/views/panel/filter/index.vue
index 01234a2dd0..4333644dcb 100644
--- a/frontend/src/views/panel/filter/index.vue
+++ b/frontend/src/views/panel/filter/index.vue
@@ -2,25 +2,6 @@
 
   <div class="filter-container" @dragstart="handleDragStart">
 
-    <!-- <el-card class="filter-card-class">
-      <div slot="header">
-        <span>卡片名称</span>
-      </div>
-      <div style="position: relative;margin-left: 5px;" @dragstart="handleDragStart">
-        <div
-          v-for="(item, index) in componentList"
-          :key="index"
-          :data-id="item.id"
-          draggable
-          :data-index="index"
-        >
-          <span class="iconfont" :class="'icon-' + item.icon" />
-          <span>{{ item.label }}</span>
-        </div>
-      </div>
-
-    </el-card> -->
-
     <div v-for="(item, key) in widgetSubjects" :key="key" class="widget-subject">
       <div class="filter-header">
         <div class="filter-header-text"> {{ key }} </div>