merge: 合并 soy 1.3.8

.vscode/extensions.json

@@ -6,9 +6,6 @@
     "dbaeumer.vscode-eslint",
     "editorconfig.editorconfig",
     "esbenp.prettier-vscode",
-    "formulahendry.auto-close-tag",
-    "formulahendry.auto-complete-tag",
-    "formulahendry.auto-rename-tag",
     "lokalise.i18n-ally",
     "mhutchie.git-graph",
     "mikestead.dotenv",

package.json

@@ -1,13 +1,8 @@
 {
   "name": "ruoyi-vue-plus",
   "type": "module",
-  "version": "1.3.6",
+  "version": "1.3.8",
   "description": "RuoYi-Vue-Plus多租户管理系统",
-  "author": {
-    "name": "xlsea",
-    "email": "xlsea@outlook.com",
-    "url": "https://blog.xlsea.cn"
-  },
   "license": "MIT",
   "homepage": "https://gitee.com/xlsea/ruoyi-plus-soybean",
   "keywords": [
@@ -56,46 +51,46 @@
     "echarts": "5.5.1",
     "jsencrypt": "^3.3.2",
     "json5": "2.2.3",
-    "monaco-editor": "^0.48.0",
-    "naive-ui": "2.39.0",
+    "monaco-editor": "^0.52.0",
+    "naive-ui": "2.40.1",
     "nprogress": "0.2.0",
-    "pinia": "2.2.2",
-    "tailwind-merge": "2.5.2",
-    "vue": "3.5.6",
-    "vue-draggable-plus": "0.5.3",
-    "vue-i18n": "10.0.1",
+    "pinia": "2.2.4",
+    "tailwind-merge": "2.5.4",
+    "vue": "3.5.12",
+    "vue-draggable-plus": "0.5.4",
+    "vue-i18n": "10.0.4",
     "vue-router": "4.4.5"
   },
   "devDependencies": {
     "@elegant-router/vue": "0.3.8",
-    "@iconify/json": "2.2.250",
+    "@iconify/json": "2.2.263",
     "@sa/scripts": "workspace:*",
     "@sa/uno-preset": "workspace:*",
-    "@soybeanjs/eslint-config": "1.4.1",
-    "@types/node": "22.5.5",
+    "@soybeanjs/eslint-config": "1.4.2",
+    "@types/node": "22.7.9",
     "@types/nprogress": "0.2.3",
-    "@unocss/eslint-config": "0.62.4",
-    "@unocss/preset-icons": "0.62.4",
-    "@unocss/preset-uno": "0.62.4",
-    "@unocss/transformer-directives": "0.62.4",
-    "@unocss/transformer-variant-group": "0.62.4",
-    "@unocss/vite": "0.62.4",
+    "@unocss/eslint-config": "0.63.6",
+    "@unocss/preset-icons": "0.63.6",
+    "@unocss/preset-uno": "0.63.6",
+    "@unocss/transformer-directives": "0.63.6",
+    "@unocss/transformer-variant-group": "0.63.6",
+    "@unocss/vite": "0.63.6",
     "@vitejs/plugin-vue": "5.1.4",
     "@vitejs/plugin-vue-jsx": "4.0.1",
-    "eslint": "9.10.0",
-    "eslint-plugin-vue": "9.28.0",
+    "eslint": "9.13.0",
+    "eslint-plugin-vue": "9.29.1",
     "lint-staged": "15.2.10",
-    "sass": "1.79.2",
+    "sass": "1.80.4",
     "simple-git-hooks": "2.11.1",
     "tsx": "4.19.1",
-    "typescript": "5.6.2",
+    "typescript": "5.6.3",
     "unplugin-icons": "0.19.3",
     "unplugin-vue-components": "0.27.4",
-    "vite": "5.4.6",
+    "vite": "5.4.10",
     "vite-plugin-monaco-editor": "^1.1.0",
     "vite-plugin-progress": "0.0.7",
     "vite-plugin-svg-icons": "2.0.1",
-    "vite-plugin-vue-devtools": "7.4.5",
+    "vite-plugin-vue-devtools": "7.5.4",
     "vue-eslint-parser": "9.4.3",
     "vue-tsc": "2.1.6"
   },
@@ -105,6 +100,5 @@
   },
   "lint-staged": {
     "*": "eslint --fix"
-  },
-  "website": "https://blog.xlsea.cn"
+  }
 }

