From cfec45692df95de695f23250a30de859de7ab585 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 3 Aug 2023 16:24:47 +0800 Subject: [PATCH] =?UTF-8?q?revert:=20=E5=9B=9E=E6=BB=9A=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=B3=BB=E7=BB=9F=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/dataset/manage/PermissionManage.java | 3 --- .../core-frontend/src/views/visualized/data/dataset/options.js | 2 +- .../java/io/dataease/api/permissions/user/dto/UserCreator.java | 2 -- .../java/io/dataease/api/permissions/user/vo/UserFormVO.java | 3 --- 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/PermissionManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/PermissionManage.java index ddb8854528..3667ede8de 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/PermissionManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/PermissionManage.java @@ -198,9 +198,6 @@ public class PermissionManage { if (StringUtils.isNotEmpty(userEntity.getName())) { expressionTree = expressionTree.replaceAll("\\$\\{sysParams\\.userName}", userEntity.getName()); } - if (StringUtils.isNotEmpty(userEntity.getLabel())) { - expressionTree = expressionTree.replaceAll("\\$\\{sysParams\\.userLabel}", userEntity.getLabel()); - } record.setExpressionTree(expressionTree); DatasetRowPermissionsTreeObj tree = JsonUtil.parseObject(expressionTree, DatasetRowPermissionsTreeObj.class); record.setTree(tree); diff --git a/core/core-frontend/src/views/visualized/data/dataset/options.js b/core/core-frontend/src/views/visualized/data/dataset/options.js index a222bb11b7..7f0cb017e2 100644 --- a/core/core-frontend/src/views/visualized/data/dataset/options.js +++ b/core/core-frontend/src/views/visualized/data/dataset/options.js @@ -20,7 +20,7 @@ const valueOptions = valueEnum.map(formatEnum) const sysParams = ['eq', 'not_eq', 'like', 'not like', 'in', 'not in'] const textOptionsForSysParams = sysParams.map(formatEnum) -const sysParamsEnum = ['userId', 'userName', 'userEmail', 'userLabel'] +const sysParamsEnum = ['userId', 'userName', 'userEmail'] const sysParamsIlns = sysParamsEnum.map(_ => { return { value: `\${sysParams.${_}}`, label: `auth.sysParams_type.${toLine(_)}` } diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserCreator.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserCreator.java index e11127967b..e97d13e952 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserCreator.java +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserCreator.java @@ -31,6 +31,4 @@ public class UserCreator implements Serializable { @Schema(hidden = true) @JsonIgnore private Long uid; - @Schema(description = "标签", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - private String label; } diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserFormVO.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserFormVO.java index 13d33f2c91..851ab91999 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserFormVO.java +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserFormVO.java @@ -42,7 +42,4 @@ public class UserFormVO implements Serializable { @Schema(description = "模式") private String model; - - @Schema(description = "标签") - private String label; }