perf: improve the logic related to login expiration

2024-07-11 20:11:11 +08:00
parent 8e6c1abf19
commit d62a3da009
43 changed files with 552 additions and 347 deletions
--- a/packages/business/layouts/package.json
+++ b/packages/business/layouts/package.json
@@ -48,7 +48,6 @@
    "@vben-core/stores": "workspace:*",
    "@vben-core/tabs-ui": "workspace:*",
    "@vben-core/toolkit": "workspace:*",
-    "@vben/universal-ui": "workspace:*",
    "@vueuse/core": "^10.11.0",
    "vue": "^3.4.31",
    "vue-router": "^4.4.0"
--- a/packages/business/layouts/src/widgets/index.ts
+++ b/packages/business/layouts/src/widgets/index.ts
@@ -4,7 +4,6 @@ export { default as CozeAssistant } from './coze-assistant.vue';
 export * from './global-search';
 export { default as LanguageToggle } from './language-toggle.vue';
 export { default as AuthenticationLayoutToggle } from './layout-toggle.vue';
-export * from './login-dialog';
 export * from './notification';
 export * from './preferences';
 export * from './theme-toggle';
--- a/packages/business/layouts/src/widgets/login-dialog/index.ts
+++ b/packages/business/layouts/src/widgets/login-dialog/index.ts
@@ -1 +0,0 @@
-export { default as LoginDialog } from './login-dialog.vue';
--- a/packages/business/layouts/src/widgets/login-dialog/login-dialog.vue
+++ b/packages/business/layouts/src/widgets/login-dialog/login-dialog.vue
@@ -1,48 +0,0 @@
-<script setup lang="ts">
-import { computed } from 'vue';
-
-import {
-  AuthenticationLogin,
-  AuthenticationProps,
-  LoginAndRegisterParams,
-} from '@vben/universal-ui';
-import { Dialog, DialogContent } from '@vben-core/shadcn-ui';
-
-interface Props extends AuthenticationProps {
-  open: boolean;
-}
-
-defineOptions({
-  name: 'LoginDialog',
-});
-
-const props = withDefaults(defineProps<Props>(), {
-  open: false,
-});
-
-const emit = defineEmits<{
-  login: [LoginAndRegisterParams];
-}>();
-
-const loginProps = computed(() => {
-  const { open: _, ...rest } = props;
-  return rest;
-});
-</script>
-
-<template>
-  <div>
-    <Dialog :open="open" class="flex items-center justify-center">
-      <DialogContent
-        class="top-[50%] w-full translate-y-[-50%] border-none p-0 shadow-xl sm:w-[600px] sm:rounded-2xl"
-      >
-        <div class="p-4">
-          <AuthenticationLogin
-            v-bind="loginProps"
-            @submit="(e) => emit('login', e)"
-          />
-        </div>
-      </DialogContent>
-    </Dialog>
-  </div>
-</template>
--- a/packages/business/layouts/src/widgets/preferences/preferences-sheet.vue
+++ b/packages/business/layouts/src/widgets/preferences/preferences-sheet.vue
@@ -399,22 +399,22 @@ async function handleReset() {
          :disabled="!diffPreference"
          class="mx-4 w-full"
          size="sm"
-          variant="outline"
-          @click="handleClearCache"
-        >
-          <IcRoundRestartAlt class="mr-2 size-4" />
-          {{ $t('preferences.clearAndLogout') }}
-        </VbenButton>
-        <VbenButton
-          :disabled="!diffPreference"
-          class="mr-4 w-full"
-          size="sm"
          variant="default"
          @click="handleCopy"
        >
          <IcRoundFolderCopy class="mr-2 size-3" />
          {{ $t('preferences.copyPreferences') }}
        </VbenButton>
+        <VbenButton
+          :disabled="!diffPreference"
+          class="mr-4 w-full"
+          size="sm"
+          variant="ghost"
+          @click="handleClearCache"
+        >
+          <IcRoundRestartAlt class="mr-2 size-4" />
+          {{ $t('preferences.clearAndLogout') }}
+        </VbenButton>
      </template>
    </VbenSheet>
  </div>
--- a/packages/business/universal-ui/src/authentication/index.ts
+++ b/packages/business/universal-ui/src/authentication/index.ts
@@ -1,6 +1,7 @@
 export { default as AuthenticationCodeLogin } from './code-login.vue';
 export { default as AuthenticationForgetPassword } from './forget-password.vue';
 export { default as AuthenticationLogin } from './login.vue';
+export { default as AuthenticationLoginExpiredModal } from './login-expired-modal.vue';
 export { default as AuthenticationQrCodeLogin } from './qrcode-login.vue';
 export { default as AuthenticationRegister } from './register.vue';
 export type {
--- a/packages/business/universal-ui/src/authentication/login-expired-modal.vue
+++ b/packages/business/universal-ui/src/authentication/login-expired-modal.vue
@@ -0,0 +1,55 @@
+<script setup lang="ts">
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogTitle,
+  VisuallyHidden,
+  useForwardPropsEmits,
+} from '@vben-core/shadcn-ui';
+
+import AuthenticationLogin from './login.vue';
+import { AuthenticationProps, LoginAndRegisterParams } from './typings';
+
+interface Props extends AuthenticationProps {}
+
+defineOptions({
+  name: 'LoginExpiredModal',
+});
+
+const props = withDefaults(defineProps<Props>(), {});
+
+const emit = defineEmits<{
+  submit: [LoginAndRegisterParams];
+}>();
+
+const open = defineModel<boolean>('open');
+
+const forwarded = useForwardPropsEmits(props, emit);
+</script>
+
+<template>
+  <div>
+    <Dialog v-model:open="open">
+      <DialogContent
+        :show-close="false"
+        class="top-1/2 h-full w-full translate-y-[-50%] border-none p-4 py-12 text-center shadow-xl sm:w-[600px] sm:rounded-2xl md:h-[unset] md:px-14 md:pt-12"
+        @escape-key-down="(e) => e.preventDefault()"
+        @interact-outside="(e) => e.preventDefault()"
+      >
+        <VisuallyHidden>
+          <DialogTitle />
+          <DialogDescription />
+        </VisuallyHidden>
+        <AuthenticationLogin
+          v-bind="forwarded"
+          :show-forget-password="false"
+          :show-register="false"
+          :show-remember-me="false"
+          :sub-title="$t('authentication.loginAgainSubTitle')"
+          :title="$t('authentication.loginAgainTitle')"
+        />
+      </DialogContent>
+    </Dialog>
+  </div>
+</template>
--- a/packages/business/universal-ui/src/authentication/login.vue
+++ b/packages/business/universal-ui/src/authentication/login.vue
@@ -31,7 +31,10 @@ withDefaults(defineProps<Props>(), {
  showForgetPassword: true,
  showQrcodeLogin: true,
  showRegister: true,
+  showRememberMe: true,
  showThirdPartyLogin: true,
+  subTitle: '',
+  title: '',
  usernamePlaceholder: '',
 });

@@ -89,10 +92,10 @@ function handleGo(path: string) {
 <template>
  <div @keypress.enter.prevent="handleSubmit">
    <Title>
-      {{ $t('authentication.welcomeBack') }} 👋🏻
+      {{ title || `${$t('authentication.welcomeBack')} 👋🏻` }}
      <template #desc>
        <span class="text-muted-foreground">
-          {{ $t('authentication.loginSubtitle') }}
+          {{ subTitle || $t('authentication.loginSubtitle') }}
        </span>
      </template>
    </Title>
@@ -120,7 +123,7 @@ function handleGo(path: string) {
    />

    <div class="mb-6 mt-4 flex justify-between">
-      <div class="flex-center flex">
+      <div v-if="showRememberMe" class="flex-center">
        <VbenCheckbox v-model:checked="formState.rememberMe" name="rememberMe">
          {{ $t('authentication.rememberMe') }}
        </VbenCheckbox>
@@ -133,10 +136,6 @@ function handleGo(path: string) {
      >
        {{ $t('authentication.forgetPassword') }}
      </span>
-
-      <!-- <VbenButton variant="ghost" @click="handleGo('/auth/forget-password')">
-        忘记密码?
-      </VbenButton> -->
    </div>
    <VbenButton :loading="loading" class="w-full" @click="handleSubmit">
      {{ $t('common.login') }}
@@ -159,14 +158,6 @@ function handleGo(path: string) {
      >
        {{ $t('authentication.qrcodeLogin') }}
      </VbenButton>
-      <!-- <VbenButton
-        :loading="loading"
-        variant="outline"
-        class="w-1/3"
-        @click="handleGo('/auth/register')"
-      >
-        创建账号
-      </VbenButton> -->
    </div>

    <!-- 第三方登录 -->
--- a/packages/business/universal-ui/src/authentication/typings.ts
+++ b/packages/business/universal-ui/src/authentication/typings.ts
@@ -3,7 +3,6 @@ interface AuthenticationProps {
   * @zh_CN 验证码登录路径
   */
  codeLoginPath?: string;
-
  /**
   * @zh_CN 忘记密码路径
   */
@@ -33,7 +32,6 @@ interface AuthenticationProps {
   * @zh_CN 是否显示验证码登录
   */
  showCodeLogin?: boolean;
-
  /**
   * @zh_CN 是否显示忘记密码
   */
@@ -49,11 +47,26 @@ interface AuthenticationProps {
   */
  showRegister?: boolean;

+  /**
+   * @zh_CN 是否显示记住账号
+   */
+  showRememberMe?: boolean;
+
  /**
   * @zh_CN 是否显示第三方登录
   */
  showThirdPartyLogin?: boolean;

+  /**
+   * @zh_CN 登录框子标题
+   */
+  subTitle?: string;
+
+  /**
+   * @zh_CN 登录框标题
+   */
+  title?: string;
+
  /**
   * @zh_CN 用户名占位符
   */
--- a/packages/business/universal-ui/src/fallback/fallback.vue
+++ b/packages/business/universal-ui/src/fallback/fallback.vue
@@ -52,7 +52,7 @@ const titleText = computed(() => {
      return $t('fallback.offlineError');
    }
    case 'comming-soon': {
-      return $t('fallback.coming-soon');
+      return $t('fallback.comingSoon');
    }
    default: {
      return '';
				`@@ -1 +0,0 @@`
				`export { default as LoginDialog } from './login-dialog.vue';`