From f525d9154a47589f659a2a4aa1cb1228b3c769a6 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 19 May 2021 16:21:20 +0800
Subject: [PATCH 1/5] =?UTF-8?q?feat:fontsize=20fix;=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E6=9D=BF=E8=A7=86=E5=9B=BE=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/provider/mysql/MysqlQueryProvider.java     | 2 +-
 frontend/src/views/chart/components/shape-attr/SizeSelector.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java
index f182c6109a..2fe0d6c0b4 100644
--- a/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java
@@ -184,7 +184,7 @@ public class MysqlQueryProvider extends QueryProvider {
                 StringUtils.join(groupField, ","),
                 StringUtils.join(field, ","),
                 table,
-                xFilter.length > 0 ? StringUtils.join(xFilter, " ") : "" + transMysqlExtFilter(extFilterRequestList),// origin field filter and panel field filter
+                (xFilter.length > 0 ? StringUtils.join(xFilter, " ") : "") + transMysqlExtFilter(extFilterRequestList),// origin field filter and panel field filter
                 StringUtils.join(group, ","),
                 StringUtils.join(order, ","));
         if (sql.endsWith(",")) {
diff --git a/frontend/src/views/chart/components/shape-attr/SizeSelector.vue b/frontend/src/views/chart/components/shape-attr/SizeSelector.vue
index 2b7a2df6b4..fb65863e19 100644
--- a/frontend/src/views/chart/components/shape-attr/SizeSelector.vue
+++ b/frontend/src/views/chart/components/shape-attr/SizeSelector.vue
@@ -194,7 +194,7 @@ export default {
   methods: {
     init() {
       const arr = []
-      for (let i = 10; i <= 30; i = i + 2) {
+      for (let i = 10; i <= 60; i = i + 2) {
         arr.push({
           name: i + '',
           value: i + ''

From c0ccf23a20255a6bf490a7742819bd0c16ac88ea Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 19 May 2021 16:29:19 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8=E6=9D=A1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/custom-component/UserView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index 44ee1c86cf..458eff586b 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -155,7 +155,7 @@ export default {
 .rect-shape {
     width: 100%;
     height: 100%;
-    overflow: auto;
+    overflow: hidden;
 }
 .chart-class{
   height: 100%;

From f615e9fda8eac21db56a09973e4622268520835d Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 19 May 2021 16:37:15 +0800
Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E4=B8=BB=E9=A2=98=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=9D=A1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue | 4 ++--
 .../panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue b/frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue
index f74e0d10da..6a8288a361 100644
--- a/frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue
+++ b/frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue
@@ -1,6 +1,6 @@
 <template>
   <el-row>
-    <el-row>
+    <el-row v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
       <el-col :span="2">
         <span>&nbsp</span>
         <ul class="direction">
@@ -14,7 +14,7 @@
           <div class="window">
             <ul class="container" :style="containerStyle">
               <li>
-                <div style="width:240px; height: 208px;">
+                <div style="width:240px; height: 208px;overflow: hidden">
                   <subject-template-item
                     v-for="item in sliders[sliders.length - 1]"
                     :key="item.id"
diff --git a/frontend/src/views/panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue b/frontend/src/views/panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue
index 0ee2d577f0..3d07f9605a 100644
--- a/frontend/src/views/panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue
+++ b/frontend/src/views/panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue
@@ -80,7 +80,7 @@ export default {
         background: 'background: 0% 0% / cover rgb(255, 255, 255)'
       }
       if (this.subjectItemDetails) {
-        if (this.subjectItemDetails.panel.backgroundType === 'image'&&this.subjectItemDetails.panel.imageUrl) {
+        if (this.subjectItemDetails.panel.backgroundType === 'image' && this.subjectItemDetails.panel.imageUrl) {
           style = {
             width: '100%',
             height: '100%',
@@ -224,7 +224,7 @@ export default {
   }
 
   .vertical-layout {
-    overflow: hidden auto;
+    overflow: hidden;
     position: absolute;
     inset: 0px 0px 30px;
     width: 108px; height: 58px;

From 7ee8e0769199ca0c7d558f5df33fcd3fe997998d Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 19 May 2021 16:42:39 +0800
Subject: [PATCH 4/5] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?title=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/chart/chart.js | 35 ++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js
index 819d0c471c..ca21d59ea3 100644
--- a/frontend/src/views/chart/chart/chart.js
+++ b/frontend/src/views/chart/chart/chart.js
@@ -98,7 +98,10 @@ export const DEFAULT_BACKGROUND_COLOR = {
 // chart config
 export const BASE_BAR = {
   title: {
-    text: ''
+    text: '',
+    textStyle: {
+      fontWeight: 'normal'
+    }
   },
   // grid: {
   //   containLabel: true
@@ -127,7 +130,10 @@ export const BASE_BAR = {
 }
 export const HORIZONTAL_BAR = {
   title: {
-    text: ''
+    text: '',
+    textStyle: {
+      fontWeight: 'normal'
+    }
   },
   // grid: {
   //   containLabel: true
@@ -157,7 +163,10 @@ export const HORIZONTAL_BAR = {
 
 export const BASE_LINE = {
   title: {
-    text: ''
+    text: '',
+    textStyle: {
+      fontWeight: 'normal'
+    }
   },
   // grid: {
   //   containLabel: true
@@ -188,7 +197,10 @@ export const BASE_LINE = {
 
 export const BASE_PIE = {
   title: {
-    text: ''
+    text: '',
+    textStyle: {
+      fontWeight: 'normal'
+    }
   },
   // grid: {
   //   containLabel: true
@@ -221,7 +233,10 @@ export const BASE_PIE = {
 
 export const BASE_FUNNEL = {
   title: {
-    text: ''
+    text: '',
+    textStyle: {
+      fontWeight: 'normal'
+    }
   },
   // grid: {
   //   containLabel: true
@@ -277,7 +292,10 @@ export const BASE_FUNNEL = {
 
 export const BASE_RADAR = {
   title: {
-    text: ''
+    text: '',
+    textStyle: {
+      fontWeight: 'normal'
+    }
   },
   // grid: {
   //   containLabel: true
@@ -312,7 +330,10 @@ export const BASE_RADAR = {
 
 export const BASE_GAUGE = {
   title: {
-    text: ''
+    text: '',
+    textStyle: {
+      fontWeight: 'normal'
+    }
   },
   // grid: {
   //   containLabel: true

From a1c4c61d95045e936e4e282a406eac7257302e80 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 19 May 2021 16:58:21 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/canvas/components/Editor/Preview.vue  | 12 ++++++++++++
 frontend/src/lang/en.js                              |  3 ++-
 frontend/src/lang/tw.js                              |  3 ++-
 frontend/src/lang/zh.js                              |  3 ++-
 frontend/src/views/panel/list/PanelList.vue          |  8 ++++----
 frontend/src/views/panel/panel.js                    |  4 ++--
 6 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue
index 3b41f46cba..ca235ed72e 100644
--- a/frontend/src/components/canvas/components/Editor/Preview.vue
+++ b/frontend/src/components/canvas/components/Editor/Preview.vue
@@ -1,5 +1,8 @@
 <template>
   <div id="canvasInfo" :style="customStyle" class="bg">
+    <el-row v-if="componentDataShow.length===0" style="height: 100%;" class="custom-position">
+      {{ $t('panel.panel_null') }}
+    </el-row>
     <ComponentWrapper
       v-for="(item, index) in componentDataInfo"
       :key="index"
@@ -148,4 +151,13 @@ export default {
         }
     }
 }
+.custom-position {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 14px;
+  flex-flow: row nowrap;
+  color: #9ea6b2;
+}
 </style>
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index cf32177a0f..c9e0d46f2e 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -872,7 +872,8 @@ export default {
     clean_canvas: 'Clean Canvas',
     insert_picture: 'Insert Picture',
     redo: 'Redo',
-    undo: 'UToolbar.vuendo'
+    undo: 'UToolbar.vuendo',
+    panel_null: 'This is a Empty Panel，You Can Edit and Enrich It'
   },
   plugin: {
     local_install: 'Local installation',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index f9638c2ffa..7635656b1f 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -872,7 +872,8 @@ export default {
     clean_canvas: '清空畫布',
     insert_picture: '插入圖片',
     redo: '重做',
-    undo: '撤銷'
+    undo: '撤銷',
+    panel_null: '这是个空的儀表盤，可以通过编辑来丰富内容'
   },
   plugin: {
     local_install: '本地安裝',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 059fa44092..2eda0d0721 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -874,7 +874,8 @@ export default {
     clean_canvas: '清空画布',
     insert_picture: '插入图片',
     redo: '重做',
-    undo: '撤销'
+    undo: '撤销',
+    panel_null: '这是个空的仪表板，可以通过编辑来丰富内容'
   },
   plugin: {
     local_install: '本地安装',
diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue
index 090fd16e6c..95a1bd7c66 100644
--- a/frontend/src/views/panel/list/PanelList.vue
+++ b/frontend/src/views/panel/list/PanelList.vue
@@ -184,8 +184,8 @@ export default {
           nodeType: null,
           panelType: null,
           panelStyle: JSON.stringify({
-            width: 1680,
-            height: 1050,
+            width: 1280,
+            height: 720,
             scale: 100,
             openCommonStyle: true,
             panel: DEFAULT_PANEL_STYLE,
@@ -225,8 +225,8 @@ export default {
           nodeType: null,
           panelType: null,
           panelStyle: JSON.stringify({
-            width: 1680,
-            height: 1050,
+            width: 1280,
+            height: 720,
             scale: 100,
             openCommonStyle: true,
             panel: DEFAULT_PANEL_STYLE,
diff --git a/frontend/src/views/panel/panel.js b/frontend/src/views/panel/panel.js
index 7f6532d8f5..ef650c5077 100644
--- a/frontend/src/views/panel/panel.js
+++ b/frontend/src/views/panel/panel.js
@@ -19,8 +19,8 @@ export const DEFAULT_PANEL_STYLE = {
 }
 
 export const DEFAULT_COMMON_CANVAS_STYLE = {
-  width: 1680,
-  height: 1050,
+  width: 1280,
+  height: 720,
   scale: 100,
   openCommonStyle: true,
   panel: DEFAULT_PANEL_STYLE,