raise-common-lib 0.0.24 → 0.0.25

package/bundles/raise-common-lib.umd.js

@@ -1734,7 +1734,7 @@
      * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
      */
     /** @type {?} */
-    var storedRoutes = {};
+    var storedRoutes = new Map();
     /** @type {?} */
     var toBeDeleteUrl;
     /** @type {?} */
@@ -1763,12 +1763,21 @@
          * @return {?}
          */
         function (route) {
+            /** @type {?} */
+            var config = route.routeConfig;
+            // console.log("shouldDetach", toBeDeleteUrl, this.getRoutePath(route));
             if (toBeDeleteUrl === this.getRoutePath(route)) {
                 // 对于新开的又即将关闭的tab，不缓存
-                toBeDeleteUrl = "";
+                if (route.children.length === 0) {
+                    toBeDeleteUrl = "";
+                }
                 return false;
             }
-            return !excludeRoutes.includes(route.routeConfig.path);
+            if (config && excludeRoutes.includes(this.getRoutePath(route))) {
+                return false;
+            }
+            //Don't store lazy loaded routes
+            return config && !config.loadChildren;
         };
         /**
          * @param {?} route
@@ -1783,7 +1792,9 @@
         function (route, handle) {
             // console.log("store", this.getRoutePath(route));
             // console.log("store", storedRoutes);
-            storedRoutes[this.getRoutePath(route)] = handle;
+            /** @type {?} */
+            var key = this.getRoutePath(route);
+            storedRoutes.set(key, handle);
         };
         /**
          * @param {?} route
@@ -1794,7 +1805,9 @@
          * @return {?}
          */
         function (route) {
-            return !!storedRoutes[this.getRoutePath(route)];
+            /** @type {?} */
+            var key = this.getRoutePath(route);
+            return !!route.routeConfig && storedRoutes.has(key);
         };
         /**
          * @param {?} route
@@ -1805,11 +1818,15 @@
          * @return {?}
          */
         function (route) {
-            if (!route.routeConfig)
-                return null;
-            if (route.routeConfig.loadChildren)
-                return null;
-            return storedRoutes[this.getRoutePath(route)];
+            /** @type {?} */
+            var config = route.routeConfig;
+            /** @type {?} */
+            var key = this.getRoutePath(route);
+            //We don't store lazy loaded routes, so don't even bother trying to retrieve them
+            if (!config || config.loadChildren) {
+                return false;
+            }
+            return storedRoutes.get(key) || null;
         };
         /**
          * @param {?} future
@@ -1822,6 +1839,8 @@
          * @return {?}
          */
         function (future, curr) {
+            // console.log("shouldReuseRoute", future, curr);
+            // return future.routeConfig === curr.routeConfig;
             if (future.routeConfig === curr.routeConfig) {
                 if (future.children.length === 0 && curr.children.length === 0) {
                     // 无子路由时, 通过params和queryParams判断是否复用路由
@@ -1843,6 +1862,7 @@
          */
         function (route) {
             if (route.routeConfig) {
+                // const pathParams = JSON.stringify(route.params);
                 /** @type {?} */
                 var queryParams = new URLSearchParams(route.queryParams).toString();
                 /** @type {?} */
@@ -1866,7 +1886,16 @@
         function (path) {
             // console.log("clearCache", storedRoutes, path);
             toBeDeleteUrl = path;
-            delete storedRoutes[path]; // 清除指定路径的缓存
+            storedRoutes.delete(path);
+        };
+        /**
+         * @return {?}
+         */
+        KeepAliveService.prototype.clearAllCache = /**
+         * @return {?}
+         */
+        function () {
+            storedRoutes.clear();
         };
         KeepAliveService.decorators = [
             { type: core.Injectable, args: [{
@@ -1940,8 +1969,11 @@
                     var state = navigation.extras.state;
                     // 获取传递的 state
                     /** @type {?} */
+                    var skipLocationChange = navigation.extras.skipLocationChange;
+                    // 获取是否跳过 location change
+                    /** @type {?} */
                     var currentRoute = _this.router.routerState.root.firstChild;
-                    if (currentRoute) {
+                    if (currentRoute && !skipLocationChange) {
                         _this.setTab(_this.router.url, currentRoute.snapshot.routeConfig.path, state && state.title);
                     }
                 }