fix(abc:sidebar-nav): fix keeping expand when changed route in enable…

…d `openStrictly` (#759)
ng-alain · Dec 30, 2019 · a7ab84a · a7ab84a
1 parent bafb44c
commit a7ab84a
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 22 deletions.
diff --git a/packages/abc/sidebar-nav/sidebar-nav.component.ts b/packages/abc/sidebar-nav/sidebar-nav.component.ts
@@ -205,13 +205,34 @@ export class SidebarNavComponent implements OnInit, OnDestroy {
   }
 
   _docClick(): void {
-    this.hideAll();
+    if (this.collapsed) {
+      this.hideAll();
+    }
+  }
+
+  private openedByUrl(url: string | null) {
+    const { menuSrv, recursivePath, openStrictly } = this;
+    let findItem = menuSrv.getHit(this.menuSrv.menus, url!, recursivePath, i => {
+      i._selected = false;
+      if (!openStrictly) {
+        i._open = false;
+      }
+    });
+    if (findItem == null) return;
+
+    do {
+      findItem._selected = true;
+      if (!openStrictly) {
+        findItem._open = true;
+      }
+      findItem = findItem.__parent;
+    } while (findItem);
   }
 
   ngOnInit(): void {
     const { doc, router, unsubscribe$, menuSrv, cdr } = this;
     this.bodyEl = doc.querySelector('body');
-    menuSrv.openedByUrl(router.url, this.recursivePath);
+    this.openedByUrl(router.url);
     this.ngZone.runOutsideAngular(() => this.genFloatingContainer());
     menuSrv.change.pipe(takeUntil(unsubscribe$)).subscribe(data => {
       menuSrv.visit(data, (i: Nav, _p, depth) => {
@@ -233,7 +254,7 @@ export class SidebarNavComponent implements OnInit, OnDestroy {
     });
     router.events.pipe(takeUntil(unsubscribe$)).subscribe(e => {
       if (e instanceof NavigationEnd) {
-        this.menuSrv.openedByUrl(e.urlAfterRedirects, this.recursivePath);
+        this.openedByUrl(e.urlAfterRedirects);
         this.underPad();
         this.cdr.detectChanges();
       }

diff --git a/packages/abc/sidebar-nav/sidebar-nav.spec.ts b/packages/abc/sidebar-nav/sidebar-nav.spec.ts
@@ -43,6 +43,27 @@ const MOCKMENUS = [
   },
 ] as Nav[];
 
+const MOCKOPENSTRICTLY = [
+  {
+    text: '',
+    group: true,
+    children: [
+      {
+        text: '',
+        link: '/v1',
+        open: true,
+        children: [{ text: '' }],
+      },
+      {
+        text: '',
+        link: '/v1',
+        open: true,
+        children: [{ text: '' }],
+      },
+    ],
+  },
+] as Nav[];
+
 class MockACLService {
   can(val: string) {
     return val === 'admin';
@@ -318,6 +339,15 @@ describe('abc: sidebar-nav', () => {
           fixture.detectChanges();
           expect(router.navigateByUrl).toHaveBeenCalled();
         });
+        it('muse be hide via document click', () => {
+          createComp();
+          setSrv.layout.collapsed = true;
+          fixture.detectChanges();
+          page.showSubMenu();
+          document.dispatchEvent(new MouseEvent('click'));
+          fixture.detectChanges();
+          expect(router.navigateByUrl).not.toHaveBeenCalled();
+        });
       });
       it('#52', () => {
         createComp();
@@ -360,24 +390,7 @@ describe('abc: sidebar-nav', () => {
         createComp();
         context.openStrictly = true;
         fixture.detectChanges();
-        menuSrv.add([
-          {
-            text: '',
-            group: true,
-            children: [
-              {
-                text: '',
-                open: true,
-                children: [{ text: '' }],
-              },
-              {
-                text: '',
-                open: true,
-                children: [{ text: '' }],
-              },
-            ],
-          },
-        ] as Nav[]);
+        menuSrv.add(deepCopy(MOCKOPENSTRICTLY));
         fixture.detectChanges();
       });
       it('should working', () => {
@@ -469,7 +482,7 @@ describe('abc: sidebar-nav', () => {
         {
           text: '主导航',
           group: true,
-          children: [{ text: 'user', link: '/user' }],
+          children: [{ text: 'user1', link: '/user' }, { text: 'user2', link: '/user' }],
         },
       ]);
     }));
@@ -497,6 +510,15 @@ describe('abc: sidebar-nav', () => {
       fixture.detectChanges();
       page.checkCount('.sidebar-nav__selected', 0);
     }));
+    it('should be ingore _open when enabled openStrictly', fakeAsync(() => {
+      context.openStrictly = true;
+      fixture.detectChanges();
+      menuSrv.add(deepCopy(MOCKOPENSTRICTLY));
+      page.checkCount('.sidebar-nav__open', 2);
+      router.navigateByUrl('/user2');
+      fixture.detectChanges();
+      page.checkCount('.sidebar-nav__open', 2);
+    }));
   });
 
   class PageObject {