raise-common-lib 0.0.175 → 0.0.176

package/fesm2015/raise-common-lib.js

@@ -7,7 +7,7 @@ import { MAT_SNACK_BAR_DATA, MatSnackBar, MatSnackBarModule } from '@angular/mat
 import { MAT_DIALOG_DATA, MatDialogRef, MatDialog, MatDialogModule } from '@angular/material/dialog';
 import { TreeGridComponent } from '@syncfusion/ej2-angular-treegrid';
 import { CarouselAllModule, ToolbarModule, TabModule, TreeViewModule } from '@syncfusion/ej2-angular-navigations';
-import { NavigationEnd, Router, ActivatedRoute, RouteReuseStrategy } from '@angular/router';
+import { NavigationEnd, Router, NavigationStart, ActivatedRoute, RouteReuseStrategy } from '@angular/router';
 import { filter } from 'rxjs/operators';
 import { moveItemInArray, DragDropModule } from '@angular/cdk/drag-drop';
 import { HttpClient, HttpClientModule } from '@angular/common/http';
@@ -2725,6 +2725,40 @@ class MultiTabComponent {
         if (isExistIdx !== -1) {
             this.selectedTab = isExistIdx;
         }
+        this.subscriptions.push(this.router.events
+            .pipe(filter((/**
+         * @param {?} event
+         * @return {?}
+         */
+        (event) => event instanceof NavigationStart)))
+            .subscribe((/**
+         * @param {?} event
+         * @return {?}
+         */
+        (event) => {
+            /** @type {?} */
+            const navigation = this.router.getCurrentNavigation();
+            if (navigation) {
+                /** @type {?} */
+                const state = navigation.extras.state;
+                // 获取传递的 state
+                /** @type {?} */
+                let noReused = (state && state["noReused"]) || false;
+                // 当前tab不复用，新开一个tab,当有已经存在的tab时候也是新开
+                /** @type {?} */
+                const isExistIdx = this.tabList.findIndex((/**
+                 * @param {?} ele
+                 * @return {?}
+                 */
+                (ele) => this.urlWithoutQuery(ele.url) ===
+                    this.urlWithoutQuery(event.url)));
+                if (isExistIdx !== -1 &&
+                    (noReused || this.tabList[isExistIdx].url !== event.url)) {
+                    // 如果当前tab已经存在，并且是新开的tab
+                    this.closeTab(isExistIdx, true); // 关闭当前tab
+                }
+            }
+        })));
         this.subscriptions.push(this.router.events
             .pipe(filter((/**
          * @param {?} event
@@ -2732,9 +2766,10 @@ class MultiTabComponent {
          */
         (event) => event instanceof NavigationEnd)))
             .subscribe((/**
+         * @param {?} event
          * @return {?}
          */
-        () => {
+        (event) => {
             /** @type {?} */
             const navigation = this.router.getCurrentNavigation();
             if (navigation) {
@@ -2765,13 +2800,11 @@ class MultiTabComponent {
                     navigationInfo.title ||
                     navigationInfo.subTitle ||
                     navigationInfo.name;
-                /** @type {?} */
-                let 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);
                 }
             }
         })));
@@ -2980,10 +3013,9 @@ class MultiTabComponent {
      * @param {?} url
      * @param {?} pureUrl
      * @param {?} title
-     * @param {?} noReused
      * @return {?}
      */
-    setTab(url, pureUrl, title, noReused) {
+    setTab(url, pureUrl, title) {
         /** @type {?} */
         const isExistIdx = this.tabList.findIndex((/**
          * @param {?} ele
@@ -3009,30 +3041,7 @@ class MultiTabComponent {
             this.addTab(url, title);
         }
         else {
-            /** @type {?} */
-            const targetTabUrl = this.tabList[isExistIdx].url;
-            if (targetTabUrl !== url || noReused) {
-                // 当缓存一致时候，但是url不一致，重新按照新的url生成tab
-                this.closeTab(isExistIdx, true);
-                setTimeout((/**
-                 * @return {?}
-                 */
-                () => {
-                    this.keepAlive.clearCache(url);
-                    this.drawer.deleteCache(url);
-                    this.router
-                        .navigateByUrl("/", { skipLocationChange: true })
-                        .then((/**
-                     * @return {?}
-                     */
-                    () => {
-                        this.router.navigateByUrl(url); // 重新导航到当前 URL
-                    }));
-                }), 30);
-            }
-            else {
-                this.changeTab(this.tabList[isExistIdx], isExistIdx);
-            }
+            this.changeTab(this.tabList[isExistIdx], isExistIdx);
             this.ref.markForCheck();
         }
     }
@@ -3042,7 +3051,7 @@ class MultiTabComponent {
      */
     onTabDrop(event) {
         const { previousIndex, currentIndex } = event;
-        console.log("previousIndex", previousIndex, "currentIndex", currentIndex);
+        // console.log("previousIndex", previousIndex, "currentIndex", currentIndex);
         if (previousIndex === 0 || currentIndex === 0) {
             return;
         }