Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
f4130f61
提交
f4130f61
authored
4月 25, 2022
作者:
fit2cloud-chenyw
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat: dataease适配符号地图插件
上级
a5d8d6cb
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
22 行增加
和
2 行删除
+22
-2
ChartViewService.java
...main/java/io/dataease/service/chart/ChartViewService.java
+3
-0
PluginService.java
.../src/main/java/io/dataease/service/sys/PluginService.java
+4
-2
UserView.vue
frontend/src/components/canvas/custom-component/UserView.vue
+7
-0
UserViewDialog.vue
...src/components/canvas/custom-component/UserViewDialog.vue
+1
-0
UserViewMobileDialog.vue
...mponents/canvas/custom-component/UserViewMobileDialog.vue
+1
-0
ChartEdit.vue
frontend/src/views/chart/view/ChartEdit.vue
+3
-0
PluginCom.vue
frontend/src/views/system/plugin/PluginCom.vue
+3
-0
没有找到文件。
backend/src/main/java/io/dataease/service/chart/ChartViewService.java
浏览文件 @
f4130f61
...
@@ -503,6 +503,9 @@ public class ChartViewService {
...
@@ -503,6 +503,9 @@ public class ChartViewService {
// 如果是插件视图 走插件内部的逻辑
// 如果是插件视图 走插件内部的逻辑
if
(
ObjectUtils
.
isNotEmpty
(
view
.
getIsPlugin
())
&&
view
.
getIsPlugin
())
{
if
(
ObjectUtils
.
isNotEmpty
(
view
.
getIsPlugin
())
&&
view
.
getIsPlugin
())
{
Map
<
String
,
List
<
ChartViewFieldDTO
>>
fieldMap
=
new
HashMap
<>();
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
(
"xAxis"
,
xAxis
);
fieldMap
.
put
(
"yAxis"
,
yAxis
);
fieldMap
.
put
(
"yAxis"
,
yAxis
);
fieldMap
.
put
(
"extStack"
,
extStack
);
fieldMap
.
put
(
"extStack"
,
extStack
);
...
...
backend/src/main/java/io/dataease/service/sys/PluginService.java
浏览文件 @
f4130f61
package
io
.
dataease
.
service
.
sys
;
package
io
.
dataease
.
service
.
sys
;
import
cn.hutool.core.io.FileUtil
;
import
cn.hutool.core.io.FileUtil
;
import
cn.hutool.core.util.ZipUtil
;
import
com.google.gson.Gson
;
import
com.google.gson.Gson
;
import
io.dataease.dto.MyPluginDTO
;
import
io.dataease.dto.MyPluginDTO
;
import
io.dataease.ext.ExtSysPluginMapper
;
import
io.dataease.ext.ExtSysPluginMapper
;
...
@@ -72,8 +73,9 @@ public class PluginService {
...
@@ -72,8 +73,9 @@ public class PluginService {
//2.解压目标文件dest 得到plugin.json和jar
//2.解压目标文件dest 得到plugin.json和jar
String
folder
=
pluginDir
+
"folder/"
;
String
folder
=
pluginDir
+
"folder/"
;
try
{
try
{
ZipUtils
.
unzip
(
dest
,
folder
);
ZipUtil
.
unzip
(
dest
.
getAbsolutePath
(),
folder
);
}
catch
(
IOException
e
)
{
// ZipUtils.unzip(dest, folder);
}
catch
(
Exception
e
)
{
DeFileUtils
.
deleteFile
(
pluginDir
+
"temp/"
);
DeFileUtils
.
deleteFile
(
pluginDir
+
"temp/"
);
DeFileUtils
.
deleteFile
(
folder
);
DeFileUtils
.
deleteFile
(
folder
);
// 需要删除文件
// 需要删除文件
...
...
frontend/src/components/canvas/custom-component/UserView.vue
浏览文件 @
f4130f61
...
@@ -21,7 +21,14 @@
...
@@ -21,7 +21,14 @@
:ref=
"element.propValue.id"
:ref=
"element.propValue.id"
:component-name=
"chart.type + '-view'"
:component-name=
"chart.type + '-view'"
:obj=
"
{chart, trackMenu, searchCount, terminalType: scaleCoefficientType}"
:obj=
"
{chart, trackMenu, searchCount, terminalType: scaleCoefficientType}"
:chart="chart"
:track-menu="trackMenu"
:search-count="searchCount"
:terminal-type="scaleCoefficientType"
:scale="scale"
class="chart-class"
class="chart-class"
@onChartClick="chartClick"
@onJumpClick="jumpClick"
/>
/>
<chart-component
<chart-component
v-else-if=
"charViewShowFlag"
v-else-if=
"charViewShowFlag"
...
...
frontend/src/components/canvas/custom-component/UserViewDialog.vue
浏览文件 @
f4130f61
...
@@ -7,6 +7,7 @@
...
@@ -7,6 +7,7 @@
v-if=
"chart.isPlugin"
v-if=
"chart.isPlugin"
:component-name=
"chart.type + '-view'"
:component-name=
"chart.type + '-view'"
:obj=
"
{chart: mapChart || chart}"
:obj=
"
{chart: mapChart || chart}"
:chart="mapChart || chart"
class="chart-class"
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"
/>
<chart-component
v-else-if=
"!chart.type.includes('text') && chart.type !== 'label' && !chart.type.includes('table') && renderComponent() === 'echarts'"
class=
"chart-class"
:chart=
"mapChart || chart"
/>
...
...
frontend/src/components/canvas/custom-component/UserViewMobileDialog.vue
浏览文件 @
f4130f61
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
v-if=
"chart.isPlugin"
v-if=
"chart.isPlugin"
:component-name=
"chart.type + '-view'"
:component-name=
"chart.type + '-view'"
:obj=
"
{chart: mapChart || chart}"
:obj=
"
{chart: mapChart || chart}"
:chart="mapChart || chart"
class="chart-class"
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"
/>
<chart-component
v-else-if=
"!chart.type.includes('text') && chart.type !== 'label' && !chart.type.includes('table') && renderComponent() === 'echarts'"
class=
"chart-class"
:chart=
"mapChart || chart"
/>
...
...
frontend/src/views/chart/view/ChartEdit.vue
浏览文件 @
f4130f61
...
@@ -962,7 +962,10 @@
...
@@ -962,7 +962,10 @@
ref=
"dynamicChart"
ref=
"dynamicChart"
:component-name=
"chart.type + '-view'"
:component-name=
"chart.type + '-view'"
:obj=
"
{chart}"
:obj=
"
{chart}"
:chart-id="chart.id"
:chart="chart"
class="chart-class"
class="chart-class"
@onChartClick="chartClick"
/>
/>
<chart-component
<chart-component
v-else-if=
"httpRequest.status && chart.type && !chart.type.includes('table') && !chart.type.includes('text') && chart.type !== 'label' && renderComponent() === 'echarts'"
v-else-if=
"httpRequest.status && chart.type && !chart.type.includes('table') && !chart.type.includes('text') && chart.type !== 'label' && renderComponent() === 'echarts'"
...
...
frontend/src/views/system/plugin/PluginCom.vue
浏览文件 @
f4130f61
...
@@ -5,6 +5,8 @@
...
@@ -5,6 +5,8 @@
:ref=
"refId"
:ref=
"refId"
:url=
"url"
:url=
"url"
:obj=
"obj"
:obj=
"obj"
v-bind=
"$attrs"
v-on=
"$listeners"
@
execute-axios=
"executeAxios"
@
execute-axios=
"executeAxios"
@
on-add-languanges=
"addLanguages"
@
on-add-languanges=
"addLanguages"
@
plugin-call-back=
"pluginCallBack"
@
plugin-call-back=
"pluginCallBack"
...
@@ -26,6 +28,7 @@ export default {
...
@@ -26,6 +28,7 @@ export default {
components
:
{
components
:
{
AsyncComponent
AsyncComponent
},
},
inheritAttrs
:
true
,
props
:
{
props
:
{
componentName
:
{
componentName
:
{
type
:
String
,
type
:
String
,
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论