From 2468ad1944d08feb34e9f88d7613cf9bb3de6f04 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 24 Oct 2025 12:01:04 +0800 Subject: [PATCH] =?UTF-8?q?fix(X-Pack):=20=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=94=A8=E6=88=B7=E5=8F=AF=E4=BB=A5=E8=A7=A3?= =?UTF-8?q?=E7=BB=91=EF=BC=8C=E8=A7=A3=E7=BB=91=E4=B9=8B=E5=90=8E=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/locales/en.ts | 3 ++- core/core-frontend/src/locales/tw.ts | 3 ++- core/core-frontend/src/locales/zh-CN.ts | 1 + .../java/io/dataease/api/permissions/user/vo/UserFormVO.java | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index 7caeabab0f..2a7b60c950 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -4690,7 +4690,8 @@ export default { 'After binding, you can log in by scanning the QR code through International Lark', bind: 'Bind', unbind_success: 'Unbind successfully', - confirm_unbind_dingtalk: 'Are you sure you want to unbind DingTalk? ', + confirm_unbind_dingtalk: 'Are you sure you want to unbind {0}? ', + unbind_error: 'Current user origin is {0}, cannot unbind', pls_use: 'Please use ', bind_use_qr: 'Scan QR code to bind', pls_use_dingtalk: 'Please use DingTalk to scan QR code to log in', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index de8c88f218..2bf628c84d 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -4556,7 +4556,8 @@ export default { international_lark_desc: '綁定後,您可透過國際飛書掃碼登入', bind: '綁定', unbind_success: '解綁成功', - confirm_unbind_dingtalk: '確定解除釘釘綁定嗎? ', + confirm_unbind_dingtalk: '確定解除{0}綁定嗎? ', + unbind_error: '當前用戶來源是{0},無法解綁', pls_use: '請使用', bind_use_qr: '掃描二維碼綁定', pls_use_dingtalk: '請使用釘釘掃描二維碼登入', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 979458468d..6723176c1e 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -4565,6 +4565,7 @@ export default { bind: '绑定', unbind_success: '解绑成功', confirm_unbind_dingtalk: '确定解除{0}绑定吗?', + unbind_error: '当前用户来源是{0},无法解绑', pls_use: '请使用', bind_use_qr: '扫描二维码绑定', pls_use_dingtalk: '请使用钉钉扫描二维码登录', 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 9a357de0fb..afcfe0be65 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 @@ -47,6 +47,9 @@ public class UserFormVO implements Serializable { @Schema(description = "MFA状态") private Boolean mfaEnable = false; + @Schema(description = "用户来源") + private Integer origin = 0; + @Schema(description = "系统变量") private List variables; }