From b87766adce0bdeb44d8ddbbca70b646600a5b177 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 19 Apr 2021 17:40:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E7=BD=AE=E5=BF=85=E9=A1=BB?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E6=95=B0=E6=8D=AE=E9=9B=86=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/widget/DeWidget/sources/ElQuarter.vue  | 2 +-
 .../components/widget/serviceImpl/TimeQuarterServiceImpl.js    | 2 +-
 frontend/src/views/panel/edit/index.vue                        | 3 ++-
 frontend/src/views/panel/filter/filterDialog.vue               | 3 +++
 frontend/src/views/panel/filter/index.vue                      | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/widget/DeWidget/sources/ElQuarter.vue b/frontend/src/components/widget/DeWidget/sources/ElQuarter.vue
index b9f92cd378..5b187feb35 100644
--- a/frontend/src/components/widget/DeWidget/sources/ElQuarter.vue
+++ b/frontend/src/components/widget/DeWidget/sources/ElQuarter.vue
@@ -11,7 +11,7 @@
     <el-card
       v-show="showSeason"
       class="box-card"
-      style="width:322px;padding: 0 3px 20px;margin-top:10px;position:fixed;z-index:9999"
+      style="width:322px !important;padding: 0 3px 20px;margin-top:10px;position:fixed;z-index:9999"
     >
       <div slot="header" class="clearfix" style="text-align:center;padding:0">
         <button
diff --git a/frontend/src/components/widget/serviceImpl/TimeQuarterServiceImpl.js b/frontend/src/components/widget/serviceImpl/TimeQuarterServiceImpl.js
index 0d28dcb752..afa531ed46 100644
--- a/frontend/src/components/widget/serviceImpl/TimeQuarterServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/TimeQuarterServiceImpl.js
@@ -9,7 +9,7 @@ const leftPanel = {
 const dialogPanel = {
   options: {
     attrs: {
-      placeholder: '请选择年份'
+      placeholder: '请选择季度'
     },
     value: ''
   },
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 55d52cf9d5..94ddb6735a 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -97,7 +97,7 @@
       <div style="text-align: end !important;margin: 0 15px !important;">
         <span slot="footer">
           <el-button @click="cancelFilter">取 消</el-button>
-          <el-button type="primary" @click="sureFilter">确 定</el-button>
+          <el-button :disabled="!currentFilterCom.options.attrs.fieldId" type="primary" @click="sureFilter">确 定</el-button>
         </span>
       </div>
     </el-dialog>
@@ -342,6 +342,7 @@ export default {
     },
     reFreshComponent(component) {
       this.currentFilterCom = component
+      this.$forceUpdate()
     },
     eidtDialog() {
       const serviceName = this.curComponent.serviceName
diff --git a/frontend/src/views/panel/filter/filterDialog.vue b/frontend/src/views/panel/filter/filterDialog.vue
index 821df439a1..d818777bf5 100644
--- a/frontend/src/views/panel/filter/filterDialog.vue
+++ b/frontend/src/views/panel/filter/filterDialog.vue
@@ -249,6 +249,9 @@ export default {
           this.componentInfo.options.attrs.dragItems = values
           this.$emit('re-fresh-component', this.componentInfo)
         }
+      } else if (this.componentInfo && this.componentInfo.options.attrs.fieldId) {
+        this.componentInfo.options.attrs.fieldId = null
+        this.$emit('re-fresh-component', this.componentInfo)
       }
     }
   },
diff --git a/frontend/src/views/panel/filter/index.vue b/frontend/src/views/panel/filter/index.vue
index 926cbaea7e..bfa730ed84 100644
--- a/frontend/src/views/panel/filter/index.vue
+++ b/frontend/src/views/panel/filter/index.vue
@@ -45,7 +45,7 @@ export default {
         '时间过滤组件': [
           'timeYearWidget',
           'timeMonthWidget',
-          'timeQuarterWidget',
+          //   'timeQuarterWidget',
           'timeDateWidget',
           'timeDateRangeWidget'