raise-common-lib 0.0.24 → 0.0.26

package/fesm5/raise-common-lib.js

@@ -1536,7 +1536,7 @@ var CommonFunctionService = /** @class */ (function () {
  * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
  */
 /** @type {?} */
-var storedRoutes = {};
+var storedRoutes = new Map();
 /** @type {?} */
 var toBeDeleteUrl;
 /** @type {?} */
@@ -1565,12 +1565,21 @@ var KeepAliveService = /** @class */ (function () {
      * @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;
+        }
+        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
@@ -1585,7 +1594,9 @@ var KeepAliveService = /** @class */ (function () {
     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
@@ -1596,7 +1607,9 @@ var KeepAliveService = /** @class */ (function () {
      * @return {?}
      */
     function (route) {
-        return !!storedRoutes[this.getRoutePath(route)];
+        /** @type {?} */
+        var key = this.getRoutePath(route);
+        return !!route.routeConfig && storedRoutes.has(key);
     };
     /**
      * @param {?} route
@@ -1607,11 +1620,15 @@ var KeepAliveService = /** @class */ (function () {
      * @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
@@ -1624,6 +1641,8 @@ var KeepAliveService = /** @class */ (function () {
      * @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判断是否复用路由
@@ -1645,6 +1664,7 @@ var KeepAliveService = /** @class */ (function () {
      */
     function (route) {
         if (route.routeConfig) {
+            // const pathParams = JSON.stringify(route.params);
             /** @type {?} */
             var queryParams = new URLSearchParams(route.queryParams).toString();
             /** @type {?} */
@@ -1668,7 +1688,16 @@ var KeepAliveService = /** @class */ (function () {
     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: Injectable, args: [{
@@ -1725,6 +1754,16 @@ var MultiTabComponent = /** @class */ (function () {
     function () {
         var _this = this;
         this.initTab();
+        // 解决刷新页面后，选中的 tab 丢失问题
+        /** @type {?} */
+        var isExistIdx = this.tabList.findIndex((/**
+         * @param {?} ele
+         * @return {?}
+         */
+        function (ele) { return ele.url === _this.router.url; }));
+        if (isExistIdx !== -1) {
+            this.selectedTab = isExistIdx;
+        }
         this.router.events
             .pipe(filter((/**
          * @param {?} event
@@ -1742,8 +1781,11 @@ var MultiTabComponent = /** @class */ (function () {
                 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);
                 }
             }
@@ -1900,14 +1942,14 @@ var MultiTabComponent = /** @class */ (function () {
     };
     /**
      * @param {?} url
-     * @param {?} pureUrl
-     * @param {?} title
+     * @param {?=} pureUrl
+     * @param {?=} title
      * @return {?}
      */
     MultiTabComponent.prototype.setTab = /**
      * @param {?} url
-     * @param {?} pureUrl
-     * @param {?} title
+     * @param {?=} pureUrl
+     * @param {?=} title
      * @return {?}
      */
     function (url, pureUrl, title) {
@@ -2056,11 +2098,13 @@ var RSHeaderComponent = /** @class */ (function () {
         function (options) {
             this._langOptions = options;
             if (options && options.length > 0) {
+                /** @type {?} */
+                var languageCode_1 = localStorage.getItem("language");
                 this.currentLang = options.find((/**
                  * @param {?} e
                  * @return {?}
                  */
-                function (e) { return e.defaultLang; }));
+                function (e) { return e.languageCode === languageCode_1; }));
             }
         },
         enumerable: true,