diff --git a/apps/vben5/apps/app-antd/package.json b/apps/vben5/apps/app-antd/package.json index 7a5e41b08..392c09fdc 100644 --- a/apps/vben5/apps/app-antd/package.json +++ b/apps/vben5/apps/app-antd/package.json @@ -1,6 +1,6 @@ { "name": "@abp/app-antd", - "version": "9.0.4", + "version": "9.1.3", "homepage": "https://github.com/colinin/abp-next-admin", "bugs": "https://github.com/colinin/abp-next-admin/issues", "repository": { @@ -46,6 +46,7 @@ "@abp/text-templating": "workspace:*", "@abp/ui": "workspace:*", "@abp/webhooks": "workspace:*", + "@vben-core/shadcn-ui": "workspace:*", "@vben/access": "workspace:*", "@vben/common-ui": "workspace:*", "@vben/constants": "workspace:*", diff --git a/apps/vben5/apps/app-antd/src/hooks/useSessions.ts b/apps/vben5/apps/app-antd/src/hooks/useSessions.ts index ae8cc1e28..6ef5435a0 100644 --- a/apps/vben5/apps/app-antd/src/hooks/useSessions.ts +++ b/apps/vben5/apps/app-antd/src/hooks/useSessions.ts @@ -1,4 +1,3 @@ -/* eslint-disable @typescript-eslint/no-non-null-assertion */ import type { Notification as NotificationInfo } from '@abp/notifications'; import { onMounted, onUnmounted } from 'vue'; @@ -27,7 +26,10 @@ export function useSessions() { /** 处理会话过期事件 */ function _onSessionExpired(event?: NotificationInfo) { - const { data, title, message } = event!; + if (!event) { + return; + } + const { data, title, message } = event; const sessionId = data.SessionId; if (sessionId === abpStore.application?.currentUser?.sessionId) { _release(); diff --git a/apps/vben5/apps/app-antd/src/views/_core/authentication/login.vue b/apps/vben5/apps/app-antd/src/views/_core/authentication/login.vue index 7af4fc667..d85f849bd 100644 --- a/apps/vben5/apps/app-antd/src/views/_core/authentication/login.vue +++ b/apps/vben5/apps/app-antd/src/views/_core/authentication/login.vue @@ -14,6 +14,7 @@ import { useAbpStore } from '@abp/core'; import { useAbpConfigApi } from '#/api/core/useAbpConfigApi'; import { useAuthStore } from '#/store'; +import ThirdPartyLogin from './third-party-login.vue'; import TwoFactorLogin from './two-factor-login.vue'; interface LoginInstance { @@ -103,7 +104,12 @@ onMounted(onInit); :form-schema="formSchema" :loading="authStore.loginLoading" @submit="onLogin" - /> + > + + + diff --git a/apps/vben5/apps/app-antd/src/views/_core/authentication/third-party-login.vue b/apps/vben5/apps/app-antd/src/views/_core/authentication/third-party-login.vue new file mode 100644 index 000000000..16533f490 --- /dev/null +++ b/apps/vben5/apps/app-antd/src/views/_core/authentication/third-party-login.vue @@ -0,0 +1,37 @@ + + + diff --git a/apps/vben5/packages/@abp/account/package.json b/apps/vben5/packages/@abp/account/package.json index 16ac1feba..570d446a3 100644 --- a/apps/vben5/packages/@abp/account/package.json +++ b/apps/vben5/packages/@abp/account/package.json @@ -1,6 +1,6 @@ { "name": "@abp/account", - "version": "9.0.4", + "version": "9.1.3", "homepage": "https://github.com/colinin/abp-next-admin", "bugs": "https://github.com/colinin/abp-next-admin/issues", "repository": { diff --git a/apps/vben5/packages/@abp/auditing/package.json b/apps/vben5/packages/@abp/auditing/package.json index 857f4ed39..b47a841d8 100644 --- a/apps/vben5/packages/@abp/auditing/package.json +++ b/apps/vben5/packages/@abp/auditing/package.json @@ -1,6 +1,6 @@ { "name": "@abp/auditing", - "version": "9.0.4", + "version": "9.1.3", "homepage": "https://github.com/colinin/abp-next-admin", "bugs": "https://github.com/colinin/abp-next-admin/issues", "repository": { diff --git a/apps/vben5/packages/@abp/components/package.json b/apps/vben5/packages/@abp/components/package.json index 24fb73276..561001022 100644 --- a/apps/vben5/packages/@abp/components/package.json +++ b/apps/vben5/packages/@abp/components/package.json @@ -1,6 +1,6 @@ { "name": "@abp/components", - "version": "9.0.4", + "version": "9.1.3", "homepage": "https://github.com/colinin/abp-next-admin", "bugs": "https://github.com/colinin/abp-next-admin/issues", "repository": { diff --git a/apps/vben5/packages/@abp/core/package.json b/apps/vben5/packages/@abp/core/package.json index 2374f1ebc..1fcd221b1 100644 --- a/apps/vben5/packages/@abp/core/package.json +++ b/apps/vben5/packages/@abp/core/package.json @@ -1,6 +1,6 @@ { "name": "@abp/core", - "version": "9.0.4", + "version": "9.1.3", "homepage": "https://github.com/colinin/abp-next-admin", "bugs": "https://github.com/colinin/abp-next-admin/issues", "repository": { diff --git a/apps/vben5/packages/@abp/data-protection/package.json b/apps/vben5/packages/@abp/data-protection/package.json index 4c4c957e9..071a351f6 100644 --- a/apps/vben5/packages/@abp/data-protection/package.json +++ b/apps/vben5/packages/@abp/data-protection/package.json @@ -1,6 +1,6 @@ { "name": "@abp/data-protection", - "version": "9.0.4", + "version": "9.1.3", "homepage": "https://github.com/colinin/abp-next-admin", "bugs": "https://github.com/colinin/abp-next-admin/issues", "repository": { diff --git a/apps/vben5/packages/@abp/demo/package.json b/apps/vben5/packages/@abp/demo/package.json index a87ba8513..3f6cd37f5 100644 --- a/apps/vben5/packages/@abp/demo/package.json +++ b/apps/vben5/packages/@abp/demo/package.json @@ -1,6 +1,6 @@ { "name": "@abp/demo", - "version": "9.0.4", + "version": "9.1.3", "homepage": "https://github.com/colinin/abp-next-admin", "bugs": "https://github.com/colinin/abp-next-admin/issues", "repository": { diff --git a/apps/vben5/packages/@abp/features/package.json b/apps/vben5/packages/@abp/features/package.json index c44657431..7477b36c1 100644 --- a/apps/vben5/packages/@abp/features/package.json +++ b/apps/vben5/packages/@abp/features/package.json @@ -1,6 +1,6 @@ { "name": "@abp/features", - "version": "9.0.4", + "version": "9.1.3", "homepage": "https://github.com/colinin/abp-next-admin", "bugs": "https://github.com/colinin/abp-next-admin/issues", "repository": { diff --git a/apps/vben5/packages/@abp/gdpr/package.json b/apps/vben5/packages/@abp/gdpr/package.json index 89d869902..e04deaafd 100644 --- a/apps/vben5/packages/@abp/gdpr/package.json +++ b/apps/vben5/packages/@abp/gdpr/package.json @@ -1,6 +1,6 @@ { "name": "@abp/gdpr", - "version": "9.0.4", + "version": "9.1.3", "homepage": "https://github.com/colinin/abp-next-admin", "bugs": "https://github.com/colinin/abp-next-admin/issues", "repository": { diff --git a/apps/vben5/packages/@abp/identity/package.json b/apps/vben5/packages/@abp/identity/package.json index 120b9d9b5..ee6141372 100644 --- a/apps/vben5/packages/@abp/identity/package.json +++ b/apps/vben5/packages/@abp/identity/package.json @@ -1,6 +1,6 @@ { "name": "@abp/identity", - "version": "9.0.4", + "version": "9.1.3", "homepage": "https://github.com/colinin/abp-next-admin", "bugs": "https://github.com/colinin/abp-next-admin/issues", "repository": { diff --git a/apps/vben5/packages/@abp/localization/package.json b/apps/vben5/packages/@abp/localization/package.json index 121edef76..8aa4939d8 100644 --- a/apps/vben5/packages/@abp/localization/package.json +++ b/apps/vben5/packages/@abp/localization/package.json @@ -1,6 +1,6 @@ { "name": "@abp/localization", - "version": "9.0.4", + "version": "9.1.3", "homepage": "https://github.com/colinin/abp-next-admin", "bugs": "https://github.com/colinin/abp-next-admin/issues", "repository": { diff --git a/apps/vben5/packages/@abp/notifications/package.json b/apps/vben5/packages/@abp/notifications/package.json index caf1a3720..20ed18c8e 100644 --- a/apps/vben5/packages/@abp/notifications/package.json +++ b/apps/vben5/packages/@abp/notifications/package.json @@ -1,6 +1,6 @@ { "name": "@abp/notifications", - "version": "9.0.4", + "version": "9.1.3", "homepage": "https://github.com/colinin/abp-next-admin", "bugs": "https://github.com/colinin/abp-next-admin/issues", "repository": { diff --git a/apps/vben5/packages/@abp/openiddict/package.json b/apps/vben5/packages/@abp/openiddict/package.json index 981869ab3..126fbe5af 100644 --- a/apps/vben5/packages/@abp/openiddict/package.json +++ b/apps/vben5/packages/@abp/openiddict/package.json @@ -1,6 +1,6 @@ { "name": "@abp/openiddict", - "version": "9.0.4", + "version": "9.1.3", "homepage": "https://github.com/colinin/abp-next-admin", "bugs": "https://github.com/colinin/abp-next-admin/issues", "repository": { diff --git a/apps/vben5/packages/@abp/oss/package.json b/apps/vben5/packages/@abp/oss/package.json index ad7022566..b194d662d 100644 --- a/apps/vben5/packages/@abp/oss/package.json +++ b/apps/vben5/packages/@abp/oss/package.json @@ -1,6 +1,6 @@ { "name": "@abp/oss", - "version": "9.0.4", + "version": "9.1.3", "homepage": "https://github.com/colinin/abp-next-admin", "bugs": "https://github.com/colinin/abp-next-admin/issues", "repository": { diff --git a/apps/vben5/packages/@abp/permissions/package.json b/apps/vben5/packages/@abp/permissions/package.json index 0a038775d..def1bd8ea 100644 --- a/apps/vben5/packages/@abp/permissions/package.json +++ b/apps/vben5/packages/@abp/permissions/package.json @@ -1,6 +1,6 @@ { "name": "@abp/permissions", - "version": "9.0.4", + "version": "9.1.3", "homepage": "https://github.com/colinin/abp-next-admin", "bugs": "https://github.com/colinin/abp-next-admin/issues", "repository": { diff --git a/apps/vben5/packages/@abp/platform/package.json b/apps/vben5/packages/@abp/platform/package.json index 090bb570d..807df9134 100644 --- a/apps/vben5/packages/@abp/platform/package.json +++ b/apps/vben5/packages/@abp/platform/package.json @@ -1,6 +1,6 @@ { "name": "@abp/platform", - "version": "9.0.4", + "version": "9.1.3", "homepage": "https://github.com/colinin/abp-next-admin", "bugs": "https://github.com/colinin/abp-next-admin/issues", "repository": { diff --git a/apps/vben5/packages/@abp/request/package.json b/apps/vben5/packages/@abp/request/package.json index e14f7d4b9..7f23f25ff 100644 --- a/apps/vben5/packages/@abp/request/package.json +++ b/apps/vben5/packages/@abp/request/package.json @@ -1,6 +1,6 @@ { "name": "@abp/request", - "version": "9.0.4", + "version": "9.1.3", "homepage": "https://github.com/colinin/abp-next-admin", "bugs": "https://github.com/colinin/abp-next-admin/issues", "repository": { diff --git a/apps/vben5/packages/@abp/saas/package.json b/apps/vben5/packages/@abp/saas/package.json index 4f41c3c5d..9c050356b 100644 --- a/apps/vben5/packages/@abp/saas/package.json +++ b/apps/vben5/packages/@abp/saas/package.json @@ -1,6 +1,6 @@ { "name": "@abp/saas", - "version": "9.0.4", + "version": "9.1.3", "homepage": "https://github.com/colinin/abp-next-admin", "bugs": "https://github.com/colinin/abp-next-admin/issues", "repository": { diff --git a/apps/vben5/packages/@abp/settings/package.json b/apps/vben5/packages/@abp/settings/package.json index 1e2c40f78..f92c70e3b 100644 --- a/apps/vben5/packages/@abp/settings/package.json +++ b/apps/vben5/packages/@abp/settings/package.json @@ -1,6 +1,6 @@ { "name": "@abp/settings", - "version": "9.0.4", + "version": "9.1.3", "homepage": "https://github.com/colinin/abp-next-admin", "bugs": "https://github.com/colinin/abp-next-admin/issues", "repository": { diff --git a/apps/vben5/packages/@abp/signalr/package.json b/apps/vben5/packages/@abp/signalr/package.json index fa9ea90a5..9cc6ab4bd 100644 --- a/apps/vben5/packages/@abp/signalr/package.json +++ b/apps/vben5/packages/@abp/signalr/package.json @@ -1,6 +1,6 @@ { "name": "@abp/signalr", - "version": "9.0.4", + "version": "9.1.3", "homepage": "https://github.com/colinin/abp-next-admin", "bugs": "https://github.com/colinin/abp-next-admin/issues", "repository": { diff --git a/apps/vben5/packages/@abp/tasks/package.json b/apps/vben5/packages/@abp/tasks/package.json index 4c0ddb87b..0c8457776 100644 --- a/apps/vben5/packages/@abp/tasks/package.json +++ b/apps/vben5/packages/@abp/tasks/package.json @@ -1,6 +1,6 @@ { "name": "@abp/tasks", - "version": "9.0.4", + "version": "9.1.3", "homepage": "https://github.com/colinin/abp-next-admin", "bugs": "https://github.com/colinin/abp-next-admin/issues", "repository": { diff --git a/apps/vben5/packages/@abp/text-templating/package.json b/apps/vben5/packages/@abp/text-templating/package.json index ec4efb8c5..f30890e21 100644 --- a/apps/vben5/packages/@abp/text-templating/package.json +++ b/apps/vben5/packages/@abp/text-templating/package.json @@ -1,6 +1,6 @@ { "name": "@abp/text-templating", - "version": "9.0.4", + "version": "9.1.3", "homepage": "https://github.com/colinin/abp-next-admin", "bugs": "https://github.com/colinin/abp-next-admin/issues", "repository": { diff --git a/apps/vben5/packages/@abp/ui/package.json b/apps/vben5/packages/@abp/ui/package.json index f077d1a35..817963907 100644 --- a/apps/vben5/packages/@abp/ui/package.json +++ b/apps/vben5/packages/@abp/ui/package.json @@ -1,6 +1,6 @@ { "name": "@abp/ui", - "version": "9.0.4", + "version": "9.1.3", "homepage": "https://github.com/colinin/abp-next-admin", "bugs": "https://github.com/colinin/abp-next-admin/issues", "repository": { diff --git a/apps/vben5/packages/@abp/webhooks/package.json b/apps/vben5/packages/@abp/webhooks/package.json index f62762874..7683bf666 100644 --- a/apps/vben5/packages/@abp/webhooks/package.json +++ b/apps/vben5/packages/@abp/webhooks/package.json @@ -1,6 +1,6 @@ { "name": "@abp/webhooks", - "version": "9.0.4", + "version": "9.1.3", "homepage": "https://github.com/colinin/abp-next-admin", "bugs": "https://github.com/colinin/abp-next-admin/issues", "repository": {