Browse Source
Merge pull request #1210 from colinin/rel-9.1.3
chore: update package version
pull/1211/head
yx lin
9 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
27 changed files with
73 additions and
27 deletions
-
apps/vben5/apps/app-antd/package.json
-
apps/vben5/apps/app-antd/src/hooks/useSessions.ts
-
apps/vben5/apps/app-antd/src/views/_core/authentication/login.vue
-
apps/vben5/apps/app-antd/src/views/_core/authentication/third-party-login.vue
-
apps/vben5/packages/@abp/account/package.json
-
apps/vben5/packages/@abp/auditing/package.json
-
apps/vben5/packages/@abp/components/package.json
-
apps/vben5/packages/@abp/core/package.json
-
apps/vben5/packages/@abp/data-protection/package.json
-
apps/vben5/packages/@abp/demo/package.json
-
apps/vben5/packages/@abp/features/package.json
-
apps/vben5/packages/@abp/gdpr/package.json
-
apps/vben5/packages/@abp/identity/package.json
-
apps/vben5/packages/@abp/localization/package.json
-
apps/vben5/packages/@abp/notifications/package.json
-
apps/vben5/packages/@abp/openiddict/package.json
-
apps/vben5/packages/@abp/oss/package.json
-
apps/vben5/packages/@abp/permissions/package.json
-
apps/vben5/packages/@abp/platform/package.json
-
apps/vben5/packages/@abp/request/package.json
-
apps/vben5/packages/@abp/saas/package.json
-
apps/vben5/packages/@abp/settings/package.json
-
apps/vben5/packages/@abp/signalr/package.json
-
apps/vben5/packages/@abp/tasks/package.json
-
apps/vben5/packages/@abp/text-templating/package.json
-
apps/vben5/packages/@abp/ui/package.json
-
apps/vben5/packages/@abp/webhooks/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:*", |
|
|
|
|
|
|
|
@ -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(); |
|
|
|
|
|
|
|
@ -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" |
|
|
|
/> |
|
|
|
> |
|
|
|
<!-- 第三方登录 --> |
|
|
|
<template #third-party-login> |
|
|
|
<ThirdPartyLogin /> |
|
|
|
</template> |
|
|
|
</AuthenticationLogin> |
|
|
|
<TwoFactorModal /> |
|
|
|
</div> |
|
|
|
</template> |
|
|
|
|
|
|
|
@ -0,0 +1,37 @@ |
|
|
|
<script setup lang="ts"> |
|
|
|
import { MdiGithub, MdiGoogle, MdiQqchat, MdiWechat } from '@vben/icons'; |
|
|
|
import { $t } from '@vben/locales'; |
|
|
|
|
|
|
|
import { VbenIconButton } from '@vben-core/shadcn-ui'; |
|
|
|
|
|
|
|
defineOptions({ |
|
|
|
name: 'ThirdPartyLogin', |
|
|
|
}); |
|
|
|
</script> |
|
|
|
|
|
|
|
<template> |
|
|
|
<div class="w-full sm:mx-auto md:max-w-md"> |
|
|
|
<div class="mt-4 flex items-center justify-between"> |
|
|
|
<span class="border-input w-[35%] border-b dark:border-gray-600"></span> |
|
|
|
<span class="text-muted-foreground text-center text-xs uppercase"> |
|
|
|
{{ $t('authentication.thirdPartyLogin') }} |
|
|
|
</span> |
|
|
|
<span class="border-input w-[35%] border-b dark:border-gray-600"></span> |
|
|
|
</div> |
|
|
|
|
|
|
|
<div class="mt-4 flex flex-wrap justify-center"> |
|
|
|
<VbenIconButton class="mb-3"> |
|
|
|
<MdiWechat /> |
|
|
|
</VbenIconButton> |
|
|
|
<VbenIconButton class="mb-3"> |
|
|
|
<MdiQqchat /> |
|
|
|
</VbenIconButton> |
|
|
|
<VbenIconButton class="mb-3"> |
|
|
|
<MdiGithub /> |
|
|
|
</VbenIconButton> |
|
|
|
<VbenIconButton class="mb-3"> |
|
|
|
<MdiGoogle /> |
|
|
|
</VbenIconButton> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</template> |
|
|
|
@ -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": { |
|
|
|
|
|
|
|
@ -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": { |
|
|
|
|
|
|
|
@ -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": { |
|
|
|
|
|
|
|
@ -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": { |
|
|
|
|
|
|
|
@ -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": { |
|
|
|
|
|
|
|
@ -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": { |
|
|
|
|
|
|
|
@ -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": { |
|
|
|
|
|
|
|
@ -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": { |
|
|
|
|
|
|
|
@ -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": { |
|
|
|
|
|
|
|
@ -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": { |
|
|
|
|
|
|
|
@ -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": { |
|
|
|
|
|
|
|
@ -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": { |
|
|
|
|
|
|
|
@ -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": { |
|
|
|
|
|
|
|
@ -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": { |
|
|
|
|
|
|
|
@ -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": { |
|
|
|
|
|
|
|
@ -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": { |
|
|
|
|
|
|
|
@ -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": { |
|
|
|
|
|
|
|
@ -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": { |
|
|
|
|
|
|
|
@ -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": { |
|
|
|
|
|
|
|
@ -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": { |
|
|
|
|
|
|
|
@ -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": { |
|
|
|
|
|
|
|
@ -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": { |
|
|
|
|
|
|
|
@ -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": { |
|
|
|
|