mirror of
https://github.com/dataease/dataease.git
synced 2025-02-24 11:32:57 +08:00
feat(用户管理): 支持用户扩展字段用于配置行权限系统变量
This commit is contained in:
parent
9b26439917
commit
7aba36c696
@ -198,6 +198,9 @@ 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);
|
||||||
|
@ -182,6 +182,7 @@ export default {
|
|||||||
user_id: '账号',
|
user_id: '账号',
|
||||||
user_name: '姓名',
|
user_name: '姓名',
|
||||||
user_source: '用户来源',
|
user_source: '用户来源',
|
||||||
|
user_label: '用户标签',
|
||||||
user_email: '邮箱',
|
user_email: '邮箱',
|
||||||
dept: '组织',
|
dept: '组织',
|
||||||
role: '角色'
|
role: '角色'
|
||||||
|
@ -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']
|
const sysParamsEnum = ['userId', 'userName', 'userEmail', 'userLabel']
|
||||||
|
|
||||||
const sysParamsIlns = sysParamsEnum.map(_ => {
|
const sysParamsIlns = sysParamsEnum.map(_ => {
|
||||||
return { value: `\${sysParams.${_}}`, label: `auth.sysParams_type.${toLine(_)}` }
|
return { value: `\${sysParams.${_}}`, label: `auth.sysParams_type.${toLine(_)}` }
|
||||||
|
@ -31,4 +31,6 @@ 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;
|
||||||
}
|
}
|
||||||
|
@ -42,4 +42,7 @@ public class UserFormVO implements Serializable {
|
|||||||
|
|
||||||
@Schema(description = "模式")
|
@Schema(description = "模式")
|
||||||
private String model;
|
private String model;
|
||||||
|
|
||||||
|
@Schema(description = "标签")
|
||||||
|
private String label;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user