@solar-angular/router 19.3.1 → 19.3.3

package/fesm2022/solar-angular-router.mjs

@@ -1,51 +1,79 @@
 class BaseRouteReuse {
     constructor() {
-        this.handlers = new WeakMap();
+        this.handlers = new Map();
     }
     /**
      * 是否缓存离开的路由组件
-     * @param route
-     * @returns
      */
     shouldDetach(route) {
         return route.data['reuse'];
     }
     /**
      * 当路由离开时将该组件存入缓存
-     * @param route
-     * @param handle
      */
     store(route, handle) {
         if (route.routeConfig) {
-            this.handlers.set(route.routeConfig, handle);
+            this.handlers.set(route.routeConfig, { handle, snapshot: route });
         }
     }
     /**
      * 是否使用缓存的路由组件
-     * @param route
-     * @returns
      */
     shouldAttach(route) {
-        return route.routeConfig ? this.handlers.has(route.routeConfig) : false;
+        const config = route.routeConfig;
+        if (!config || !this.handlers.has(config)) {
+            return false;
+        }
+        const cached = this.handlers.get(config);
+        // 修改: 只有当 params、queryParams 和 data 完全一致时才允许还原缓存
+        return isRouteEqual(route, cached.snapshot);
     }
     /**
      * 获取缓存的组件
-     * @param route
-     * @returns
      */
     retrieve(route) {
-        return route.routeConfig ? this.handlers.get(route.routeConfig) ?? null : null;
+        if (!route.routeConfig)
+            return null;
+        const cached = this.handlers.get(route.routeConfig);
+        return cached ? cached.handle : null;
     }
     /**
      * 判断是否复用当前路由
      * 当导航到相同的路由时，复用当前路由
-     * @param future
-     * @param curr
-     * @returns
+     * 但如果 params、queryParams 或 data 发生变化，则不复用
      */
     shouldReuseRoute(future, curr) {
-        return future.routeConfig === curr.routeConfig;
+        // 修改: 使用增强的对比逻辑
+        return isRouteEqual(future, curr);
+    }
+}
+function isRouteEqual(future, curr) {
+    if (future.routeConfig !== curr.routeConfig) {
+        return false;
+    }
+    if (!compareObjects(future.params, curr.params)) {
+        return false;
+    }
+    if (!compareObjects(future.queryParams, curr.queryParams)) {
+        return false;
+    }
+    // if (!compareObjects(future.data, curr.data)) {
+    //   return false;
+    // }
+    return true;
+}
+function compareObjects(obj1, obj2) {
+    const keys1 = Object.keys(obj1);
+    const keys2 = Object.keys(obj2);
+    if (keys1.length !== keys2.length) {
+        return false;
+    }
+    for (const key of keys1) {
+        if (obj1[key] !== obj2[key]) {
+            return false;
+        }
     }
+    return true;
 }
 
 /**

package/fesm2022/solar-angular-router.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"solar-angular-router.mjs","sources":["../../../packages/router/src/route-reuse-strategy.ts","../../../packages/router/src/solar-angular-router.ts"],"sourcesContent":["import { ActivatedRouteSnapshot, DetachedRouteHandle, Route, RouteReuseStrategy } from '@angular/router';\n\nexport class BaseRouteReuse implements RouteReuseStrategy {\n  private handlers = new WeakMap<Route, DetachedRouteHandle>();\n\n  /**\n   * 是否缓存离开的路由组件\n   * @param route\n   * @returns\n   */\n  shouldDetach(route: ActivatedRouteSnapshot): boolean {\n    return route.data['reuse'];\n  }\n\n  /**\n   * 当路由离开时将该组件存入缓存\n   * @param route\n   * @param handle\n   */\n  store(route: ActivatedRouteSnapshot, handle: DetachedRouteHandle): void {\n    if (route.routeConfig) {\n      this.handlers.set(route.routeConfig, handle);\n    }\n  }\n\n  /**\n   * 是否使用缓存的路由组件\n   * @param route\n   * @returns\n   */\n  shouldAttach(route: ActivatedRouteSnapshot): boolean {\n    return route.routeConfig ? this.handlers.has(route.routeConfig) : false;\n  }\n\n  /**\n   * 获取缓存的组件\n   * @param route\n   * @returns\n   */\n  retrieve(route: ActivatedRouteSnapshot): DetachedRouteHandle | null {\n    return route.routeConfig ? this.handlers.get(route.routeConfig) ?? null : null;\n  }\n\n  /**\n   * 判断是否复用当前路由\n   * 当导航到相同的路由时，复用当前路由\n   * @param future\n   * @param curr\n   * @returns\n   */\n  shouldReuseRoute(future: ActivatedRouteSnapshot, curr: ActivatedRouteSnapshot): boolean {\n    return future.routeConfig === curr.routeConfig;\n  }\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":"MAEa,cAAc,CAAA;AAA3B,IAAA,WAAA,GAAA;AACU,QAAA,IAAA,CAAA,QAAQ,GAAG,IAAI,OAAO,EAA8B;;AAE5D;;;;AAIG;AACH,IAAA,YAAY,CAAC,KAA6B,EAAA;AACxC,QAAA,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;;AAG5B;;;;AAIG;IACH,KAAK,CAAC,KAA6B,EAAE,MAA2B,EAAA;AAC9D,QAAA,IAAI,KAAK,CAAC,WAAW,EAAE;YACrB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,MAAM,CAAC;;;AAIhD;;;;AAIG;AACH,IAAA,YAAY,CAAC,KAA6B,EAAA;QACxC,OAAO,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,KAAK;;AAGzE;;;;AAIG;AACH,IAAA,QAAQ,CAAC,KAA6B,EAAA;QACpC,OAAO,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,IAAI,GAAG,IAAI;;AAGhF;;;;;;AAMG;IACH,gBAAgB,CAAC,MAA8B,EAAE,IAA4B,EAAA;AAC3E,QAAA,OAAO,MAAM,CAAC,WAAW,KAAK,IAAI,CAAC,WAAW;;AAEjD;;ACrDD;;AAEG;;;;"}
+{"version":3,"file":"solar-angular-router.mjs","sources":["../../../packages/router/src/route-reuse-strategy.ts","../../../packages/router/src/solar-angular-router.ts"],"sourcesContent":["import { ActivatedRouteSnapshot, DetachedRouteHandle, Route, RouteReuseStrategy } from '@angular/router';\n\nexport class BaseRouteReuse implements RouteReuseStrategy {\n  private handlers = new Map<Route, { handle: DetachedRouteHandle; snapshot: ActivatedRouteSnapshot }>();\n\n  /**\n   * 是否缓存离开的路由组件\n   */\n  shouldDetach(route: ActivatedRouteSnapshot): boolean {\n    return route.data['reuse'];\n  }\n\n  /**\n   * 当路由离开时将该组件存入缓存\n   */\n  store(route: ActivatedRouteSnapshot, handle: DetachedRouteHandle): void {\n    if (route.routeConfig) {\n      this.handlers.set(route.routeConfig, { handle, snapshot: route });\n    }\n  }\n\n  /**\n   * 是否使用缓存的路由组件\n   */\n  shouldAttach(route: ActivatedRouteSnapshot): boolean {\n    const config = route.routeConfig;\n    if (!config || !this.handlers.has(config)) {\n      return false;\n    }\n\n    const cached = this.handlers.get(config)!;\n    // 修改: 只有当 params、queryParams 和 data 完全一致时才允许还原缓存\n    return isRouteEqual(route, cached.snapshot);\n  }\n\n  /**\n   * 获取缓存的组件\n   */\n  retrieve(route: ActivatedRouteSnapshot): DetachedRouteHandle | null {\n    if (!route.routeConfig) return null;\n    const cached = this.handlers.get(route.routeConfig);\n    return cached ? cached.handle : null;\n  }\n\n  /**\n   * 判断是否复用当前路由\n   * 当导航到相同的路由时，复用当前路由\n   * 但如果 params、queryParams 或 data 发生变化，则不复用\n   */\n  shouldReuseRoute(future: ActivatedRouteSnapshot, curr: ActivatedRouteSnapshot): boolean {\n    // 修改: 使用增强的对比逻辑\n    return isRouteEqual(future, curr);\n  }\n\n}\n\nfunction isRouteEqual(future: ActivatedRouteSnapshot, curr: ActivatedRouteSnapshot): boolean {\n  if (future.routeConfig !== curr.routeConfig) {\n    return false;\n  }\n\n  if (!compareObjects(future.params, curr.params)) {\n    return false;\n  }\n\n  if (!compareObjects(future.queryParams, curr.queryParams)) {\n    return false;\n  }\n\n  // if (!compareObjects(future.data, curr.data)) {\n  //   return false;\n  // }\n\n  return true;\n}\n\nfunction compareObjects(obj1: any, obj2: any): boolean {\n  const keys1 = Object.keys(obj1);\n  const keys2 = Object.keys(obj2);\n\n  if (keys1.length !== keys2.length) {\n    return false;\n  }\n\n  for (const key of keys1) {\n    if (obj1[key] !== obj2[key]) {\n      return false;\n    }\n  }\n  return true;\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":"MAEa,cAAc,CAAA;AAA3B,IAAA,WAAA,GAAA;AACU,QAAA,IAAA,CAAA,QAAQ,GAAG,IAAI,GAAG,EAA4E;;AAEtG;;AAEG;AACH,IAAA,YAAY,CAAC,KAA6B,EAAA;AACxC,QAAA,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;;AAG5B;;AAEG;IACH,KAAK,CAAC,KAA6B,EAAE,MAA2B,EAAA;AAC9D,QAAA,IAAI,KAAK,CAAC,WAAW,EAAE;AACrB,YAAA,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;;AAIrE;;AAEG;AACH,IAAA,YAAY,CAAC,KAA6B,EAAA;AACxC,QAAA,MAAM,MAAM,GAAG,KAAK,CAAC,WAAW;AAChC,QAAA,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;AACzC,YAAA,OAAO,KAAK;;QAGd,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAE;;QAEzC,OAAO,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC;;AAG7C;;AAEG;AACH,IAAA,QAAQ,CAAC,KAA6B,EAAA;QACpC,IAAI,CAAC,KAAK,CAAC,WAAW;AAAE,YAAA,OAAO,IAAI;AACnC,QAAA,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC;QACnD,OAAO,MAAM,GAAG,MAAM,CAAC,MAAM,GAAG,IAAI;;AAGtC;;;;AAIG;IACH,gBAAgB,CAAC,MAA8B,EAAE,IAA4B,EAAA;;AAE3E,QAAA,OAAO,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC;;AAGpC;AAED,SAAS,YAAY,CAAC,MAA8B,EAAE,IAA4B,EAAA;IAChF,IAAI,MAAM,CAAC,WAAW,KAAK,IAAI,CAAC,WAAW,EAAE;AAC3C,QAAA,OAAO,KAAK;;AAGd,IAAA,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE;AAC/C,QAAA,OAAO,KAAK;;AAGd,IAAA,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,EAAE;AACzD,QAAA,OAAO,KAAK;;;;;AAOd,IAAA,OAAO,IAAI;AACb;AAEA,SAAS,cAAc,CAAC,IAAS,EAAE,IAAS,EAAA;IAC1C,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;IAC/B,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;IAE/B,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,EAAE;AACjC,QAAA,OAAO,KAAK;;AAGd,IAAA,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;QACvB,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE;AAC3B,YAAA,OAAO,KAAK;;;AAGhB,IAAA,OAAO,IAAI;AACb;;AC1FA;;AAEG;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solar-angular/router",
-  "version": "19.3.1",
+  "version": "19.3.3",
   "sideEffects": false,
   "publishConfig": {
     "access": "public"

package/route-reuse-strategy.d.ts

@@ -3,34 +3,24 @@ export declare class BaseRouteReuse implements RouteReuseStrategy {
     private handlers;
     /**
      * 是否缓存离开的路由组件
-     * @param route
-     * @returns
      */
     shouldDetach(route: ActivatedRouteSnapshot): boolean;
     /**
      * 当路由离开时将该组件存入缓存
-     * @param route
-     * @param handle
      */
     store(route: ActivatedRouteSnapshot, handle: DetachedRouteHandle): void;
     /**
      * 是否使用缓存的路由组件
-     * @param route
-     * @returns
      */
     shouldAttach(route: ActivatedRouteSnapshot): boolean;
     /**
      * 获取缓存的组件
-     * @param route
-     * @returns
      */
     retrieve(route: ActivatedRouteSnapshot): DetachedRouteHandle | null;
     /**
      * 判断是否复用当前路由
      * 当导航到相同的路由时，复用当前路由
-     * @param future
-     * @param curr
-     * @returns
+     * 但如果 params、queryParams 或 data 发生变化，则不复用
      */
     shouldReuseRoute(future: ActivatedRouteSnapshot, curr: ActivatedRouteSnapshot): boolean;
 }