Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
njgzx
dataease
Commits
d033387c
提交
d033387c
authored
4月 26, 2022
作者:
wangjiahao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: 直接复制tab组件内部视图依然是软连接问题
上级
abe23499
显示空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
80 行增加
和
11 行删除
+80
-11
ChartViewController.java
...ava/io/dataease/controller/chart/ChartViewController.java
+9
-4
ChartCopyBatchRequest.java
...aease/controller/request/chart/ChartCopyBatchRequest.java
+20
-0
ChartViewService.java
...main/java/io/dataease/service/chart/ChartViewService.java
+29
-6
chart.js
frontend/src/api/chart/chart.js
+8
-0
copy.js
frontend/src/components/canvas/store/copy.js
+14
-1
没有找到文件。
backend/src/main/java/io/dataease/controller/chart/ChartViewController.java
浏览文件 @
d033387c
...
@@ -5,10 +5,7 @@ import io.dataease.auth.annotation.DePermission;
...
@@ -5,10 +5,7 @@ import io.dataease.auth.annotation.DePermission;
import
io.dataease.auth.annotation.DePermissionProxy
;
import
io.dataease.auth.annotation.DePermissionProxy
;
import
io.dataease.commons.constants.DePermissionType
;
import
io.dataease.commons.constants.DePermissionType
;
import
io.dataease.commons.constants.ResourceAuthLevel
;
import
io.dataease.commons.constants.ResourceAuthLevel
;
import
io.dataease.controller.request.chart.ChartCalRequest
;
import
io.dataease.controller.request.chart.*
;
import
io.dataease.controller.request.chart.ChartExtRequest
;
import
io.dataease.controller.request.chart.ChartViewCacheRequest
;
import
io.dataease.controller.request.chart.ChartViewRequest
;
import
io.dataease.controller.response.ChartDetail
;
import
io.dataease.controller.response.ChartDetail
;
import
io.dataease.dto.chart.ChartViewDTO
;
import
io.dataease.dto.chart.ChartViewDTO
;
import
io.dataease.plugins.common.base.domain.ChartViewCacheWithBLOBs
;
import
io.dataease.plugins.common.base.domain.ChartViewCacheWithBLOBs
;
...
@@ -23,6 +20,7 @@ import springfox.documentation.annotations.ApiIgnore;
...
@@ -23,6 +20,7 @@ import springfox.documentation.annotations.ApiIgnore;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
/**
/**
* @Author gin
* @Author gin
...
@@ -112,6 +110,13 @@ public class ChartViewController {
...
@@ -112,6 +110,13 @@ public class ChartViewController {
return
chartViewService
.
chartCopy
(
id
,
panelId
);
return
chartViewService
.
chartCopy
(
id
,
panelId
);
}
}
@DePermission
(
type
=
DePermissionType
.
PANEL
,
level
=
ResourceAuthLevel
.
PANNEL_LEVEL_MANAGE
,
paramIndex
=
1
)
@ApiOperation
(
"批量复制"
)
@PostMapping
(
"chartBatchCopy/{panelId}"
)
public
Map
<
String
,
String
>
chartBatchCopy
(
@RequestBody
ChartCopyBatchRequest
request
,
@PathVariable
String
panelId
)
{
return
chartViewService
.
chartBatchCopy
(
request
,
panelId
);
}
@ApiIgnore
@ApiIgnore
@GetMapping
(
"searchAdviceSceneId/{panelId}"
)
@GetMapping
(
"searchAdviceSceneId/{panelId}"
)
public
String
searchAdviceSceneId
(
@PathVariable
String
panelId
)
{
public
String
searchAdviceSceneId
(
@PathVariable
String
panelId
)
{
...
...
backend/src/main/java/io/dataease/controller/request/chart/ChartCopyBatchRequest.java
0 → 100644
浏览文件 @
d033387c
package
io
.
dataease
.
controller
.
request
.
chart
;
import
lombok.Data
;
import
java.util.HashMap
;
import
java.util.Map
;
/**
* Author: wangjiahao
* Date: 2022/4/26
* Description:
*/
@Data
public
class
ChartCopyBatchRequest
{
private
String
panelId
;
private
Map
<
String
,
String
>
sourceAndTargetIds
;
}
backend/src/main/java/io/dataease/service/chart/ChartViewService.java
浏览文件 @
d033387c
package
io
.
dataease
.
service
.
chart
;
package
io
.
dataease
.
service
.
chart
;
import
cn.hutool.core.lang.Assert
;
import
com.google.gson.Gson
;
import
com.google.gson.Gson
;
import
com.google.gson.reflect.TypeToken
;
import
com.google.gson.reflect.TypeToken
;
import
io.dataease.auth.entity.SysUserEntity
;
import
io.dataease.auth.entity.SysUserEntity
;
...
@@ -1024,13 +1025,35 @@ public class ChartViewService {
...
@@ -1024,13 +1025,35 @@ public class ChartViewService {
return
chartViewMapper
.
selectByPrimaryKey
(
id
);
return
chartViewMapper
.
selectByPrimaryKey
(
id
);
}
}
public
String
chartCopy
(
String
id
,
String
panelId
)
{
public
String
chartCopy
(
String
sourceViewId
,
String
newViewId
,
String
panelId
)
{
extChartViewMapper
.
chartCopy
(
newViewId
,
sourceViewId
,
panelId
);
extChartViewMapper
.
copyCache
(
sourceViewId
,
newViewId
);
extPanelGroupExtendDataMapper
.
copyExtendData
(
sourceViewId
,
newViewId
,
panelId
);
chartViewCacheService
.
refreshCache
(
newViewId
);
return
newViewId
;
}
public
String
chartCopy
(
String
sourceViewId
,
String
panelId
)
{
String
newChartId
=
UUID
.
randomUUID
().
toString
();
String
newChartId
=
UUID
.
randomUUID
().
toString
();
extChartViewMapper
.
chartCopy
(
newChartId
,
id
,
panelId
);
return
chartCopy
(
sourceViewId
,
newChartId
,
panelId
);
extChartViewMapper
.
copyCache
(
id
,
newChartId
);
}
extPanelGroupExtendDataMapper
.
copyExtendData
(
id
,
newChartId
,
panelId
);
chartViewCacheService
.
refreshCache
(
newChartId
);
return
newChartId
;
/**
* @Description Copy a set of views with a given source ID and target ID
* @param request
* @param panelId
* @return
*/
public
Map
<
String
,
String
>
chartBatchCopy
(
ChartCopyBatchRequest
request
,
String
panelId
){
Assert
.
notNull
(
panelId
,
"panelId should not be null"
);
Map
<
String
,
String
>
sourceAndTargetIds
=
request
.
getSourceAndTargetIds
();
if
(
sourceAndTargetIds
!=
null
&&
!
sourceAndTargetIds
.
isEmpty
()){
for
(
Map
.
Entry
<
String
,
String
>
entry:
sourceAndTargetIds
.
entrySet
()){
chartCopy
(
entry
.
getKey
(),
entry
.
getValue
(),
panelId
);
}
}
return
request
.
getSourceAndTargetIds
();
}
}
public
String
searchAdviceSceneId
(
String
panelId
)
{
public
String
searchAdviceSceneId
(
String
panelId
)
{
...
...
frontend/src/api/chart/chart.js
浏览文件 @
d033387c
...
@@ -27,6 +27,14 @@ export function chartCopy(id, panelId) {
...
@@ -27,6 +27,14 @@ export function chartCopy(id, panelId) {
loading
:
false
loading
:
false
})
})
}
}
export
function
chartBatchCopy
(
params
,
panelId
)
{
return
request
({
url
:
'/chart/view/chartBatchCopy/'
+
panelId
,
method
:
'post'
,
data
:
params
,
loading
:
false
})
}
export
function
chartGroupTree
(
data
)
{
export
function
chartGroupTree
(
data
)
{
return
request
({
return
request
({
url
:
'/chart/group/tree'
,
url
:
'/chart/group/tree'
,
...
...
frontend/src/components/canvas/store/copy.js
浏览文件 @
d033387c
...
@@ -2,7 +2,7 @@ import store from '@/store/index'
...
@@ -2,7 +2,7 @@ import store from '@/store/index'
import
toast
from
'@/components/canvas/utils/toast'
import
toast
from
'@/components/canvas/utils/toast'
import
generateID
from
'@/components/canvas/utils/generateID'
import
generateID
from
'@/components/canvas/utils/generateID'
import
{
deepCopy
}
from
'@/components/canvas/utils/utils'
import
{
deepCopy
}
from
'@/components/canvas/utils/utils'
import
{
chartCopy
}
from
'@/api/chart/chart'
import
{
chart
BatchCopy
,
chart
Copy
}
from
'@/api/chart/chart'
import
{
uuid
}
from
'vue-uuid'
import
{
uuid
}
from
'vue-uuid'
export
default
{
export
default
{
...
@@ -53,6 +53,19 @@ export default {
...
@@ -53,6 +53,19 @@ export default {
newView
.
propValue
.
viewId
=
res
.
data
newView
.
propValue
.
viewId
=
res
.
data
store
.
commit
(
'addComponent'
,
{
component
:
newView
})
store
.
commit
(
'addComponent'
,
{
component
:
newView
})
})
})
}
if
(
data
.
type
===
'de-tabs'
)
{
const
sourceAndTargetIds
=
{}
const
newCop
=
deepCopy
(
data
)
newCop
.
options
.
tabList
.
forEach
((
item
)
=>
{
if
(
item
.
content
&&
item
.
content
.
type
===
'view'
)
{
const
newViewId
=
uuid
.
v1
()
sourceAndTargetIds
[
item
.
content
.
propValue
.
viewId
]
=
newViewId
item
.
content
.
propValue
.
viewId
=
newViewId
}
})
chartBatchCopy
({
'sourceAndTargetIds'
:
sourceAndTargetIds
},
state
.
panel
.
panelInfo
.
id
).
then
((
rsp
)
=>
{
store
.
commit
(
'addComponent'
,
{
component
:
newCop
})
})
}
else
{
}
else
{
const
newCop
=
deepCopy
(
data
)
const
newCop
=
deepCopy
(
data
)
newCop
.
id
=
uuid
.
v1
()
newCop
.
id
=
uuid
.
v1
()
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论