From 72ea246cdce04377b4584082d57ede0719c967f9 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 19 May 2021 11:59:04 +0800
Subject: [PATCH 1/2] feat(dashboard):UI fix;i18n fix

---
 frontend/src/views/panel/edit/index.vue          | 4 ++--
 frontend/src/views/panel/filter/filterDialog.vue | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 9b6eafb0a0..cc347e533c 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -86,8 +86,8 @@
       </filter-dialog>
       <div style="text-align: end !important;margin: 0 15px !important;">
         <span slot="footer">
-          <el-button @click="cancelFilter">{{ $t('commons.cancel') }}</el-button>
-          <el-button :disabled="!currentFilterCom.options.attrs.fieldId" type="primary" @click="sureFilter">{{ $t('commons.confirm') }}</el-button>
+          <el-button size="mini" @click="cancelFilter">{{ $t('commons.cancel') }}</el-button>
+          <el-button :disabled="!currentFilterCom.options.attrs.fieldId" type="primary" size="mini" @click="sureFilter">{{ $t('commons.confirm') }}</el-button>
         </span>
       </div>
     </el-dialog>
diff --git a/frontend/src/views/panel/filter/filterDialog.vue b/frontend/src/views/panel/filter/filterDialog.vue
index 50c198bffb..58fd121223 100644
--- a/frontend/src/views/panel/filter/filterDialog.vue
+++ b/frontend/src/views/panel/filter/filterDialog.vue
@@ -120,7 +120,7 @@
             <div class="filter-field">
               <div class="field-content">
                 <div class="field-content-left">
-                  <div class="field-content-text">{{ $t(panel.field) }} </div>
+                  <div class="field-content-text">{{ $t('panel.field') }} </div>
                 </div>
 
                 <div class="field-content-right">
@@ -156,7 +156,7 @@
             </div>
           </el-col>
           <el-col :span="16"><div class="filter-options-right">
-            <el-checkbox v-model="customRange"><span>  {{ $t(panel.custom_scope) }} </span> </el-checkbox>
+            <el-checkbox v-model="customRange"><span>  {{ $t('panel.custom_scope') }} </span> </el-checkbox>
 
             <el-popover
               v-model="popovervisible"
@@ -239,7 +239,7 @@ export default {
       showDomType: 'tree',
       comShowDomType: 'view',
       dataSetBreads: [
-        { label: this.$t('panel.data_list') , link: false, type: 'root' }
+        { label: this.$t('panel.data_list'), link: false, type: 'root' }
       ],
       componentSetBreads: [
         { label: this.$t('panel.component_list'), link: false, type: 'root' }
@@ -577,6 +577,7 @@ export default {
 
   .filter-dialog-tabs {
       border: 1px solid #E6E6E6;
+      height: 100%;
   }
 
   .filter-common {

From 58072f1b136d0b98b970bf2fc2b5f404ddd6ec5c Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 19 May 2021 12:50:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/panel/filter/filterDialog.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/panel/filter/filterDialog.vue b/frontend/src/views/panel/filter/filterDialog.vue
index 58fd121223..811123150b 100644
--- a/frontend/src/views/panel/filter/filterDialog.vue
+++ b/frontend/src/views/panel/filter/filterDialog.vue
@@ -120,7 +120,8 @@
             <div class="filter-field">
               <div class="field-content">
                 <div class="field-content-left">
-                  <div class="field-content-text">{{ $t('panel.field') }} </div>
+                  <!-- <div class="field-content-text">{{ $t('panel.field') }} </div> -->
+                  <div class="field-content-text">字段</div>
                 </div>
 
                 <div class="field-content-right">