From f4130f61a28a519ff65be147ab928c6056bae443 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 25 Apr 2022 13:00:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20dataease=E9=80=82=E9=85=8D=E7=AC=A6?=
 =?UTF-8?q?=E5=8F=B7=E5=9C=B0=E5=9B=BE=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/service/chart/ChartViewService.java   | 3 +++
 .../main/java/io/dataease/service/sys/PluginService.java   | 6 ++++--
 .../src/components/canvas/custom-component/UserView.vue    | 7 +++++++
 .../components/canvas/custom-component/UserViewDialog.vue  | 1 +
 .../canvas/custom-component/UserViewMobileDialog.vue       | 1 +
 frontend/src/views/chart/view/ChartEdit.vue                | 3 +++
 frontend/src/views/system/plugin/PluginCom.vue             | 3 +++
 7 files changed, 22 insertions(+), 2 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 f8dc176372..c3d1e31871 100644
--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -503,6 +503,9 @@ public class ChartViewService {
         // 如果是插件视图 走插件内部的逻辑
         if (ObjectUtils.isNotEmpty(view.getIsPlugin()) && view.getIsPlugin()) {
             Map<String, List<ChartViewFieldDTO>> fieldMap = new HashMap<>();
+            List<ChartViewFieldDTO> xAxisExt = new Gson().fromJson(view.getXAxisExt(), new TypeToken<List<ChartViewFieldDTO>>() {
+            }.getType());
+            fieldMap.put("xAxisExt",xAxisExt);
             fieldMap.put("xAxis", xAxis);
             fieldMap.put("yAxis", yAxis);
             fieldMap.put("extStack", extStack);
diff --git a/backend/src/main/java/io/dataease/service/sys/PluginService.java b/backend/src/main/java/io/dataease/service/sys/PluginService.java
index 0627830715..db6882f081 100644
--- a/backend/src/main/java/io/dataease/service/sys/PluginService.java
+++ b/backend/src/main/java/io/dataease/service/sys/PluginService.java
@@ -1,6 +1,7 @@
 package io.dataease.service.sys;
 
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.ZipUtil;
 import com.google.gson.Gson;
 import io.dataease.dto.MyPluginDTO;
 import io.dataease.ext.ExtSysPluginMapper;
@@ -72,8 +73,9 @@ public class PluginService {
         //2.解压目标文件dest 得到plugin.json和jar
         String folder = pluginDir + "folder/";
         try {
-            ZipUtils.unzip(dest, folder);
-        } catch (IOException e) {
+            ZipUtil.unzip(dest.getAbsolutePath(), folder);
+            // ZipUtils.unzip(dest, folder);
+        } catch (Exception e) {
             DeFileUtils.deleteFile(pluginDir + "temp/");
             DeFileUtils.deleteFile(folder);
             // 需要删除文件
diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index 0e8f35793e..3dfc26d96a 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -21,7 +21,14 @@
       :ref="element.propValue.id"
       :component-name="chart.type + '-view'"
       :obj="{chart, trackMenu, searchCount, terminalType: scaleCoefficientType}"
+      :chart="chart"
+      :track-menu="trackMenu"
+      :search-count="searchCount"
+      :terminal-type="scaleCoefficientType"
+      :scale="scale"
       class="chart-class"
+      @onChartClick="chartClick"
+      @onJumpClick="jumpClick"
     />
     <chart-component
       v-else-if="charViewShowFlag"
diff --git a/frontend/src/components/canvas/custom-component/UserViewDialog.vue b/frontend/src/components/canvas/custom-component/UserViewDialog.vue
index 55f87f758b..7091f51821 100644
--- a/frontend/src/components/canvas/custom-component/UserViewDialog.vue
+++ b/frontend/src/components/canvas/custom-component/UserViewDialog.vue
@@ -7,6 +7,7 @@
             v-if="chart.isPlugin"
             :component-name="chart.type + '-view'"
             :obj="{chart: mapChart || chart}"
+            :chart="mapChart || chart"
             class="chart-class"
           />
           <chart-component v-else-if="!chart.type.includes('text') && chart.type !== 'label' && !chart.type.includes('table') && renderComponent() === 'echarts'" class="chart-class" :chart="mapChart || chart" />
diff --git a/frontend/src/components/canvas/custom-component/UserViewMobileDialog.vue b/frontend/src/components/canvas/custom-component/UserViewMobileDialog.vue
index d57297fd04..6dd44ebe5e 100644
--- a/frontend/src/components/canvas/custom-component/UserViewMobileDialog.vue
+++ b/frontend/src/components/canvas/custom-component/UserViewMobileDialog.vue
@@ -5,6 +5,7 @@
         v-if="chart.isPlugin"
         :component-name="chart.type + '-view'"
         :obj="{chart: mapChart || chart}"
+        :chart="mapChart || chart"
         class="chart-class"
       />
       <chart-component v-else-if="!chart.type.includes('text') && chart.type !== 'label' && !chart.type.includes('table') && renderComponent() === 'echarts'" class="chart-class" :chart="mapChart || chart" />
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 6ef0cf3eac..f4a1a28171 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -962,7 +962,10 @@
               ref="dynamicChart"
               :component-name="chart.type + '-view'"
               :obj="{chart}"
+              :chart-id="chart.id"
+              :chart="chart"
               class="chart-class"
+              @onChartClick="chartClick"
             />
             <chart-component
               v-else-if="httpRequest.status && chart.type && !chart.type.includes('table') && !chart.type.includes('text') && chart.type !== 'label' && renderComponent() === 'echarts'"
diff --git a/frontend/src/views/system/plugin/PluginCom.vue b/frontend/src/views/system/plugin/PluginCom.vue
index 01bce3904a..3ffcdf3d9f 100644
--- a/frontend/src/views/system/plugin/PluginCom.vue
+++ b/frontend/src/views/system/plugin/PluginCom.vue
@@ -5,6 +5,8 @@
     :ref="refId"
     :url="url"
     :obj="obj"
+    v-bind="$attrs"
+    v-on="$listeners"
     @execute-axios="executeAxios"
     @on-add-languanges="addLanguages"
     @plugin-call-back="pluginCallBack"
@@ -26,6 +28,7 @@ export default {
   components: {
     AsyncComponent
   },
+  inheritAttrs: true,
   props: {
     componentName: {
       type: String,