Merge pull request #13 from vbenjs/feature/bug-fix-0704

fix: fix the preference problem，close #8, close #9

Author: anncwb

apps/web-antd/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@vben/antd-view",
+  "name": "@vben/web-antd",
   "version": "5.0.0",
   "homepage": "https://github.com/vbenjs/vue-vben-admin",
   "bugs": "https://github.com/vbenjs/vue-vben-admin/issues",

internal/tailwind-config/package.json

@@ -45,7 +45,7 @@
     "tailwindcss": "^3.4.3"
   },
   "dependencies": {
-    "@iconify/json": "^2.2.224",
+    "@iconify/json": "^2.2.225",
     "@iconify/tailwind": "^1.1.1",
     "@tailwindcss/forms": "^0.5.7",
     "@tailwindcss/nesting": "0.0.0-insiders.565cd3e",

package.json

@@ -74,7 +74,7 @@
     "unbuild": "^2.0.0",
     "vite": "^5.3.3",
     "vitest": "^2.0.0-beta.12",
-    "vue-tsc": "^2.0.24"
+    "vue-tsc": "^2.0.26"
   },
   "engines": {
     "node": ">=20",

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

@@ -107,29 +107,6 @@ class PreferenceManager {
       return;
     }
 
-    // const debounceWaterState = useDebounceFn(() => {
-    //   const newFlattenedState = flattenObject(this.state);
-    //   for (const k in newFlattenedState) {
-    //     const key = k as FlattenObjectKeys<Preferences>;
-    //     this.flattenedState[key] = newFlattenedState[key];
-    //   }
-    //   this.savePreferences(this.state);
-    // }, 16);
-
-    // const debounceWaterFlattenedState = useDebounceFn(
-    //   (val: Flatten<Preferences>) => {
-    //     this.updateState(val);
-    //     this.savePreferences(this.state);
-    //   },
-    //   16,
-    // );
-
-    // 监听 state 的变化
-    // watch(this.state, debounceWaterState, { deep: true });
-
-    // 监听 flattenedState 的变化并触发 set 方法
-    // watch(this.flattenedState, debounceWaterFlattenedState, { deep: true });
-
     // 监听断点，判断是否移动端
     const breakpoints = useBreakpoints(breakpointsTailwind);
     const isMobile = breakpoints.smaller('md');
@@ -210,16 +187,6 @@ class PreferenceManager {
     updateCSSVariables(colorVariables);
   }
 
-  /**
-   *  更新状态
-   * 将新的扁平对象转换为嵌套对象，并与当前状态合并。
-   * @param {FlattenObject<Preferences>} newValue - 新的扁平对象
-   */
-  // private updateState(newValue: Flatten<Preferences>) {
-  //   const nestObj = nestedObject(newValue, 2);
-  //   Object.assign(this.state, merge(nestObj, this.state));
-  // }
-
   /**
    * 更新主题
    * @param preferences - 当前偏好设置对象，它的主题值将被用来设置文档的主题。
@@ -278,9 +245,11 @@ class PreferenceManager {
     }
   }
 
-  // public getFlatPreferences() {
-  //   return this.flattenedState;
-  // }
+  clearCache() {
+    [STORAGE_KEY, STORAGE_KEY_LOCALE, STORAGE_KEY_THEME].forEach((key) => {
+      this.cache?.removeItem(key);
+    });
+  }
 
   public getInitialPreferences() {
     return this.initialPreferences;
@@ -308,8 +277,8 @@ class PreferenceManager {
     // 加载并合并当前存储的偏好设置
     const mergedPreference = merge(
       {},
-      this.loadCachedPreferences(),
-      this.initialPreferences,
+      overrides,
+      this.loadCachedPreferences() || defaultPreferences,
     );
 
     // 更新偏好设置
@@ -352,8 +321,6 @@ class PreferenceManager {
 
     Object.assign(this.state, mergedState);
 
-    // Object.assign(this.flattenedState, flattenObject(this.state));
-
     // 根据更新的键值执行相应的操作
     this.handleUpdates(updates);
     this.savePreferences(this.state);

packages/@core/forward/request/src/request-client/modules/canceler.test.ts

@@ -12,7 +12,6 @@ import { merge } from '@vben-core/toolkit';
 
 import axios from 'axios';
 
-import { AxiosCanceler } from './modules/canceler';
 import { FileDownloader } from './modules/downloader';
 import { InterceptorManager } from './modules/interceptor';
 import { FileUploader } from './modules/uploader';
@@ -97,8 +96,6 @@ class RequestClient {
   private setupInterceptors() {
     // 默认拦截器
     this.setupAuthorizationInterceptor();
-    // 设置取消请求的拦截器
-    this.setupCancelerInterceptor();
   }
 
   /**
@@ -168,28 +165,6 @@ class RequestClient {
       throw error.response ? error.response.data : error;
     }
   }
-
-  public setupCancelerInterceptor() {
-    const axiosCanceler = new AxiosCanceler();
-    // 注册取消重复请求的请求拦截器
-    this.addRequestInterceptor((config: InternalAxiosRequestConfig) => {
-      return axiosCanceler.addRequest(config);
-    }, this.errorHandler);
-
-    // 注册移除请求的响应拦截器
-    this.addResponseInterceptor(
-      (response: AxiosResponse) => {
-        axiosCanceler.removeRequest(response);
-        return response;
-      },
-      (error) => {
-        if (error.config) {
-          axiosCanceler.removeRequest(error.config);
-        }
-        return Promise.reject(error);
-      },
-    );
-  }
 }
 
 export { RequestClient };

packages/@core/forward/request/src/request-client/modules/canceler.ts

@@ -22,7 +22,7 @@ describe('useAccessStore', () => {
     expect(store.userInfo).toBeNull();
     expect(store.userRoles).toEqual([]);
 
-    const userInfo: any = { name: 'John Doe', roles: [{ value: 'admin' }] };
+    const userInfo: any = { name: 'John Doe', roles: ['admin'] };
     store.setUserInfo(userInfo);
 
     expect(store.userInfo).toEqual(userInfo);

packages/@core/forward/request/src/request-client/request-client.ts

@@ -49,7 +49,7 @@
     "@vben-core/typings": "workspace:*",
     "@vueuse/core": "^10.11.0",
     "class-variance-authority": "^0.7.0",
-    "radix-vue": "^1.8.5",
+    "radix-vue": "^1.9.0",
     "vue": "^3.4.31",
     "vue-sonner": "^1.1.3"
   }

packages/@core/forward/stores/src/modules/access.test.ts

@@ -16,7 +16,7 @@ interface Props {
 }
 
 const props = withDefaults(defineProps<Props>(), {
-  showHome: true,
+  showHome: false,
   showIcon: false,
   type: 'normal',
 });