Merge branch 'main' into example

src/hooks/common/router.ts

@@ -102,9 +102,9 @@ export function useRouterPush(inSetup = true) {
     const redirect = route.value.query?.redirect as string;
 
     if (needRedirect && redirect) {
-      routerPush(redirect);
+      await routerPush(redirect);
     } else {
-      toHome();
+      await toHome();
     }
   }
 

src/hooks/common/table.ts

@@ -119,6 +119,7 @@ export function useTable<A extends NaiveUI.TableApiFn>(config: NaiveUI.NaiveTabl
     page: 1,
     pageSize: 10,
     showSizePicker: true,
+    itemCount: 0,
     pageSizes: [10, 15, 20, 25, 30],
     onUpdatePage: async (page: number) => {
       pagination.page = page;

src/layouts/modules/global-header/index.vue

@@ -40,7 +40,12 @@ const { isFullscreen, toggle } = useFullscreen();
     <div class="h-full flex-y-center justify-end">
       <GlobalSearch />
       <FullScreen v-if="!appStore.isMobile" :full="isFullscreen" @click="toggle" />
-      <LangSwitch :lang="appStore.locale" :lang-options="appStore.localeOptions" @change-lang="appStore.changeLocale" />
+      <LangSwitch
+        v-if="themeStore.header.multilingual.visible"
+        :lang="appStore.locale"
+        :lang-options="appStore.localeOptions"
+        @change-lang="appStore.changeLocale"
+      />
       <ThemeSchemaSwitch
         :theme-schema="themeStore.themeScheme"
         :is-dark="themeStore.darkMode"

src/layouts/modules/theme-drawer/modules/page-fun.vue

@@ -127,6 +127,9 @@ const isWrapperScrollMode = computed(() => themeStore.layout.scrollMode === 'wra
         placeholder="SoybeanAdmin"
       />
     </SettingItem>
+    <SettingItem key="9" :label="$t('theme.header.multilingual.visible')">
+      <NSwitch v-model:value="themeStore.header.multilingual.visible" />
+    </SettingItem>
   </TransitionGroup>
 </template>
 

src/locales/langs/en-us.ts

@@ -109,6 +109,9 @@ const local: App.I18n.Schema = {
       breadcrumb: {
         visible: 'Breadcrumb Visible',
         showIcon: 'Breadcrumb Icon Visible'
+      },
+      multilingual: {
+        visible: 'Display multilingual button'
       }
     },
     tab: {

src/locales/langs/zh-cn.ts

@@ -109,6 +109,9 @@ const local: App.I18n.Schema = {
       breadcrumb: {
         visible: '显示面包屑',
         showIcon: '显示面包屑图标'
+      },
+      multilingual: {
+        visible: '显示多语言按钮'
       }
     },
     tab: {

src/plugins/app.ts

@@ -10,22 +10,18 @@ export function setupAppErrorHandle(app: App) {
   };
 }
 
-// Update check interval in milliseconds
-const UPDATE_CHECK_INTERVAL = 3 * 60 * 1000;
-
 export function setupAppVersionNotification() {
-  const canAutoUpdateApp = import.meta.env.VITE_AUTOMATICALLY_DETECT_UPDATE === 'Y';
+  // Update check interval in milliseconds
+  const UPDATE_CHECK_INTERVAL = 3 * 60 * 1000;
 
+  const canAutoUpdateApp = import.meta.env.VITE_AUTOMATICALLY_DETECT_UPDATE === 'Y' && import.meta.env.PROD;
   if (!canAutoUpdateApp) return;
 
   let isShow = false;
   let updateInterval: ReturnType<typeof setInterval> | undefined;
 
-  // Check if updates should be checked
-  const shouldCheckForUpdates = [!isShow, document.visibilityState === 'visible', !import.meta.env.DEV].every(Boolean);
-
   const checkForUpdates = async () => {
-    if (!shouldCheckForUpdates) return;
+    if (isShow) return;
 
     const buildTime = await getHtmlBuildTime();
 
@@ -47,6 +43,7 @@ export function setupAppVersionNotification() {
             {
               onClick() {
                 n?.destroy();
+                isShow = false;
               }
             },
             () => $t('system.updateCancel')
@@ -77,7 +74,7 @@ export function setupAppVersionNotification() {
   };
 
   // If updates should be checked, set up the visibility change listener and start the update interval
-  if (shouldCheckForUpdates) {
+  if (!isShow && document.visibilityState === 'visible') {
     // Check for updates when the document is visible
     document.addEventListener('visibilitychange', () => {
       if (document.visibilityState === 'visible') {

src/store/modules/auth/index.ts

@@ -71,13 +71,11 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
       if (pass) {
         await redirectFromLogin(redirect);
 
-        if (routeStore.isInitAuthRoute) {
-          window.$notification?.success({
-            title: $t('page.login.common.loginSuccess'),
-            content: $t('page.login.common.welcomeBack', { userName: userInfo.userName }),
-            duration: 4500
-          });
-        }
+        window.$notification?.success({
+          title: $t('page.login.common.loginSuccess'),
+          content: $t('page.login.common.welcomeBack', { userName: userInfo.userName }),
+          duration: 4500
+        });
       }
     } else {
       resetStore();

src/theme/settings.ts

@@ -27,6 +27,9 @@ export const themeSettings: App.Theme.ThemeSetting = {
     breadcrumb: {
       visible: true,
       showIcon: true
+    },
+    multilingual: {
+      visible: true
     }
   },
   tab: {

src/typings/app.d.ts

@@ -53,6 +53,11 @@ declare namespace App {
           /** Whether to show the breadcrumb icon */
           showIcon: boolean;
         };
+        /** Multilingual */
+        multilingual: {
+          /** Whether to show the multilingual */
+          visible: boolean;
+        };
       };
       /** Tab */
       tab: {
@@ -363,6 +368,9 @@ declare namespace App {
             visible: string;
             showIcon: string;
           };
+          multilingual: {
+            visible: string;
+          };
         };
         tab: {
           visible: string;