raise-common-lib 0.0.24 → 0.0.26

package/fesm2015/raise-common-lib.js

@@ -1300,7 +1300,7 @@ CommonFunctionService.ctorParameters = () => [];
  * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
  */
 /** @type {?} */
-const storedRoutes = {};
+const storedRoutes = new Map();
 /** @type {?} */
 let toBeDeleteUrl;
 /** @type {?} */
@@ -1319,12 +1319,21 @@ class KeepAliveService {
      * @return {?}
      */
     shouldDetach(route) {
+        /** @type {?} */
+        let 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;
+        }
+        if (config && excludeRoutes.includes(this.getRoutePath(route))) {
             return false;
         }
-        return !excludeRoutes.includes(route.routeConfig.path);
+        //Don't store lazy loaded routes
+        return config && !config.loadChildren;
     }
     /**
      * @param {?} route
@@ -1334,25 +1343,33 @@ class KeepAliveService {
     store(route, handle) {
         // console.log("store", this.getRoutePath(route));
         // console.log("store", storedRoutes);
-        storedRoutes[this.getRoutePath(route)] = handle;
+        /** @type {?} */
+        const key = this.getRoutePath(route);
+        storedRoutes.set(key, handle);
     }
     /**
      * @param {?} route
      * @return {?}
      */
     shouldAttach(route) {
-        return !!storedRoutes[this.getRoutePath(route)];
+        /** @type {?} */
+        const key = this.getRoutePath(route);
+        return !!route.routeConfig && storedRoutes.has(key);
     }
     /**
      * @param {?} route
      * @return {?}
      */
     retrieve(route) {
-        if (!route.routeConfig)
-            return null;
-        if (route.routeConfig.loadChildren)
-            return null;
-        return storedRoutes[this.getRoutePath(route)];
+        /** @type {?} */
+        let config = route.routeConfig;
+        /** @type {?} */
+        const 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
@@ -1360,6 +1377,8 @@ class KeepAliveService {
      * @return {?}
      */
     shouldReuseRoute(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判断是否复用路由
@@ -1377,6 +1396,7 @@ class KeepAliveService {
      */
     getRoutePath(route) {
         if (route.routeConfig) {
+            // const pathParams = JSON.stringify(route.params);
             /** @type {?} */
             const queryParams = new URLSearchParams(route.queryParams).toString();
             /** @type {?} */
@@ -1396,7 +1416,13 @@ class KeepAliveService {
     clearCache(path) {
         // console.log("clearCache", storedRoutes, path);
         toBeDeleteUrl = path;
-        delete storedRoutes[path]; // 清除指定路径的缓存
+        storedRoutes.delete(path);
+    }
+    /**
+     * @return {?}
+     */
+    clearAllCache() {
+        storedRoutes.clear();
     }
 }
 KeepAliveService.decorators = [
@@ -1449,6 +1475,16 @@ class MultiTabComponent {
      */
     ngOnInit() {
         this.initTab();
+        // 解决刷新页面后，选中的 tab 丢失问题
+        /** @type {?} */
+        const isExistIdx = this.tabList.findIndex((/**
+         * @param {?} ele
+         * @return {?}
+         */
+        (ele) => ele.url === this.router.url));
+        if (isExistIdx !== -1) {
+            this.selectedTab = isExistIdx;
+        }
         this.router.events
             .pipe(filter((/**
          * @param {?} event
@@ -1466,8 +1502,11 @@ class MultiTabComponent {
                 const state = navigation.extras.state;
                 // 获取传递的 state
                 /** @type {?} */
+                const skipLocationChange = navigation.extras.skipLocationChange;
+                // 获取是否跳过 location change
+                /** @type {?} */
                 const currentRoute = this.router.routerState.root.firstChild;
-                if (currentRoute) {
+                if (currentRoute && !skipLocationChange) {
                     this.setTab(this.router.url, currentRoute.snapshot.routeConfig.path, state && state.title);
                 }
             }
@@ -1598,8 +1637,8 @@ class MultiTabComponent {
     }
     /**
      * @param {?} url
-     * @param {?} pureUrl
-     * @param {?} title
+     * @param {?=} pureUrl
+     * @param {?=} title
      * @return {?}
      */
     setTab(url, pureUrl, title) {
@@ -1731,11 +1770,13 @@ class RSHeaderComponent {
     set langOptions(options) {
         this._langOptions = options;
         if (options && options.length > 0) {
+            /** @type {?} */
+            const languageCode = localStorage.getItem("language");
             this.currentLang = options.find((/**
              * @param {?} e
              * @return {?}
              */
-            (e) => e.defaultLang));
+            (e) => e.languageCode === languageCode));
         }
     }
     /**