From 15349817b6c01451b6c33f8c3c587adcb334a20c Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 24 Jun 2021 16:08:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E6=9D=BF=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6=E6=98=AF=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/Editor/ComponentWrapper.vue           | 6 ++++++
 frontend/src/components/widget/DeWidget/DeDate.vue          | 1 +
 frontend/src/components/widget/DeWidget/DeInputSearch.vue   | 4 ++--
 frontend/src/views/panel/filter/filterDialog.vue            | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
index 83ce904b80..c0d6701949 100644
--- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
+++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
@@ -9,6 +9,7 @@
       :is="config.component"
       v-if="config.type==='custom'"
       :id="'component' + config.id"
+      class="component-custom"
       :style="getComponentStyleDefault(config.style)"
       :out-style="config.style"
       :element="config"
@@ -99,4 +100,9 @@ export default {
 .gap_class{
   padding:3px;
 }
+.component-custom {
+  outline: none;
+  width: 100%;
+  height: 100%;
+}
 </style>
diff --git a/frontend/src/components/widget/DeWidget/DeDate.vue b/frontend/src/components/widget/DeWidget/DeDate.vue
index 0c46b2c6da..3819591e05 100644
--- a/frontend/src/components/widget/DeWidget/DeDate.vue
+++ b/frontend/src/components/widget/DeWidget/DeDate.vue
@@ -8,6 +8,7 @@
     :start-placeholder="options.attrs.startPlaceholder"
     :end-placeholder="options.attrs.endPlaceholder"
     :placeholder="options.attrs.placeholder"
+    style="min-height: 36px;"
     @change="dateChange"
   />
 </template>
diff --git a/frontend/src/components/widget/DeWidget/DeInputSearch.vue b/frontend/src/components/widget/DeWidget/DeInputSearch.vue
index a0a0bf503f..71dc57d33c 100644
--- a/frontend/src/components/widget/DeWidget/DeInputSearch.vue
+++ b/frontend/src/components/widget/DeWidget/DeInputSearch.vue
@@ -2,7 +2,7 @@
 
   <el-input
     v-if="options!== null && options.attrs!==null"
-    v-model="options.value"
+    v-model="values"
     resize="vertical"
     :placeholder="options.attrs.placeholder"
     @keyup.enter.native="search"
@@ -46,7 +46,7 @@ export default {
     setCondition() {
       const param = {
         component: this.element,
-        value: !this.options.value ? [] : Array.isArray(this.options.value) ? this.options.value : [this.options.value],
+        value: !this.values ? [] : Array.isArray(this.values) ? this.values : [this.values],
         operator: this.operator
       }
       this.inDraw && this.$store.commit('addViewFilter', param)
diff --git a/frontend/src/views/panel/filter/filterDialog.vue b/frontend/src/views/panel/filter/filterDialog.vue
index 06d5d71498..454929942f 100644
--- a/frontend/src/views/panel/filter/filterDialog.vue
+++ b/frontend/src/views/panel/filter/filterDialog.vue
@@ -628,7 +628,7 @@ export default {
     min-width: 230px !important;
     max-width: 260px !important;
     height: 100%;
-    min-height: 390px;
+    min-height: 100px;
     padding: 5px;
     border: none;
     padding-bottom: 20px !important;