Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
njgzx
dataease
Commits
fabb431b
提交
fabb431b
authored
2月 23, 2022
作者:
junjun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: 修复视图中数据集字段、数据,未受数据集权限控制的问题
上级
6e7c9d4b
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
20 行增加
和
12 行删除
+20
-12
ChartViewService.java
...main/java/io/dataease/service/chart/ChartViewService.java
+18
-12
ChartEdit.vue
frontend/src/views/chart/view/ChartEdit.vue
+2
-0
没有找到文件。
backend/src/main/java/io/dataease/service/chart/ChartViewService.java
浏览文件 @
fabb431b
...
@@ -18,6 +18,7 @@ import io.dataease.controller.request.datasource.DatasourceRequest;
...
@@ -18,6 +18,7 @@ import io.dataease.controller.request.datasource.DatasourceRequest;
import
io.dataease.controller.response.ChartDetail
;
import
io.dataease.controller.response.ChartDetail
;
import
io.dataease.controller.response.DataSetDetail
;
import
io.dataease.controller.response.DataSetDetail
;
import
io.dataease.dto.chart.*
;
import
io.dataease.dto.chart.*
;
import
io.dataease.dto.dataset.DataSetTableDTO
;
import
io.dataease.dto.dataset.DataSetTableUnionDTO
;
import
io.dataease.dto.dataset.DataSetTableUnionDTO
;
import
io.dataease.dto.dataset.DataTableInfoDTO
;
import
io.dataease.dto.dataset.DataTableInfoDTO
;
import
io.dataease.i18n.Translator
;
import
io.dataease.i18n.Translator
;
...
@@ -43,8 +44,6 @@ import java.util.*;
...
@@ -43,8 +44,6 @@ import java.util.*;
import
java.util.concurrent.locks.ReentrantLock
;
import
java.util.concurrent.locks.ReentrantLock
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
import
static
io
.
dataease
.
commons
.
constants
.
ColumnPermissionConstants
.
Desensitization_desc
;
/**
/**
* @Author gin
* @Author gin
* @Date 2021/3/1 12:34 下午
* @Date 2021/3/1 12:34 下午
...
@@ -243,11 +242,13 @@ public class ChartViewService {
...
@@ -243,11 +242,13 @@ public class ChartViewService {
DatasetTableField
datasetTableFieldObj
=
DatasetTableField
.
builder
().
tableId
(
view
.
getTableId
()).
checked
(
Boolean
.
TRUE
).
build
();
DatasetTableField
datasetTableFieldObj
=
DatasetTableField
.
builder
().
tableId
(
view
.
getTableId
()).
checked
(
Boolean
.
TRUE
).
build
();
List
<
DatasetTableField
>
fields
=
dataSetTableFieldsService
.
list
(
datasetTableFieldObj
);
List
<
DatasetTableField
>
fields
=
dataSetTableFieldsService
.
list
(
datasetTableFieldObj
);
DatasetTable
datasetTable
=
dataSetTableService
.
get
(
view
.
getTableId
());
// 获取数据集,需校验权限
DataSetTableDTO
table
=
dataSetTableService
.
getWithPermission
(
view
.
getTableId
());
checkPermission
(
"use"
,
table
);
//列权限
//列权限
List
<
String
>
desensitizationList
=
new
ArrayList
<>();
List
<
String
>
desensitizationList
=
new
ArrayList
<>();
List
<
DatasetTableField
>
columnPermissionFields
=
permissionService
.
filterColumnPermissons
(
fields
,
desensitizationList
,
datasetT
able
.
getId
(),
requestList
.
getUser
());
List
<
DatasetTableField
>
columnPermissionFields
=
permissionService
.
filterColumnPermissons
(
fields
,
desensitizationList
,
t
able
.
getId
(),
requestList
.
getUser
());
//将没有权限的列删掉
//将没有权限的列删掉
List
<
String
>
dataeaseNames
=
columnPermissionFields
.
stream
().
map
(
DatasetTableField:
:
getDataeaseName
).
collect
(
Collectors
.
toList
());
List
<
String
>
dataeaseNames
=
columnPermissionFields
.
stream
().
map
(
DatasetTableField:
:
getDataeaseName
).
collect
(
Collectors
.
toList
());
dataeaseNames
.
add
(
"*"
);
dataeaseNames
.
add
(
"*"
);
...
@@ -258,7 +259,7 @@ public class ChartViewService {
...
@@ -258,7 +259,7 @@ public class ChartViewService {
//行权限
//行权限
List
<
ChartFieldCustomFilterDTO
>
rowPermissionFields
=
permissionService
.
getCustomFilters
(
columnPermissionFields
,
datasetT
able
,
requestList
.
getUser
());
List
<
ChartFieldCustomFilterDTO
>
rowPermissionFields
=
permissionService
.
getCustomFilters
(
columnPermissionFields
,
t
able
,
requestList
.
getUser
());
fieldCustomFilter
.
addAll
(
rowPermissionFields
);
fieldCustomFilter
.
addAll
(
rowPermissionFields
);
for
(
ChartFieldCustomFilterDTO
ele
:
fieldCustomFilter
)
{
for
(
ChartFieldCustomFilterDTO
ele
:
fieldCustomFilter
)
{
...
@@ -390,11 +391,6 @@ public class ChartViewService {
...
@@ -390,11 +391,6 @@ public class ChartViewService {
}
}
}
}
// 获取数据集,需校验权限
DatasetTable
table
=
dataSetTableService
.
get
(
view
.
getTableId
());
if
(
ObjectUtils
.
isEmpty
(
table
))
{
throw
new
RuntimeException
(
Translator
.
get
(
"i18n_dataset_delete_or_no_permission"
));
}
// 判断连接方式,直连或者定时抽取 table.mode
// 判断连接方式,直连或者定时抽取 table.mode
DatasourceRequest
datasourceRequest
=
new
DatasourceRequest
();
DatasourceRequest
datasourceRequest
=
new
DatasourceRequest
();
List
<
String
[]>
data
=
new
ArrayList
<>();
List
<
String
[]>
data
=
new
ArrayList
<>();
...
@@ -1680,9 +1676,9 @@ public class ChartViewService {
...
@@ -1680,9 +1676,9 @@ public class ChartViewService {
return
chartViewMapper
.
selectByPrimaryKey
(
id
);
return
chartViewMapper
.
selectByPrimaryKey
(
id
);
}
}
public
String
chartCopy
(
String
id
,
String
panelId
)
{
public
String
chartCopy
(
String
id
,
String
panelId
)
{
String
newChartId
=
UUID
.
randomUUID
().
toString
();
String
newChartId
=
UUID
.
randomUUID
().
toString
();
extChartViewMapper
.
chartCopy
(
newChartId
,
id
,
panelId
);
extChartViewMapper
.
chartCopy
(
newChartId
,
id
,
panelId
);
return
newChartId
;
return
newChartId
;
}
}
...
@@ -1697,4 +1693,14 @@ public class ChartViewService {
...
@@ -1697,4 +1693,14 @@ public class ChartViewService {
return
"NO"
;
return
"NO"
;
}
}
}
}
// check permission
private
void
checkPermission
(
String
needPermission
,
DataSetTableDTO
table
)
{
if
(
ObjectUtils
.
isEmpty
(
table
)
||
ObjectUtils
.
isEmpty
(
table
.
getPrivileges
()))
{
throw
new
RuntimeException
(
Translator
.
get
(
"i18n_dataset_delete_or_no_permission"
));
}
if
(!
AuthUtils
.
getUser
().
getIsAdmin
()
&&
!
table
.
getPrivileges
().
contains
(
needPermission
))
{
throw
new
RuntimeException
(
Translator
.
get
(
"i18n_dataset_delete_or_no_permission"
));
}
}
}
}
frontend/src/views/chart/view/ChartEdit.vue
浏览文件 @
fabb431b
...
@@ -56,6 +56,7 @@
...
@@ -56,6 +56,7 @@
<div
class=
"padding-lr field-height"
>
<div
class=
"padding-lr field-height"
>
<span>
{{
$t
(
'chart.dimension'
)
}}
</span>
<span>
{{
$t
(
'chart.dimension'
)
}}
</span>
<draggable
<draggable
v-if=
"table && hasDataPermission('use',table.privileges)"
v-model=
"dimensionData"
v-model=
"dimensionData"
:options=
"
{group:{name: 'drag',pull:'clone'},sort: true}"
:options=
"
{group:{name: 'drag',pull:'clone'},sort: true}"
animation="300"
animation="300"
...
@@ -81,6 +82,7 @@
...
@@ -81,6 +82,7 @@
<div
class=
"padding-lr field-height"
>
<div
class=
"padding-lr field-height"
>
<span>
{{
$t
(
'chart.quota'
)
}}
</span>
<span>
{{
$t
(
'chart.quota'
)
}}
</span>
<draggable
<draggable
v-if=
"table && hasDataPermission('use',table.privileges)"
v-model=
"quotaData"
v-model=
"quotaData"
:options=
"
{group:{name: 'drag',pull:'clone'},sort: true}"
:options=
"
{group:{name: 'drag',pull:'clone'},sort: true}"
animation="300"
animation="300"
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论