Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
njgzx
dataease
Commits
beb295f3
提交
beb295f3
authored
12月 14, 2021
作者:
wangjiahao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat: 仪表板tab组件内视图,支持放大和编辑
上级
2f109a94
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
55 行增加
和
6 行删除
+55
-6
ExtPanelLinkJumpMapper.xml
...va/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.xml
+3
-0
PanelLinkJumpInfoDTO.java
.../io/dataease/dto/panel/linkJump/PanelLinkJumpInfoDTO.java
+3
-0
EditBarView.vue
...d/src/components/canvas/components/Editor/EditBarView.vue
+3
-1
UserView.vue
frontend/src/components/canvas/custom-component/UserView.vue
+18
-3
index.js
frontend/src/store/index.js
+5
-0
index.vue
frontend/src/views/link/index.vue
+1
-0
index.vue
frontend/src/views/link/view/index.vue
+22
-2
没有找到文件。
backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.xml
浏览文件 @
beb295f3
...
@@ -12,6 +12,7 @@
...
@@ -12,6 +12,7 @@
<resultMap
id=
"LinkJumpInfoMap"
type=
"io.dataease.dto.panel.linkJump.PanelLinkJumpInfoDTO"
extends=
"io.dataease.base.mapper.PanelLinkJumpInfoMapper.BaseResultMap"
>
<resultMap
id=
"LinkJumpInfoMap"
type=
"io.dataease.dto.panel.linkJump.PanelLinkJumpInfoDTO"
extends=
"io.dataease.base.mapper.PanelLinkJumpInfoMapper.BaseResultMap"
>
<result
column=
"source_field_id"
jdbcType=
"VARCHAR"
property=
"sourceFieldId"
/>
<result
column=
"source_field_id"
jdbcType=
"VARCHAR"
property=
"sourceFieldId"
/>
<result
column=
"source_field_name"
jdbcType=
"VARCHAR"
property=
"sourceFieldName"
/>
<result
column=
"source_field_name"
jdbcType=
"VARCHAR"
property=
"sourceFieldName"
/>
<result
column=
"publicJumpId"
jdbcType=
"VARCHAR"
property=
"publicJumpId"
/>
<collection
property=
"targetViewInfoList"
ofType=
"io.dataease.base.domain.PanelLinkJumpTargetViewInfo"
>
<collection
property=
"targetViewInfoList"
ofType=
"io.dataease.base.domain.PanelLinkJumpTargetViewInfo"
>
<result
column=
"target_view_id"
jdbcType=
"VARCHAR"
property=
"targetViewId"
/>
<result
column=
"target_view_id"
jdbcType=
"VARCHAR"
property=
"targetViewId"
/>
<result
column=
"target_field_id"
jdbcType=
"VARCHAR"
property=
"targetFieldId"
/>
<result
column=
"target_field_id"
jdbcType=
"VARCHAR"
property=
"targetFieldId"
/>
...
@@ -35,6 +36,7 @@
...
@@ -35,6 +36,7 @@
panel_link_jump_info.jump_type,
panel_link_jump_info.jump_type,
panel_link_jump_info.target_panel_id,
panel_link_jump_info.target_panel_id,
panel_link_jump_info.content,
panel_link_jump_info.content,
panel_link_mapping.id as publicJumpId,
ifnull( panel_link_jump_info.checked, 0 ) AS checked,
ifnull( panel_link_jump_info.checked, 0 ) AS checked,
panel_link_jump_target_view_info.target_view_id,
panel_link_jump_target_view_info.target_view_id,
panel_link_jump_target_view_info.target_field_id
panel_link_jump_target_view_info.target_field_id
...
@@ -45,6 +47,7 @@
...
@@ -45,6 +47,7 @@
LEFT JOIN panel_link_jump_info ON panel_link_jump.id = panel_link_jump_info.link_jump_id
LEFT JOIN panel_link_jump_info ON panel_link_jump.id = panel_link_jump_info.link_jump_id
AND dataset_table_field.id = panel_link_jump_info.source_field_id
AND dataset_table_field.id = panel_link_jump_info.source_field_id
LEFT JOIN panel_link_jump_target_view_info ON panel_link_jump_info.id = panel_link_jump_target_view_info.link_jump_info_id
LEFT JOIN panel_link_jump_target_view_info ON panel_link_jump_info.id = panel_link_jump_target_view_info.link_jump_info_id
LEFT JOIN panel_link_mapping on panel_link_jump_info.target_panel_id = panel_link_mapping.resource_id
WHERE
WHERE
chart_view.id =#{source_view_id}
chart_view.id =#{source_view_id}
ORDER BY
ORDER BY
...
...
backend/src/main/java/io/dataease/dto/panel/linkJump/PanelLinkJumpInfoDTO.java
浏览文件 @
beb295f3
...
@@ -19,6 +19,9 @@ public class PanelLinkJumpInfoDTO extends PanelLinkJumpInfo {
...
@@ -19,6 +19,9 @@ public class PanelLinkJumpInfoDTO extends PanelLinkJumpInfo {
private
String
sourceJumpInfo
;
private
String
sourceJumpInfo
;
//存在公共链接的目标仪表板
private
String
publicJumpId
;
private
List
<
PanelLinkJumpTargetViewInfo
>
targetViewInfoList
=
new
ArrayList
<>();
// linkType = inner 时使用
private
List
<
PanelLinkJumpTargetViewInfo
>
targetViewInfoList
=
new
ArrayList
<>();
// linkType = inner 时使用
...
...
frontend/src/components/canvas/components/Editor/EditBarView.vue
浏览文件 @
beb295f3
...
@@ -40,7 +40,9 @@ export default {
...
@@ -40,7 +40,9 @@ export default {
},
},
computed
:
{
computed
:
{
...
mapState
([
...
mapState
([
'linkageSettingStatus'
'linkageSettingStatus'
,
'componentData'
,
'canvasStyleData'
])
])
},
},
mounted
()
{
mounted
()
{
...
...
frontend/src/components/canvas/custom-component/UserView.vue
浏览文件 @
beb295f3
...
@@ -208,7 +208,8 @@ export default {
...
@@ -208,7 +208,8 @@ export default {
...
mapState
([
...
mapState
([
'canvasStyleData'
,
'canvasStyleData'
,
'nowPanelTrackInfo'
,
'nowPanelTrackInfo'
,
'nowPanelJumpInfo'
'nowPanelJumpInfo'
,
'publicLinkStatus'
])
])
},
},
...
@@ -399,9 +400,23 @@ export default {
...
@@ -399,9 +400,23 @@ export default {
// 内部仪表板跳转
// 内部仪表板跳转
if
(
jumpInfo
.
linkType
===
'inner'
)
{
if
(
jumpInfo
.
linkType
===
'inner'
)
{
if
(
jumpInfo
.
targetPanelId
)
{
if
(
jumpInfo
.
targetPanelId
)
{
const
url
=
'#/preview/'
+
jumpInfo
.
targetPanelId
localStorage
.
setItem
(
'jumpInfoParam'
,
JSON
.
stringify
(
param
))
localStorage
.
setItem
(
'jumpInfoParam'
,
JSON
.
stringify
(
param
))
window
.
open
(
url
,
jumpInfo
.
jumpType
)
if
(
this
.
publicLinkStatus
)
{
// 判断是否有公共链接ID
if
(
jumpInfo
.
publicJumpId
)
{
const
url
=
'/link/'
+
jumpInfo
.
publicJumpId
window
.
open
(
url
,
jumpInfo
.
jumpType
)
}
else
{
this
.
$message
({
type
:
'warn'
,
message
:
'当前是公共链接模式,目标仪表板未设置公共链接,无法跳转'
,
showClose
:
true
})
}
}
else
{
const
url
=
'#/preview/'
+
jumpInfo
.
targetPanelId
window
.
open
(
url
,
jumpInfo
.
jumpType
)
}
}
else
{
}
else
{
this
.
$message
({
this
.
$message
({
type
:
'warn'
,
type
:
'warn'
,
...
...
frontend/src/store/index.js
浏览文件 @
beb295f3
...
@@ -79,6 +79,8 @@ const data = {
...
@@ -79,6 +79,8 @@ const data = {
componentGap
:
5
,
componentGap
:
5
,
// 移动端布局状态
// 移动端布局状态
mobileLayoutStatus
:
false
,
mobileLayoutStatus
:
false
,
// 公共链接状态(当前是否是公共链接打开)
publicLinkStatus
:
false
,
pcMatrixCount
:
{
pcMatrixCount
:
{
x
:
36
,
x
:
36
,
y
:
18
y
:
18
...
@@ -326,6 +328,9 @@ const data = {
...
@@ -326,6 +328,9 @@ const data = {
setMobileLayoutStatus
(
state
,
status
)
{
setMobileLayoutStatus
(
state
,
status
)
{
state
.
mobileLayoutStatus
=
status
state
.
mobileLayoutStatus
=
status
},
},
setPublicLinkStatus
(
state
,
status
)
{
state
.
publicLinkStatus
=
status
},
// 启用移动端布局
// 启用移动端布局
openMobileLayout
(
state
)
{
openMobileLayout
(
state
)
{
state
.
componentDataCache
=
JSON
.
stringify
(
state
.
componentData
)
state
.
componentDataCache
=
JSON
.
stringify
(
state
.
componentData
)
...
...
frontend/src/views/link/index.vue
浏览文件 @
beb295f3
...
@@ -32,6 +32,7 @@ export default {
...
@@ -32,6 +32,7 @@ export default {
methods
:
{
methods
:
{
loadInit
()
{
loadInit
()
{
this
.
$store
.
commit
(
'setPublicLinkStatus'
,
true
)
debugger
debugger
// this.link = getQueryVariable(this.PARAMKEY)
// this.link = getQueryVariable(this.PARAMKEY)
this
.
link
=
this
.
$route
.
query
.
link
this
.
link
=
this
.
$route
.
query
.
link
...
...
frontend/src/views/link/view/index.vue
浏览文件 @
beb295f3
...
@@ -9,7 +9,7 @@ import { loadResource } from '@/api/link'
...
@@ -9,7 +9,7 @@ import { loadResource } from '@/api/link'
import
{
uuid
}
from
'vue-uuid'
import
{
uuid
}
from
'vue-uuid'
import
Preview
from
'@/components/canvas/components/Editor/Preview'
import
Preview
from
'@/components/canvas/components/Editor/Preview'
import
{
getPanelAllLinkageInfo
}
from
'@/api/panel/linkage'
import
{
getPanelAllLinkageInfo
}
from
'@/api/panel/linkage'
import
{
queryPanelJumpInfo
}
from
'@/api/panel/linkJump'
import
{
queryPanelJumpInfo
,
queryTargetPanelJumpInfo
}
from
'@/api/panel/linkJump'
export
default
{
export
default
{
name
:
'LinkView'
,
name
:
'LinkView'
,
...
@@ -43,7 +43,27 @@ export default {
...
@@ -43,7 +43,27 @@ export default {
queryPanelJumpInfo
(
this
.
resourceId
).
then
(
rsp
=>
{
queryPanelJumpInfo
(
this
.
resourceId
).
then
(
rsp
=>
{
this
.
$store
.
commit
(
'setNowPanelJumpInfo'
,
rsp
.
data
)
this
.
$store
.
commit
(
'setNowPanelJumpInfo'
,
rsp
.
data
)
})
})
this
.
show
=
true
// 如果含有跳转参数 进行触发
const
tempParam
=
localStorage
.
getItem
(
'jumpInfoParam'
)
if
(
tempParam
)
{
localStorage
.
removeItem
(
'jumpInfoParam'
)
const
jumpParam
=
JSON
.
parse
(
tempParam
)
const
jumpRequestParam
=
{
sourcePanelId
:
jumpParam
.
sourcePanelId
,
sourceViewId
:
jumpParam
.
sourceViewId
,
sourceFieldId
:
jumpParam
.
sourceFieldId
,
targetPanelId
:
this
.
panelId
}
this
.
show
=
false
// 刷新跳转目标仪表板联动信息
queryTargetPanelJumpInfo
(
jumpRequestParam
).
then
(
rsp
=>
{
this
.
show
=
true
this
.
$store
.
commit
(
'setNowTargetPanelJumpInfo'
,
rsp
.
data
)
this
.
$store
.
commit
(
'addViewTrackFilter'
,
jumpParam
)
})
}
else
{
this
.
show
=
true
}
})
})
},
},
resetID
(
data
)
{
resetID
(
data
)
{
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论