Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
38905dce
提交
38905dce
authored
3月 29, 2022
作者:
taojinlong
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of github.com:dataease/dataease into dev
上级
e67e6d04
1104d33b
隐藏空白字符变更
内嵌
并排
正在显示
25 个修改的文件
包含
90 行增加
和
52 行删除
+90
-52
DePermissionAnnotationHandler.java
...a/io/dataease/auth/aop/DePermissionAnnotationHandler.java
+1
-0
ShiroServiceImpl.java
.../java/io/dataease/auth/service/impl/ShiroServiceImpl.java
+4
-0
ExtPanelOuterParamsMapper.xml
...io/dataease/base/mapper/ext/ExtPanelOuterParamsMapper.xml
+2
-1
ChartViewService.java
...main/java/io/dataease/service/chart/ChartViewService.java
+1
-1
link.html
frontend/public/link.html
+3
-1
ContextMenu.vue
...d/src/components/canvas/components/Editor/ContextMenu.vue
+1
-1
EditBarView.vue
...d/src/components/canvas/components/Editor/EditBarView.vue
+2
-5
SettingMenuTest.vue
...c/components/canvas/components/Editor/SettingMenuTest.vue
+0
-3
UserView.vue
frontend/src/components/canvas/custom-component/UserView.vue
+1
-1
DeAsideContainer.vue
frontend/src/components/dataease/DeAsideContainer.vue
+13
-3
DeLeft2RightDragBar.vue
...d/src/components/dataease/dragbar/DeLeft2RightDragBar.vue
+8
-2
index.js
frontend/src/directive/index.js
+4
-1
en.js
frontend/src/lang/en.js
+1
-0
tw.js
frontend/src/lang/tw.js
+1
-0
zh.js
frontend/src/lang/zh.js
+1
-0
index.vue
frontend/src/layout/index.vue
+1
-1
LayoutUtil.js
frontend/src/utils/LayoutUtil.js
+17
-0
index.vue
frontend/src/views/dataset/index.vue
+2
-2
index.vue
frontend/src/views/link/view/index.vue
+7
-1
index.vue
frontend/src/views/panel/OuterParamsSet/index.vue
+3
-3
index.vue
frontend/src/views/panel/edit/index.vue
+1
-13
PanelList.vue
frontend/src/views/panel/list/PanelList.vue
+0
-3
PanelMain.vue
frontend/src/views/panel/list/PanelMain.vue
+1
-1
DsMain.vue
frontend/src/views/system/datasource/DsMain.vue
+13
-7
index.vue
frontend/src/views/system/datasource/index.vue
+2
-2
没有找到文件。
backend/src/main/java/io/dataease/auth/aop/DePermissionAnnotationHandler.java
浏览文件 @
38905dce
...
...
@@ -41,6 +41,7 @@ public class DePermissionAnnotationHandler {
DePermission
[]
dePermissions
=
annotation
.
value
();
Object
[]
args
=
point
.
getArgs
();
if
(
logical
==
Logical
.
AND
)
{
access
=
true
;
for
(
int
i
=
0
;
i
<
dePermissions
.
length
;
i
++)
{
DePermission
permission
=
dePermissions
[
i
];
boolean
currentAccess
=
access
(
args
[
permission
.
paramIndex
()],
permission
,
0
);
...
...
backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java
浏览文件 @
38905dce
...
...
@@ -55,6 +55,10 @@ public class ShiroServiceImpl implements ShiroService {
filterChainDefinitionMap
.
put
(
"/linkJump/queryPanelJumpInfo/**"
,
ANON
);
filterChainDefinitionMap
.
put
(
"/linkJump/queryTargetPanelJumpInfo"
,
ANON
);
//外部跳转参数
filterChainDefinitionMap
.
put
(
"/outerParams/**"
,
ANON
);
filterChainDefinitionMap
.
put
(
"/tempMobileLink/**"
,
ANON
);
filterChainDefinitionMap
.
put
(
"/de-app/**"
,
ANON
);
filterChainDefinitionMap
.
put
(
"/app.html"
,
ANON
);
...
...
backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelOuterParamsMapper.xml
浏览文件 @
38905dce
...
...
@@ -92,7 +92,8 @@
LEFT JOIN panel_outer_params_info popi ON pop.params_id = popi.params_id
LEFT JOIN panel_outer_params_target_view_info poptvi ON popi.params_info_id = poptvi.params_info_id
WHERE
pop.panel_id = #{panelId}
pop.panel_id = #{panelId} and pop.checked=1
and popi.checked=1
</select>
...
...
backend/src/main/java/io/dataease/service/chart/ChartViewService.java
浏览文件 @
38905dce
...
...
@@ -803,7 +803,7 @@ public class ChartViewService {
pluginViewParam
.
setPluginChartFieldCustomFilters
(
fieldFilters
);
pluginViewParam
.
setPluginChartExtFilters
(
panelFilters
);
pluginViewParam
.
setPluginViewLimit
(
pluginViewLimit
);
pluginViewParam
.
setUserId
(
AuthUtils
.
getUser
().
getUserId
());
//
pluginViewParam.setUserId(AuthUtils.getUser().getUserId());
return
pluginViewParam
;
}
...
...
frontend/public/link.html
浏览文件 @
38905dce
...
...
@@ -41,7 +41,9 @@
url
+=
'&user='
+
encodeURIComponent
(
user
)
}
if
(
attachParams
)
{
url
+=
'&attachParams='
+
attachParams
console
.
log
(
'attachParams-bf:'
+
attachParams
+
';-af:'
+
encodeURIComponent
(
attachParams
))
url
+=
'&attachParams='
+
encodeURIComponent
(
attachParams
)
}
window
.
location
.
href
=
url
</script>
...
...
frontend/src/components/canvas/components/Editor/ContextMenu.vue
浏览文件 @
38905dce
...
...
@@ -50,7 +50,7 @@ export default {
if
(
this
.
curComponent
.
type
===
'view'
)
{
this
.
$store
.
dispatch
(
'chart/setViewId'
,
null
)
this
.
$store
.
dispatch
(
'chart/setViewId'
,
this
.
curComponent
.
propValue
.
viewId
)
bus
.
$emit
(
'
PanelSwitchComponent'
,
{
name
:
'ChartEdit'
,
param
:
{
'id'
:
this
.
curComponent
.
propValue
.
viewId
,
'optType'
:
'edit'
}}
)
bus
.
$emit
(
'
change_panel_right_draw'
,
true
)
}
if
(
this
.
curComponent
.
type
===
'custom'
)
{
bus
.
$emit
(
'component-dialog-edit'
)
...
...
frontend/src/components/canvas/components/Editor/EditBarView.vue
浏览文件 @
38905dce
<
template
>
<div
class=
"bar-main"
>
<div
v-if=
"!linkageSettingStatus"
>
<div>
<span
v-if=
"isEdit"
:title=
"$t('panel.edit')"
>
<i
class=
"icon iconfont icon-edit"
@
click
.
stop=
"edit"
/>
</span>
...
...
@@ -51,12 +51,9 @@ export default {
},
methods
:
{
edit
()
{
// 编辑时临时保存 当前修改的画布
this
.
$store
.
dispatch
(
'panel/setComponentDataTemp'
,
JSON
.
stringify
(
this
.
componentData
))
this
.
$store
.
dispatch
(
'panel/setCanvasStyleDataTemp'
,
JSON
.
stringify
(
this
.
canvasStyleData
))
this
.
$store
.
dispatch
(
'chart/setViewId'
,
null
)
this
.
$store
.
dispatch
(
'chart/setViewId'
,
this
.
viewId
)
bus
.
$emit
(
'
PanelSwitchComponent'
,
{
name
:
'ChartEdit'
,
param
:
{
'id'
:
this
.
viewId
,
'optType'
:
'edit'
}}
)
bus
.
$emit
(
'
change_panel_right_draw'
,
true
)
},
linkageEdit
()
{
...
...
frontend/src/components/canvas/components/Editor/SettingMenuTest.vue
浏览文件 @
38905dce
...
...
@@ -46,9 +46,6 @@ export default {
this
.
$refs
.
trackButton
.
$el
.
click
()
},
edit
()
{
// 编辑时临时保存 当前修改的画布
this
.
$store
.
dispatch
(
'panel/setComponentDataTemp'
,
JSON
.
stringify
(
this
.
componentData
))
this
.
$store
.
dispatch
(
'panel/setCanvasStyleDataTemp'
,
JSON
.
stringify
(
this
.
canvasStyleData
))
if
(
this
.
curComponent
.
type
===
'view'
)
{
this
.
$store
.
dispatch
(
'chart/setViewId'
,
null
)
this
.
$store
.
dispatch
(
'chart/setViewId'
,
this
.
curComponent
.
propValue
.
viewId
)
...
...
frontend/src/components/canvas/custom-component/UserView.vue
浏览文件 @
38905dce
...
...
@@ -372,7 +372,7 @@ export default {
this
.
destroyTimeMachine
()
this
.
changeIndex
++
this
.
chartResize
(
this
.
changeIndex
)
}
else
{
}
else
if
(
this
.
$refs
[
this
.
element
.
propValue
.
id
])
{
this
.
chart
.
isPlugin
?
this
.
$refs
[
this
.
element
.
propValue
.
id
].
callPluginInner
({
methodName
:
'chartResize'
})
:
this
.
$refs
[
this
.
element
.
propValue
.
id
].
chartResize
()
...
...
frontend/src/components/dataease/DeAsideContainer.vue
浏览文件 @
38905dce
<
template
>
<el-aside
:width=
"
w
idth"
:width=
"
currentW
idth"
class=
"ms-aside-container"
:style=
"
{'margin-left': !asideHidden ? 0 : '-' +
w
idth}"
:style=
"
{'margin-left': !asideHidden ? 0 : '-' +
currentW
idth}"
>
<slot
/>
<de-horizontal-drag-bar
v-if=
"showDragBar"
/>
<de-horizontal-drag-bar
v-if=
"showDragBar"
:type=
"type"
/>
</el-aside>
</
template
>
<
script
>
import
DeHorizontalDragBar
from
'./dragbar/DeLeft2RightDragBar'
import
{
getLayout
}
from
'@/utils/LayoutUtil'
export
default
{
name
:
'DeAsideContainer'
,
components
:
{
DeHorizontalDragBar
},
...
...
@@ -26,12 +27,21 @@ export default {
showDragBar
:
{
type
:
Boolean
,
default
:
true
},
type
:
{
type
:
String
,
default
:
null
}
},
data
()
{
return
{
asideHidden
:
false
}
},
computed
:
{
currentWidth
()
{
return
this
.
type
&&
getLayout
(
this
.
type
)
||
this
.
width
}
}
}
</
script
>
...
...
frontend/src/components/dataease/dragbar/DeLeft2RightDragBar.vue
浏览文件 @
38905dce
<
template
>
<div
v-left-to-right-drag
class=
"drag-bar"
/>
<div
v-left-to-right-drag
=
"type"
class=
"drag-bar"
/>
</
template
>
<
script
>
export
default
{
name
:
'DeLeft2RightDragBar'
name
:
'DeLeft2RightDragBar'
,
props
:
{
type
:
{
type
:
String
,
default
:
null
}
}
}
</
script
>
...
...
frontend/src/directive/index.js
浏览文件 @
38905dce
import
permission
from
'@/directive/Permission'
// import dataPermission from '@/directive/DataPermission
'
import
{
setLayout
}
from
'@/utils/LayoutUtil
'
export
const
left2RightDrag
=
{
inserted
(
el
,
binding
)
{
const
value
=
binding
.
value
el
.
onmousedown
=
function
(
e
)
{
const
init
=
e
.
clientX
const
parent
=
el
.
parentNode
...
...
@@ -15,6 +16,8 @@ export const left2RightDrag = {
}
}
document
.
onmouseup
=
function
()
{
value
&&
setLayout
(
value
,
parent
.
style
.
width
)
document
.
onmousemove
=
document
.
onmouseup
=
null
}
}
...
...
frontend/src/lang/en.js
浏览文件 @
38905dce
...
...
@@ -1390,6 +1390,7 @@ export default {
sure_bt
:
'Confirm'
},
panel
:
{
json_params_error
:
'Third Party Parameters Parsing Failed. Please Check Whether The Parameters Format Is Correct'
,
inner_padding
:
'Inner Padding'
,
board_radio
:
'Board Radio'
,
background
:
'Background'
,
...
...
frontend/src/lang/tw.js
浏览文件 @
38905dce
...
...
@@ -1391,6 +1391,7 @@ export default {
sure_bt
:
'確定'
},
panel
:
{
json_params_error
:
'第三方参数解析失败,请检查参数格式是否正确'
,
inner_padding
:
'内边距'
,
board_radio
:
'边框半径'
,
background
:
'背景'
,
...
...
frontend/src/lang/zh.js
浏览文件 @
38905dce
...
...
@@ -1399,6 +1399,7 @@ export default {
sure_bt
:
'确定'
},
panel
:
{
json_params_error
:
'第三方参数解析失败,请检查参数格式是否正确'
,
inner_padding
:
'内边距'
,
board_radio
:
'边框半径'
,
background
:
'背景'
,
...
...
frontend/src/layout/index.vue
浏览文件 @
38905dce
...
...
@@ -4,7 +4,7 @@
<topbar
v-if=
"!fullHeightFlag && finishLoad"
:show-tips=
"showTips"
/>
<de-container
:style=
"mainStyle"
>
<de-aside-container
v-if=
"!sidebar.hide"
class=
"le-aside-container"
>
<de-aside-container
v-if=
"!sidebar.hide"
type=
"system"
class=
"le-aside-container"
>
<sidebar
class=
"sidebar-container"
/>
</de-aside-container>
...
...
frontend/src/utils/LayoutUtil.js
0 → 100644
浏览文件 @
38905dce
const
defaultLayout
=
{
panel
:
'260px'
,
dataset
:
'260px'
,
datasource
:
'260px'
,
system
:
'260px'
}
const
STORAGE_KEY
=
'global_layout'
export
const
getLayout
=
(
type
)
=>
{
const
key
=
STORAGE_KEY
+
'_'
+
type
return
localStorage
.
getItem
(
key
)
||
defaultLayout
[
type
]
}
export
const
setLayout
=
(
type
,
val
)
=>
{
const
key
=
STORAGE_KEY
+
'_'
+
type
localStorage
.
setItem
(
key
,
val
||
defaultLayout
[
type
])
}
frontend/src/views/dataset/index.vue
浏览文件 @
38905dce
<
template
>
<de-container
v-loading=
"$store.getters.loadingMap[$store.getters.currentPath]"
>
<de-aside-container>
<de-aside-container
type=
"dataset"
>
<group
:save-status=
"saveStatus"
@
switchComponent=
"switchComponent"
/>
</de-aside-container>
...
...
@@ -30,7 +30,7 @@ import { removeClass } from '@/utils'
import
{
checkCustomDs
}
from
'@/api/dataset/dataset'
export
default
{
name
:
'DataSet'
,
components
:
{
DeMainContainer
,
DeContainer
,
DeAsideContainer
,
Group
,
DataHome
,
ViewTable
,
AddDB
,
AddSQL
,
AddExcel
,
AddCustom
,
AddApi
},
components
:
{
DeMainContainer
,
DeContainer
,
DeAsideContainer
,
Group
,
DataHome
,
ViewTable
,
AddDB
,
AddSQL
,
AddExcel
,
AddCustom
,
AddApi
},
data
()
{
return
{
component
:
DataHome
,
...
...
frontend/src/views/link/view/index.vue
浏览文件 @
38905dce
...
...
@@ -69,7 +69,7 @@ export default {
if
(
attachParamsEncode
)
{
try
{
const
Base64
=
require
(
'js-base64'
).
Base64
const
attachParam
=
JSON
.
parse
(
Base64
.
decode
(
attachParamsEncode
))
const
attachParam
=
JSON
.
parse
(
decodeURIComponent
(
Base64
.
decode
(
attachParamsEncode
)
))
getOuterParamsInfo
(
this
.
resourceId
).
then
(
rsp
=>
{
if
(
--
loadingCount
===
0
)
{
this
.
show
=
true
...
...
@@ -81,6 +81,12 @@ export default {
if
(
--
loadingCount
===
0
)
{
this
.
show
=
true
}
this
.
$message
({
message
:
this
.
$t
(
'panel.json_params_error'
),
type
:
'error'
,
showClose
:
true
})
console
.
log
(
'outerParams Decode error:'
,
e
)
}
}
...
...
frontend/src/views/panel/OuterParamsSet/index.vue
浏览文件 @
38905dce
...
...
@@ -259,7 +259,7 @@ export default {
this
.
$emit
(
'outerParamsSetVisibleChange'
,
false
)
},
save
()
{
if
(
checkRepeat
(
this
.
outerParams
.
outerParamsInfoArray
,
'
n
ame'
))
{
if
(
checkRepeat
(
this
.
outerParams
.
outerParamsInfoArray
,
'
paramN
ame'
))
{
this
.
$message
({
message
:
this
.
$t
(
'panel.repeat_params'
),
type
:
'warn'
,
...
...
@@ -389,7 +389,7 @@ export default {
}
.bottom
{
margin-top
:
20
px
;
margin-top
:
15
px
;
text-align
:
center
;
}
...
...
@@ -482,7 +482,7 @@ export default {
}
.tree-bottom
{
margin-top
:
12
px
;
margin-top
:
7
px
;
text-align
:
center
;
}
...
...
frontend/src/views/panel/edit/index.vue
浏览文件 @
38905dce
...
...
@@ -634,15 +634,7 @@ export default {
init
(
panelId
)
{
const
_this
=
this
_this
.
initHasStar
()
// 如果临时画布有数据 则使用临时画布数据(视图编辑的时候 会保存临时画布数据)
const
componentDataTemp
=
this
.
$store
.
state
.
panel
.
componentDataTemp
const
canvasStyleDataTemp
=
this
.
$store
.
state
.
panel
.
canvasStyleDataTemp
if
(
componentDataTemp
&&
canvasStyleDataTemp
)
{
panelInit
(
JSON
.
parse
(
componentDataTemp
),
JSON
.
parse
(
canvasStyleDataTemp
))
// 清空临时画布数据
_this
.
$store
.
dispatch
(
'panel/setComponentDataTemp'
,
null
)
_this
.
$store
.
dispatch
(
'panel/setCanvasStyleDataTemp'
,
null
)
}
else
if
(
panelId
)
{
if
(
panelId
)
{
initPanelData
(
panelId
,
function
()
{
// 初始化视图缓存
initViewCache
(
panelId
)
...
...
@@ -650,10 +642,6 @@ export default {
setTimeout
(()
=>
{
_this
.
$store
.
commit
(
'refreshSaveStatus'
)
},
500
)
// initPanelComponentsData(panelId, function(rsp) {
// _this.$store.commit('initPanelComponents', rsp)// 初始化仪表板组件视图数据
// _this.$store.commit('recordSnapshot', 'init')// 记录快照
// })
})
}
},
...
...
frontend/src/views/panel/list/PanelList.vue
浏览文件 @
38905dce
...
...
@@ -690,9 +690,6 @@ export default {
this
.
$store
.
commit
(
'refreshSnapshot'
)
this
.
$store
.
commit
(
'setComponentData'
,
[])
this
.
$store
.
commit
(
'setCanvasStyle'
,
DEFAULT_COMMON_CANVAS_STYLE_STRING
)
// 清空临时画布数据
this
.
$store
.
dispatch
(
'panel/setComponentDataTemp'
,
null
)
this
.
$store
.
dispatch
(
'panel/setCanvasStyleDataTemp'
,
null
)
this
.
$store
.
dispatch
(
'panel/setPanelInfo'
,
data
)
bus
.
$emit
(
'PanelSwitchComponent'
,
{
name
:
'PanelEdit'
})
},
...
...
frontend/src/views/panel/list/PanelMain.vue
浏览文件 @
38905dce
<
template
>
<de-container>
<de-aside-container>
<de-aside-container
type=
"panel"
>
<el-tabs
v-model=
"activeName"
class=
"tab-panel"
:stretch=
"true"
@
tab-click=
"handleClick"
>
<el-tab-pane
name=
"PanelList"
>
<span
slot=
"label"
><i
class=
"el-icon-document tablepanel-i"
/>
{{
$t
(
'panel.panel_list'
)
}}
</span>
...
...
frontend/src/views/system/datasource/DsMain.vue
浏览文件 @
38905dce
<
template
>
<de-container
v-loading=
"$store.getters.loadingMap[$store.getters.currentPath]"
>
<de-aside-container
style=
"padding: 0 0;"
>
<ds-tree
ref=
"dsTree"
:datasource=
"datasource"
@
switch-main=
"switchMain"
/>
<de-aside-container
style=
"padding: 0 0;"
type=
"datasource"
>
<ds-tree
ref=
"dsTree"
:datasource=
"datasource"
@
switch-main=
"switchMain"
/>
</de-aside-container>
<de-main-container>
<component
:is=
"component"
v-if=
"!!component"
:params=
"param"
:tData=
"tData"
@
refresh-type=
"refreshType"
@
switch-component=
"switchMain"
/>
<component
:is=
"component"
v-if=
"!!component"
:params=
"param"
:t-data=
"tData"
@
refresh-type=
"refreshType"
@
switch-component=
"switchMain"
/>
</de-main-container>
</de-container>
</
template
>
...
...
@@ -20,7 +26,7 @@ import DataHome from './DataHome'
export
default
{
name
:
'DsMain'
,
components
:
{
DeMainContainer
,
DeContainer
,
DeAsideContainer
,
DsTree
,
DataHome
},
components
:
{
DeMainContainer
,
DeContainer
,
DeAsideContainer
,
DsTree
,
DataHome
},
data
()
{
return
{
component
:
DataHome
,
...
...
@@ -37,7 +43,7 @@ export default {
methods
:
{
// 切换main区内容
switchMain
(
param
)
{
const
{
component
,
componentParam
,
tData
}
=
param
const
{
component
,
componentParam
,
tData
}
=
param
this
.
component
=
DataHome
this
.
param
=
null
this
.
$nextTick
(()
=>
{
...
...
@@ -55,7 +61,7 @@ export default {
})
},
refreshType
(
datasource
)
{
this
.
datasource
=
datasource
;
this
.
datasource
=
datasource
this
.
$refs
.
dsTree
&&
this
.
$refs
.
dsTree
.
refreshType
(
datasource
)
},
msg2Current
(
sourceParam
)
{
...
...
frontend/src/views/system/datasource/index.vue
浏览文件 @
38905dce
<
template
>
<de-container
v-loading=
"$store.getters.loadingMap[$store.getters.currentPath]"
>
<de-main-container>
<ds-main
ref=
"dsMain"
/>
<ds-main
ref=
"dsMain"
/>
</de-main-container>
</de-container>
</
template
>
...
...
@@ -14,7 +14,7 @@ import bus from '@/utils/bus'
export
default
{
name
:
'Panel'
,
components
:
{
DeMainContainer
,
DeContainer
,
DsMain
},
components
:
{
DeMainContainer
,
DeContainer
,
DsMain
},
data
()
{
return
{
component
:
DsMain
,
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论