From ac3ac0f6578de9ad1832a3cb0368a6fbe9cf1a43 Mon Sep 17 00:00:00 2001
From: fossabot <badges@fossa.io>
Date: Wed, 10 May 2023 20:45:11 -1000
Subject: [PATCH 01/10] Add license scan report and status

Signed off by: fossabot <badges@fossa.com>
---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 453a75a9c4..e83373f93e 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,9 @@
 </p>
 <hr/>
 
+
+[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fdataease%2Fdataease.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fdataease%2Fdataease?ref=badge_large)
+
 ## 什么是 DataEase？
 
 DataEase 是开源的数据可视化分析工具，帮助用户快速分析数据并洞察业务趋势，从而实现业务的改进与优化。DataEase 支持丰富的数据源连接，能够通过拖拉拽方式快速制作图表，并可以方便的与他人分享。
@@ -103,6 +106,7 @@ curl -sSL https://dataease.oss-cn-hangzhou.aliyuncs.com/quick_start.sh | bash
 ## Star History
 
 [![Star History Chart](https://api.star-history.com/svg?repos=dataease/dataease&type=Date)](https://star-history.com/#dataease/dataease&Date)
+[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fdataease%2Fdataease.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fdataease%2Fdataease?ref=badge_shield)
 
 ## License
 
@@ -112,4 +116,4 @@ Licensed under The GNU General Public License version 3 (GPLv3)  (the "License")
 
 <https://www.gnu.org/licenses/gpl-3.0.html>
 
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
\ No newline at end of file

From 42dde10015b0608dbdd47bfd45728541022467ea Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 11 May 2023 14:55:50 +0800
Subject: [PATCH 02/10] =?UTF-8?q?refactor:=20=E5=8E=BB=E6=8E=89=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/service/dataset/DataSetTableService.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index 15f0f5ced2..3381f2d15d 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -1279,7 +1279,6 @@ public class DataSetTableService {
         QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
         String sqlAsTable = qp.createSQLPreview(sql, null);
         datasourceRequest.setQuery(sqlAsTable);
-        System.out.println(sqlAsTable);
         Map<String, List> result;
         try {
             datasetSqlLog.setStartTime(System.currentTimeMillis());

From b47ab5b30d47a26245e656d55a3aa21296e79400 Mon Sep 17 00:00:00 2001
From: maninhill <41712985+maninhill@users.noreply.github.com>
Date: Thu, 11 May 2023 15:16:11 +0800
Subject: [PATCH 03/10] Update README.md

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index e83373f93e..eb0b491854 100644
--- a/README.md
+++ b/README.md
@@ -5,13 +5,9 @@
   <a href="https://app.codacy.com/gh/dataease/dataease?utm_source=github.com&utm_medium=referral&utm_content=dataease/dataease&utm_campaign=Badge_Grade_Dashboard"><img src="https://app.codacy.com/project/badge/Grade/da67574fd82b473992781d1386b937ef" alt="Codacy"></a>
   <a href="https://github.com/dataease/dataease/releases/latest"><img src="https://img.shields.io/github/v/release/dataease/dataease" alt="Latest release"></a>
   <a href="https://github.com/dataease/dataease"><img src="https://img.shields.io/github/stars/dataease/dataease?color=%231890FF&style=flat-square" alt="Stars"></a>
-
 </p>
 <hr/>
 
-
-[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fdataease%2Fdataease.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fdataease%2Fdataease?ref=badge_large)
-
 ## 什么是 DataEase？
 
 DataEase 是开源的数据可视化分析工具，帮助用户快速分析数据并洞察业务趋势，从而实现业务的改进与优化。DataEase 支持丰富的数据源连接，能够通过拖拉拽方式快速制作图表，并可以方便的与他人分享。
@@ -106,7 +102,11 @@ curl -sSL https://dataease.oss-cn-hangzhou.aliyuncs.com/quick_start.sh | bash
 ## Star History
 
 [![Star History Chart](https://api.star-history.com/svg?repos=dataease/dataease&type=Date)](https://star-history.com/#dataease/dataease&Date)
-[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fdataease%2Fdataease.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fdataease%2Fdataease?ref=badge_shield)
+
+## FOSSA Status
+
+[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fdataease%2Fdataease.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fdataease%2Fdataease?ref=badge_large)
+
 
 ## License
 
@@ -116,4 +116,4 @@ Licensed under The GNU General Public License version 3 (GPLv3)  (the "License")
 
 <https://www.gnu.org/licenses/gpl-3.0.html>
 
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
\ No newline at end of file
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

From 688029e6d7f10cafd338c1708f94f7e30a810ab2 Mon Sep 17 00:00:00 2001
From: maninhill <41712985+maninhill@users.noreply.github.com>
Date: Thu, 11 May 2023 23:25:55 +0800
Subject: [PATCH 04/10] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index eb0b491854..fd9336bc85 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@
   <a href="https://app.codacy.com/gh/dataease/dataease?utm_source=github.com&utm_medium=referral&utm_content=dataease/dataease&utm_campaign=Badge_Grade_Dashboard"><img src="https://app.codacy.com/project/badge/Grade/da67574fd82b473992781d1386b937ef" alt="Codacy"></a>
   <a href="https://github.com/dataease/dataease/releases/latest"><img src="https://img.shields.io/github/v/release/dataease/dataease" alt="Latest release"></a>
   <a href="https://github.com/dataease/dataease"><img src="https://img.shields.io/github/stars/dataease/dataease?color=%231890FF&style=flat-square" alt="Stars"></a>
+  <a href="https://app.fossa.com/projects/git%2Bgithub.com%2F1dataease%2Fdataease?ref=badge_shield"><img src="https://app.fossa.com/api/projects/git%2Bgithub.com%2Fdataease%2Fdataease.svg?type=shield" alt="FOSSA Status"></a>  
 </p>
 <hr/>
 

From c2da4248a175df3aa338e74daa7c063ffea772e6 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Fri, 21 Apr 2023 11:09:13 +0800
Subject: [PATCH 05/10] =?UTF-8?q?fix:=20antv=20=E8=A1=A8=E6=A0=BC=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/editor/ViewTrackBar.vue        | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/canvas/components/editor/ViewTrackBar.vue b/frontend/src/components/canvas/components/editor/ViewTrackBar.vue
index b044107dfa..23a4e9a263 100644
--- a/frontend/src/components/canvas/components/editor/ViewTrackBar.vue
+++ b/frontend/src/components/canvas/components/editor/ViewTrackBar.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
-    <el-dropdown trigger="click">
+    <el-dropdown
+      trigger="click">
       <input
         id="input"
         ref="trackButton"
@@ -64,6 +65,15 @@ export default {
     width: 80px;
   }
 
+  ::v-deep.el-popper[x-placement^=bottom] .popper__arrow {
+    transform: rotate(180deg) !important;
+    top: 75px !important;
+  }
+
+  ::v-deep.el-popper[x-placement^=bottom] {
+    margin-top: -80px !important;
+  }
+
   .track-menu {
     border: #3a8ee6 1px solid;
   }

From ba549dc5b665bfb8b2ae77f7e46941a8fd08f4e4 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Fri, 12 May 2023 16:14:05 +0800
Subject: [PATCH 06/10] =?UTF-8?q?fix:=20=E5=89=8D=E7=AB=AF=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/customComponent/UserView.vue | 2 +-
 frontend/src/views/panel/filter/FilterDialog.vue            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/canvas/customComponent/UserView.vue b/frontend/src/components/canvas/customComponent/UserView.vue
index f42553a851..b27195250f 100644
--- a/frontend/src/components/canvas/customComponent/UserView.vue
+++ b/frontend/src/components/canvas/customComponent/UserView.vue
@@ -710,7 +710,7 @@ export default {
     clearPanelLinkage(param) {
       if (param.viewId === 'all' || param.viewId === this.element.propValue.viewId) {
         try {
-          this.$refs[this.element.propValue.id].reDrawView()
+          this.$refs[this.element.propValue.id]?.reDrawView()
         } catch (e) {
           console.error('reDrawView-error：', this.element.propValue.id)
         }
diff --git a/frontend/src/views/panel/filter/FilterDialog.vue b/frontend/src/views/panel/filter/FilterDialog.vue
index fe04b0923d..916727fae7 100644
--- a/frontend/src/views/panel/filter/FilterDialog.vue
+++ b/frontend/src/views/panel/filter/FilterDialog.vue
@@ -755,7 +755,7 @@ export default {
         type = 'NUM'
       }
       datasetParams(tableId, type).then(res => {
-        this.datasetParams = res.data
+        this.datasetParams = res.data || []
       })
     },
     comLoadField(tableId) {

From 32305503e6049efa9d0ad4287ba2f55e5dce35f4 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Sun, 14 May 2023 20:16:52 +0800
Subject: [PATCH 07/10] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=88=86=E4=BA=ABIDOR=E6=BC=8F=E6=B4=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/io/dataease/controller/panel/api/ShareApi.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/main/java/io/dataease/controller/panel/api/ShareApi.java b/backend/src/main/java/io/dataease/controller/panel/api/ShareApi.java
index f1c81f851c..95af14d0ae 100644
--- a/backend/src/main/java/io/dataease/controller/panel/api/ShareApi.java
+++ b/backend/src/main/java/io/dataease/controller/panel/api/ShareApi.java
@@ -56,6 +56,7 @@ public interface ShareApi {
     @PostMapping("/removeShares")
     void removeShares(PanelShareRemoveRequest request);
 
+    @DePermission(type = DePermissionType.PANEL)
     @ApiOperation("删除仪表板所有分享")
     @PostMapping("/removePanelShares/{panelId}")
     void removePanelShares(@PathVariable("panelId") String panelId);

From 9c5e2d5e6f983c67348b4346445bf59d80a390cf Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Mon, 15 May 2023 11:01:31 +0800
Subject: [PATCH 08/10] =?UTF-8?q?refactor:=20=E7=BB=84=E5=90=88=E5=9B=BE?=
 =?UTF-8?q?=E8=BD=B4=E5=80=BC=E6=9C=80=E5=A4=A7=E5=80=BC=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E5=B0=8F=E4=BA=8E=E6=95=B0=E5=80=BC=E6=9C=80=E5=A4=A7=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/chart/mix/mix.js | 31 +++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/frontend/src/views/chart/chart/mix/mix.js b/frontend/src/views/chart/chart/mix/mix.js
index 37779bc51c..c0c3579016 100644
--- a/frontend/src/views/chart/chart/mix/mix.js
+++ b/frontend/src/views/chart/chart/mix/mix.js
@@ -24,6 +24,7 @@ export function baseMixOption(chart_option, chart) {
     }
   }
   // 处理data
+  const yAxisSeriesMaxList = []; const yAxisExtSeriesMaxList = []
   if (chart.data) {
     chart_option.title.text = chart.title
     chart_option.xAxis.data = chart.data.x
@@ -69,12 +70,42 @@ export function baseMixOption(chart_option, chart) {
       chart_option.legend.data.push(y.name)
       i >= yAxis.length ? (y.yAxisIndex = 1) : (y.yAxisIndex = 0)
 
+      // get max
+      if (i >= yAxis.length) {
+        const valueList = []
+        y.data.forEach(ele => {
+          valueList.push(ele.value)
+        })
+        yAxisExtSeriesMaxList.push(Math.max.apply(null, valueList))
+      } else {
+        const valueList = []
+        y.data.forEach(ele => {
+          valueList.push(ele.value)
+        })
+        yAxisSeriesMaxList.push(Math.max.apply(null, valueList))
+      }
+
       y.selectedMode = true
       y.select = BASE_ECHARTS_SELECT
       chart_option.series.push(y)
     }
   }
   componentStyle(chart_option, chart)
+
+  // 若轴值中最大值小于data的最大值，则轴值最大值设置失效
+  if (yAxisSeriesMaxList.length > 0 && !isNaN(chart_option.yAxis[0].max)) {
+    const max = Math.max.apply(null, yAxisSeriesMaxList)
+    if (max > chart_option.yAxis[0].max) {
+      delete chart_option.yAxis[0].max
+    }
+  }
+  if (yAxisExtSeriesMaxList.length > 0 && !isNaN(chart_option.yAxis[1].max)) {
+    const max = Math.max.apply(null, yAxisExtSeriesMaxList)
+    if (max > chart_option.yAxis[1].max) {
+      delete chart_option.yAxis[1].max
+    }
+  }
+
   seniorCfg(chart_option, chart)
   return chart_option
 }

From ac9e2fb838349385af04e406b8b7707908323d85 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 15 May 2023 12:32:06 +0800
Subject: [PATCH 09/10] =?UTF-8?q?fix:=20Excel=E5=8C=85=E5=90=ABEmoji?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=BC=9A=E5=AF=BC=E8=87=B4=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/provider/engine/mysql/MysqlDDLProvider.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlDDLProvider.java b/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlDDLProvider.java
index cd9ff9f1b8..8b18cb33ce 100644
--- a/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlDDLProvider.java
+++ b/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlDDLProvider.java
@@ -20,7 +20,7 @@ public class MysqlDDLProvider extends DDLProviderImpl {
 
     private static final String creatTableSql =
             "CREATE TABLE IF NOT EXISTS `TABLE_NAME`" +
-            "Column_Fields;" ;
+            "Column_Fields" + " ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci;" ;
 
 
     @Override

From a3ca7387c93ffbfa8ccb03fb2d9358acd2e569d4 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 15 May 2023 12:37:35 +0800
Subject: [PATCH 10/10] =?UTF-8?q?fix:=20Excel=E5=8C=85=E5=90=ABEmoji?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=BC=9A=E5=AF=BC=E8=87=B4=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/dataease/service/engine/EngineService.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/backend/src/main/java/io/dataease/service/engine/EngineService.java b/backend/src/main/java/io/dataease/service/engine/EngineService.java
index 3089f547ca..6f572f8fb5 100644
--- a/backend/src/main/java/io/dataease/service/engine/EngineService.java
+++ b/backend/src/main/java/io/dataease/service/engine/EngineService.java
@@ -227,6 +227,9 @@ public class EngineService {
         mysqlConfiguration.setPort(Integer.valueOf(matcher.group(2)));
         mysqlConfiguration.setDataBase(matcher.group(3).split("\\?")[0]);
         mysqlConfiguration.setExtraParams(matcher.group(3).split("\\?")[1]);
+        if(StringUtils.isNotEmpty(mysqlConfiguration.getExtraParams()) && !mysqlConfiguration.getExtraParams().contains("connectionCollation")){
+            mysqlConfiguration.setExtraParams(mysqlConfiguration.getExtraParams() + "&connectionCollation=utf8mb4_general_ci");
+        }
         mysqlConfiguration.setUsername(env.getProperty("spring.datasource.username"));
         mysqlConfiguration.setPassword(env.getProperty("spring.datasource.password"));
         engine.setConfiguration(new Gson().toJson(mysqlConfiguration));