chore: update types

apps/antd-view/src/apis/index.ts

@@ -0,0 +1,2 @@
+export * from './modules';
+export type * from './types';

apps/antd-view/src/apis/modules/index.ts

@@ -0,0 +1 @@
+export * from './user';

apps/antd-view/src/apis/modules/user.ts

@@ -0,0 +1,22 @@
+import type { UserApiType } from '@/apis/types';
+import type { UserInfo } from '@vben/types';
+
+import { request } from '@/apis/request';
+
+/**
+ * 登录
+ */
+async function userLogin(data: UserApiType.LoginParams) {
+  return request<UserApiType.LoginResult>('/login', { data, method: 'post' });
+}
+
+/**
+ * 获取用户信息
+ */
+async function getUserInfo() {
+  return request<UserInfo>('/getUserInfo', { method: 'get' });
+}
+
+export { getUserInfo, userLogin };
+
+export * from './user';

apps/antd-view/src/apis/types/index.ts

@@ -0,0 +1 @@
+export type * from './user';

apps/antd-view/src/apis/types/user.ts

@@ -1,4 +1,4 @@
-namespace UserApi {
+namespace UserApiType {
   /** 登录接口参数 */
   export interface LoginParams {
     password: string;
@@ -15,4 +15,4 @@ namespace UserApi {
   }
 }
 
-export type { UserApi };
+export type { UserApiType };

apps/antd-view/src/services/index.ts

@@ -1 +0,0 @@
-export * from './modules/user';

apps/antd-view/src/services/modules/user/index.ts

@@ -1,23 +0,0 @@
-import type { UserInfo } from '@vben/types';
-
-import { request } from '@/services/request';
-
-import type { UserApi } from './typing';
-
-/**
- * 登录
- */
-async function userLogin(data: UserApi.LoginParams) {
-  return request<UserApi.LoginResult>('/login', { data, method: 'post' });
-}
-
-/**
- * 获取用户信息
- */
-async function getUserInfo() {
-  return request<UserInfo>('/getUserInfo', { method: 'get' });
-}
-
-export { getUserInfo, userLogin };
-
-export type { UserApi } from './typing';

apps/antd-view/src/views/_essential/authentication/login.vue

@@ -3,7 +3,7 @@ import type { LoginAndRegisterParams } from '@vben/common-ui';
 
 import { useAccessStore } from '@vben-core/stores';
 
-import { getUserInfo, userLogin } from '@/services';
+import { getUserInfo, userLogin } from '@/apis';
 import { AuthenticationLogin } from '@vben/common-ui';
 import { $t } from '@vben/locales';
 import { useRequest } from '@vben/request';

internal/tailwind-config/package.json

@@ -44,6 +44,9 @@
     },
     "./*": "./*"
   },
+  "peerDependencies": {
+    "tailwindcss": "^3.4.3"
+  },
   "dependencies": {
     "@iconify/json": "^2.2.215",
     "@iconify/tailwind": "^1.1.1",

internal/tailwind-config/src/index.ts

@@ -8,6 +8,8 @@ import typographyPlugin from '@tailwindcss/typography';
 import { fs, getPackagesSync } from '@vben/node-utils';
 import animate from 'tailwindcss-animate';
 
+import { enterAnimationPlugin } from './plugins/entry';
+
 // import defaultTheme from 'tailwindcss/defaultTheme';
 
 const { packages } = getPackagesSync();
@@ -29,7 +31,13 @@ export default {
     ),
   ],
   darkMode: 'class',
