chore(release): release tauri v1.3.0

CHANGELOG.md

@@ -1,94 +1,6 @@
 # Changelog
 
 
-## [v1.3.4](https://github.com/honghuangdc/soybean-admin/compare/v1.3.3...v1.3.4) (2024-08-01)
-
-###    🚨 Breaking Changes
-
-- **projects**: don't reset active menu of vertical-mix layout when it is mixSiderFixed &nbsp;-&nbsp; by @honghuangdc [<samp>(939c5)</samp>](https://github.com/honghuangdc/soybean-admin/commit/939c512)
-
-### &nbsp;&nbsp;&nbsp;🛠 Optimizations
-
-- **projects**: optimize code &nbsp;-&nbsp; by @honghuangdc [<samp>(cb1d4)</samp>](https://github.com/honghuangdc/soybean-admin/commit/cb1d445)
-
-### &nbsp;&nbsp;&nbsp;🏡 Chore
-
-- **projects**: update deps & fix vue-router type &nbsp;-&nbsp; by @honghuangdc [<samp>(96837)</samp>](https://github.com/honghuangdc/soybean-admin/commit/968370b)
-
-### &nbsp;&nbsp;&nbsp;❤️ Contributors
-
-[![honghuangdc](https://github.com/honghuangdc.png?size=48)](https://github.com/honghuangdc)&nbsp;&nbsp;
-
-## [v1.3.3](https://github.com/honghuangdc/soybean-admin/compare/v1.3.2...v1.3.3) (2024-07-30)
-
-### &nbsp;&nbsp;&nbsp;🐞 Bug Fixes
-
-- **projects**: fix watermark settings &nbsp;-&nbsp; by @honghuangdc [<samp>(5646a)</samp>](https://github.com/honghuangdc/soybean-admin/commit/5646a50)
-
-### &nbsp;&nbsp;&nbsp;📖 Documentation
-
-- **projects**: update CHANGELOG &nbsp;-&nbsp; by @honghuangdc [<samp>(ebc83)</samp>](https://github.com/honghuangdc/soybean-admin/commit/ebc838c)
-
-### &nbsp;&nbsp;&nbsp;❤️ Contributors
-
-[![honghuangdc](https://github.com/honghuangdc.png?size=48)](https://github.com/honghuangdc)&nbsp;&nbsp;
-
-## [v1.3.2](https://github.com/honghuangdc/soybean-admin/compare/v1.3.1...v1.3.2) (2024-07-30)
-
-### &nbsp;&nbsp;&nbsp;🚀 Features
-
-- **projects**:
-  - add color fading mode.close #567 &nbsp;-&nbsp; by @Azir-11 in https://github.com/honghuangdc/soybean-admin/issues/569 and https://github.com/honghuangdc/soybean-admin/issues/567 [<samp>(4dde4)</samp>](https://github.com/honghuangdc/soybean-admin/commit/4dde4c2)
-  - add full screen watermark. close#571 &nbsp;-&nbsp; by @paynezhuang in https://github.com/honghuangdc/soybean-admin/issues/573 and https://github.com/honghuangdc/soybean-admin/issues/571 [<samp>(ea8aa)</samp>](https://github.com/honghuangdc/soybean-admin/commit/ea8aa6c)
-
-### &nbsp;&nbsp;&nbsp;🐞 Bug Fixes
-
-- **projects**: fix vertical-mix menu selected &nbsp;-&nbsp; by @honghuangdc [<samp>(59f07)</samp>](https://github.com/honghuangdc/soybean-admin/commit/59f07d8)
-
-### &nbsp;&nbsp;&nbsp;🛠 Optimizations
-
-- **projects**:
-  - add type WatermarkProps &nbsp;-&nbsp; by @honghuangdc [<samp>(f26d0)</samp>](https://github.com/honghuangdc/soybean-admin/commit/f26d0a6)
-  - remove home NAlert closable &nbsp;-&nbsp; by @honghuangdc [<samp>(98b75)</samp>](https://github.com/honghuangdc/soybean-admin/commit/98b75c2)
-  - optimize response code comparison &nbsp;-&nbsp; by @honghuangdc [<samp>(cf67d)</samp>](https://github.com/honghuangdc/soybean-admin/commit/cf67d55)
-- **types**:
-  - remove useless types. &nbsp;-&nbsp; by **Azir** [<samp>(eed61)</samp>](https://github.com/honghuangdc/soybean-admin/commit/eed617f)
-
-### &nbsp;&nbsp;&nbsp;📖 Documentation
-
-- **projects**: update CHANGELOG &nbsp;-&nbsp; by @honghuangdc [<samp>(d3759)</samp>](https://github.com/honghuangdc/soybean-admin/commit/d37591d)
-
-### &nbsp;&nbsp;&nbsp;🏡 Chore
-
-- **deps**: update deps &nbsp;-&nbsp; by @honghuangdc [<samp>(993e9)</samp>](https://github.com/honghuangdc/soybean-admin/commit/993e9ca)
-
-### &nbsp;&nbsp;&nbsp;❤️ Contributors
-
-[![honghuangdc](https://github.com/honghuangdc.png?size=48)](https://github.com/honghuangdc)&nbsp;&nbsp;[![paynezhuang](https://github.com/paynezhuang.png?size=48)](https://github.com/paynezhuang)&nbsp;&nbsp;[![Azir-11](https://github.com/Azir-11.png?size=48)](https://github.com/Azir-11)&nbsp;&nbsp;
-[Azir](mailto:2075125282@qq.com),&nbsp;
-
-## [v1.3.1](https://github.com/honghuangdc/soybean-admin/compare/v1.3.0...v1.3.1) (2024-07-22)
-
-### &nbsp;&nbsp;&nbsp;🐞 Bug Fixes
-
-- **projects**:
-  - fix the issue of abnormal width of the sidebar in the top menu mix and reverse mode &nbsp;-&nbsp; by @Azir-11 in https://github.com/honghuangdc/soybean-admin/issues/562 [<samp>(c4695)</samp>](https://github.com/honghuangdc/soybean-admin/commit/c469512)
-  - fix HorizontalMixMenu inverted. fixed #563 &nbsp;-&nbsp; by @honghuangdc in https://github.com/honghuangdc/soybean-admin/issues/563 [<samp>(4e55b)</samp>](https://github.com/honghuangdc/soybean-admin/commit/4e55b0e)
-  - fix vertical-menu will not render when the layout is from mobile &nbsp;-&nbsp; by @honghuangdc [<samp>(84027)</samp>](https://github.com/honghuangdc/soybean-admin/commit/8402734)
-
-### &nbsp;&nbsp;&nbsp;📖 Documentation
-
-- **projects**: update CHANGELOG &nbsp;-&nbsp; by @honghuangdc [<samp>(613c8)</samp>](https://github.com/honghuangdc/soybean-admin/commit/613c836)
-
-### &nbsp;&nbsp;&nbsp;🎨 Styles
-
-- **other**: modify the Chinese name of the grayscale mode &nbsp;-&nbsp; by **Azir** [<samp>(53770)</samp>](https://github.com/honghuangdc/soybean-admin/commit/5377002)
-
-### &nbsp;&nbsp;&nbsp;❤️ Contributors
-
-[![honghuangdc](https://github.com/honghuangdc.png?size=48)](https://github.com/honghuangdc)&nbsp;&nbsp;[![Azir-11](https://github.com/Azir-11.png?size=48)](https://github.com/Azir-11)&nbsp;&nbsp;
-[Azir](mailto:2075125282@qq.com),&nbsp;
-
 ## [v1.3.0](https://github.com/soybeanjs/soybean-admin/compare/v1.2.8...v1.3.0) (2024-07-22)
 
 ### &nbsp;&nbsp;&nbsp;🚨 Breaking Changes

CHANGELOG.zh_CN.md

@@ -1,61 +1,5 @@
 # 更新日志
 
-## [v1.3.2](https://github.com/honghuangdc/soybean-admin/compare/v1.3.1...v1.3.2) (2024-07-30)
-
-###    🚀 新功能
-
-- **项目**:
-  - 添加颜色渐变模式。关闭 #567 &nbsp;-&nbsp; 由 @Azir-11 在 https://github.com/honghuangdc/soybean-admin/issues/569 和 https://github.com/honghuangdc/soybean-admin/issues/567 [<samp>(4dde4)</samp>](https://github.com/honghuangdc/soybean-admin/commit/4dde4c2)
-  - 添加全屏水印。关闭 #571 &nbsp;-&nbsp; 由 @paynezhuang 在 https://github.com/honghuangdc/soybean-admin/issues/573 和 https://github.com/honghuangdc/soybean-admin/issues/571 [<samp>(ea8aa)</samp>](https://github.com/honghuangdc/soybean-admin/commit/ea8aa6c)
-
-### &nbsp;&nbsp;&nbsp;🐞 Bug 修复
-
-- **项目**: 修复 vertical-mix 菜单选中问题 &nbsp;-&nbsp; 由 @honghuangdc [<samp>(59f07)</samp>](https://github.com/honghuangdc/soybean-admin/commit/59f07d8)
-
-### &nbsp;&nbsp;&nbsp;🛠 优化
-
-- **项目**:
-  - 添加类型 WatermarkProps &nbsp;-&nbsp; 由 @honghuangdc [<samp>(f26d0)</samp>](https://github.com/honghuangdc/soybean-admin/commit/f26d0a6)
-  - 移除 home NAlert 可关闭 &nbsp;-&nbsp; 由 @honghuangdc [<samp>(98b75)</samp>](https://github.com/honghuangdc/soybean-admin/commit/98b75c2)
-  - 优化响应代码比较 &nbsp;-&nbsp; 由 @honghuangdc [<samp>(cf67d)</samp>](https://github.com/honghuangdc/soybean-admin/commit/cf67d55)
-- **类型**:
-  - 移除无用类型。 &nbsp;-&nbsp; 由 **Azir** [<samp>(eed61)</samp>](https://github.com/honghuangdc/soybean-admin/commit/eed617f)
-
-### &nbsp;&nbsp;&nbsp;📖 文档
-
-- **项目**: 更新更新日志 &nbsp;-&nbsp; 由 @honghuangdc [<samp>(d3759)</samp>](https://github.com/honghuangdc/soybean-admin/commit/d37591d)
-
-### &nbsp;&nbsp;&nbsp;🏡 杂项
-
-- **依赖**: 更新依赖 &nbsp;-&nbsp; 由 @honghuangdc [<samp>(993e9)</samp>](https://github.com/honghuangdc/soybean-admin/commit/993e9ca)
-
-### &nbsp;&nbsp;&nbsp;❤️ 贡献者
-
-[![honghuangdc](https://github.com/honghuangdc.png?size=48)](https://github.com/honghuangdc)&nbsp;&nbsp;[![paynezhuang](https://github.com/paynezhuang.png?size=48)](https://github.com/paynezhuang)&nbsp;&nbsp;[![Azir-11](https://github.com/Azir-11.png?size=48)](https://github.com/Azir-11)&nbsp;&nbsp;
-[Azir](mailto:2075125282@qq.com),&nbsp;
-
-## [v1.3.1](https://github.com/honghuangdc/soybean-admin/compare/v1.3.0...v1.3.1) (2024-07-22)
-
-### &nbsp;&nbsp;&nbsp;🐞 Bug 修复
-
-- **项目**:
-  - 修复顶部菜单混合和反向模式下侧边栏宽度异常的问题 &nbsp;-&nbsp; 由 @Azir-11 在 https://github.com/honghuangdc/soybean-admin/issues/562 修复 [<samp>(c4695)</samp>](https://github.com/honghuangdc/soybean-admin/commit/c469512)
-  - 修复水平混合菜单反转问题。修复 #563 &nbsp;-&nbsp; 由 @honghuangdc 在 https://github.com/honghuangdc/soybean-admin/issues/563 修复 [<samp>(4e55b)</samp>](https://github.com/honghuangdc/soybean-admin/commit/4e55b0e)
-  - 修复当布局来自移动端时垂直菜单不渲染的问题 &nbsp;-&nbsp; 由 @honghuangdc 修复 [<samp>(84027)</samp>](https://github.com/honghuangdc/soybean-admin/commit/8402734)
-
-### &nbsp;&nbsp;&nbsp;📖 文档
-
-- **项目**: 更新更新日志 &nbsp;-&nbsp; 由 @honghuangdc 更新 [<samp>(613c8)</samp>](https://github.com/honghuangdc/soybean-admin/commit/613c836)
-
-### &nbsp;&nbsp;&nbsp;🎨 样式
-
-- **其他**: 修改灰度模式的中文名称 &nbsp;-&nbsp; 由 **Azir** 修改 [<samp>(53770)</samp>](https://github.com/honghuangdc/soybean-admin/commit/5377002)
-
-### &nbsp;&nbsp;&nbsp;❤️ 贡献者
-
-[![honghuangdc](https://github.com/honghuangdc.png?size=48)](https://github.com/honghuangdc)&nbsp;&nbsp;[![Azir-11](https://github.com/Azir-11.png?size=48)](https://github.com/Azir-11)&nbsp;&nbsp;
-[Azir](mailto:2075125282@qq.com),&nbsp;
-
 
 ## [v1.3.0](https://github.com/soybeanjs/soybean-admin/compare/v1.2.8...v1.3.0) (2024-07-22)
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "soybean-admin",
   "type": "module",
-  "version": "1.3.4",
+  "version": "1.3.0",
   "description": "A fresh and elegant admin template, based on Vue3、Vite3、TypeScript、NaiveUI and UnoCSS. 一个基于Vue3、Vite3、TypeScript、NaiveUI and UnoCSS的清新优雅的中后台模版。",
   "author": {
     "name": "Soybean",
@@ -63,45 +63,45 @@
     "echarts": "5.5.1",
     "naive-ui": "2.39.0",
     "nprogress": "0.2.0",
-    "pinia": "2.2.0",
+    "pinia": "2.1.7",
     "tailwind-merge": "2.4.0",
-    "vue": "3.4.35",
+    "vue": "3.4.33",
     "vue-draggable-plus": "0.5.2",
     "vue-i18n": "9.13.1",
-    "vue-router": "4.4.1"
+    "vue-router": "4.4.0"
   },
   "devDependencies": {
-    "@elegant-router/vue": "0.3.8",
+    "@elegant-router/vue": "0.3.7",
-    "@iconify/json": "2.2.232",
+    "@iconify/json": "2.2.230",
     "@sa/scripts": "workspace:*",
     "@sa/uno-preset": "workspace:*",
-    "@soybeanjs/eslint-config": "1.4.0",
+    "@soybeanjs/eslint-config": "1.3.7",
     "@tauri-apps/cli": "1.6.0",
-    "@types/node": "22.0.1",
+    "@types/node": "20.14.11",
     "@types/nprogress": "0.2.3",
-    "@unocss/eslint-config": "0.61.9",
+    "@unocss/eslint-config": "0.61.5",
-    "@unocss/preset-icons": "0.61.9",
+    "@unocss/preset-icons": "0.61.5",
-    "@unocss/preset-uno": "0.61.9",
+    "@unocss/preset-uno": "0.61.5",
-    "@unocss/transformer-directives": "0.61.9",
+    "@unocss/transformer-directives": "0.61.5",
-    "@unocss/transformer-variant-group": "0.61.9",
+    "@unocss/transformer-variant-group": "0.61.5",
-    "@unocss/vite": "0.61.9",
+    "@unocss/vite": "0.61.5",
-    "@vitejs/plugin-vue": "5.1.1",
+    "@vitejs/plugin-vue": "5.0.5",
     "@vitejs/plugin-vue-jsx": "4.0.0",
-    "eslint": "9.8.0",
+    "eslint": "9.7.0",
     "eslint-plugin-vue": "9.27.0",
     "lint-staged": "15.2.7",
     "sass": "1.77.8",
     "simple-git-hooks": "2.11.1",
-    "tsx": "4.16.3",
+    "tsx": "4.16.2",
-    "typescript": "5.5.4",
+    "typescript": "5.5.3",
-    "unplugin-icons": "0.19.1",
+    "unplugin-icons": "0.19.0",
     "unplugin-vue-components": "0.27.3",
-    "vite": "5.3.5",
+    "vite": "5.3.4",
     "vite-plugin-progress": "0.0.7",
     "vite-plugin-svg-icons": "2.0.1",
-    "vite-plugin-vue-devtools": "7.3.7",
+    "vite-plugin-vue-devtools": "7.3.6",
     "vue-eslint-parser": "9.4.3",
-    "vue-tsc": "2.0.29"
+    "vue-tsc": "2.0.26"
   },
   "simple-git-hooks": {
     "commit-msg": "pnpm sa git-commit-verify",

packages/axios/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/axios",
-  "version": "1.3.4",
+  "version": "1.3.0",
   "exports": {
     ".": "./src/index.ts"
   },
@@ -12,7 +12,7 @@
   "dependencies": {
     "@sa/utils": "workspace:*",
     "axios": "1.7.2",
-    "axios-retry": "4.4.2",
+    "axios-retry": "4.4.1",
     "qs": "6.12.3"
   },
   "devDependencies": {

packages/color/package.json

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

packages/hooks/package.json

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

packages/materials/package.json

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

packages/ofetch/package.json

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

packages/scripts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/scripts",
-  "version": "1.3.4",
+  "version": "1.3.0",
   "bin": {
     "sa": "./bin.ts"
   },
@@ -21,7 +21,7 @@
     "enquirer": "2.4.1",
     "execa": "9.3.0",
     "kolorist": "1.8.0",
-    "npm-check-updates": "17.0.0",
+    "npm-check-updates": "16.14.20",
     "rimraf": "6.0.1"
   }
 }

packages/uno-preset/package.json

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

packages/utils/package.json

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

src/App.vue

@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { computed } from 'vue';
 import { NConfigProvider, darkTheme } from 'naive-ui';
-import type { WatermarkProps } from 'naive-ui';
 import { useAppStore } from './store/modules/app';
 import { useThemeStore } from './store/modules/theme';
 import { naiveDateLocales, naiveLocales } from './locales/naive';
@@ -22,22 +21,6 @@ const naiveLocale = computed(() => {
 const naiveDateLocale = computed(() => {
   return naiveDateLocales[appStore.locale];
 });
-
-const watermarkProps = computed<WatermarkProps>(() => {
-  return {
-    content: themeStore.watermark?.text || 'SoybeanAdmin',
-    cross: true,
-    fullscreen: true,
-    fontSize: 16,
-    lineHeight: 16,
-    width: 384,
-    height: 384,
-    xOffset: 12,
-    yOffset: 60,
-    rotate: -15,
-    zIndex: 9999
-  };
-});
 </script>
 
 <template>
@@ -50,7 +33,6 @@ const watermarkProps = computed<WatermarkProps>(() => {
   >
     <AppProvider>
       <RouterView class="bg-layout" />
-      <NWatermark v-if="themeStore.watermark?.visible" v-bind="watermarkProps" />
     </AppProvider>
   </NConfigProvider>
 </template>

src/layouts/base-layout/index.vue

@@ -85,13 +85,8 @@ function getSiderWidth() {
 }
 
 function getSiderCollapsedWidth() {
-  const { reverseHorizontalMix } = themeStore.layout;
   const { collapsedWidth, mixCollapsedWidth, mixChildMenuWidth } = themeStore.sider;
 
-  if (isHorizontalMix.value && reverseHorizontalMix) {
-    return isActiveFirstLevelMenuHasChildren.value ? collapsedWidth : 0;
-  }
-
   let w = isVerticalMix.value || isHorizontalMix.value ? mixCollapsedWidth : collapsedWidth;
 
   if (isVerticalMix.value && appStore.mixSiderFixed && childLevelMenus.value.length) {

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

@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { computed } from 'vue';
 import type { Component } from 'vue';
-import { useAppStore } from '@/store/modules/app';
 import { useThemeStore } from '@/store/modules/theme';
 import VerticalMenu from './modules/vertical-menu.vue';
 import VerticalMixMenu from './modules/vertical-mix-menu.vue';
@@ -13,7 +12,6 @@ defineOptions({
   name: 'GlobalMenu'
 });
 
-const appStore = useAppStore();
 const themeStore = useThemeStore();
 
 const activeMenu = computed(() => {
@@ -26,12 +24,10 @@ const activeMenu = computed(() => {
 
   return menuMap[themeStore.layout.mode];
 });
-
-const reRenderVertical = computed(() => themeStore.layout.mode === 'vertical' && appStore.isMobile);
 </script>
 
 <template>
-  <component :is="activeMenu" :key="reRenderVertical" />
+  <component :is="activeMenu" />
 </template>
 
 <style scoped></style>

src/layouts/modules/global-menu/modules/horizontal-mix-menu.vue

@@ -18,6 +18,8 @@ const themeStore = useThemeStore();
 const { allMenus, childLevelMenus, activeFirstLevelMenuKey, setActiveFirstLevelMenuKey } = useMixMenuContext();
 const { routerPushByKeyWithMetaQuery } = useRouterPush();
 
+const inverted = computed(() => !themeStore.darkMode && themeStore.sider.inverted);
+
 const selectedKey = computed(() => {
   const { hideInMenu, activeMenu } = route.meta;
   const name = route.name as string;
@@ -51,12 +53,15 @@ function handleSelectMixMenu(menu: App.Global.Menu) {
     <FirstLevelMenu
       :menus="allMenus"
       :active-menu-key="activeFirstLevelMenuKey"
+      :inverted="inverted"
       :sider-collapse="appStore.siderCollapse"
       :dark-mode="themeStore.darkMode"
       :theme-color="themeStore.themeColor"
       @select="handleSelectMixMenu"
       @toggle-sider-collapse="appStore.toggleSiderCollapse"
-    />
+    >
+      <slot></slot>
+    </FirstLevelMenu>
   </Teleport>
 </template>
 

src/layouts/modules/global-menu/modules/reversed-horizontal-mix-menu.vue

@@ -27,6 +27,8 @@ const {
 } = useMixMenuContext();
 const { routerPushByKeyWithMetaQuery } = useRouterPush();
 
+const inverted = computed(() => !themeStore.darkMode && themeStore.sider.inverted);
+
 const selectedKey = computed(() => {
   const { hideInMenu, activeMenu } = route.meta;
   const name = route.name as string;
@@ -84,6 +86,7 @@ watch(
         :collapsed-width="themeStore.sider.collapsedWidth"
         :collapsed-icon-size="22"
         :options="childLevelMenus"
+        :inverted="inverted"
         :indent="18"
         @update:value="routerPushByKeyWithMetaQuery"
       />

src/layouts/modules/global-menu/modules/vertical-mix-menu.vue

@@ -49,11 +49,8 @@ function handleSelectMixMenu(menu: App.Global.Menu) {
 }
 
 function handleResetActiveMenu() {
+  getActiveFirstLevelMenuKey();
   setDrawerVisible(false);
-
-  if (!appStore.mixSiderFixed) {
-    getActiveFirstLevelMenuKey();
-  }
 }
 
 const selectedKey = computed(() => {
@@ -120,7 +117,6 @@ watch(
             <NMenu
               v-model:expanded-keys="expandedKeys"
               mode="vertical"
-              :value="selectedKey"
               :options="childLevelMenus"
               :collapsed="appStore.siderCollapse"
               :collapsed-width="themeStore.sider.collapsedWidth"

src/layouts/modules/theme-drawer/modules/dark-mode.vue

@@ -25,10 +25,6 @@ function handleGrayscaleChange(value: boolean) {
   themeStore.setGrayscale(value);
 }
 
-function handleColourWeaknessChange(value: boolean) {
-  themeStore.setColourWeakness(value);
-}
-
 const showSiderInverted = computed(() => !themeStore.darkMode && themeStore.layout.mode.includes('vertical'));
 </script>
 
@@ -57,9 +53,6 @@ const showSiderInverted = computed(() => !themeStore.darkMode && themeStore.layo
     <SettingItem :label="$t('theme.grayscale')">
       <NSwitch :value="themeStore.grayscale" @update:value="handleGrayscaleChange" />
     </SettingItem>
-    <SettingItem :label="$t('theme.colourWeakness')">
-      <NSwitch :value="themeStore.colourWeakness" @update:value="handleColourWeaknessChange" />
-    </SettingItem>
   </div>
 </template>
 

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

@@ -101,19 +101,6 @@ const isWrapperScrollMode = computed(() => themeStore.layout.scrollMode === 'wra
     >
       <NSwitch v-model:value="themeStore.footer.right" />
     </SettingItem>
-    <SettingItem v-if="themeStore.watermark" key="8" :label="$t('theme.watermark.visible')">
-      <NSwitch v-model:value="themeStore.watermark.visible" />
-    </SettingItem>
-    <SettingItem v-if="themeStore.watermark?.visible" key="8-1" :label="$t('theme.watermark.text')">
-      <NInput
-        v-model:value="themeStore.watermark.text"
-        autosize
-        type="text"
-        size="small"
-        class="w-120px"
-        placeholder="SoybeanAdmin"
-      />
-    </SettingItem>
   </TransitionGroup>
 </template>
 

src/locales/langs/en-us.ts

@@ -65,7 +65,6 @@ const local: App.I18n.Schema = {
       auto: 'Follow System'
     },
     grayscale: 'Grayscale',
-    colourWeakness: 'Colour Weakness',
     layoutMode: {
       title: 'Layout Mode',
       vertical: 'Vertical Menu Mode',
@@ -135,10 +134,6 @@ const local: App.I18n.Schema = {
       height: 'Footer Height',
       right: 'Right Footer'
     },
-    watermark: {
-      visible: 'Watermark Full Screen Visible',
-      text: 'Watermark Text'
-    },
     themeDrawerTitle: 'Theme Configuration',
     pageFunTitle: 'Page Function',
     configOperation: {

src/locales/langs/zh-cn.ts

@@ -64,8 +64,7 @@ const local: App.I18n.Schema = {
       dark: '暗黑模式',
       auto: '跟随系统'
     },
-    grayscale: '灰色模式',
+    grayscale: '灰度模式',
-    colourWeakness: '色弱模式',
     layoutMode: {
       title: '布局模式',
       vertical: '左侧菜单模式',
@@ -135,10 +134,6 @@ const local: App.I18n.Schema = {
       height: '底部高度',
       right: '底部局右'
     },
-    watermark: {
-      visible: '显示全屏水印',
-      text: '水印文本'
-    },
     themeDrawerTitle: '主题配置',
     pageFunTitle: '页面功能',
     configOperation: {

src/router/elegant/transform.ts

@@ -97,13 +97,10 @@ function transformElegantRouteToVueRoute(
     if (component) {
       if (isSingleLevelRoute(route)) {
         const { layout, view } = getSingleLevelRouteComponent(component);
-
+  
         const singleLevelRoute: RouteRecordRaw = {
           path,
           component: layouts[layout],
-          meta: {
-            title: route.meta?.title || ''
-          },
           children: [
             {
               name,
@@ -113,35 +110,36 @@ function transformElegantRouteToVueRoute(
             } as RouteRecordRaw
           ]
         };
-
+  
         return [singleLevelRoute];
       }
-
+  
       if (isLayout(component)) {
         const layoutName = getLayoutName(component);
-
+  
         vueRoute.component = layouts[layoutName];
       }
-
+  
       if (isView(component)) {
         const viewName = getViewName(component);
-
+  
         vueRoute.component = views[viewName];
       }
-
+  
     }
   } catch (error: any) {
     console.error(`Error transforming route "${route.name}": ${error.toString()}`);
     return [];
   }
 
+  
   // add redirect to child
   if (children?.length && !vueRoute.redirect) {
     vueRoute.redirect = {
       name: children[0].name
     };
   }
-
+  
   if (children?.length) {
     const childRoutes = children.flatMap(child => transformElegantRouteToVueRoute(child, layouts, views));
 

src/service/request/index.ts

@@ -35,7 +35,6 @@ export const request = createFlatRequest<App.Service.Response, RequestInstanceSt
     },
     async onBackendFail(response, instance) {
       const authStore = useAuthStore();
-      const responseCode = String(response.data.code);
 
       function handleLogout() {
         authStore.resetStore();
@@ -50,14 +49,14 @@ export const request = createFlatRequest<App.Service.Response, RequestInstanceSt
 
       // when the backend response code is in `logoutCodes`, it means the user will be logged out and redirected to login page
       const logoutCodes = import.meta.env.VITE_SERVICE_LOGOUT_CODES?.split(',') || [];
-      if (logoutCodes.includes(responseCode)) {
+      if (logoutCodes.includes(response.data.code)) {
         handleLogout();
         return null;
       }
 
       // when the backend response code is in `modalLogoutCodes`, it means the user will be logged out by displaying a modal
       const modalLogoutCodes = import.meta.env.VITE_SERVICE_MODAL_LOGOUT_CODES?.split(',') || [];
-      if (modalLogoutCodes.includes(responseCode) && !request.state.errMsgStack?.includes(response.data.msg)) {
+      if (modalLogoutCodes.includes(response.data.code) && !request.state.errMsgStack?.includes(response.data.msg)) {
         request.state.errMsgStack = [...(request.state.errMsgStack || []), response.data.msg];
 
         // prevent the user from refreshing the page
@@ -83,7 +82,7 @@ export const request = createFlatRequest<App.Service.Response, RequestInstanceSt
       // when the backend response code is in `expiredTokenCodes`, it means the token is expired, and refresh token
       // the api `refreshToken` can not return error code in `expiredTokenCodes`, otherwise it will be a dead loop, should return `logoutCodes` or `modalLogoutCodes`
       const expiredTokenCodes = import.meta.env.VITE_SERVICE_EXPIRED_TOKEN_CODES?.split(',') || [];
-      if (expiredTokenCodes.includes(responseCode) && !request.state.isRefreshingToken) {
+      if (expiredTokenCodes.includes(response.data.code) && !request.state.isRefreshingToken) {
         request.state.isRefreshingToken = true;
 
         const refreshConfig = await handleRefreshToken(response.config);
@@ -109,7 +108,7 @@ export const request = createFlatRequest<App.Service.Response, RequestInstanceSt
       // get backend error message and code
       if (error.code === BACKEND_ERROR_CODE) {
         message = error.response?.data?.msg || message;
-        backendErrorCode = String(error.response?.data?.code || '');
+        backendErrorCode = error.response?.data?.code || '';
       }
 
       // the error message is displayed in the modal

src/store/modules/theme/index.ts

@@ -10,8 +10,8 @@ import {
   createThemeToken,
   getNaiveTheme,
   initThemeSettings,
-  toggleAuxiliaryColorModes,
+  toggleCssDarkMode,
-  toggleCssDarkMode
+  toggleGrayscaleMode
 } from './shared';
 
 /** Theme store */
@@ -33,9 +33,6 @@ export const useThemeStore = defineStore(SetupStoreId.Theme, () => {
   /** grayscale mode */
   const grayscaleMode = computed(() => settings.value.grayscale);
 
-  /** colourWeakness mode */
-  const colourWeaknessMode = computed(() => settings.value.colourWeakness);
-
   /** Theme colors */
   const themeColors = computed(() => {
     const { themeColor, otherColor, isInfoFollowPrimary } = settings.value;
@@ -82,15 +79,6 @@ export const useThemeStore = defineStore(SetupStoreId.Theme, () => {
     settings.value.grayscale = isGrayscale;
   }
 
-  /**
-   * Set colourWeakness value
-   *
-   * @param isColourWeakness
-   */
-  function setColourWeakness(isColourWeakness: boolean) {
-    settings.value.colourWeakness = isColourWeakness;
-  }
-
   /** Toggle theme scheme */
   function toggleThemeScheme() {
     const themeSchemes: UnionKey.ThemeScheme[] = ['light', 'dark', 'auto'];
@@ -179,9 +167,9 @@ export const useThemeStore = defineStore(SetupStoreId.Theme, () => {
     );
 
     watch(
-      [grayscaleMode, colourWeaknessMode],
+      grayscaleMode,
       val => {
-        toggleAuxiliaryColorModes(val[0], val[1]);
+        toggleGrayscaleMode(val);
       },
       { immediate: true }
     );
@@ -209,7 +197,6 @@ export const useThemeStore = defineStore(SetupStoreId.Theme, () => {
     naiveTheme,
     settingsJson,
     setGrayscale,
-    setColourWeakness,
     resetStore,
     setThemeScheme,
     toggleThemeScheme,

src/store/modules/theme/shared.ts

@@ -180,16 +180,20 @@ export function toggleCssDarkMode(darkMode = false) {
 }
 
 /**
- * Toggle auxiliary color modes
+ * Toggle grayscale mode
  *
- * @param grayscaleMode
+ * @param grayscaleMode Is grayscale mode
- * @param colourWeakness
  */
-export function toggleAuxiliaryColorModes(grayscaleMode = false, colourWeakness = false) {
+export function toggleGrayscaleMode(grayscaleMode = false) {
-  const htmlElement = document.documentElement;
+  const GRAYSCALE_CLASS = 'grayscale';
-  htmlElement.style.filter = [grayscaleMode ? 'grayscale(100%)' : '', colourWeakness ? 'invert(80%)' : '']
+
-    .filter(Boolean)
+  const { add, remove } = toggleHtmlClass(GRAYSCALE_CLASS);
-    .join(' ');
+
+  if (grayscaleMode) {
+    add();
+  } else {
+    remove();
+  }
 }
 
 type NaiveColorScene = '' | 'Suppl' | 'Hover' | 'Pressed' | 'Active';

src/styles/css/global.css

@@ -11,3 +11,7 @@ body,
 html {
   overflow-x: hidden;
 }
+
+html.grayscale {
+  filter: grayscale(100%);
+}

src/theme/settings.ts

@@ -2,7 +2,6 @@
 export const themeSettings: App.Theme.ThemeSetting = {
   themeScheme: 'light',
   grayscale: false,
-  colourWeakness: false,
   recommendColor: false,
   themeColor: '#646cff',
   otherColor: {
@@ -49,10 +48,6 @@ export const themeSettings: App.Theme.ThemeSetting = {
     height: 48,
     right: true
   },
-  watermark: {
-    visible: false,
-    text: 'SoybeanAdmin'
-  },
   tokens: {
     light: {
       colors: {

src/typings/api.d.ts

@@ -81,4 +81,142 @@ declare namespace Api {
       home: import('@elegant-router/types').LastLevelRouteKey;
     }
   }
+
+  /**
+   * namespace SystemManage
+   *
+   * backend api module: "systemManage"
+   */
+  namespace SystemManage {
+    type CommonSearchParams = Pick<Common.PaginatingCommonParams, 'current' | 'size'>;
+
+    /** role */
+    type Role = Common.CommonRecord<{
+      /** role name */
+      roleName: string;
+      /** role code */
+      roleCode: string;
+      /** role description */
+      roleDesc: string;
+    }>;
+
+    /** role search params */
+    type RoleSearchParams = CommonType.RecordNullable<
+      Pick<Api.SystemManage.Role, 'roleName' | 'roleCode' | 'status'> & CommonSearchParams
+    >;
+
+    /** role list */
+    type RoleList = Common.PaginatingQueryRecord<Role>;
+
+    /** all role */
+    type AllRole = Pick<Role, 'id' | 'roleName' | 'roleCode'>;
+
+    /**
+     * user gender
+     *
+     * - "1": "male"
+     * - "2": "female"
+     */
+    type UserGender = '1' | '2';
+
+    /** user */
+    type User = Common.CommonRecord<{
+      /** user name */
+      userName: string;
+      /** user gender */
+      userGender: UserGender | null;
+      /** user nick name */
+      nickName: string;
+      /** user phone */
+      userPhone: string;
+      /** user email */
+      userEmail: string;
+      /** user role code collection */
+      userRoles: string[];
+    }>;
+
+    /** user search params */
+    type UserSearchParams = CommonType.RecordNullable<
+      Pick<Api.SystemManage.User, 'userName' | 'userGender' | 'nickName' | 'userPhone' | 'userEmail' | 'status'> &
+        CommonSearchParams
+    >;
+
+    /** user list */
+    type UserList = Common.PaginatingQueryRecord<User>;
+
+    /**
+     * menu type
+     *
+     * - "1": directory
+     * - "2": menu
+     */
+    type MenuType = '1' | '2';
+
+    type MenuButton = {
+      /**
+       * button code
+       *
+       * it can be used to control the button permission
+       */
+      code: string;
+      /** button description */
+      desc: string;
+    };
+
+    /**
+     * icon type
+     *
+     * - "1": iconify icon
+     * - "2": local icon
+     */
+    type IconType = '1' | '2';
+
+    type MenuPropsOfRoute = Pick<
+      import('vue-router').RouteMeta,
+      | 'i18nKey'
+      | 'keepAlive'
+      | 'constant'
+      | 'order'
+      | 'href'
+      | 'hideInMenu'
+      | 'activeMenu'
+      | 'multiTab'
+      | 'fixedIndexInTab'
+      | 'query'
+    >;
+
+    type Menu = Common.CommonRecord<{
+      /** parent menu id */
+      parentId: number;
+      /** menu type */
+      menuType: MenuType;
+      /** menu name */
+      menuName: string;
+      /** route name */
+      routeName: string;
+      /** route path */
+      routePath: string;
+      /** component */
+      component?: string;
+      /** iconify icon name or local icon name */
+      icon: string;
+      /** icon type */
+      iconType: IconType;
+      /** buttons */
+      buttons?: MenuButton[] | null;
+      /** children menu */
+      children?: Menu[] | null;
+    }> &
+      MenuPropsOfRoute;
+
+    /** menu list */
+    type MenuList = Common.PaginatingQueryRecord<Menu>;
+
+    type MenuTree = {
+      id: number;
+      label: string;
+      pId: number;
+      children?: MenuTree[];
+    };
+  }
 }

src/typings/app.d.ts

@@ -10,8 +10,6 @@ declare namespace App {
       themeScheme: UnionKey.ThemeScheme;
       /** grayscale mode */
       grayscale: boolean;
-      /** colour weakness mode */
-      colourWeakness: boolean;
       /** Whether to recommend color */
       recommendColor: boolean;
       /** Theme color */
@@ -95,13 +93,6 @@ declare namespace App {
         /** Whether float the footer to the right when the layout is 'horizontal-mix' */
         right: boolean;
       };
-      /** Watermark */
-      watermark?: {
-        /** Whether to show the watermark */
-        visible: boolean;
-        /** Watermark text */
-        text: string;
-      };
       /** define some theme settings tokens, will transform to css variables */
       tokens: {
         light: ThemeSettingToken;
@@ -341,7 +332,6 @@ declare namespace App {
       theme: {
         themeSchema: { title: string } & Record<UnionKey.ThemeScheme, string>;
         grayscale: string;
-        colourWeakness: string;
         layoutMode: { title: string; reverseHorizontalMix: string } & Record<UnionKey.ThemeLayoutMode, string>;
         recommendColor: string;
         recommendColorDesc: string;
@@ -382,10 +372,6 @@ declare namespace App {
           height: string;
           right: string;
         };
-        watermark: {
-          visible: string;
-          text: string;
-        };
         themeDrawerTitle: string;
         pageFunTitle: string;
         configOperation: {

src/typings/components.d.ts

@@ -84,7 +84,6 @@ declare module 'vue' {
     NThing: typeof import('naive-ui')['NThing']
     NTooltip: typeof import('naive-ui')['NTooltip']
     NTree: typeof import('naive-ui')['NTree']
-    NWatermark: typeof import('naive-ui')['NWatermark']
     PinToggler: typeof import('./../components/common/pin-toggler.vue')['default']
     ReloadButton: typeof import('./../components/common/reload-button.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']

src/typings/elegant-router.d.ts

@@ -37,7 +37,7 @@ declare module "@elegant-router/types" {
 
   /**
    * custom route key
-   */
+   */ 
   export type CustomRouteKey = Extract<
     RouteKey,
     | "root"
@@ -46,7 +46,7 @@ declare module "@elegant-router/types" {
 
   /**
    * the generated route key
-   */
+   */ 
   export type GeneratedRouteKey = Exclude<RouteKey, CustomRouteKey>;
 
   /**

src/views/home/index.vue

@@ -15,7 +15,7 @@ const gap = computed(() => (appStore.isMobile ? 0 : 16));
 
 <template>
   <NSpace vertical :size="16">
-    <NAlert :title="$t('common.warning')" type="warning">
+    <NAlert :title="$t('common.warning')" type="warning" closable>
       {{ $t('page.home.branchDesc') }}
     </NAlert>
     <HeaderBanner />