refactor(projects): use new elegant-router plugin

README.en_US.md

@@ -13,8 +13,10 @@
 [![gitcode star](https://gitcode.com/soybeanjs/soybean-admin/star/badge.svg)](https://gitcode.com/soybeanjs/soybean-admin)
 [![Powered by DartNode](https://dartnode.com/branding/DN-Open-Source-sm.png)](https://dartnode.com "Powered by DartNode - Free VPS for Open Source")
 
+<div style="display: flex; gap: 12px; align-items: center;">
+  <a href="https://trendshift.io/repositories/7963" target="_blank"><img src="https://trendshift.io/api/badge/repositories/7963" alt="soybeanjs%2Fsoybean-admin | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
   <a href="https://hellogithub.com/repository/1298f27d5fe54959a16cf9686516ddb3" target="_blank"><img src="https://abroad.hellogithub.com/v1/widgets/recommend.svg?rid=1298f27d5fe54959a16cf9686516ddb3&claim_uid=IiDXWmP4TEntjbV" alt="Featured｜HelloGitHub" style="width: 250px; height: 54px;" width="250" height="54" /></a>
-
+</div>
 
 > [!NOTE]
 > If you think `SoybeanAdmin` is helpful to you, or you like our project, please give us a ⭐️ on GitHub. Your support is the driving force for us to continue to improve and add new features! Thank you for your support!

README.md

@@ -13,7 +13,10 @@
 [![gitcode star](https://gitcode.com/soybeanjs/soybean-admin/star/badge.svg)](https://gitcode.com/soybeanjs/soybean-admin)
 [![Powered by DartNode](https://dartnode.com/branding/DN-Open-Source-sm.png)](https://dartnode.com "Powered by DartNode - Free VPS for Open Source")
 
+<div style="display: flex; gap: 12px; align-items: center;">
+  <a href="https://trendshift.io/repositories/7963" target="_blank"><img src="https://trendshift.io/api/badge/repositories/7963" alt="soybeanjs%2Fsoybean-admin | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
   <a href="https://hellogithub.com/repository/1298f27d5fe54959a16cf9686516ddb3" target="_blank"><img src="https://abroad.hellogithub.com/v1/widgets/recommend.svg?rid=1298f27d5fe54959a16cf9686516ddb3&claim_uid=IiDXWmP4TEntjbV" alt="Featured｜HelloGitHub" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+</div>
 
 > [!NOTE]
 > 如果您觉得 `SoybeanAdmin`对您有所帮助，或者您喜欢我们的项目，请在 GitHub 上给我们一个 ⭐️。您的支持是我们持续改进和增加新功能的动力！感谢您的支持！

package.json

@@ -54,54 +54,54 @@
     "@sa/hooks": "workspace:*",
     "@sa/materials": "workspace:*",
     "@sa/utils": "workspace:*",
-    "@vueuse/core": "13.8.0",
+    "@vueuse/core": "13.9.0",
     "clipboard": "2.0.11",
-    "dayjs": "1.11.14",
+    "dayjs": "1.11.18",
     "defu": "6.1.4",
     "echarts": "6.0.0",
     "json5": "2.2.3",
-    "naive-ui": "2.42.0",
+    "naive-ui": "2.43.1",
     "nprogress": "0.2.0",
     "pinia": "3.0.3",
     "tailwind-merge": "3.3.1",
-    "vue": "3.5.20",
+    "vue": "3.5.22",
     "vue-draggable-plus": "0.6.0",
-    "vue-i18n": "11.1.11",
+    "vue-i18n": "11.1.12",
     "vue-router": "4.5.1"
   },
   "devDependencies": {
     "@elegant-router/vue": "0.3.8",
-    "@iconify/json": "2.2.378",
+    "@iconify/json": "2.2.395",
     "@sa/scripts": "workspace:*",
     "@sa/uno-preset": "workspace:*",
     "@soybeanjs/eslint-config": "1.7.1",
-    "@types/node": "24.3.0",
+    "@types/node": "24.7.2",
     "@types/nprogress": "0.2.3",
-    "@unocss/eslint-config": "66.4.2",
+    "@unocss/eslint-config": "66.5.3",
-    "@unocss/preset-icons": "66.4.2",
+    "@unocss/preset-icons": "66.5.3",
-    "@unocss/preset-uno": "66.4.2",
+    "@unocss/preset-uno": "66.5.3",
-    "@unocss/transformer-directives": "66.4.2",
+    "@unocss/transformer-directives": "66.5.3",
-    "@unocss/transformer-variant-group": "66.4.2",
+    "@unocss/transformer-variant-group": "66.5.3",
-    "@unocss/vite": "66.4.2",
+    "@unocss/vite": "66.5.3",
     "@vitejs/plugin-vue": "6.0.1",
-    "@vitejs/plugin-vue-jsx": "5.1.0",
+    "@vitejs/plugin-vue-jsx": "5.1.1",
     "consola": "3.4.2",
-    "elegant-router": "1.0.4-beta.10",
+    "elegant-router": "1.0.4",
-    "eslint": "9.34.0",
+    "eslint": "9.37.0",
-    "eslint-plugin-vue": "10.4.0",
+    "eslint-plugin-vue": "10.5.0",
     "kolorist": "1.8.0",
-    "sass": "1.91.0",
+    "sass": "1.93.2",
     "simple-git-hooks": "2.13.1",
-    "tsx": "4.20.5",
+    "tsx": "4.20.6",
-    "typescript": "5.9.2",
+    "typescript": "5.9.3",
-    "unplugin-icons": "22.2.0",
+    "unplugin-icons": "22.4.2",
-    "unplugin-vue-components": "29.0.0",
+    "unplugin-vue-components": "29.1.0",
-    "vite": "7.1.3",
+    "vite": "7.1.9",
     "vite-plugin-progress": "0.0.7",
     "vite-plugin-svg-icons": "2.0.1",
-    "vite-plugin-vue-devtools": "8.0.1",
+    "vite-plugin-vue-devtools": "8.0.2",
     "vue-eslint-parser": "10.2.0",
-    "vue-tsc": "3.0.6"
+    "vue-tsc": "3.1.1"
   },
   "simple-git-hooks": {
     "commit-msg": "pnpm sa git-commit-verify",

packages/axios/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@sa/utils": "workspace:*",
-    "axios": "1.11.0",
+    "axios": "1.12.2",
     "axios-retry": "4.5.0",
     "qs": "6.14.0"
   },

packages/axios/src/index.ts

@@ -3,6 +3,7 @@ import type { AxiosResponse, CreateAxiosDefaults, InternalAxiosRequestConfig } f
 import axiosRetry from 'axios-retry';
 import { nanoid } from '@sa/utils';
 import { createAxiosConfig, createDefaultOptions, createRetryOptions } from './options';
+import { transformResponse } from './shared';
 import { BACKEND_ERROR_CODE, REQUEST_ID_KEY } from './constant';
 import type {
   CustomAxiosRequestConfig,
@@ -53,6 +54,8 @@ function createCommonRequest<
     async response => {
       const responseType: ResponseType = (response.config?.responseType as ResponseType) || 'json';
 
+      await transformResponse(response);
+
       if (responseType !== 'json' || opts.isBackendSuccess(response)) {
         return Promise.resolve(response);
       }

packages/axios/src/shared.ts

@@ -1,4 +1,5 @@
 import type { AxiosHeaderValue, AxiosResponse, InternalAxiosRequestConfig } from 'axios';
+import type { ResponseType } from './type';
 
 export function getContentType(config: InternalAxiosRequestConfig) {
   const contentType: AxiosHeaderValue = config.headers?.['Content-Type'] || 'application/json';
@@ -26,3 +27,53 @@ export function isResponseJson(response: AxiosResponse) {
 
   return responseType === 'json' || responseType === undefined;
 }
+
+export async function transformResponse(response: AxiosResponse) {
+  const responseType: ResponseType = (response.config?.responseType as ResponseType) || 'json';
+  if (responseType === 'json') return;
+
+  const isJson = response.headers['content-type']?.includes('application/json');
+  if (!isJson) return;
+
+  if (responseType === 'blob') {
+    await transformBlobToJson(response);
+  }
+
+  if (responseType === 'arrayBuffer') {
+    await transformArrayBufferToJson(response);
+  }
+}
+
+export async function transformBlobToJson(response: AxiosResponse) {
+  try {
+    let data = response.data;
+
+    if (typeof data === 'string') {
+      data = JSON.parse(data);
+    }
+
+    if (Object.prototype.toString.call(data) === '[object Blob]') {
+      const json = await data.text();
+      data = JSON.parse(json);
+    }
+
+    response.data = data;
+  } catch {}
+}
+
+export async function transformArrayBufferToJson(response: AxiosResponse) {
+  try {
+    let data = response.data;
+
+    if (typeof data === 'string') {
+      data = JSON.parse(data);
+    }
+
+    if (Object.prototype.toString.call(data) === '[object ArrayBuffer]') {
+      const json = new TextDecoder().decode(data);
+      data = JSON.parse(json);
+    }
+
+    response.data = data;
+  } catch {}
+}

packages/materials/src/libs/page-tab/index.module.css

@@ -95,3 +95,27 @@
 .chrome-tab_dark .chrome-tab-divider {
   background-color: rgba(255, 255, 255, 0.9);
 }
+
+.slider-tab {
+  background-color: transparent;
+  height: 100%;
+  border-bottom: 2px solid transparent;
+}
+
+.slider-tab_dark {
+  background-color: transparent;
+}
+
+.slider-tab:hover {
+  color: var(--soy-primary-color);
+}
+
+.slider-tab_active {
+  color: var(--soy-primary-color);
+  background-color: var(--soy-primary-color-opacity1);
+  border-bottom-color: var(--soy-primary-color);
+}
+
+.slider-tab_active_dark {
+  background-color: var(--soy-primary-color-opacity2);
+}

packages/materials/src/libs/page-tab/index.module.css.d.ts

@@ -10,6 +10,10 @@ declare const styles: {
   readonly 'chrome-tab_dark': string;
   readonly 'chrome-tab-divider': string;
   readonly 'svg-close': string;
+  readonly 'slider-tab': string;
+  readonly 'slider-tab_active': string;
+  readonly 'slider-tab_active_dark': string;
+  readonly 'slider-tab_dark': string;
 };
 
 export default styles;

packages/materials/src/libs/page-tab/index.vue

@@ -5,6 +5,7 @@ import type { PageTabMode, PageTabProps } from '../../types';
 import { ACTIVE_COLOR, createTabCssVars } from './shared';
 import ChromeTab from './chrome-tab.vue';
 import ButtonTab from './button-tab.vue';
+import SliderTab from './slider-tab.vue';
 import SvgClose from './svg-close.vue';
 import style from './index.module.css';
 
@@ -26,7 +27,7 @@ interface Emits {
 const emit = defineEmits<Emits>();
 
 const activeTabComponent = computed(() => {
-  const { mode, chromeClass, buttonClass } = props;
+  const { mode, chromeClass, buttonClass, sliderClass } = props;
 
   const tabComponentMap = {
     chrome: {
@@ -36,6 +37,10 @@ const activeTabComponent = computed(() => {
     button: {
       component: ButtonTab,
       class: buttonClass
+    },
+    slider: {
+      component: SliderTab,
+      class: sliderClass
     }
   } satisfies Record<PageTabMode, { component: Component; class?: string }>;
 
@@ -45,7 +50,7 @@ const activeTabComponent = computed(() => {
 const cssVars = computed(() => createTabCssVars(props.activeColor));
 
 const bindProps = computed(() => {
-  const { chromeClass: _chromeCls, buttonClass: _btnCls, ...rest } = props;
+  const { chromeClass: _chromeCls, buttonClass: _btnCls, sliderClass: _sliderCls, ...rest } = props;
 
   return rest;
 });

packages/materials/src/libs/page-tab/slider-tab.vue

@@ -0,0 +1,53 @@
+<script setup lang="ts">
+import type { PageTabProps } from '../../types';
+import style from './index.module.css';
+
+defineOptions({
+  name: 'SliderTab'
+});
+
+defineProps<PageTabProps>();
+
+type SlotFn = (props?: Record<string, unknown>) => any;
+
+type Slots = {
+  /**
+   * Slot
+   *
+   * The center content of the tab
+   */
+  default?: SlotFn;
+  /**
+   * Slot
+   *
+   * The left content of the tab
+   */
+  prefix?: SlotFn;
+  /**
+   * Slot
+   *
+   * The right content of the tab
+   */
+  suffix?: SlotFn;
+};
+
+defineSlots<Slots>();
+</script>
+
+<template>
+  <div
+    class=":soy: relative inline-flex cursor-pointer items-center justify-center gap-6px whitespace-nowrap px-12px py-4px"
+    :class="[
+      style['slider-tab'],
+      { [style['slider-tab_dark']]: darkMode },
+      { [style['slider-tab_active']]: active },
+      { [style['slider-tab_active_dark']]: active && darkMode }
+    ]"
+  >
+    <slot name="prefix"></slot>
+    <slot></slot>
+    <slot name="suffix"></slot>
+  </div>
+</template>
+
+<style scoped></style>

packages/materials/src/types/index.ts

@@ -239,7 +239,7 @@ export type LayoutCssVars = {
  *
  * @default chrome
  */
-export type PageTabMode = 'button' | 'chrome';
+export type PageTabMode = 'button' | 'chrome' | 'slider';
 
 export interface PageTabProps {
   /** Whether is dark mode */
@@ -262,6 +262,8 @@ export interface PageTabProps {
   buttonClass?: string;
   /** The class of the chrome tab */
   chromeClass?: string;
+  /** The class of the title tab */
+  sliderClass?: string;
   /** Whether the tab is active */
   active?: boolean;
   /** The color of the active tab */

packages/scripts/package.json

@@ -13,15 +13,15 @@
     }
   },
   "devDependencies": {
-    "@soybeanjs/changelog": "0.3.24",
+    "@soybeanjs/changelog": "0.3.25",
-    "bumpp": "10.2.3",
+    "bumpp": "10.3.1",
-    "c12": "3.2.0",
+    "c12": "3.3.0",
     "cac": "6.7.14",
     "consola": "3.4.2",
     "enquirer": "2.4.1",
     "execa": "9.6.0",
     "kolorist": "1.8.0",
-    "npm-check-updates": "18.0.3",
+    "npm-check-updates": "19.0.0",
     "picomatch": "4.0.3",
     "rimraf": "6.0.1"
   }

packages/utils/package.json

@@ -14,7 +14,7 @@
     "crypto-js": "4.2.0",
     "klona": "2.0.6",
     "localforage": "1.10.0",
-    "nanoid": "5.1.5"
+    "nanoid": "5.1.6"
   },
   "devDependencies": {
     "@types/crypto-js": "4.2.2"

src/constants/app.ts

@@ -40,7 +40,8 @@ export const themeScrollModeOptions = transformRecordToOption(themeScrollModeRec
 
 export const themeTabModeRecord: Record<UnionKey.ThemeTabMode, App.I18n.I18nKey> = {
   chrome: 'theme.layout.tab.mode.chrome',
-  button: 'theme.layout.tab.mode.button'
+  button: 'theme.layout.tab.mode.button',
+  slider: 'theme.layout.tab.mode.slider'
 };
 
 export const themeTabModeOptions = transformRecordToOption(themeTabModeRecord);
@@ -57,13 +58,6 @@ export const themePageAnimationModeRecord: Record<UnionKey.ThemePageAnimateMode,
 
 export const themePageAnimationModeOptions = transformRecordToOption(themePageAnimationModeRecord);
 
-export const resetCacheStrategyRecord: Record<UnionKey.ResetCacheStrategy, App.I18n.I18nKey> = {
-  refresh: 'theme.layout.resetCacheStrategy.refresh',
-  close: 'theme.layout.resetCacheStrategy.close'
-};
-
-export const resetCacheStrategyOptions = transformRecordToOption(resetCacheStrategyRecord);
-
 export const DARK_CLASS = 'dark';
 
 export const watermarkTimeFormatOptions = [

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

@@ -169,7 +169,9 @@ init();
         <div
           ref="tabRef"
           class="h-full flex pr-18px"
-          :class="[themeStore.tab.mode === 'chrome' ? 'items-end' : 'items-center gap-12px']"
+          :class="[
+            themeStore.tab.mode === 'chrome' || themeStore.tab.mode === 'slider' ? 'items-end' : 'items-center gap-12px'
+          ]"
         >
           <PageTab
             v-for="tab in tabStore.tabs"

src/layouts/modules/theme-drawer/modules/layout/modules/tab-settings.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { resetCacheStrategyOptions, themeTabModeOptions } from '@/constants/app';
+import { themeTabModeOptions } from '@/constants/app';
 import { useThemeStore } from '@/store/modules/theme';
 import { translateOptions } from '@/utils/common';
 import { $t } from '@/locales';
@@ -15,14 +15,6 @@ const themeStore = useThemeStore();
 <template>
   <NDivider>{{ $t('theme.layout.tab.title') }}</NDivider>
   <TransitionGroup tag="div" name="setting-list" class="flex-col-stretch gap-12px">
-    <SettingItem key="0" :label="$t('theme.layout.resetCacheStrategy.title')">
-      <NSelect
-        v-model:value="themeStore.resetCacheStrategy"
-        :options="translateOptions(resetCacheStrategyOptions)"
-        size="small"
-        class="w-120px"
-      />
-    </SettingItem>
     <SettingItem key="1" :label="$t('theme.layout.tab.visible')">
       <NSwitch v-model:value="themeStore.tab.visible" />
     </SettingItem>

src/layouts/modules/theme-drawer/modules/preset/modules/theme-preset.vue

@@ -16,7 +16,6 @@ type ThemePreset = Pick<
   | 'themeColor'
   | 'otherColor'
   | 'isInfoFollowPrimary'
-  | 'resetCacheStrategy'
   | 'layout'
   | 'page'
   | 'header'

src/locales/langs/en-us.ts

@@ -135,6 +135,7 @@ const local: App.I18n.Schema = {
         height: 'Tab Height',
         mode: {
           title: 'Tab Mode',
+          slider: 'Slider',
           chrome: 'Chrome',
           button: 'Button'
         }
@@ -185,11 +186,6 @@ const local: App.I18n.Schema = {
           }
         },
         fixedHeaderAndTab: 'Fixed Header And Tab'
-      },
-      resetCacheStrategy: {
-        title: 'Reset Cache Strategy',
-        close: 'Close Page',
-        refresh: 'Refresh Page'
       }
     },
     general: {

src/locales/langs/zh-cn.ts

@@ -132,6 +132,7 @@ const local: App.I18n.Schema = {
         height: '标签栏高度',
         mode: {
           title: '标签栏风格',
+          slider: '滑块风格',
           chrome: '谷歌风格',
           button: '按钮风格'
         }
@@ -158,7 +159,7 @@ const local: App.I18n.Schema = {
         visible: '显示底部',
         fixed: '固定底部',
         height: '底部高度',
-        right: '底部局右'
+        right: '底部居右'
       },
       content: {
         title: '内容区域设置',
@@ -182,11 +183,6 @@ const local: App.I18n.Schema = {
           }
         },
         fixedHeaderAndTab: '固定头部和标签栏'
-      },
-      resetCacheStrategy: {
-        title: '重置缓存策略',
-        close: '关闭页面',
-        refresh: '刷新页面'
       }
     },
     general: {

src/router/_generated/imports.ts

@@ -19,11 +19,7 @@ export const views: Record<RouteFileKey, RawRouteComponent> = {
   Home: () => import("@/views/home/index.vue"),
   IframeUrl: () => import("@/views/(builtin)/iframe/[url].vue"),
   Login: () => import("@/views/(builtin)/login/index.vue"),
-  ManageApi: () => import("@/views/manage/api/index.vue"),
-  ManageDictionary: () => import("@/views/manage/dictionary/index.vue"),
   ManageMenu: () => import("@/views/manage/menu/index.vue"),
-  ManageOrganization: () => import("@/views/manage/organization/index.vue"),
-  ManagePermission: () => import("@/views/manage/permission/index.vue"),
   ManageRole: () => import("@/views/manage/role/index.vue"),
   ManageRoute: () => import("@/views/manage/route/index.vue"),
   ManageUser: () => import("@/views/manage/user/index.vue"),

src/router/_generated/routes.ts

@@ -82,24 +82,6 @@ export const routes: AutoRouterRoute[] = [
       constant: true
     },
   },
-  {
-    name: 'ManageApi',
-    path: '/manage/api',
-    layout: 'base',
-    component: 'ManageApi',
-    meta: {
-      title: "ManageApi"
-    }
-  },
-  {
-    name: 'ManageDictionary',
-    path: '/manage/dictionary',
-    layout: 'base',
-    component: 'ManageDictionary',
-    meta: {
-      title: "ManageDictionary"
-    }
-  },
   {
     name: 'ManageMenu',
     path: '/manage/menu',
@@ -109,24 +91,6 @@ export const routes: AutoRouterRoute[] = [
       title: "ManageMenu"
     },
   },
-  {
-    name: 'ManageOrganization',
-    path: '/manage/organization',
-    layout: 'base',
-    component: 'ManageOrganization',
-    meta: {
-      title: "ManageOrganization"
-    }
-  },
-  {
-    name: 'ManagePermission',
-    path: '/manage/permission',
-    layout: 'base',
-    component: 'ManagePermission',
-    meta: {
-      title: "ManagePermission"
-    }
-  },
   {
     name: 'ManageRole',
     path: '/manage/role',

src/router/_generated/shared.ts

@@ -16,11 +16,7 @@ const routePathMap: RoutePathMap = {
   "Home": "/home",
   "IframeUrl": "/iframe/:url",
   "Login": "/login/:module(pwd-login|code-login|register|reset-pwd|bind-wechat)?",
-  "ManageApi": "/manage/api",
-  "ManageDictionary": "/manage/dictionary",
   "ManageMenu": "/manage/menu",
-  "ManageOrganization": "/manage/organization",
-  "ManagePermission": "/manage/permission",
   "ManageRole": "/manage/role",
   "ManageRoute": "/manage/route",
   "ManageUser": "/manage/user",

src/router/routes/index.ts

@@ -1,4 +1,4 @@
-import type { AutoRouterRoute } from '@elegant-router/types';
+import type { AutoRouterRedirect, AutoRouterRoute } from '@elegant-router/types';
 import { routes } from '../_generated/routes';
 import { layouts, views } from '../_generated/imports';
 import { transformToVueRoutes } from '../_generated/transformer';
@@ -8,17 +8,24 @@ export function createStaticRoutes() {
   const constantRoutes: AutoRouterRoute[] = [];
   const authRoutes: AutoRouterRoute[] = [];
 
+  let rootRoute: AutoRouterRedirect | undefined;
+
   routes.forEach(item => {
     if (item.meta?.constant) {
       constantRoutes.push(item);
     } else {
       authRoutes.push(item);
     }
+
+    if (item.name === 'Root') {
+      rootRoute = item as AutoRouterRedirect;
+    }
   });
 
   return {
     constantRoutes,
-    authRoutes
+    authRoutes,
+    rootRoute: rootRoute as AutoRouterRedirect
   };
 }
 

src/store/modules/app/index.ts

@@ -46,11 +46,8 @@ export const useAppStore = defineStore(SetupStoreId.App, () => {
     });
 
     setReloadFlag(true);
-
-    if (themeStore.resetCacheStrategy === 'refresh') {
     routeStore.resetRouteCache();
   }
-  }
 
   const locale = ref<App.I18n.LangType>(localStg.get('lang') || 'zh-CN');
 

src/store/modules/tab/index.ts

@@ -112,11 +112,9 @@ export const useTabStore = defineStore(SetupStoreId.Tab, () => {
       await switchRouteByTab(nextTab);
     }
 
-    // reset route cache if cache strategy is close
+    // reset route cache
-    if (themeStore.resetCacheStrategy === 'close') {
     routeStore.resetRouteCache(removedTabRouteKey);
   }
-  }
 
   /** remove active tab */
   async function removeActiveTab() {
@@ -147,11 +145,9 @@ export const useTabStore = defineStore(SetupStoreId.Tab, () => {
     const tabsToRemove = tabs.value.filter(tab => !remainTabIds.includes(tab.id));
     const routeKeysToReset: RouteKey[] = [];
 
-    if (themeStore.resetCacheStrategy === 'close') {
     for (const tab of tabsToRemove) {
       routeKeysToReset.push(tab.routeKey);
     }
-    }
 
     const removedTabsIds = tabsToRemove.map(tab => tab.id);
 

src/theme/preset/azir.json

@@ -15,7 +15,6 @@
     "error": "#c49a9a"
   },
   "isInfoFollowPrimary": true,
-  "resetCacheStrategy": "refresh",
   "layout": {
     "mode": "vertical-mix",
     "scrollMode": "wrapper"

src/theme/preset/compact.json

@@ -15,7 +15,6 @@
     "error": "#f5222d"
   },
   "isInfoFollowPrimary": true,
-  "resetCacheStrategy": "close",
   "layout": {
     "mode": "vertical",
     "scrollMode": "content"

src/theme/preset/dark.json

@@ -15,7 +15,6 @@
     "error": "#f5222d"
   },
   "isInfoFollowPrimary": true,
-  "resetCacheStrategy": "close",
   "layout": {
     "mode": "vertical",
     "scrollMode": "content"

src/theme/preset/default.json

@@ -15,7 +15,6 @@
     "error": "#f5222d"
   },
   "isInfoFollowPrimary": true,
-  "resetCacheStrategy": "close",
   "layout": {
     "mode": "vertical",
     "scrollMode": "content"

src/theme/settings.ts

@@ -12,7 +12,6 @@ export const themeSettings: App.Theme.ThemeSetting = {
     error: '#f5222d'
   },
   isInfoFollowPrimary: true,
-  resetCacheStrategy: 'refresh',
   layout: {
     mode: 'vertical',
     scrollMode: 'content'

src/typings/api/common.d.ts

@@ -5,46 +5,38 @@
  */
 declare namespace Api {
   namespace Common {
-    /** common params of paginating */
+    interface CreatedUpdatedDTO {
-    interface PaginatingCommonParams {
+      /** 创建人 */
-      /** current page number */
+      createdBy: string;
-      current: number;
+      /** 创建时间 */
-      /** page size */
+      createdTime: string;
-      size: number;
+      /** 更新人 */
-      /** total count */
+      updatedBy: string;
+      /** 更新时间 */
+      updatedTime: string;
+    }
+
+    interface CommonRecordDTO extends CreatedUpdatedDTO {
+      /** 主键 */
+      id: number;
+      /**
+       * 启用状态 Enable status
+       *
+       * - "1": 启用
+       * - "2": 禁用
+       */
+      status: Union.EnableStatus | null;
+    }
+
+    interface PaginationQueryDTO {
+      page: number;
+      pageSize: number;
+      sort: string;
+    }
+
+    interface PaginationDTO extends Pick<PaginationQueryDTO, 'page' | 'pageSize'> {
+      /** 总条数 */
       total: number;
     }
-
-    /** common params of paginating query list data */
-    interface PaginatingQueryRecord<T = any> extends PaginatingCommonParams {
-      records: T[];
-    }
-
-    /** common search params of table */
-    type CommonSearchParams = Pick<Common.PaginatingCommonParams, 'current' | 'size'>;
-
-    /**
-     * enable status
-     *
-     * - "1": enabled
-     * - "2": disabled
-     */
-    type EnableStatus = '1' | '2';
-
-    /** common record */
-    type CommonRecord<T = any> = {
-      /** record id */
-      id: number;
-      /** record creator */
-      createBy: string;
-      /** record create time */
-      createTime: string;
-      /** record updater */
-      updateBy: string;
-      /** record update time */
-      updateTime: string;
-      /** record status */
-      status: EnableStatus | null;
-    } & T;
   }
 }

src/typings/api/menu.d.ts

@@ -0,0 +1,42 @@
+declare namespace Api {
+  namespace Menu {
+    type RouteKey = import('@elegant-router/types').RouteKey;
+
+    interface Menu extends Common.CommonRecordDTO {
+      /** 菜单名称 */
+      name: string;
+      /** 菜单类型 */
+      menuType: Union.MenuType;
+      /** 菜单描述 */
+      description?: string | null;
+      /** 菜单图标 */
+      icon?: string | null;
+      /** 菜单图标类型 */
+      iconType?: string | null;
+      /** 父级菜单ID */
+      parentId?: number | null;
+      /** 菜单排序 */
+      order?: number | null;
+      /** 是否隐藏 */
+      isHidden?: boolean | null;
+      /** iframe 页面URL */
+      iframeUrl?: string | null;
+      /** 链接 */
+      href?: string | null;
+      /** 路由名称 */
+      routeName?: RouteKey | null;
+      /** 路由查询参数 */
+      routeQueries?: Record<string, string | number | boolean> | null;
+      /** 路由路径参数 */
+      routeParams?: Record<string, string | number | boolean> | null;
+    }
+
+    interface MenuListDTO extends Common.PaginationDTO {
+      list: Menu[];
+    }
+
+    interface MenuTreeDTO extends Menu {
+      children?: MenuTreeDTO[];
+    }
+  }
+}

src/typings/api/route.d.ts

@@ -1,19 +1,34 @@
 declare namespace Api {
-  /**
-   * namespace Route
-   *
-   * backend api module: "route"
-   */
   namespace Route {
-    type ElegantConstRoute = import('@elegant-router/types').ElegantConstRoute;
+    interface RouteDTO extends Common.CommonRecordDTO {
-
+      /** 路由路径 */
-    interface MenuRoute extends ElegantConstRoute {
+      path: string;
-      id: string;
+      /** 路由名称 */
+      name: string;
+      /** 路由布局 */
+      layout: string;
+      /** 路由组件 */
+      component: string;
+      /** 重定向路径 */
+      redirect?: string | null;
+      /** 路由图标 */
+      icon?: string | null;
+      /** 路由图标类型 */
+      iconType?: string | null;
+      /** 是否缓存 */
+      isCache?: boolean | null;
+      /** 是否支持多开 */
+      isMultiple?: boolean | null;
+      /** 固定索引 */
+      fixedIndex?: number | null;
+      /** 是否需要权限 */
+      requireAuth?: boolean | null;
+      /** 路由属性 */
+      props?: Record<string, string | number | boolean> | null;
     }
 
-    interface UserRoute {
+    interface RouteListDTO extends Common.PaginationDTO {
-      routes: MenuRoute[];
+      list: RouteDTO[];
-      home: import('@elegant-router/types').LastLevelRouteKey;
     }
   }
 }

src/typings/api/union.d.ts

@@ -0,0 +1,31 @@
+declare namespace Api {
+  namespace Union {
+    /**
+     * 是否 Yes or No
+     *
+     * - "Y": yes
+     * - "N": no
+     */
+    type YesOrNo = 'Y' | 'N';
+
+    /**
+     * 启用状态 Enable status
+     *
+     * - "1": 启用
+     * - "2": 禁用
+     */
+    type EnableStatus = '1' | '2';
+
+    /**
+     * 菜单类型
+     *
+     * - "directory": 目录
+     * - "menu": 菜单
+     * - "iframe": iframe 页面（iframe 嵌入页面）
+     * - "link": 链接（跳转外部链接）
+     * - "page": 页面（不展示在菜单中，可用于作为菜单类型的子菜单展示在面包屑中）
+     * - "other": 其他（作用自行定义）
+     */
+    type MenuType = 'page' | 'directory' | 'menu' | 'iframe' | 'link' | 'other';
+  }
+}

src/typings/app.d.ts

@@ -20,8 +20,6 @@ declare namespace App {
       otherColor: OtherColor;
       /** Whether info color is followed by the primary color */
       isInfoFollowPrimary: boolean;
-      /** Reset cache strategy */
-      resetCacheStrategy: UnionKey.ResetCacheStrategy;
       /** Layout */
       layout: {
         /** Layout mode */
@@ -181,9 +179,9 @@ declare namespace App {
     type VNode = import('vue').VNode;
     type RouteLocationNormalizedLoaded = import('vue-router').RouteLocationNormalizedLoaded;
     type RouteKey = import('@elegant-router/types').RouteKey;
-    type RouteMap = import('@elegant-router/types').RouteMap;
+    type RoutePathMap = import('@elegant-router/types').RoutePathMap;
     type RoutePath = import('@elegant-router/types').RoutePath;
-    type LastLevelRouteKey = import('@elegant-router/types').LastLevelRouteKey;
+    type RouteFileKey = import('@elegant-router/types').RouteFileKey;
 
     /** The router push options */
     type RouterPushOptions = {
@@ -201,77 +199,25 @@ declare namespace App {
       showMenu?: boolean;
     }
 
+    type MenuType = 'page' | 'directory' | 'menu' | 'iframe' | 'link' | 'button' | 'other';
+
     /** The global menu */
-    type Menu = {
+    interface Menu {
-      /**
+      id: number;
-       * The menu key
+      name: string;
-       *
+      menuType: MenuType;
-       * Equal to the route key
+      description?: string | null;
-       */
+      icon?: string | null;
-      key: string;
+      iconType?: string | null;
-      /** The menu label */
+      parentId?: number | null;
-      label: string;
+      order?: number | null;
-      /** The menu i18n key */
+      isHidden?: boolean | null;
-      i18nKey?: I18n.I18nKey | null;
+      iframeUrl?: string | null;
-      /** The route key */
+      href?: string | null;
-      routeKey: RouteKey;
+      routeName?: RouteKey | null;
-      /** The route path */
+      routeQueries?: Record<string, string | number | boolean> | null;
-      routePath: RoutePath;
+      routeParams?: Record<string, string | number | boolean> | null;
-      /** The menu icon */
+    }
-      icon?: () => VNode;
-      /** The menu children */
-      children?: Menu[];
-    };
-
-    type Breadcrumb = Omit<Menu, 'children'> & {
-      options?: Breadcrumb[];
-    };
-
-    /** Tab route */
-    type TabRoute = Pick<RouteLocationNormalizedLoaded, 'name' | 'path' | 'meta'> &
-      Partial<Pick<RouteLocationNormalizedLoaded, 'fullPath' | 'query' | 'matched'>>;
-
-    /** The global tab */
-    type Tab = {
-      /** The tab id */
-      id: string;
-      /** The tab label */
-      label: string;
-      /**
-       * The new tab label
-       *
-       * If set, the tab label will be replaced by this value
-       */
-      newLabel?: string;
-      /**
-       * The old tab label
-       *
-       * when reset the tab label, the tab label will be replaced by this value
-       */
-      oldLabel?: string;
-      /** The tab route key */
-      routeKey: LastLevelRouteKey;
-      /** The tab route path */
-      routePath: RouteMap[LastLevelRouteKey];
-      /** The tab route full path */
-      fullPath: string;
-      /** The tab fixed index */
-      fixedIndex?: number | null;
-      /**
-       * Tab icon
-       *
-       * Iconify icon
-       */
-      icon?: string;
-      /**
-       * Tab local icon
-       *
-       * Local icon
-       */
-      localIcon?: string;
-      /** I18n key */
-      i18nKey?: I18n.I18nKey | null;
-    };
 
     /** Form rule */
     type FormRule = import('naive-ui').FormItemRule;
@@ -376,7 +322,7 @@ declare namespace App {
           themeColor: {
             title: string;
             followPrimary: string;
-          } & Theme.ThemeColor;
+          } & Record<Theme.ThemeColorKey, string>;
           recommendColor: string;
           recommendColorDesc: string;
           preset: {
@@ -436,7 +382,6 @@ declare namespace App {
             };
             fixedHeaderAndTab: string;
           };
-          resetCacheStrategy: { title: string } & Record<UnionKey.ResetCacheStrategy, string>;
         };
         general: {
           title: string;

src/typings/elegant-router.d.ts

@@ -31,11 +31,7 @@ declare module "@elegant-router/types" {
     "Home": "/home";
     "IframeUrl": "/iframe/:url";
     "Login": "/login/:module(pwd-login|code-login|register|reset-pwd|bind-wechat)?";
-    "ManageApi": "/manage/api";
-    "ManageDictionary": "/manage/dictionary";
     "ManageMenu": "/manage/menu";
-    "ManageOrganization": "/manage/organization";
-    "ManagePermission": "/manage/permission";
     "ManageRole": "/manage/role";
     "ManageRoute": "/manage/route";
     "ManageUser": "/manage/user";

src/typings/typed-router.d.ts

@@ -31,11 +31,7 @@ declare module "vue-router/auto-routes" {
     "Home": RouteRecordInfo<"Home", "/home", Record<never, never>, Record<never, never>>;
     "IframeUrl": RouteRecordInfo<"IframeUrl", "/iframe/:url", { url: ParamValue<true> }, { url: ParamValue<false> }>;
     "Login": RouteRecordInfo<"Login", "/login/:module(pwd-login|code-login|register|reset-pwd|bind-wechat)?", { module?: ParamValueZeroOrOne<true> }, { module?: ParamValueZeroOrOne<false> }>;
-    "ManageApi": RouteRecordInfo<"ManageApi", "/manage/api", Record<never, never>, Record<never, never>>;
-    "ManageDictionary": RouteRecordInfo<"ManageDictionary", "/manage/dictionary", Record<never, never>, Record<never, never>>;
     "ManageMenu": RouteRecordInfo<"ManageMenu", "/manage/menu", Record<never, never>, Record<never, never>>;
-    "ManageOrganization": RouteRecordInfo<"ManageOrganization", "/manage/organization", Record<never, never>, Record<never, never>>;
-    "ManagePermission": RouteRecordInfo<"ManagePermission", "/manage/permission", Record<never, never>, Record<never, never>>;
     "ManageRole": RouteRecordInfo<"ManageRole", "/manage/role", Record<never, never>, Record<never, never>>;
     "ManageRoute": RouteRecordInfo<"ManageRoute", "/manage/route", Record<never, never>, Record<never, never>>;
     "ManageUser": RouteRecordInfo<"ManageUser", "/manage/user", Record<never, never>, Record<never, never>>;

src/typings/union-key.d.ts

@@ -14,14 +14,6 @@ declare namespace UnionKey {
   /** Theme scheme */
   type ThemeScheme = 'light' | 'dark' | 'auto';
 
-  /**
-   * Reset cache strategy
-   *
-   * - close: re-cache when close page
-   * - refresh: re-cache when refresh page
-   */
-  type ResetCacheStrategy = 'close' | 'refresh';
-
   /**
    * The layout mode
    *

src/views/(builtin)/login/index.vue

@@ -23,7 +23,7 @@ const appStore = useAppStore();
 const themeStore = useThemeStore();
 
 interface LoginModule {
-  label: string;
+  label: App.I18n.I18nKey;
   component: Component;
 }
 

src/views/manage/api/index.vue

@@ -1,5 +0,0 @@
-<script setup lang="ts"></script>
-
-<template>
-  <div>ManageApi</div>
-</template>

src/views/manage/dictionary/index.vue

@@ -1,5 +0,0 @@
-<script setup lang="ts"></script>
-
-<template>
-  <div>ManageDictionary</div>
-</template>

src/views/manage/organization/index.vue

@@ -1,5 +0,0 @@
-<script setup lang="ts"></script>
-
-<template>
-  <div>ManageOrganization</div>
-</template>

src/views/manage/permission/index.vue

@@ -1,5 +0,0 @@
-<script setup lang="ts"></script>
-
-<template>
-  <div>ManagePermission</div>
-</template>