packages/alova/package.json

@@ -0,0 +1,20 @@
+{
+  "name": "@sa/alova",
+  "version": "1.3.8",
+  "exports": {
+    ".": "./src/index.ts",
+    "./fetch": "./src/fetch.ts",
+    "./client": "./src/client.ts",
+    "./mock": "./src/mock.ts"
+  },
+  "typesVersions": {
+    "*": {
+      "*": ["./src/*"]
+    }
+  },
+  "dependencies": {
+    "@alova/mock": "2.0.8",
+    "@sa/utils": "workspace:*",
+    "alova": "3.1.1"
+  }
+}

packages/alova/src/client.ts

@@ -0,0 +1 @@
+export * from 'alova/client';

packages/alova/src/constant.ts

@@ -0,0 +1,2 @@
+/** the backend error code key */
+export const BACKEND_ERROR_CODE = 'BACKEND_ERROR';

packages/alova/src/fetch.ts

@@ -0,0 +1,2 @@
+import adapterFetch from 'alova/fetch';
+export default adapterFetch;

packages/alova/src/index.ts

@@ -0,0 +1,77 @@
+import { createAlova } from 'alova';
+import type { AlovaDefaultCacheAdapter, AlovaGenerics, AlovaGlobalCacheAdapter, AlovaRequestAdapter } from 'alova';
+import VueHook from 'alova/vue';
+import type { VueHookType } from 'alova/vue';
+import adapterFetch from 'alova/fetch';
+import { createServerTokenAuthentication } from 'alova/client';
+import type { FetchRequestInit } from 'alova/fetch';
+import { BACKEND_ERROR_CODE } from './constant';
+import type { CustomAlovaConfig, RequestOptions } from './type';
+
+export const createAlovaRequest = <
+  RequestConfig = FetchRequestInit,
+  ResponseType = Response,
+  ResponseHeader = Headers,
+  L1Cache extends AlovaGlobalCacheAdapter = AlovaDefaultCacheAdapter,
+  L2Cache extends AlovaGlobalCacheAdapter = AlovaDefaultCacheAdapter
+>(
+  customConfig: CustomAlovaConfig<
+    AlovaGenerics<any, any, RequestConfig, ResponseType, ResponseHeader, L1Cache, L2Cache, any>
+  >,
+  options: RequestOptions<AlovaGenerics<any, any, RequestConfig, ResponseType, ResponseHeader, L1Cache, L2Cache, any>>
+) => {
+  const { tokenRefresher } = options;
+  const { onAuthRequired, onResponseRefreshToken } = createServerTokenAuthentication<
+    VueHookType,
+    AlovaRequestAdapter<RequestConfig, ResponseType, ResponseHeader>
+  >({
+    refreshTokenOnSuccess: {
+      isExpired: (response, method) => tokenRefresher?.isExpired(response, method) || false,
+      handler: async (response, method) => tokenRefresher?.handler(response, method)
+    },
+    refreshTokenOnError: {
+      isExpired: (response, method) => tokenRefresher?.isExpired(response, method) || false,
+      handler: async (response, method) => tokenRefresher?.handler(response, method)
+    }
+  });
+
+  const instance = createAlova({
+    ...customConfig,
+    timeout: customConfig.timeout ?? 10 * 1000,
+    requestAdapter: (customConfig.requestAdapter as any) ?? adapterFetch(),
+    statesHook: VueHook,
+    beforeRequest: onAuthRequired(options.onRequest as any),
+    responded: onResponseRefreshToken({
+      onSuccess: async (response, method) => {
+        // check if http status is success
+        let error: any = null;
+        let transformedData: any = null;
+        try {
+          if (await options.isBackendSuccess(response)) {
+            transformedData = await options.transformBackendResponse(response);
+          } else {
+            error = new Error('the backend request error');
+            error.code = BACKEND_ERROR_CODE;
+          }
+        } catch (err) {
+          error = err;
+        }
+
+        if (error) {
+          await options.onError?.(error, response, method);
+          throw error;
+        }
+
+        return transformedData;
+      },
+      onComplete: options.onComplete,
+      onError: (error, method) => options.onError?.(error, null, method)
+    })
+  });
+
+  return instance;
+};
+
+export { BACKEND_ERROR_CODE };
+export type * from './type';
+export type * from 'alova';

