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> fieldMap = new HashMap<>(); + List xAxisExt = new Gson().fromJson(view.getXAxisExt(), new TypeToken>() { + }.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" /> 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" /> 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" />