From e97c0d8e36d704d005751417309587ff8e794fa9 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 24 Aug 2021 12:02:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E9=9B=B7=E8=BE=BE=E5=9B=BE?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/en.js                                       | 3 ++-
 frontend/src/lang/tw.js                                       | 3 ++-
 frontend/src/lang/zh.js                                       | 3 ++-
 frontend/src/views/chart/chart/chart.js                       | 1 +
 frontend/src/views/chart/chart/radar/radar.js                 | 1 +
 .../src/views/chart/components/shape-attr/SizeSelector.vue    | 4 ++++
 6 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 97b552de8f..8532718ef6 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -847,7 +847,8 @@ export default {
     height: 'Height',
     system_case: 'System',
     custom_case: 'Custom',
-    last_layer: 'This Is The Last Layer'
+    last_layer: 'This Is The Last Layer',
+    radar_size: 'Size'
   },
   dataset: {
     sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 79a40eaef3..16e2f4543b 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -846,7 +846,8 @@ export default {
     height: '高度',
     system_case: '系統方案',
     custom_case: '自定義',
-    last_layer: '當前已經是最後一級'
+    last_layer: '當前已經是最後一級',
+    radar_size: '大小'
   },
   dataset: {
     sheet_warn: '有多個sheet頁面，默認抽取第一個',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 56d071bb02..e2d201ea11 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -846,7 +846,8 @@ export default {
     height: '高度',
     system_case: '系统方案',
     custom_case: '自定义',
-    last_layer: '当前已经是最后一级'
+    last_layer: '当前已经是最后一级',
+    radar_size: '大小'
   },
   dataset: {
     sheet_warn: '有多个 Sheet 页，默认抽取第一个',
diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js
index df765c00f0..fecf05878d 100644
--- a/frontend/src/views/chart/chart/chart.js
+++ b/frontend/src/views/chart/chart/chart.js
@@ -25,6 +25,7 @@ export const DEFAULT_SIZE = {
   pieRoseRadius: 5,
   funnelWidth: 80,
   radarShape: 'polygon',
+  radarSize: 80,
   tableTitleFontSize: 12,
   tableItemFontSize: 12,
   tableTitleHeight: 36,
diff --git a/frontend/src/views/chart/chart/radar/radar.js b/frontend/src/views/chart/chart/radar/radar.js
index cf1e9b37a1..56e6ec55d1 100644
--- a/frontend/src/views/chart/chart/radar/radar.js
+++ b/frontend/src/views/chart/chart/radar/radar.js
@@ -12,6 +12,7 @@ export function baseRadarOption(chart_option, chart) {
     // size
     if (customAttr.size) {
       chart_option.radar.shape = customAttr.size.radarShape
+      chart_option.radar.radius = (customAttr.size.radarSize ? customAttr.size.radarSize : 80) + '%'
     }
     // tooltip
     if (customAttr.tooltip) {
diff --git a/frontend/src/views/chart/components/shape-attr/SizeSelector.vue b/frontend/src/views/chart/components/shape-attr/SizeSelector.vue
index 1dd5a77237..e39a28e73b 100644
--- a/frontend/src/views/chart/components/shape-attr/SizeSelector.vue
+++ b/frontend/src/views/chart/components/shape-attr/SizeSelector.vue
@@ -78,6 +78,9 @@
             <el-radio-button label="circle">{{ $t('chart.circle') }}</el-radio-button>
           </el-radio-group>
         </el-form-item>
+        <el-form-item :label="$t('chart.radar_size')" class="form-item form-item-slider">
+          <el-slider v-model="sizeForm.radarSize" show-input :show-input-controls="false" input-size="mini" :min="0" :max="100" @change="changeBarSizeCase" />
+        </el-form-item>
       </el-form>
 
       <el-form v-show="chart.type && chart.type.includes('table')" ref="sizeFormPie" :disabled="param && !hasDataPermission('manage',param.privileges)" :model="sizeForm" label-width="100px" size="mini">
@@ -220,6 +223,7 @@ export default {
           this.sizeForm = customAttr.size
           this.sizeForm.treemapWidth = this.sizeForm.treemapWidth ? this.sizeForm.treemapWidth : 80
           this.sizeForm.treemapHeight = this.sizeForm.treemapHeight ? this.sizeForm.treemapHeight : 80
+          this.sizeForm.radarSize = this.sizeForm.radarSize ? this.sizeForm.radarSize : 80
         }
       }
     },

From 407bdb52c4a27fdda3142b12ae466be48919c988 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 24 Aug 2021 13:45:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor:=E4=BB=AA=E8=A1=A8=E7=89=88?=
 =?UTF-8?q?=E9=A6=96=E6=AC=A1=E5=88=B7=E7=BA=BF=E8=AE=BE=E7=BD=AE=E4=B8=BA?=
 =?UTF-8?q?5=E5=88=86=E9=92=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/components/Editor/Preview.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue
index d40a4ae3ed..488dd6381c 100644
--- a/frontend/src/components/canvas/components/Editor/Preview.vue
+++ b/frontend/src/components/canvas/components/Editor/Preview.vue
@@ -84,7 +84,7 @@ export default {
       componentDataShow: [],
       mainWidth: '100%',
       mainHeight: '100%',
-      searchCount: -1,
+      searchCount: 0,
       chartDetailsVisible: false,
       showChartInfo: {},
       showChartTableInfo: {}