From 136bbd9a28c5955ea18a26972b1dd7f8098c2cbb Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 30 Aug 2021 17:21:54 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=E6=9D=A1=E4=BB=B6=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=80=BC=E5=9B=9E=E6=98=BE=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/widget/DeWidget/DeInputSearch.vue   | 14 +++++++++++---
 .../components/widget/DeWidget/DeNumberRange.vue   |  9 +++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/widget/DeWidget/DeInputSearch.vue b/frontend/src/components/widget/DeWidget/DeInputSearch.vue
index 36cb3083a9..18f23069b9 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="values"
+    v-model="value"
     resize="vertical"
     :placeholder="$t(options.attrs.placeholder)"
     @keypress.enter.native="search"
@@ -31,22 +31,30 @@ export default {
     return {
       options: null,
       operator: 'like',
-      values: null,
+      value: null,
       canEdit: false
     }
   },
   created() {
     this.options = this.element.options
+    if (this.inDraw && this.options.value && this.options.value.length > 0) {
+      this.value = this.options.value[0]
+    }
   },
   methods: {
     search() {
     //   this.options.value && this.setCondition()
+      this.options.value = []
+      if (this.inDraw && this.value) {
+        this.options.value = [this.value]
+      }
+
       this.setCondition()
     },
     setCondition() {
       const param = {
         component: this.element,
-        value: !this.values ? [] : Array.isArray(this.values) ? this.values : [this.values],
+        value: !this.options.value ? [] : Array.isArray(this.options.value) ? this.options.value : [this.options.value],
         operator: this.operator
       }
       this.inDraw && this.$store.commit('addViewFilter', param)
diff --git a/frontend/src/components/widget/DeWidget/DeNumberRange.vue b/frontend/src/components/widget/DeWidget/DeNumberRange.vue
index 17dc4cde31..c005736cbe 100644
--- a/frontend/src/components/widget/DeWidget/DeNumberRange.vue
+++ b/frontend/src/components/widget/DeWidget/DeNumberRange.vue
@@ -66,6 +66,12 @@ export default {
   },
   created() {
     this.options = this.element.options
+    if (this.inDraw && this.options.value && this.options.value.length > 0) {
+      this.form.min = this.options.value[0]
+      if (this.options.value.length > 1) {
+        this.form.max = this.options.value[1]
+      }
+    }
   },
   methods: {
     searchWithKey(index) {
@@ -134,6 +140,7 @@ export default {
         if (!valid) {
           return false
         }
+
         this.setCondition()
         this.styleChange()
       })
@@ -145,6 +152,8 @@ export default {
         value: [this.form.min, this.form.max],
         operator: this.operator
       }
+
+      this.inDraw && (this.options.value = param.value)
       if (this.form.min && this.form.max) {
         this.inDraw && this.$store.commit('addViewFilter', param)
         return

From 1fcc794a1c8dc9dcec2940b98e63b5e677432328 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 31 Aug 2021 10:29:20 +0800
Subject: [PATCH 2/3] =?UTF-8?q?refactor:=E8=A7=86=E5=9B=BE=E4=B8=8B?=
 =?UTF-8?q?=E9=92=BB=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/components/ChartComponent.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/chart/components/ChartComponent.vue b/frontend/src/views/chart/components/ChartComponent.vue
index 7c81e1e8a0..f23c41b0f5 100644
--- a/frontend/src/views/chart/components/ChartComponent.vue
+++ b/frontend/src/views/chart/components/ChartComponent.vue
@@ -218,7 +218,10 @@ export default {
     trackClick(trackAction) {
       const param = this.pointParam
       if (!param || !param.data || !param.data.dimensionList) {
-        this.$warning(this.$t('panel.no_drill_field'))
+        // 地图提示没有关联字段 其他没有维度信息的 直接返回
+        if (this.chart.type === 'map') {
+          this.$warning(this.$t('panel.no_drill_field'))
+        }
         return
       }
       const linkageParam = {

From d0bb428ac16b2da3b224613655cfccbb7adc6eac Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 31 Aug 2021 11:13:31 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E5=9C=B0=E5=9B=BEresize=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/components/ChartComponent.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/frontend/src/views/chart/components/ChartComponent.vue b/frontend/src/views/chart/components/ChartComponent.vue
index f23c41b0f5..92a1374e18 100644
--- a/frontend/src/views/chart/components/ChartComponent.vue
+++ b/frontend/src/views/chart/components/ChartComponent.vue
@@ -214,6 +214,13 @@ export default {
       // 指定图表的配置项和数据
       const chart = this.myChart
       chart.resize()
+      this.reDrawMap()
+    },
+    reDrawMap() {
+      const chart = this.chart
+      if (chart.type === 'map') {
+        this.preDraw()
+      }
     },
     trackClick(trackAction) {
       const param = this.pointParam