feat: And surface switching loading optimization

Author: anncwb

apps/web-antd/src/router/guard.ts

@@ -22,17 +22,21 @@ function setupCommonGuard(router: Router) {
   const loadedPaths = new Set<string>();
 
   router.beforeEach(async (to) => {
+    to.meta.loaded = loadedPaths.has(to.path);
+
     // 页面加载进度条
-    if (preferences.transition.progress) {
+    if (!to.meta.loaded && preferences.transition.progress) {
       startProgress();
     }
-    to.meta.loaded = loadedPaths.has(to.path);
     return true;
   });
 
   router.afterEach((to) => {
     // 记录页面是否加载,如果已经加载，后续的页面切换动画等效果不在重复执行
-    loadedPaths.add(to.path);
+
+    if (preferences.tabbar.enable) {
+      loadedPaths.add(to.path);
+    }
 
     // 关闭页面加载进度条
     if (preferences.transition.progress) {

apps/web-antd/src/views/dashboard/index.vue

@@ -3,7 +3,7 @@
 
 // import { echartsInstance as echarts } from '@vben/chart-ui';
 
-defineOptions({ name: 'WelCome' });
+defineOptions({ name: 'Welcome' });
 
 // const cardList = ref([
 //   {
@@ -247,5 +247,4 @@ defineOptions({ name: 'WelCome' });
 
 <template>
   <div>dashboard</div>
-  <!-- <Dashboard :card-list="cardList" :chart-tabs="chartTabs" /> -->
 </template>

cspell.json

@@ -3,7 +3,9 @@
   "language": "en,en-US",
   "allowCompoundWords": true,
   "words": [
+    "clsx",
     "esno",
+    "taze",
     "acmr",
     "antd",
     "brotli",

internal/lint-configs/eslint-config/package.json

@@ -38,7 +38,7 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-i": "^2.29.1",
-    "eslint-plugin-jsdoc": "^48.4.0",
+    "eslint-plugin-jsdoc": "^48.5.0",
     "eslint-plugin-jsonc": "^2.16.0",
     "eslint-plugin-n": "^17.9.0",
     "eslint-plugin-no-only-tests": "^3.1.0",

internal/tailwind-config/src/index.ts

@@ -105,11 +105,11 @@ export default {
           DEFAULT: 'hsl(var(--card))',
           foreground: 'hsl(var(--card-foreground))',
         },
-
         destructive: {
           ...createColorsPattern('destructive'),
           DEFAULT: 'hsl(var(--destructive))',
         },
+
         foreground: 'hsl(var(--foreground))',
         green: {
           ...createColorsPattern('green'),
@@ -146,7 +146,6 @@ export default {
           desc: 'hsl(var(--secondary-desc))',
           foreground: 'hsl(var(--secondary-foreground))',
         },
-
         success: {
           ...createColorsPattern('success'),
           DEFAULT: 'hsl(var(--success))',

internal/vite-config/package.json

@@ -46,7 +46,7 @@
     "rollup": "^4.18.0",
     "rollup-plugin-visualizer": "^5.12.0",
     "sass": "^1.77.6",
-    "unplugin-turbo-console": "^1.8.7",
+    "unplugin-turbo-console": "^1.8.8-beta.1",
     "vite": "^5.3.1",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-dts": "^3.9.1",

internal/vite-config/src/plugins/inject-app-loading/loading.html

@@ -34,7 +34,7 @@
 
   .title {
     margin-top: 66px;
-    font-size: 30px;
+    font-size: 28px;
     font-weight: 600;
     color: rgb(0 0 0 / 85%);
   }
@@ -56,7 +56,7 @@
     width: 48px;
     height: 5px;
     content: '';
-    background: #0065cc50;
+    background: hsl(var(--primary) / 50%);
     border-radius: 50%;
     animation: shadow-ani 0.5s linear infinite;
   }
@@ -68,7 +68,7 @@
     width: 100%;
     height: 100%;
     content: '';
-    background: #0065cc;
+    background: hsl(var(--primary));
     border-radius: 4px;
     animation: jump-ani 0.5s linear infinite;
   }

package.json

@@ -68,7 +68,7 @@
     "is-ci": "^3.0.1",
     "jsdom": "^24.1.0",
     "rimraf": "^5.0.7",
-    "taze": "^0.13.8",
+    "taze": "^0.13.9",
     "turbo": "^2.0.5",
     "typescript": "^5.5.2",
     "unbuild": "^2.0.0",

packages/@core/forward/preferences/src/config.ts

@@ -76,6 +76,7 @@ const defaultPreferences: Preferences = {
   },
   transition: {
     enable: true,
+    loading: true,
     name: 'fade-slide',
     progress: true,
   },

packages/@core/forward/preferences/src/preferences.ts

@@ -341,9 +341,9 @@ class PreferenceManager {
     // 保存重置后的偏好设置
     this.savePreferences(this.state);
     // 从存储中移除偏好设置项
-    this.cache?.removeItem(STORAGE_KEY);
-    this.cache?.removeItem(STORAGE_KEY_THEME);
-    this.cache?.removeItem(STORAGE_KEY_LOCALE);
+    [STORAGE_KEY, STORAGE_KEY_THEME, STORAGE_KEY_LOCALE].forEach((key) => {
+      this.cache?.removeItem(key);
+    });
   }
 
   /**