center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

revert: 回滚用户设置系统变量

Browse Source
This commit is contained in:
fit2cloud-chenyw 2023-08-03 16:24:47 +08:00 committed by taojinlong
parent 970720eeab
commit cfec45692d
4 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/core-backend/src/main/java/io/dataease/dataset/manage/PermissionManage.java
View File

@ -198,9 +198,6 @@ public class PermissionManage {
if (StringUtils.isNotEmpty(userEntity.getName())) { if (StringUtils.isNotEmpty(userEntity.getName())) {
expressionTree = expressionTree.replaceAll("\\$\\{sysParams\\.userName}", userEntity.getName()); expressionTree = expressionTree.replaceAll("\\$\\{sysParams\\.userName}", userEntity.getName());
} }
if (StringUtils.isNotEmpty(userEntity.getLabel())) {
expressionTree = expressionTree.replaceAll("\\$\\{sysParams\\.userLabel}", userEntity.getLabel());
}
record.setExpressionTree(expressionTree); record.setExpressionTree(expressionTree);
DatasetRowPermissionsTreeObj tree = JsonUtil.parseObject(expressionTree, DatasetRowPermissionsTreeObj.class); DatasetRowPermissionsTreeObj tree = JsonUtil.parseObject(expressionTree, DatasetRowPermissionsTreeObj.class);
record.setTree(tree); record.setTree(tree);

2
core/core-frontend/src/views/visualized/data/dataset/options.js
View File

@ -20,7 +20,7 @@ const valueOptions = valueEnum.map(formatEnum)
const sysParams = ['eq', 'not_eq', 'like', 'not like', 'in', 'not in'] const sysParams = ['eq', 'not_eq', 'like', 'not like', 'in', 'not in']
const textOptionsForSysParams = sysParams.map(formatEnum) const textOptionsForSysParams = sysParams.map(formatEnum)
const sysParamsEnum = ['userId', 'userName', 'userEmail', 'userLabel'] const sysParamsEnum = ['userId', 'userName', 'userEmail']
const sysParamsIlns = sysParamsEnum.map(_ => { const sysParamsIlns = sysParamsEnum.map(_ => {
return { value: `\${sysParams.${_}}`, label: `auth.sysParams_type.${toLine(_)}` } return { value: `\${sysParams.${_}}`, label: `auth.sysParams_type.${toLine(_)}` }

2
sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserCreator.java
View File

@ -31,6 +31,4 @@ public class UserCreator implements Serializable {
@Schema(hidden = true) @Schema(hidden = true)
@JsonIgnore @JsonIgnore
private Long uid; private Long uid;
@Schema(description = "标签", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private String label;
} }

3
sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserFormVO.java
View File

@ -42,7 +42,4 @@ public class UserFormVO implements Serializable {
@Schema(description = "模式") @Schema(description = "模式")
private String model; private String model;
@Schema(description = "标签")
private String label;
} }