forked from github/dataease
feat: dataease适配符号地图插件
This commit is contained in:
parent
a5d8d6cbbb
commit
f4130f61a2
@ -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);
|
||||
|
@ -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);
|
||||
// 需要删除文件
|
||||
|
@ -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"
|
||||
|
@ -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" />
|
||||
|
@ -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" />
|
||||
|
@ -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'"
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user