From e5ad92ae9119adbc2f4e152bd82abb529ee750bc Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Wed, 1 Jun 2022 11:04:50 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E6=81=A2=E5=A4=8D=E7=BB=84=E5=90=88?=
 =?UTF-8?q?=E5=9B=BE=E5=89=AF=E8=BD=B4=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/chart/util.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/chart/chart/util.js b/frontend/src/views/chart/chart/util.js
index 820119b829..c100ca2f23 100644
--- a/frontend/src/views/chart/chart/util.js
+++ b/frontend/src/views/chart/chart/util.js
@@ -1564,7 +1564,9 @@ export const TYPE_CONFIGS = [
         'position',
         'name',
         'nameTextStyle',
-        'splitLine'
+        'axisValue',
+        'splitLine',
+        'axisLabel'
       ],
       'title-selector': [
         'show',

From 75a3fab1c8e7a9342bd83260f504a16151289d10 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 1 Jun 2022 11:10:44 +0800
Subject: [PATCH 2/4] =?UTF-8?q?style:=20=E4=BF=AE=E6=94=B9checkbox?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/Editor/EditBar.vue        | 17 +++++++++++++----
 .../canvas/components/Editor/MobileCheckBar.vue | 10 +++++++++-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/EditBar.vue b/frontend/src/components/canvas/components/Editor/EditBar.vue
index 67f037e229..1732428db3 100644
--- a/frontend/src/components/canvas/components/Editor/EditBar.vue
+++ b/frontend/src/components/canvas/components/Editor/EditBar.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="bar-main">
     <input id="input" ref="files" type="file" accept="image/*" hidden @click="e => {e.target.value = '';}" @change="handleFileChange">
-    <div v-if="linkageAreaShow" style="margin-right: -1px;width: 18px">
-      <el-checkbox v-model="linkageInfo.linkageActive" />
+    <div v-if="linkageAreaShow" style="margin-right: -1px;width: 20px">
+      <el-checkbox v-model="linkageInfo.linkageActive" size="medium" />
       <linkage-field v-if="linkageInfo.linkageActive" :element="element" />
     </div>
-    <div v-if="batchOptAreaShow" style="margin-right: -1px;width: 18px;z-index: 5">
-      <el-checkbox @change="batchOptChange" />
+    <div v-if="batchOptAreaShow" style="margin-right: -1px;width: 20px;z-index: 5">
+      <el-checkbox size="medium" @change="batchOptChange" />
     </div>
     <div v-if="normalAreaShow">
       <setting-menu v-if="activeModel==='edit'" style="float: right;height: 24px!important;" @amRemoveItem="amRemoveItem" @linkJumpSet="linkJumpSet" @boardSet="boardSet">
@@ -297,4 +297,13 @@ export default {
     margin-right: 3px;
   }
 
+  .bar-main ::v-deep .el-checkbox__inner{
+    width: 16px;
+    height: 16px;
+  }
+
+  .bar-main ::v-deep .el-checkbox__inner::after{
+    width: 4.5px;
+  }
+
 </style>
diff --git a/frontend/src/components/canvas/components/Editor/MobileCheckBar.vue b/frontend/src/components/canvas/components/Editor/MobileCheckBar.vue
index cb511a2cbf..9dcb0779c2 100644
--- a/frontend/src/components/canvas/components/Editor/MobileCheckBar.vue
+++ b/frontend/src/components/canvas/components/Editor/MobileCheckBar.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="bar-main">
-    <div style="width: 18px">
+    <div style="width: 20px">
       <!--      <svg-icon icon-class="field_text" class="el-icon-close" />-->
       <el-checkbox v-model="element.mobileSelected" @change="onChange" />
     </div>
@@ -84,4 +84,12 @@ export default {
     margin-right: 3px;
   }
 
+  .bar-main ::v-deep .el-checkbox__inner{
+    width: 16px;
+    height: 16px;
+  }
+
+  .bar-main ::v-deep .el-checkbox__inner::after{
+    width: 4.5px;
+  }
 </style>

From 87001c32682a9ce3a490068b09d715c1f9737944 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 1 Jun 2022 11:15:49 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E7=AC=A6=E5=8F=B7=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BAexcel=E7=BC=BA=E5=B0=91=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/service/chart/ChartViewService.java |  2 +-
 .../service/chart/util/ChartDataBuild.java       | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
index 25190fb6c8..d5d2bb2e6b 100644
--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -787,7 +787,7 @@ public class ChartViewService {
             data = datasourceProvider.getData(datasourceRequest);
 
             Map<String, Object> mapChart = pluginViewResult(pluginViewParam, view, data, isDrill);
-            Map<String, Object> mapTableNormal = ChartDataBuild.transTableNormal(xAxis, yAxis, view, data, extStack, desensitizationList);
+            Map<String, Object> mapTableNormal = ChartDataBuild.transTableNormal(fieldMap, view, data, desensitizationList);
 
             return uniteViewResult(datasourceRequest.getQuery(), mapChart, mapTableNormal, view, isDrill, drillFilters);
             // 如果是插件到此结束
diff --git a/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java b/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java
index 6fa1d9a3f0..4daf0ce137 100644
--- a/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java
+++ b/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java
@@ -859,9 +859,7 @@ public class ChartDataBuild {
 
     // 表格
     public static Map<String, Object> transTableNormal(List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, ChartViewWithBLOBs view, List<String[]> data, List<ChartViewFieldDTO> extStack, List<String> desensitizationList) {
-        Map<String, Object> map = new TreeMap<>();
         List<ChartViewFieldDTO> fields = new ArrayList<>();
-        List<Map<String, Object>> tableRow = new ArrayList<>();
         if (ObjectUtils.isNotEmpty(xAxis)) {
             fields.addAll(xAxis);
         }
@@ -871,6 +869,18 @@ public class ChartDataBuild {
             }
         }
         fields.addAll(yAxis);
+        return transTableNormal(fields, view, data, desensitizationList);
+    }
+
+    // 表格
+    public static Map<String, Object> transTableNormal(Map<String, List<ChartViewFieldDTO>> fieldMap, ChartViewWithBLOBs view, List<String[]> data, List<String> desensitizationList) {
+        List<ChartViewFieldDTO> fields = fieldMap.entrySet().stream().map(Map.Entry::getValue).flatMap(List::stream).collect(Collectors.toList());
+        return transTableNormal(fields, view, data, desensitizationList);
+    }
+
+    private static Map<String, Object> transTableNormal(List<ChartViewFieldDTO> fields, ChartViewWithBLOBs view, List<String[]> data, List<String> desensitizationList) {
+        Map<String, Object> map = new TreeMap<>();
+        List<Map<String, Object>> tableRow = new ArrayList<>();
         data.forEach(ele -> {
             Map<String, Object> d = new HashMap<>();
             for (int i = 0; i < fields.size(); i++) {
@@ -880,7 +890,7 @@ public class ChartDataBuild {
                 }
 
                 ChartViewFieldDTO chartViewFieldDTO = fields.get(i);
-                if (chartViewFieldDTO.getDeType() == 0 || chartViewFieldDTO.getDeType() == 1) {
+                if (chartViewFieldDTO.getDeType() == 0 || chartViewFieldDTO.getDeType() == 1 || chartViewFieldDTO.getDeType() == 5) {
                     d.put(fields.get(i).getDataeaseName(), StringUtils.isEmpty(ele[i]) ? "" : ele[i]);
                 } else if (chartViewFieldDTO.getDeType() == 2 || chartViewFieldDTO.getDeType() == 3) {
                     d.put(fields.get(i).getDataeaseName(), StringUtils.isEmpty(ele[i]) ? null : new BigDecimal(ele[i]).setScale(2, RoundingMode.HALF_UP));

From bf493362a96cd20564450c5375d04f6ac427492a Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 1 Jun 2022 12:15:43 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E7=AC=A6=E5=8F=B7=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E5=BF=97=E5=9C=A8=E8=81=94=E5=8A=A8=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E6=9C=AA=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/io/dataease/ext/ExtPanelViewMapper.xml   | 1 +
 frontend/src/views/panel/LinkJumpSet/index.vue             | 7 +++++--
 frontend/src/views/panel/OuterParamsSet/index.vue          | 5 ++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/dataease/ext/ExtPanelViewMapper.xml b/backend/src/main/java/io/dataease/ext/ExtPanelViewMapper.xml
index 691c9e3bfd..ff61587c59 100644
--- a/backend/src/main/java/io/dataease/ext/ExtPanelViewMapper.xml
+++ b/backend/src/main/java/io/dataease/ext/ExtPanelViewMapper.xml
@@ -33,6 +33,7 @@
             chart_view.create_time,
             chart_view.update_time,
             chart_view.style_priority,
+            ifnull(chart_view.is_plugin,0) as 'is_plugin',
             panel_view.panel_id,
             dataset_table_field.id as 'field_id',
             dataset_table_field.origin_name,
diff --git a/frontend/src/views/panel/LinkJumpSet/index.vue b/frontend/src/views/panel/LinkJumpSet/index.vue
index b63ca719a9..22a1966c7c 100644
--- a/frontend/src/views/panel/LinkJumpSet/index.vue
+++ b/frontend/src/views/panel/LinkJumpSet/index.vue
@@ -95,10 +95,13 @@
                           :label="item.name"
                           :value="item.id"
                         >
-                          <span style="float: left">
+                          <span v-if="item.isPlugin" style="float: left">
+                            <svg-icon :icon-class="item.type !== 'buddle-map' ? ('/api/pluginCommon/staticInfo/' + item.type + '/svg') : item.type" style="width: 14px;height: 14px" />
+                          </span>
+                          <span v-else style="float: left">
                             <svg-icon :icon-class="item.type" style="width: 14px;height: 14px" />
                           </span>
-                          <span style="float: left; font-size: 12px"> {{ item.name }}</span>
+                          <span style="float: left; font-size: 12px">{{ item.name }}</span>
                         </el-option>
                       </el-select>
                     </div>
diff --git a/frontend/src/views/panel/OuterParamsSet/index.vue b/frontend/src/views/panel/OuterParamsSet/index.vue
index d7e4360a7d..a72b716d8d 100644
--- a/frontend/src/views/panel/OuterParamsSet/index.vue
+++ b/frontend/src/views/panel/OuterParamsSet/index.vue
@@ -81,7 +81,10 @@
                           :label="item.name"
                           :value="item.id"
                         >
-                          <span style="float: left">
+                          <span v-if="item.isPlugin" style="float: left">
+                            <svg-icon :icon-class="item.type !== 'buddle-map' ? ('/api/pluginCommon/staticInfo/' + item.type + '/svg') : item.type" style="width: 14px;height: 14px" />
+                          </span>
+                          <span v-else style="float: left">
                             <svg-icon :icon-class="item.type" style="width: 14px;height: 14px" />
                           </span>
                           <span style="float: left; font-size: 12px"> {{ item.name }}</span>