From f642e42eeaec24a2d7559a8339a77714b19d4151 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Sun, 15 Mar 2026 02:20:39 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96passkey?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/locales/langs/en-US/certd.ts | 5 +- .../src/locales/langs/zh-CN/certd.ts | 7 +- .../ui/certd-client/src/style/common.less | 8 +- .../src/views/certd/mine/user-profile.vue | 147 ++++++++-------- .../src/views/framework/login/index.vue | 4 +- .../src/views/sys/settings/tabs/oauth.vue | 16 +- .../modules/login/service/passkey-service.ts | 80 +++++---- pnpm-lock.yaml | 160 ++++++------------ 8 files changed, 204 insertions(+), 223 deletions(-) diff --git a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts index e8e032598..d300dc382 100644 --- a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts +++ b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts @@ -770,7 +770,10 @@ export default { oauthOnly: "OAuth2 Login Only", oauthOnlyHelper: "Whether to only allow OAuth2 login, disable password login", enablePasskey: "Enable Passkey Login", - passkeyEnabledHelper: "Whether to enable Passkey login", + passkeyHostnameNotSame: "Passkey hostname must be the same as the main domain", + passkeyEnabledHelper: + "1、Site must enable https \n2、Domain name must not change, otherwise the registered passkey will be invalid \n3、Domain name must be the same as the main domain, otherwise the registered passkey will be invalid", + email: { templates: "Email Templates", templateType: "Template Type", diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts index 5110b53cd..b7eaead14 100644 --- a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts +++ b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts @@ -728,7 +728,7 @@ export default { paymentSetting: "支付设置", captchaSetting: "验证码设置", pipelineSetting: "流水线设置", - oauthSetting: "登录设置", + oauthSetting: "第三方登录", networkSetting: "网络设置", adminModeSetting: "管理模式", adminModeHelper: "企业管理模式: 企业内部使用，通过项目来隔离权限，流水线、授权数据属于项目。\nsaas模式：供外部用户注册使用，各个用户之间数据隔离，流水线、授权数据属于用户。", @@ -780,8 +780,9 @@ export default { oauthAutoRedirectHelper: "是否自动跳转第三方登录（使用第一个已启用的第三方登录类型）", oauthOnly: "仅使用第三方登录", oauthOnlyHelper: "是否仅使用第三方登录，关闭密码登录（注意：请务必在测试第三方登录功能正常后再开启，否则会导致无法登录）\n 如果无法登录，请访问 http://你的certd地址/#/login?oauthOnly=false 来临时关闭此模式", - enablePasskey: "启用Passkey", - passkeyEnabledHelper: "是否启用Passkey登录", + enablePasskey: "启用Passkey登录", + passkeyHostnameNotSame: "当前域名与主绑定域名不同", + passkeyEnabledHelper: "1、站点必须启用https \n2、域名不要变，否则会导致已注册的passkey失效 \n3、域名以主绑定域名为准，当前主域名:{0}", email: { templates: "邮件模板", templateType: "模板类型", diff --git a/packages/ui/certd-client/src/style/common.less b/packages/ui/certd-client/src/style/common.less index 95587342c..cec52ee67 100644 --- a/packages/ui/certd-client/src/style/common.less +++ b/packages/ui/certd-client/src/style/common.less @@ -110,10 +110,10 @@ h6 { flex: 0; } -.flex-col { - display: flex; - flex-direction: column; -} +// .flex-col { +// display: flex; +// flex-direction: column; +// } .align-left { text-align: left; diff --git a/packages/ui/certd-client/src/views/certd/mine/user-profile.vue b/packages/ui/certd-client/src/views/certd/mine/user-profile.vue index 5cc88b5ed..0776d49c1 100644 --- a/packages/ui/certd-client/src/views/certd/mine/user-profile.vue +++ b/packages/ui/certd-client/src/views/certd/mine/user-profile.vue @@ -45,79 +45,86 @@ -
-
- - 第三方账号绑定 -
-
- -
暂无可用的第三方账号绑定
-
-
- -
-
- - Passkey 安全密钥 -
-
-
-
- +
+ +
暂无可用的第三方账号绑定
-
-
{{ passkey.deviceName }}
-
- - - {{ formatDate(passkey.registeredAt) }} - - - - 最近使用： - -
-
- - - 移除 -
-
- -

暂无Passkey

+ +
+
+
+ + Passkey 安全密钥 +
+
+
+
+ +
+
+
{{ passkey.deviceName }}
+
+ + + {{ formatDate(passkey.registeredAt) }} + + + + 最近使用： + +
+
+ + + 移除 + +
+
+
+ +

暂无Passkey

+
+
+ + {{ t("authentication.passkeyNotSupported") }} +
+ + + 注册新的Passkey + + 
{{ t("authentication.passkeyRegisterHelper") }}
+
-
- - {{ t("authentication.passkeyNotSupported") }} -
- - - 注册新的Passkey - - 
{{ t("authentication.passkeyRegisterHelper") }}
@@ -485,7 +492,7 @@ onMounted(async () => { display: flex; flex-direction: column; gap: 20px; - max-width: 1000px; + // max-width: 1000px; .profile-card, .bindings-card, @@ -649,7 +656,7 @@ onMounted(async () => { display: flex; align-items: center; justify-content: center; - background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); + background: linear-gradient(135deg, #ebefff 0%, #e5d4ff 100%); border-radius: 10px; } diff --git a/packages/ui/certd-client/src/views/framework/login/index.vue b/packages/ui/certd-client/src/views/framework/login/index.vue index 89b4918e0..4d5d78b10 100644 --- a/packages/ui/certd-client/src/views/framework/login/index.vue +++ b/packages/ui/certd-client/src/views/framework/login/index.vue @@ -4,7 +4,7 @@