From d776e7e3456426caa9f4fba90c7b10c9cb15dd7d Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 14 Apr 2026 11:01:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E3=80=90=E6=9D=83=E9=99=90=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E3=80=91=E7=B3=BB=E7=BB=9F=E5=8F=98=E9=87=8F=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E2=80=9C=E6=89=8B=E6=9C=BA=E5=8F=B7=E2=80=9D=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E6=94=AF=E6=8C=81=E5=9F=BA=E4=BA=8E=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E8=B4=A6=E5=8F=B7=E6=89=8B=E6=9C=BA=E5=8F=B7=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E4=B8=8E=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/dataset/manage/PermissionManage.java | 8 +++++++- core/core-frontend/src/locales/en.ts | 1 + core/core-frontend/src/locales/tw.ts | 1 + core/core-frontend/src/locales/zh-CN.ts | 1 + .../src/views/visualized/data/dataset/form/AddSql.vue | 4 ++++ .../src/views/visualized/data/dataset/options.js | 2 +- 6 files changed, 15 insertions(+), 2 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 4182a481a6..249b03346d 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 @@ -212,7 +212,13 @@ public class PermissionManage { items.add(datasetRowPermissionsTreeItem); continue; } - + if (StringUtils.isNotEmpty(userEntity.getName()) && datasetRowPermissionsTreeItem.getValue().equalsIgnoreCase("${sysParams.userPhone}")) { + if(StringUtils.isNotEmpty(userEntity.getPhone())){ + datasetRowPermissionsTreeItem.setValue(userEntity.getPhone()); + items.add(datasetRowPermissionsTreeItem); + } + continue; + } String value = handleSysVariable(userEntity, datasetRowPermissionsTreeItem); if (value == null) { continue; diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index e911167245..f72ce1012c 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -924,6 +924,7 @@ export default { user_source: 'Origin', user_label: 'User label', user_email: 'Email', + user_phone: 'Mobile phone', dept: 'Organization', role: 'Role' }, diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index 71b9876d25..7246136ced 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -894,6 +894,7 @@ export default { user_source: '使用者來源', user_label: '使用者標籤', user_email: '信箱', + user_phone: '手機號', dept: '組織', role: '角色' }, diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index a10ca9b796..4255873cb5 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -896,6 +896,7 @@ export default { user_source: '用户来源', user_label: '用户标签', user_email: '邮箱', + user_phone: '手机号', dept: '组织', role: '角色' }, diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue b/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue index 5a4cb22eb3..c6b6cd13b8 100644 --- a/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue +++ b/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue @@ -156,6 +156,10 @@ const builtInList = ref([ { id: 'sysParams.userEmail', name: t('commons.email') + }, + { + id: 'sysParams.userPhone', + name: t('auth.sysParams_type.user_phone') } ]) 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 894b8aeee2..3acdec621b 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'] +const sysParamsEnum = ['userId', 'userName', 'userEmail', 'userPhone'] const sysParamsIlns = sysParamsEnum.map(_ => { return { value: `\${sysParams.${_}}`, label: `auth.sysParams_type.${toLine(_)}` }