packages/alova/src/mock.ts

@@ -0,0 +1 @@
+export * from '@alova/mock';

packages/alova/src/type.ts

@@ -0,0 +1,52 @@
+import type { AlovaGenerics, AlovaOptions, AlovaRequestAdapter, Method, ResponseCompleteHandler } from 'alova';
+
+export type CustomAlovaConfig<AG extends AlovaGenerics> = Omit<
+  AlovaOptions<AG>,
+  'statesHook' | 'beforeRequest' | 'responded' | 'requestAdapter'
+> & {
+  /** request adapter. all request of alova will be sent by it. */
+  requestAdapter?: AlovaRequestAdapter<AG['RequestConfig'], AG['Response'], AG['ResponseHeader']>;
+};
+
+export interface RequestOptions<AG extends AlovaGenerics> {
+  /**
+   * The hook before request
+   *
+   * For example: You can add header token in this hook
+   *
+   * @param method alova Method Instance
+   */
+  onRequest?: AlovaOptions<AG>['beforeRequest'];
+  /**
+   * The hook to check backend response is success or not
+   *
+   * @param response alova response
+   */
+  isBackendSuccess: (response: AG['Response']) => Promise<boolean>;
+
+  /** The config to refresh token */
+  tokenRefresher?: {
+    /** detect the token is expired */
+    isExpired(response: AG['Response'], Method: Method<AG>): Promise<boolean> | boolean;
+    /** refresh token handler */
+    handler(response: AG['Response'], Method: Method<AG>): Promise<void>;
+  };
+
+  /** The hook after backend request complete */
+  onComplete?: ResponseCompleteHandler<AG>;
+
+  /**
+   * The hook to handle error
+   *
+   * For example: You can show error message in this hook
+   *
+   * @param error
+   */
+  onError?: (error: any, response: AG['Response'] | null, methodInstance: Method<AG>) => any | Promise<any>;
+  /**
+   * transform backend response when the responseType is json
+   *
+   * @param response alova response
+   */
+  transformBackendResponse: (response: AG['Response']) => any;
+}

packages/alova/tsconfig.json

@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "target": "ESNext",
+    "jsx": "preserve",
+    "lib": ["DOM", "ESNext"],
+    "baseUrl": ".",
+    "module": "ESNext",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "types": ["node"],
+    "strict": true,
+    "strictNullChecks": true,
+    "noUnusedLocals": true,
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "include": ["src/**/*"],
+  "exclude": ["node_modules", "dist"]
+}

packages/axios/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/axios",
-  "version": "1.3.6",
+  "version": "1.3.8",
   "exports": {
     ".": "./src/index.ts"
   },

packages/color/package.json

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

packages/hooks/package.json

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

packages/materials/package.json

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

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

@@ -53,23 +53,10 @@ const bindProps = computed(() => {
 function handleClose() {
   emit('close');
 }
-
-function handleMouseup(e: MouseEvent) {
-  // close tab by mouse wheel button click
-  if (e.button === 1) {
-    handleClose();
-  }
-}
 </script>
 
 <template>
-  <component
-    :is="activeTabComponent.component"
-    :class="activeTabComponent.class"
-    :style="cssVars"
-    v-bind="bindProps"
-    @mouseup="handleMouseup"
-  >
+  <component :is="activeTabComponent.component" :class="activeTabComponent.class" :style="cssVars" v-bind="bindProps">
     <template #prefix>
       <slot name="prefix"></slot>
     </template>

packages/ofetch/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/fetch",
-  "version": "1.3.6",
+  "version": "1.3.8",
   "exports": {
     ".": "./src/index.ts"
   },
@@ -10,6 +10,6 @@
     }
   },
   "dependencies": {
-    "ofetch": "1.3.4"
+    "ofetch": "1.4.1"
   }
 }

