raise-common-lib 0.0.174 → 0.0.176

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

@@ -3382,6 +3382,42 @@
             if (isExistIdx !== -1) {
                 this.selectedTab = isExistIdx;
             }
+            this.subscriptions.push(this.router.events
+                .pipe(operators.filter((/**
+             * @param {?} event
+             * @return {?}
+             */
+            function (event) { return event instanceof router.NavigationStart; })))
+                .subscribe((/**
+             * @param {?} event
+             * @return {?}
+             */
+            function (event) {
+                /** @type {?} */
+                var navigation = _this.router.getCurrentNavigation();
+                if (navigation) {
+                    /** @type {?} */
+                    var state = navigation.extras.state;
+                    // 获取传递的 state
+                    /** @type {?} */
+                    var noReused = (state && state["noReused"]) || false;
+                    // 当前tab不复用，新开一个tab,当有已经存在的tab时候也是新开
+                    /** @type {?} */
+                    var isExistIdx_1 = _this.tabList.findIndex((/**
+                     * @param {?} ele
+                     * @return {?}
+                     */
+                    function (ele) {
+                        return _this.urlWithoutQuery(ele.url) ===
+                            _this.urlWithoutQuery(event.url);
+                    }));
+                    if (isExistIdx_1 !== -1 &&
+                        (noReused || _this.tabList[isExistIdx_1].url !== event.url)) {
+                        // 如果当前tab已经存在，并且是新开的tab
+                        _this.closeTab(isExistIdx_1, true); // 关闭当前tab
+                    }
+                }
+            })));
             this.subscriptions.push(this.router.events
                 .pipe(operators.filter((/**
              * @param {?} event
@@ -3389,9 +3425,10 @@
              */
             function (event) { return event instanceof router.NavigationEnd; })))
                 .subscribe((/**
+             * @param {?} event
              * @return {?}
              */
-            function () {
+            function (event) {
                 /** @type {?} */
                 var navigation = _this.router.getCurrentNavigation();
                 if (navigation) {
@@ -3422,13 +3459,11 @@
                         navigationInfo.title ||
                         navigationInfo.subTitle ||
                         navigationInfo.name;
-                    /** @type {?} */
-                    var noReused = (state && state["noReused"]) || false;
                     if (currentRoute && !skipLocationChange) {
                         if (_this.noGenerateTabUrls.includes(_this.urlWithoutQuery(_this.router.url))) {
                             return; // 排除不生成tab的url
                         }
-                        _this.setTab(_this.router.url, currentRoute.snapshot.routeConfig.path, title, noReused);
+                        _this.setTab(_this.router.url, currentRoute.snapshot.routeConfig.path, title);
                     }
                 }
             })));
@@ -3670,17 +3705,15 @@
          * @param {?} url
          * @param {?} pureUrl
          * @param {?} title
-         * @param {?} noReused
          * @return {?}
          */
         MultiTabComponent.prototype.setTab = /**
          * @param {?} url
          * @param {?} pureUrl
          * @param {?} title
-         * @param {?} noReused
          * @return {?}
          */
-        function (url, pureUrl, title, noReused) {
+        function (url, pureUrl, title) {
             var _this = this;
             /** @type {?} */
             var isExistIdx = this.tabList.findIndex((/**
@@ -3707,21 +3740,7 @@
                 this.addTab(url, title);
             }
             else {
-                /** @type {?} */
-                var targetTabUrl = this.tabList[isExistIdx].url;
-                if (targetTabUrl !== url || noReused) {
-                    // 当缓存一致时候，但是url不一致，重新按照新的url生成tab
-                    this.closeTab(isExistIdx, true);
-                    setTimeout((/**
-                     * @return {?}
-                     */
-                    function () {
-                        _this.router.navigateByUrl(url);
-                    }), 30);
-                }
-                else {
-                    this.changeTab(this.tabList[isExistIdx], isExistIdx);
-                }
+                this.changeTab(this.tabList[isExistIdx], isExistIdx);
                 this.ref.markForCheck();
             }
         };
@@ -3735,7 +3754,7 @@
          */
         function (event) {
             var previousIndex = event.previousIndex, currentIndex = event.currentIndex;
-            console.log("previousIndex", previousIndex, "currentIndex", currentIndex);
+            // console.log("previousIndex", previousIndex, "currentIndex", currentIndex);
             if (previousIndex === 0 || currentIndex === 0) {
                 return;
             }