Merge branch 'main' into example

CHANGELOG.md

@@ -1,6 +1,36 @@
 # Changelog
 
 
+## [v1.3.11](https://github.com/soybeanjs/soybean-admin/compare/v1.3.10...v1.3.11) (2025-01-19)
+
+###    🚀 Features
+
+- **projects**: multi language buttons support hiding. &nbsp;-&nbsp; by @Azir-11 in https://github.com/soybeanjs/soybean-admin/issues/683 [<samp>(d7aeb)</samp>](https://github.com/soybeanjs/soybean-admin/commit/d7aebb7)
+
+### &nbsp;&nbsp;&nbsp;🐞 Bug Fixes
+
+- **hooks**:
+  - The total number before assigning a value to the table is incorrect. &nbsp;-&nbsp; by @Azir-11 in https://github.com/soybeanjs/soybean-admin/issues/687 [<samp>(56760)</samp>](https://github.com/soybeanjs/soybean-admin/commit/5676024)
+- **projects**:
+  - fix login success notification. fixed #688 &nbsp;-&nbsp; by @soybeanjs in https://github.com/soybeanjs/soybean-admin/issues/688 [<samp>(60dd2)</samp>](https://github.com/soybeanjs/soybean-admin/commit/60dd226)
+  - fix update notifications. fixed #691, fixed #692 &nbsp;-&nbsp; by @soybeanjs in https://github.com/soybeanjs/soybean-admin/issues/691 and https://github.com/soybeanjs/soybean-admin/issues/692 [<samp>(ac862)</samp>](https://github.com/soybeanjs/soybean-admin/commit/ac86247)
+
+### &nbsp;&nbsp;&nbsp;🛠 Optimizations
+
+- **projects**: optimize code &nbsp;-&nbsp; by @soybeanjs [<samp>(6489e)</samp>](https://github.com/soybeanjs/soybean-admin/commit/6489ec4)
+
+### &nbsp;&nbsp;&nbsp;📖 Documentation
+
+- **projects**: update README &nbsp;-&nbsp; by @soybeanjs [<samp>(21434)</samp>](https://github.com/soybeanjs/soybean-admin/commit/214341e)
+
+### &nbsp;&nbsp;&nbsp;🏡 Chore
+
+- **deps**: update deps &nbsp;-&nbsp; by @soybeanjs [<samp>(c9433)</samp>](https://github.com/soybeanjs/soybean-admin/commit/c9433e1)
+
+### &nbsp;&nbsp;&nbsp;❤️ Contributors
+
+[![soybeanjs](https://github.com/soybeanjs.png?size=48)](https://github.com/soybeanjs)&nbsp;&nbsp;[![Azir-11](https://github.com/Azir-11.png?size=48)](https://github.com/Azir-11)&nbsp;&nbsp;
+
 ## [v1.3.10](https://github.com/honghuangdc/soybean-admin/compare/v1.3.9...v1.3.10) (2024-12-16)
 
 ### &nbsp;&nbsp;&nbsp;🚀 Features

README.en_US.md

@@ -49,7 +49,7 @@
   - [Github Repository](https://github.com/soybeanjs/soybean-admin-antd)
   - [Gitee Repository](https://gitee.com/honghuangdc/soybean-admin-antd)
 
-- **ElementPlusVue Version:**
+- **ElementPlus Version:**
   - [Preview Link](https://elp.soybeanjs.cn/)
   - [Github Repository](https://github.com/soybeanjs/soybean-admin-element-plus)
 
@@ -113,6 +113,10 @@ pnpm dev
 pnpm build
 ```
 
+**Code Synchronization**
+
+Refer to the [Code Synchronization](https://docs.soybeanjs.cn/guide/sync) document.
+
 ## Ecosystem
 
 - [react-soybean-admin](https://github.com/mufeng889/react-soybean-admin): SoybeanAdmin based version of React.

README.md

@@ -45,7 +45,7 @@
   - [预览地址](https://antd.soybeanjs.cn/)
   - [Github 仓库](https://github.com/soybeanjs/soybean-admin-antd)
   - [Gitee 仓库](https://gitee.com/honghuangdc/soybean-admin-antd)
-- **ElementPlusVue 版本:**
+- **ElementPlus 版本:**
   - [预览地址](https://elp.soybeanjs.cn/)
   - [Github 仓库](https://github.com/soybeanjs/soybean-admin-element-plus)
 - **旧版:**
@@ -138,6 +138,10 @@ pnpm dev
 pnpm build
 ```
 
+**代码同步**
+
+参考 [代码同步](https://docs.soybeanjs.cn/zh/guide/sync) 文档。
+
 ## 周边生态
 
 - [react-soybean-admin](https://github.com/mufeng889/react-soybean-admin): 基于SoybeanAdmin的React版本.

package.json

@@ -1,7 +1,7 @@
 {
   "name": "soybean-admin",
   "type": "module",
-  "version": "1.3.10",
+  "version": "1.3.11",
   "description": "A fresh and elegant admin template, based on Vue3、Vite3、TypeScript、NaiveUI and UnoCSS. 一个基于Vue3、Vite3、TypeScript、NaiveUI and UnoCSS的清新优雅的中后台模版。",
   "author": {
     "name": "Soybean",
@@ -51,7 +51,7 @@
     "@antv/g2": "5.2.10",
     "@antv/g6": "5.0.35",
     "@better-scroll/core": "2.5.1",
-    "@iconify/vue": "4.2.0",
+    "@iconify/vue": "4.3.0",
     "@sa/alova": "workspace:*",
     "@sa/axios": "workspace:*",
     "@sa/color": "workspace:*",
@@ -64,27 +64,27 @@
     "@visactor/vtable-gantt": "1.13.1",
     "@visactor/vue-vtable": "1.13.1",
     "@vueuse/components": "12.0.0",
-    "@vueuse/core": "12.0.0",
+    "@vueuse/core": "12.4.0",
     "clipboard": "2.0.11",
     "dayjs": "1.11.13",
     "defu": "6.1.4",
     "dhtmlx-gantt": "9.0.3",
     "dompurify": "3.2.3",
-    "echarts": "5.5.1",
+    "echarts": "5.6.0",
     "jsbarcode": "3.11.6",
     "json5": "2.2.3",
-    "naive-ui": "2.40.3",
+    "naive-ui": "2.41.0",
     "nprogress": "0.2.0",
     "pinia": "2.3.0",
     "pinyin-pro": "3.26.0",
     "print-js": "1.6.0",
     "swiper": "11.1.15",
-    "tailwind-merge": "2.5.5",
+    "tailwind-merge": "2.6.0",
     "typeit": "8.8.7",
     "vditor": "3.10.8",
     "vue": "3.5.13",
     "vue-draggable-plus": "0.6.0",
-    "vue-i18n": "10.0.5",
+    "vue-i18n": "11.0.1",
     "vue-pdf-embed": "2.1.1",
     "vue-router": "4.5.0",
     "wangeditor": "4.7.15",
@@ -94,37 +94,37 @@
   "devDependencies": {
     "@amap/amap-jsapi-types": "0.0.15",
     "@elegant-router/vue": "0.3.8",
-    "@iconify/json": "2.2.283",
+    "@iconify/json": "2.2.297",
     "@sa/scripts": "workspace:*",
     "@sa/uno-preset": "workspace:*",
     "@soybeanjs/eslint-config": "1.4.4",
     "@types/bmapgl": "0.0.7",
     "@types/dompurify": "3.2.0",
-    "@types/node": "22.10.2",
+    "@types/node": "22.10.7",
     "@types/nprogress": "0.2.3",
-    "@unocss/eslint-config": "0.65.1",
+    "@unocss/eslint-config": "65.4.2",
-    "@unocss/preset-icons": "0.65.1",
+    "@unocss/preset-icons": "65.4.2",
-    "@unocss/preset-uno": "0.65.1",
+    "@unocss/preset-uno": "65.4.2",
-    "@unocss/transformer-directives": "0.65.1",
+    "@unocss/transformer-directives": "65.4.2",
-    "@unocss/transformer-variant-group": "0.65.1",
+    "@unocss/transformer-variant-group": "65.4.2",
-    "@unocss/vite": "0.65.1",
+    "@unocss/vite": "65.4.2",
     "@vitejs/plugin-vue": "5.2.1",
     "@vitejs/plugin-vue-jsx": "4.1.1",
-    "eslint": "9.17.0",
+    "eslint": "9.18.0",
     "eslint-plugin-vue": "9.32.0",
-    "lint-staged": "15.2.11",
+    "lint-staged": "15.4.1",
-    "sass": "1.83.0",
+    "sass": "1.83.4",
     "simple-git-hooks": "2.11.1",
     "tsx": "4.19.2",
-    "typescript": "5.7.2",
+    "typescript": "5.7.3",
-    "unplugin-icons": "0.21.0",
+    "unplugin-icons": "22.0.0",
-    "unplugin-vue-components": "0.28.0",
+    "unplugin-vue-components": "28.0.0",
-    "vite": "6.0.3",
+    "vite": "6.0.7",
     "vite-plugin-progress": "0.0.7",
     "vite-plugin-svg-icons": "2.0.1",
-    "vite-plugin-vue-devtools": "7.6.8",
+    "vite-plugin-vue-devtools": "7.7.0",
     "vue-eslint-parser": "9.4.3",
-    "vue-tsc": "2.1.10"
+    "vue-tsc": "2.2.0"
   },
   "simple-git-hooks": {
     "commit-msg": "pnpm sa git-commit-verify",

packages/alova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/alova",
-  "version": "1.3.10",
+  "version": "1.3.11",
   "exports": {
     ".": "./src/index.ts",
     "./fetch": "./src/fetch.ts",
@@ -13,8 +13,8 @@
     }
   },
   "dependencies": {
-    "@alova/mock": "2.0.10",
+    "@alova/mock": "2.0.11",
     "@sa/utils": "workspace:*",
-    "alova": "3.2.6"
+    "alova": "3.2.8"
   }
 }

packages/axios/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/axios",
-  "version": "1.3.10",
+  "version": "1.3.11",
   "exports": {
     ".": "./src/index.ts"
   },
@@ -13,9 +13,9 @@
     "@sa/utils": "workspace:*",
     "axios": "1.7.9",
     "axios-retry": "4.5.0",
-    "qs": "6.13.1"
+    "qs": "6.14.0"
   },
   "devDependencies": {
-    "@types/qs": "6.9.17"
+    "@types/qs": "6.9.18"
   }
 }

packages/color/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/color",
-  "version": "1.3.10",
+  "version": "1.3.11",
   "exports": {
     ".": "./src/index.ts"
   },

packages/hooks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/hooks",
-  "version": "1.3.10",
+  "version": "1.3.11",
   "exports": {
     ".": "./src/index.ts"
   },

packages/materials/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/materials",
-  "version": "1.3.10",
+  "version": "1.3.11",
   "exports": {
     ".": "./src/index.ts"
   },

packages/ofetch/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/fetch",
-  "version": "1.3.10",
+  "version": "1.3.11",
   "exports": {
     ".": "./src/index.ts"
   },

packages/scripts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/scripts",
-  "version": "1.3.10",
+  "version": "1.3.11",
   "bin": {
     "sa": "./bin.ts"
   },
@@ -14,14 +14,14 @@
   },
   "devDependencies": {
     "@soybeanjs/changelog": "0.3.24",
-    "bumpp": "9.9.1",
+    "bumpp": "9.10.1",
     "c12": "2.0.1",
     "cac": "6.7.14",
-    "consola": "3.2.3",
+    "consola": "3.4.0",
     "enquirer": "2.4.1",
     "execa": "9.5.2",
     "kolorist": "1.8.0",
-    "npm-check-updates": "17.1.11",
+    "npm-check-updates": "17.1.14",
     "rimraf": "6.0.1"
   }
 }

packages/uno-preset/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/uno-preset",
-  "version": "1.3.10",
+  "version": "1.3.11",
   "exports": {
     ".": "./src/index.ts"
   },

packages/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/utils",
-  "version": "1.3.10",
+  "version": "1.3.11",
   "exports": {
     ".": "./src/index.ts"
   },

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({
-          window.$notification?.success({
+          title: $t('page.login.common.loginSuccess'),
-            title: $t('page.login.common.loginSuccess'),
+          content: $t('page.login.common.welcomeBack', { userName: userInfo.userName }),
-            content: $t('page.login.common.welcomeBack', { userName: userInfo.userName }),
+          duration: 4500
-            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;