+
-
todo: 绑定功能
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+ {{ item.description }}
+
+
+
+ {{ buttonText(item) }}
+
+
+
+
+
+
+
+
+
+
+ 需要添加第三方账号在
+
+ apps\web-antd\src\views\_core\oauth-common.ts
+
+ 中accountBindList按模板添加
+
+
+ 添加对应模板后会在此处显示绑定, 但只有
+ 实现了action才能在登录页显示
+
+
+
+
+
+
diff --git a/apps/web-antd/src/views/_core/social-callback/index.vue b/apps/web-antd/src/views/_core/social-callback/index.vue
new file mode 100644
index 00000000..ad7135f4
--- /dev/null
+++ b/apps/web-antd/src/views/_core/social-callback/index.vue
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
diff --git a/cspell.json b/cspell.json
index 60020248..05d09ac8 100644
--- a/cspell.json
+++ b/cspell.json
@@ -4,49 +4,51 @@
"language": "en,en-US",
"allowCompoundWords": true,
"words": [
- "clsx",
- "esno",
- "demi",
- "unref",
- "taze",
"acmr",
"antd",
- "lucide",
+ "antdv",
+ "astro",
"brotli",
+ "clsx",
"defu",
+ "demi",
+ "echarts",
+ "ependencies",
+ "esno",
+ "etag",
"execa",
+ "Gitee",
"iconify",
"intlify",
+ "lockb",
+ "lucide",
"mkdist",
"mockjs",
+ "nocheck",
"noopener",
"noreferrer",
"nprogress",
+ "nuxt",
"pinia",
+ "prefixs",
"publint",
+ "Qqchat",
"qrcode",
"shadcn",
"sonner",
+ "sortablejs",
+ "styl",
+ "taze",
+ "ui-kit",
"unplugin",
+ "unref",
"vben",
"vbenjs",
- "vueuse",
- "yxxx",
- "nuxt",
- "lockb",
- "astro",
- "ui-kit",
- "styl",
- "vnode",
- "nocheck",
- "prefixs",
- "vitepress",
- "antdv",
- "ependencies",
"vite",
- "echarts",
- "sortablejs",
- "etag"
+ "vitepress",
+ "vnode",
+ "vueuse",
+ "yxxx"
],
"ignorePaths": [
"**/node_modules/**",
diff --git a/packages/effects/common-ui/src/ui/authentication/login.vue b/packages/effects/common-ui/src/ui/authentication/login.vue
index 7584b7f3..aa7f257d 100644
--- a/packages/effects/common-ui/src/ui/authentication/login.vue
+++ b/packages/effects/common-ui/src/ui/authentication/login.vue
@@ -92,6 +92,19 @@ const formState = reactive({
username: localUsername,
});
+/**
+ * oauth登录 需要tenantId参数
+ */
+watch(
+ () => formState.tenantId,
+ (tenantId) => {
+ localStorage.setItem('__oauth_tenant_id', tenantId);
+ },
+ {
+ immediate: true,
+ },
+);
+
/**
* 默认选中第一项租户
*/
diff --git a/packages/locales/src/langs/en-US.json b/packages/locales/src/langs/en-US.json
index 80fe320f..46e31685 100644
--- a/packages/locales/src/langs/en-US.json
+++ b/packages/locales/src/langs/en-US.json
@@ -5,7 +5,8 @@
"register": "Register",
"codeLogin": "Code Login",
"qrcodeLogin": "Qr Code Login",
- "forgetPassword": "Forget Password"
+ "forgetPassword": "Forget Password",
+ "oauthLogin": "Oauth Login"
},
"dashboard": {
"title": "Dashboard",
diff --git a/packages/locales/src/langs/zh-CN.json b/packages/locales/src/langs/zh-CN.json
index ca9bbfbd..452977c6 100644
--- a/packages/locales/src/langs/zh-CN.json
+++ b/packages/locales/src/langs/zh-CN.json
@@ -5,7 +5,8 @@
"register": "注册",
"codeLogin": "验证码登录",
"qrcodeLogin": "二维码登录",
- "forgetPassword": "忘记密码"
+ "forgetPassword": "忘记密码",
+ "oauthLogin": "第三方登录"
},
"dashboard": {
"title": "概览",