packages/scripts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/scripts",
-  "version": "1.3.6",
+  "version": "1.3.8",
   "bin": {
     "sa": "./bin.ts"
   },
@@ -14,14 +14,14 @@
   },
   "devDependencies": {
     "@soybeanjs/changelog": "0.3.24",
-    "bumpp": "9.5.2",
-    "c12": "1.11.2",
+    "bumpp": "9.7.1",
+    "c12": "2.0.1",
     "cac": "6.7.14",
     "consola": "3.2.3",
     "enquirer": "2.4.1",
-    "execa": "9.4.0",
+    "execa": "9.4.1",
     "kolorist": "1.8.0",
-    "npm-check-updates": "17.1.2",
+    "npm-check-updates": "17.1.4",
     "rimraf": "6.0.1"
   }
 }

packages/uno-preset/package.json

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

packages/utils/package.json

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

src/constants/app.ts

@@ -54,3 +54,10 @@ export const themePageAnimationModeRecord: Record<UnionKey.ThemePageAnimateMode,
 };
 
 export const themePageAnimationModeOptions = transformRecordToOption(themePageAnimationModeRecord);
+
+export const resetCacheStrategyRecord: Record<UnionKey.ResetCacheStrategy, App.I18n.I18nKey> = {
+  close: 'theme.resetCacheStrategy.close',
+  refresh: 'theme.resetCacheStrategy.refresh'
+};
+
+export const resetCacheStrategyOptions = transformRecordToOption(resetCacheStrategyRecord);

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