-  plugins: [animate, formsPlugin, typographyPlugin, addDynamicIconSelectors()],
+  plugins: [
+    animate,
+    formsPlugin,
+    typographyPlugin,
+    addDynamicIconSelectors(),
+    enterAnimationPlugin,
+  ],
   prefix: '',
   safelist: ['dark'],
   theme: {

internal/tailwind-config/src/plugins/entry.ts

@@ -0,0 +1,53 @@
+import plugin from 'tailwindcss/plugin.js';
+
+const enterAnimationPlugin = plugin(({ addUtilities }) => {
+  const maxChild = 5;
+  const utilities: Record<string, any> = {};
+  for (let i = 1; i <= maxChild; i++) {
+    const baseDelay = 0.1;
+    const delay = `${baseDelay * i}s`;
+
+    utilities[`.enter-x:nth-child(${i})`] = {
+      animation: `enter-x-animation 0.3s ease-in-out ${delay} forwards`,
+      opacity: '0',
+      transform: `translateX(50px)`,
+    };
+
+    utilities[`.enter-y:nth-child(${i})`] = {
+      animation: `enter-y-animation 0.3s ease-in-out ${delay} forwards`,
+      opacity: '0',
+      transform: `translateY(50px)`,
+    };
+
+    utilities[`.-enter-x:nth-child(${i})`] = {
+      animation: `enter-x-animation 0.3s ease-in-out ${delay} forwards`,
+      opacity: '0',
+      transform: `translateX(-50px)`,
+    };
+
+    utilities[`.-enter-y:nth-child(${i})`] = {
+      animation: `enter-y-animation 0.3s ease-in-out ${delay} forwards`,
+      opacity: '0',
+      transform: `translateY(-50px)`,
+    };
+  }
+
+  // 添加动画关键帧
+  addUtilities(utilities);
+  addUtilities({
+    '@keyframes enter-x-animation': {
+      to: {
+        opacity: '1',
+        transform: 'translateX(0)',
+      },
+    },
+    '@keyframes enter-y-animation': {
+      to: {
+        opacity: '1',
+        transform: 'translateY(0)',
+      },
+    },
+  });
+});
+
+export { enterAnimationPlugin };

packages/@vben-core/forward/preferences/src/constants.ts

@@ -1,7 +1,7 @@
-import type { LocaleSupportType } from './types';
+import type { SupportedLanguagesType } from './types';
 
 interface Language {
-  key: LocaleSupportType;
+  key: SupportedLanguagesType;
   text: string;
 }
 

packages/@vben-core/forward/preferences/src/preferences.ts

@@ -96,7 +96,7 @@ class PreferenceManager {
    * 加载偏好设置
    * @returns {Preferences} 加载的偏好设置
    */
-  private loadPreferences(): Preferences | null {
+  private loadPreferences(): Preferences {
     return this.loadCachedPreferences() || { ...defaultPreferences };
   }
 

packages/@vben-core/forward/preferences/src/types.ts

@@ -2,7 +2,7 @@ import type {
   ContentCompactType,
   LayoutHeaderModeType,
   LayoutType,
-  LocaleSupportType,
+  SupportedLanguagesType,
   ThemeModeType,
 } from '@vben-core/typings';
 
@@ -36,7 +36,7 @@ interface AppPreferences {
   /** 布局方式 */
   layout: LayoutType;
   /** 支持的语言 */
-  locale: LocaleSupportType;
+  locale: SupportedLanguagesType;
   /** 应用名 */
   name: string;
   /** 是否开启半深色菜单（只在theme='light'时生效） */
@@ -174,7 +174,6 @@ export type {
   HeaderPreferences,
   LayoutHeaderModeType,
   LayoutType,
-  LocaleSupportType,
   LogoPreferences,
   NavigationPreferences,
   PageTransitionType,
@@ -182,6 +181,7 @@ export type {
   PreferencesKeys,
   ShortcutKeyPreferences,
   SidebarPreferences,
+  SupportedLanguagesType,
   TabbarPreferences,
   ThemeModeType,
   ThemePreferences,

packages/@vben-core/forward/stores/src/modules/access.ts

@@ -1,4 +1,4 @@
-import type { MenuRecordRaw, UserInfo } from '@vben-core/typings';
+import type { MenuRecordRaw } from '@vben-core/typings';
 
 import type { RouteRecordRaw } from 'vue-router';
 
@@ -6,6 +6,28 @@ import { acceptHMRUpdate, defineStore } from 'pinia';
 
 type AccessToken = null | string;
 
+interface BasicUserInfo {
+  [key: string]: any;
+  /**
+   * 头像
+   */
+  avatar: string;
+  /**
+   * 用户昵称
+   */
+  realName: string;
+
+  /**
+   * 用户id
+   */
+  userId: string;
+
+  /**
+   * 用户名
+   */
+  username: string;
+}
+
 interface AccessState {
   /**
    * 可访问的菜单列表
@@ -22,7 +44,7 @@ interface AccessState {
   /**
    * 用户信息
    */
-  userInfo: UserInfo | null;
+  userInfo: BasicUserInfo | null;
   /**
    * 用户角色
    */
@@ -43,12 +65,15 @@ const useAccessStore = defineStore('access', {
     setAccessToken(token: AccessToken) {
       this.accessToken = token;
     },
-    setUserInfo(userInfo: UserInfo) {
+    setUserInfo(userInfo: BasicUserInfo) {
       // 设置用户信息
       this.userInfo = userInfo;
       // 设置角色信息
       const roles = userInfo?.roles ?? [];
-      const roleValues = roles.map((item) => item.value);
+      const roleValues =
+        typeof roles[0] === 'string'
+          ? roles
+          : roles.map((item: Record<string, any>) => item.value);
       this.setUserRoles(roleValues);
     },
     setUserRoles(roles: string[]) {
@@ -65,7 +90,7 @@ const useAccessStore = defineStore('access', {
     getAccessToken(): AccessToken {
       return this.accessToken;
     },
-    getUserInfo(): UserInfo | null {
+    getUserInfo(): BasicUserInfo | null {
       return this.userInfo;
     },
     getUserRoles(): string[] {

packages/@vben-core/shared/design/src/index.css

@@ -0,0 +1,327 @@
+@charset "UTF-8";
+
+/** css 样式重置 */
+@import 'modern-normalize/modern-normalize.css';
+
+#app,
+.ant-app,
+body,
+html {
+  width: 100%;
+  height: 100%;
+  overscroll-behavior: none;
+}
+
+*,
+::after,
+::before {
+  @apply border-border;
+
+  box-sizing: border-box;
+  border-style: solid;
+  border-width: 0;
+}
+
+body.invert-mode {
+  @apply invert;
+}
+
+body.grayscale-mode {
+  @apply grayscale;
+}
+
+html {
+  @apply text-foreground bg-background;
+
+  font-variation-settings: normal;
+  text-size-adjust: 100%;
+  font-synthesis-weight: none;
+  scroll-behavior: smooth;
+  text-rendering: optimizelegibility;
+  -webkit-tap-highlight-color: transparent;
+}
+
+a,
+a:active,
+a:hover,
+a:link,
+a:visited {
+  color: inherit;
+  text-decoration: none;
+}
+
+::view-transition-new(root),
+::view-transition-old(root) {
+  mix-blend-mode: normal;
+  animation: none;
+}
+
+::view-transition-old(root) {
+  z-index: 1;
+}
+
+::view-transition-new(root) {
+  z-index: 2147483646;
+}
+
+html.dark::view-transition-old(root) {
+  z-index: 2147483646;
+}
+
+html.dark::view-transition-new(root) {
+  z-index: 1;
+}
+
+input::placeholder,
+textarea::placeholder {
+  opacity: 1;
+}
+
+input:-webkit-autofill {
+  border: none;
+  box-shadow: 0 0 0 1000px transparent inset;
+}
+
+input[type='number']::-webkit-inner-spin-button,
+input[type='number']::-webkit-outer-spin-button {
+  margin: 0;
+  appearance: none;
+}
+
+.slide-up-enter-active,
+.slide-up-leave-active {
+  transition: 0.25s cubic-bezier(0.25, 0.8, 0.5, 1);
+}
+
+.slide-up-move {
+  transition: transform 0.3s;
+}
+
+.slide-up-enter-from,
+.slide-up-leave-to {
+  opacity: 0;
+  transform: translateY(-15px);
+}
+
+.slide-down-enter-active,
+.slide-down-leave-active {
+  transition: 0.25s cubic-bezier(0.25, 0.8, 0.5, 1);
+}
+
+.slide-down-move {
+  transition: transform 0.3s;
+}
+
+.slide-down-enter-from,
+.slide-down-leave-to {
+  opacity: 0;
+  transform: translateY(15px);
+}
+
+.slide-left-enter-active,
+.slide-left-leave-active {
+  transition: 0.25s cubic-bezier(0.25, 0.8, 0.5, 1);
+}
+
+.slide-left-move {
+  transition: transform 0.3s;
+}
+
+.slide-left-enter-from,
+.slide-left-leave-to {
+  opacity: 0;
+  transform: translateX(-15px);
+}
+
+.slide-right-enter-active,
+.slide-right-leave-active {
+  transition: 0.25s cubic-bezier(0.25, 0.8, 0.5, 1);
+}
+
+.slide-right-move {
+  transition: transform 0.3s;
+}
+
+.slide-right-enter-from,
+.slide-right-leave-to {
+  opacity: 0;
+  transform: translateX(15px);
+}
+
+.fade-transition-enter-active,
+.fade-transition-leave-active {
+  transition: opacity 0.2s ease-in-out;
+}
+
+.fade-transition-enter-from,
+.fade-transition-leave-to {
+  opacity: 0;
+}
+
+.fade-enter-active,
+.fade-leave-active {
+  transition: opacity 0.2s ease-in-out;
+}
+
+.fade-enter-from,
+.fade-leave-to {
+  opacity: 0;
+}
+
+/* fade-slide */
+.fade-slide-leave-active,
+.fade-slide-enter-active {
+  transition: all 0.3s;
+}
+
+.fade-slide-enter-from {
+  opacity: 0;
+  transform: translateX(-30px);
+}
+
+.fade-slide-leave-to {
+  opacity: 0;
+  transform: translateX(30px);
+}
+
+.fade-down-enter-active,
+.fade-down-leave-active {
+  transition:
+    opacity 0.25s,
+    transform 0.3s;
+}
+
+.fade-down-enter-from {
+  opacity: 0;
+  transform: translateY(-10%);
+}
+
+.fade-down-leave-to {
+  opacity: 0;
+  transform: translateY(10%);
+}
+
+.fade-scale-leave-active,
+.fade-scale-enter-active {
+  transition: all 0.28s;
+}
+
+.fade-scale-enter-from {
+  opacity: 0;
+  transform: scale(1.2);
+}
+
+.fade-scale-leave-to {
+  opacity: 0;
+  transform: scale(0.8);
+}
+
+.fade-up-enter-active,
+.fade-up-leave-active {
+  transition:
+    opacity 0.2s,
+    transform 0.25s;
+}
+
+.fade-up-enter-from {
+  opacity: 0;
+  transform: translateY(10%);
+}
+
+.fade-up-leave-to {
+  opacity: 0;
+  transform: translateY(-10%);
+}
+
+@keyframes fade-slide {
+  0% {
+    opacity: 0;
+    transform: translateX(-30px);
+  }
+
+  50% {
+    opacity: 1;
+  }
+
+  100% {
+    opacity: 0;
+    transform: translateX(30px);
+  }
+}
+
+@keyframes fade {
+  0% {
+    opacity: 0;
+  }
+
+  50% {
+    opacity: 1;
+  }
+
+  100% {
+    opacity: 0;
+  }
+}
+
+@keyframes fade-up {
+  0% {
+    opacity: 0;
+    transform: translateY(10%);
+  }
+
+  50% {
+    opacity: 1;
+  }
+
+  100% {
+    opacity: 0;
+    transform: translateY(-10%);
+  }
+}
+
+@keyframes fade-down {
+  0% {
+    opacity: 0;
+    transform: translateY(-10%);
+  }
+
+  50% {
+    opacity: 1;
+  }
+
+  100% {
+    opacity: 0;
+    transform: translateY(10%);
+  }
+}
+
+.fade-slow {
+  animation: fade 3s infinite;
+}
+
+.fade-slide-slow {
+  animation: fade-slide 3s infinite;
+}
+
+.fade-up-slow {
+  animation: fade-up 3s infinite;
+}
+
+.fade-down-slow {
+  animation: fade-down 3s infinite;
+}
+
+.collapse-transition {
+  transition:
+    0.2s height ease-in-out,
+    0.2s padding-top ease-in-out,
+    0.2s padding-bottom ease-in-out;
+}
+
+.collapse-transition-leave-active,
+.collapse-transition-enter-active {
+  transition:
+    0.2s max-height ease-in-out,
+    0.2s padding-top ease-in-out,
+    0.2s margin-top ease-in-out;
+}

packages/@vben-core/shared/design/src/tailwind.css

@@ -19,21 +19,21 @@
 
   .outline-box {
     @apply outline-border relative cursor-pointer rounded-md p-1 outline outline-1;
+  }
 
-    &::after {
+  .outline-box::after {
-      @apply absolute left-1/2 top-1/2 z-20 h-0 w-[1px] rounded-sm opacity-0 outline outline-2 outline-transparent transition-all duration-300 content-[''];
+    @apply absolute left-1/2 top-1/2 z-20 h-0 w-[1px] rounded-sm opacity-0 outline outline-2 outline-transparent transition-all duration-300 content-[""];
-    }
+  }
 
-    &.outline-box-active {
+  .outline-box.outline-box-active {
-      @apply outline-primary outline outline-2;
+    @apply outline-primary outline outline-2;
+  }
 
-      &::after {
+  .outline-box.outline-box-active::after {
-        display: none;
+    display: none;
-      }
+  }
-    }
 
-    &:not(.outline-box-active):hover::after {
+  .outline-box:not(.outline-box-active):hover::after {
-      @apply outline-primary left-0 top-0 h-full w-full p-1 opacity-100;
+    @apply outline-primary left-0 top-0 h-full w-full p-1 opacity-100;
-    }
   }
 }

packages/@vben-core/shared/typings/src/app.d.ts

@@ -1,4 +1,4 @@
-type LocaleSupportType = 'en-US' | 'zh-CN';
+type SupportedLanguagesType = 'en-US' | 'zh-CN';
 
 type LayoutType =
   | 'full-content'
@@ -17,6 +17,6 @@ export type {
   ContentCompactType,
   LayoutHeaderModeType,
   LayoutType,
-  LocaleSupportType,
+  SupportedLanguagesType,
   ThemeModeType,
 };

packages/@vben-core/shared/typings/src/index.ts

@@ -1,7 +1,6 @@
-export type * from './access';
 export type * from './app';
 export type * from './flatten';
+export type * from './helper';
 export type * from './menu-record';
 export type * from './tabs';
-export type * from './tools';
 export type * from './vue-router';

packages/business/common-ui/src/language-toggle/language-toggle.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { LocaleSupportType } from '@vben/types';
+import type { SupportedLanguagesType } from '@vben/types';
 
 import { IcBaselineLanguage } from '@vben-core/iconify';
 import {
@@ -18,7 +18,7 @@ defineOptions({
 const menus = SUPPORT_LANGUAGES;
 
 async function handleUpdate(value: string) {
-  const locale = value as LocaleSupportType;
+  const locale = value as SupportedLanguagesType;
   updatePreferences({
     app: {
       locale,

packages/business/common-ui/src/preferences/preferences-widget.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { LocaleSupportType } from '@vben/types';
+import type { SupportedLanguagesType } from '@vben/types';
 
 import {
   COLOR_PRIMARY_RESETS,
@@ -12,7 +12,7 @@ import { loadLocaleMessages } from '@vben/locales';
 import Preferences from './preferences.vue';
 
 function updateLocale(value: string) {
-  const locale = value as LocaleSupportType;
+  const locale = value as SupportedLanguagesType;
   updatePreferences({
     app: { locale },
   });

packages/business/layouts/src/authentication/authentication.vue

@@ -22,7 +22,7 @@ const appName = computed(() => preferences.app.name);
   >
     <AuthenticationFromView
       v-if="authPanelLeft"
-      class="min-h-full w-2/5"
+      class="-enter-x min-h-full w-2/5"
       transition-name="slide-left"
     />
 
@@ -50,7 +50,7 @@ const appName = computed(() => preferences.app.name);
       <div
         class="absolute inset-0 h-full w-full bg-[var(--color-authentication)]"
       >
-        <div class="flex-col-center mr-20 h-full">
+        <div class="flex-col-center -enter-x mr-20 h-full">
           <SloganIcon :alt="appName" class="animate-float h-64 w-2/5" />
           <div class="text-1xl mt-6 font-sans text-white lg:text-2xl">
             {{ $t('authentication.layout-title') }}
@@ -75,12 +75,7 @@ const appName = computed(() => preferences.app.name);
     </div>
     <AuthenticationFromView
       v-if="authPanelRight"
-      class="min-h-full w-2/5 flex-1"
+      class="enter-x min-h-full w-2/5 flex-1"
     />
   </div>
 </template>
-
-<!-- background-image: radial-gradient(
-  rgba(255, 255, 255, 0.1) 1px,
-  transparent 1px
-); -->

packages/locales/src/i18n.ts

@@ -1,4 +1,4 @@
-import type { LocaleSupportType } from '@vben-core/typings';
+import type { SupportedLanguagesType } from '@vben-core/typings';
 
 import type { Locale } from 'vue-i18n';
 
@@ -44,7 +44,7 @@ function setI18nLanguage(locale: Locale) {
  * Load locale messages
  * @param lang
  */
-async function loadLocaleMessages(lang: LocaleSupportType) {
+async function loadLocaleMessages(lang: SupportedLanguagesType) {
   if (unref(i18n.global.locale) === lang) {
     return setI18nLanguage(lang);
   }

packages/locales/src/typing.ts

@@ -1,4 +1,4 @@
-import type { LocaleSupportType } from '@vben-core/typings';
+import type { SupportedLanguagesType } from '@vben-core/typings';
 
 type ImportLocaleFn = () => Promise<{ default: Record<string, string> }>;
 
@@ -7,7 +7,7 @@ interface LocaleSetupOptions {
    * Default language
    * @default zh-CN
    */
-  defaultLocale?: LocaleSupportType;
+  defaultLocale?: SupportedLanguagesType;
 }
 
-export type { ImportLocaleFn, LocaleSetupOptions, LocaleSupportType };
+export type { ImportLocaleFn, LocaleSetupOptions, SupportedLanguagesType };

packages/styles/src/common/entry.scss

@@ -1,51 +0,0 @@
-$max-child: 5;
-
-@for $i from 1 through $max-child {
-  * > .enter-x:nth-child(#{$i}) {
-    transform: translateX(50px);
-  }
-
-  * > .-enter-x:nth-child(#{$i}) {
-    transform: translateX(-50px);
-  }
-
-  * > .enter-x:nth-child(#{$i}),
-  * > .-enter-x:nth-child(#{$i}) {
-    // z-index: 10 - $i;
-    opacity: 0;
-    animation: enter-x-animation 0.3s ease-in-out 0.2s;
-    animation-delay: 0.1s * $i;
-    animation-fill-mode: forwards;
-  }
-
-  * > .enter-y:nth-child(#{$i}) {
-    transform: translateY(50px);
-  }
-
-  * > .-enter-y:nth-child(#{$i}) {
-    transform: translateY(-50px);
-  }
-
-  * > .enter-y:nth-child(#{$i}),
-  * > .-enter-y:nth-child(#{$i}) {
-    // z-index: 10 - $i;
-    opacity: 0;
-    animation: enter-y-animation 0.3s ease-in-out 0.2s;
-    animation-delay: 0.1s * $i;
-    animation-fill-mode: forwards;
-  }
-}
-
-@keyframes enter-x-animation {
-  to {
-    opacity: 1;
-    transform: translateX(0);
-  }
-}
-
-@keyframes enter-y-animation {
-  to {
-    opacity: 1;
-    transform: translateY(0);
-  }
-}

packages/styles/src/index.scss

@@ -1,4 +1,3 @@
 @import './tokens/light';
 @import './tokens/dark';
 @import './common/nprogress.css';
-// @import './common/entry';

packages/types/src/index.ts

@@ -1,2 +1,3 @@
 export type * from './ui';
+export type * from './user';
 export type * from '@vben-core/typings';