@@ -43,7 +43,7 @@ function resetScroll() {
       @after-leave="resetScroll"
       @after-enter="appStore.setContentXScrollable(false)"
     >
-      <KeepAlive :include="routeStore.cacheRoutes">
+      <KeepAlive :include="routeStore.cacheRoutes" :exclude="routeStore.excludeCacheRoutes">
         <component
           :is="Component"
           v-if="appStore.reloadFlag"

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

@@ -8,6 +8,7 @@ import { useAppStore } from '@/store/modules/app';
 import { useThemeStore } from '@/store/modules/theme';
 import { useRouteStore } from '@/store/modules/route';
 import { useTabStore } from '@/store/modules/tab';
+import { isPC } from '@/utils/agent';
 import ContextMenu from './context-menu.vue';
 
 defineOptions({
@@ -24,6 +25,7 @@ const bsWrapper = ref<HTMLElement>();
 const { width: bsWrapperWidth, left: bsWrapperLeft } = useElementBounding(bsWrapper);
 const bsScroll = ref<InstanceType<typeof BetterScroll>>();
 const tabRef = ref<HTMLElement>();
+const isPCFlag = isPC();
 
 const TAB_DATA_ID = 'data-tab-id';
 
@@ -82,7 +84,10 @@ function getContextMenuDisabledKeys(tabId: string) {
 
 async function handleCloseTab(tab: App.Global.Tab) {
   await tabStore.removeTab(tab.id);
-  await routeStore.reCacheRoutesByKey(tab.routeKey);
+
+  if (themeStore.resetCacheStrategy === 'close') {
+    routeStore.resetRouteCache(tab.routeKey);
+  }
 }
 
 async function refresh() {
@@ -166,7 +171,7 @@ init();
 <template>
   <DarkModeContainer class="size-full flex-y-center px-16px shadow-tab">
     <div ref="bsWrapper" class="h-full flex-1-hidden">
-      <BetterScroll ref="bsScroll" :options="{ scrollX: true, scrollY: false, click: true }" @click="removeFocus">
+      <BetterScroll ref="bsScroll" :options="{ scrollX: true, scrollY: false, click: !isPCFlag }" @click="removeFocus">
         <div
           ref="tabRef"
           class="h-full flex pr-18px"

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

@@ -2,7 +2,12 @@
 import { computed } from 'vue';
 import { $t } from '@/locales';
 import { useThemeStore } from '@/store/modules/theme';
-import { themePageAnimationModeOptions, themeScrollModeOptions, themeTabModeOptions } from '@/constants/app';
+import {
+  resetCacheStrategyOptions,
+  themePageAnimationModeOptions,
+  themeScrollModeOptions,
+  themeTabModeOptions
+} from '@/constants/app';
 import { translateOptions } from '@/utils/common';
 import SettingItem from '../components/setting-item.vue';
 
@@ -22,6 +27,14 @@ const isWrapperScrollMode = computed(() => themeStore.layout.scrollMode === 'wra
 <template>
   <NDivider>{{ $t('theme.pageFunTitle') }}</NDivider>
   <TransitionGroup tag="div" name="setting-list" class="flex-col-stretch gap-12px">
+    <SettingItem key="0" :label="$t('theme.resetCacheStrategy.title')">
+      <NSelect
+        v-model:value="themeStore.resetCacheStrategy"
+        :options="translateOptions(resetCacheStrategyOptions)"
+        size="small"
+        class="w-120px"
+      />
+    </SettingItem>
     <SettingItem key="1" :label="$t('theme.scrollMode.title')">
       <NSelect
         v-model:value="themeStore.layout.scrollMode"

src/locales/langs/en-us.ts

@@ -115,7 +115,7 @@ const local: App.I18n.Schema = {
     },
     tab: {
       visible: 'Tab Visible',
-      cache: 'Tab Cache',
+      cache: 'Tag Bar Info Cache',
       height: 'Tab Height',
       mode: {
         title: 'Tab Mode',
@@ -143,6 +143,11 @@ const local: App.I18n.Schema = {
     },
     themeDrawerTitle: 'Theme Configuration',
     pageFunTitle: 'Page Function',
+    resetCacheStrategy: {
+      title: 'Reset Cache Strategy',
+      close: 'Close Page',
+      refresh: 'Refresh Page'
+    },
     configOperation: {
       copyConfig: 'Copy Config',
       copySuccessMsg: 'Copy Success, Please replace the variable "themeSettings" in "src/theme/settings.ts"',

src/locales/langs/zh-cn.ts

@@ -115,7 +115,7 @@ const local: App.I18n.Schema = {
     },
     tab: {
       visible: '显示标签栏',
-      cache: '缓存标签页',
+      cache: '标签栏信息缓存',
       height: '标签栏高度',
       mode: {
         title: '标签栏风格',
@@ -143,6 +143,11 @@ const local: App.I18n.Schema = {
     },
     themeDrawerTitle: '主题配置',
     pageFunTitle: '页面功能',
+    resetCacheStrategy: {
+      title: '重置缓存策略',
+      close: '关闭页面',
+      refresh: '刷新页面'
+    },
     configOperation: {
       copyConfig: '复制配置',
       copySuccessMsg: '复制成功，请替换 src/theme/settings.ts 中的变量 themeSettings',

src/store/modules/app/index.ts

@@ -46,6 +46,10 @@ 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/route/index.ts

@@ -1,4 +1,4 @@
-import { computed, ref, shallowRef } from 'vue';
+import { computed, nextTick, ref, shallowRef } from 'vue';
 import type { RouteRecordRaw } from 'vue-router';
 import { defineStore } from 'pinia';
 import { useBoolean } from '@sa/hooks';
@@ -10,7 +10,6 @@ import { ROOT_ROUTE } from '@/router/routes/builtin';
 import { getRouteName, getRoutePath } from '@/router/elegant/transform';
 import { fetchGetRoutes } from '@/service/api';
 import { humpToLine } from '@/utils/common';
-import { useAppStore } from '../app';
 import { useAuthStore } from '../auth';
 import { useTabStore } from '../tab';
 import {
@@ -26,7 +25,6 @@ import {
 } from './shared';
 
 export const useRouteStore = defineStore(SetupStoreId.Route, () => {
-  const appStore = useAppStore();
   const authStore = useAuthStore();
   const tabStore = useTabStore();
   const { bool: isInitConstantRoute, setBool: setIsInitConstantRoute } = useBoolean();
@@ -166,8 +164,12 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
   /** Cache routes */
   const cacheRoutes = ref<RouteKey[]>([]);
 
-  /** All cache routes */
-  const allCacheRoutes = shallowRef<RouteKey[]>([]);
+  /**
+   * Exclude cache routes
+   *
+   * for reset route cache
+   */
+  const excludeCacheRoutes = ref<RouteKey[]>([]);
 
   /**
    * Get cache routes
@@ -175,69 +177,23 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
    * @param routes Vue routes
    */
   function getCacheRoutes(routes: RouteRecordRaw[]) {
-    const alls = getCacheRouteNames(routes);
-
-    cacheRoutes.value = alls;
-    allCacheRoutes.value = [...alls];
+    cacheRoutes.value = getCacheRouteNames(routes);
   }
 
   /**
-   * Add cache routes
+   * Reset route cache
    *
+   * @default router.currentRoute.value.name current route name
    * @param routeKey
    */
-  function addCacheRoutes(routeKey: RouteKey) {
-    if (cacheRoutes.value.includes(routeKey)) return;
+  async function resetRouteCache(routeKey?: RouteKey) {
+    const routeName = routeKey || (router.currentRoute.value.name as RouteKey);
 
-    cacheRoutes.value.push(routeKey);
-  }
+    excludeCacheRoutes.value.push(routeName);
 
-  /**
-   * Remove cache routes
-   *
-   * @param routeKey
-   */
-  function removeCacheRoutes(routeKey: RouteKey) {
-    const index = cacheRoutes.value.findIndex(item => item === routeKey);
+    await nextTick();
 
-    if (index === -1) return;
-
-    cacheRoutes.value.splice(index, 1);
-  }
-
-  /**
-   * Is cached route
-   *
-   * @param routeKey
-   */
-  function isCachedRoute(routeKey: RouteKey) {
-    return allCacheRoutes.value.includes(routeKey);
-  }
-
-  /**
-   * Re cache routes by route key
-   *
-   * @param routeKey
-   */
-  async function reCacheRoutesByKey(routeKey: RouteKey) {
-    if (!isCachedRoute(routeKey)) return;
-
-    removeCacheRoutes(routeKey);
-
-    await appStore.reloadPage();
-
-    addCacheRoutes(routeKey);
-  }
-
-  /**
-   * Re cache routes by route keys
-   *
-   * @param routeKeys
-   */
-  async function reCacheRoutesByKeys(routeKeys: RouteKey[]) {
-    for await (const key of routeKeys) {
-      await reCacheRoutesByKey(key);
-    }
+    excludeCacheRoutes.value = [];
   }
 
   /** Global breadcrumbs */
@@ -415,8 +371,8 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
     searchMenus,
     updateGlobalMenusByLocale,
     cacheRoutes,
-    reCacheRoutesByKey,
-    reCacheRoutesByKeys,
+    excludeCacheRoutes,
+    resetRouteCache,
     breadcrumbs,
     initConstantRoute,
     isInitConstantRoute,

src/styles/scss/global.scss

@@ -1,2 +1,2 @@
-@import './scrollbar.scss';
-@import './custom.scss';
+@forward 'scrollbar';
+@forward 'custom';

src/theme/settings.ts

@@ -12,6 +12,7 @@ export const themeSettings: App.Theme.ThemeSetting = {
     error: '#CB2634'
   },
   isInfoFollowPrimary: true,
+  resetCacheStrategy: 'close',
   layout: {
     mode: 'vertical',
     scrollMode: 'content',
@@ -82,4 +83,10 @@ export const themeSettings: App.Theme.ThemeSetting = {
  *
  * If publish new version, use `overrideThemeSettings` to override certain theme settings
  */
-export const overrideThemeSettings: Partial<App.Theme.ThemeSetting> = {};
+export const overrideThemeSettings: Partial<App.Theme.ThemeSetting> = {
+  resetCacheStrategy: 'close',
+  watermark: {
+    visible: false,
+    text: 'SoybeanAdmin'
+  }
+};

src/typings/app.d.ts

@@ -20,6 +20,8 @@ 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 */
@@ -390,6 +392,7 @@ declare namespace App {
         };
         themeDrawerTitle: string;
         pageFunTitle: string;
+        resetCacheStrategy: { title: string } & Record<UnionKey.ResetCacheStrategy, string>;
         configOperation: {
           copyConfig: string;
           copySuccessMsg: string;

src/typings/global.d.ts

@@ -21,14 +21,6 @@ declare global {
     };
   }
 
-  interface ViewTransition {
-    ready: Promise<void>;
-  }
-
-  export interface Document {
-    startViewTransition?: (callback: () => Promise<void> | void) => ViewTransition;
-  }
-
   /** Build time of the project */
   export const BUILD_TIME: string;
 }

src/typings/union-key.d.ts

@@ -14,6 +14,14 @@ 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/utils/agent.ts

@@ -0,0 +1,7 @@
+export function isPC() {
+  const agents = ['Android', 'iPhone', 'webOS', 'BlackBerry', 'SymbianOS', 'Windows Phone', 'iPad', 'iPod'];
+
+  const isMobile = agents.some(agent => window.navigator.userAgent.includes(agent));
+
+  return !isMobile;
+}

src/views/_builtin/login/modules/code-login.vue

@@ -40,7 +40,7 @@ async function handleSubmit() {
 </script>
 
 <template>
-  <NForm ref="formRef" :model="model" :rules="rules" size="large" :show-label="false">
+  <NForm ref="formRef" :model="model" :rules="rules" size="large" :show-label="false" @keyup.enter="handleSubmit">
     <NFormItem path="phone">
       <NInput v-model:value="model.phone" :placeholder="$t('page.login.common.phonePlaceholder')" />
     </NFormItem>

src/views/_builtin/login/modules/pwd-login.vue

@@ -59,7 +59,7 @@ async function handleSubmit() {
   }
   try {
     await authStore.login(model);
-  } catch (error) {
+  } catch {
     handleFetchCaptchaCode();
   }
 }
@@ -104,7 +104,7 @@ handleLoginRember();
 </script>
 
 <template>
-  <NForm ref="formRef" :model="model" :rules="rules" size="large" :show-label="false">
+  <NForm ref="formRef" :model="model" :rules="rules" size="large" :show-label="false" @keyup.enter="handleSubmit">
     <NFormItem v-if="tenantEnabled" path="tenantId">
       <NSelect v-model:value="model.tenantId" placeholder="请选择/输入公司名称" :options="tenantOption" />
     </NFormItem>

src/views/_builtin/login/modules/register.vue

@@ -46,7 +46,7 @@ async function handleSubmit() {
 </script>
 
 <template>
-  <NForm ref="formRef" :model="model" :rules="rules" size="large" :show-label="false">
+  <NForm ref="formRef" :model="model" :rules="rules" size="large" :show-label="false" @keyup.enter="handleSubmit">
     <NFormItem path="phone">
       <NInput v-model:value="model.phone" :placeholder="$t('page.login.common.phonePlaceholder')" />
     </NFormItem>

src/views/_builtin/login/modules/reset-pwd.vue

@@ -45,7 +45,7 @@ async function handleSubmit() {
 </script>
 
 <template>
-  <NForm ref="formRef" :model="model" :rules="rules" size="large" :show-label="false">
+  <NForm ref="formRef" :model="model" :rules="rules" size="large" :show-label="false" @keyup.enter="handleSubmit">
     <NFormItem path="phone">
       <NInput v-model:value="model.phone" :placeholder="$t('page.login.common.phonePlaceholder')" />
     </NFormItem>

vite.config.ts

@@ -22,7 +22,8 @@ export default defineConfig(configEnv => {
     css: {
       preprocessorOptions: {
         scss: {
-          additionalData: `@use "./src/styles/scss/global.scss" as *;`
+          api: 'modern-compiler',
+          additionalData: `@use "@/styles/scss/global.scss" as *;`
         }
       }
     },