fix: repeat drawer

alauda · Nov 30, 2021 · 0747c8d · 0747c8d
1 parent 5fa4072
commit 0747c8d
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/src/drawer/component/drawer.service.ts b/src/drawer/component/drawer.service.ts
@@ -25,10 +25,9 @@ export class DrawerService {
   constructor(private readonly overlay: Overlay) {}
 
   open<T = any>(options: DrawerOptions<T>) {
-    if (!this.drawerRef) {
-      this.createDrawer();
-      this.updateOptions(options);
-    }
+    this.drawerRef?.instance?.closure();
+    this.createDrawer();
+    this.updateOptions(options);
     return this.drawerRef?.instance;
   }
 

diff --git a/stories/drawer/index.ts b/stories/drawer/index.ts
@@ -34,8 +34,12 @@ storiesOf('Drawer', module)
   .add('service create component drawer', () => ({
     moduleMetadata: {
       imports: [ButtonModule, DrawerModule],
-      declarations: [ServiceDrawerCptComponent, DrawerContentComponent],
-      entryComponents: [DrawerContentComponent],
+      declarations: [
+        ServiceDrawerCptComponent,
+        DrawerContentComponent,
+        DrawerContent1Component,
+      ],
+      entryComponents: [DrawerContentComponent, DrawerContent1Component],
     },
     component: ServiceDrawerCptComponent,
   }));
@@ -154,6 +158,7 @@ export class ServiceDrawerComponent {
 @Component({
   template: `
     <button aui-button="primary" (click)="open()">打开component抽屉</button>
+    <button aui-button="primary" (click)="openTow()">打开component2抽屉</button>
     <button aui-button (click)="close()">关闭</button>
   `,
 })
@@ -177,6 +182,16 @@ export class ServiceDrawerCptComponent {
     });
   }
 
+  openTow() {
+    this.drawerService.open({
+      title: 'title',
+      width: 500,
+      content: DrawerContent1Component,
+      contentParams: { data: 222 },
+      footer: 'footer',
+    });
+  }
+
   close() {
     this.drawerRef.closure('on close');
   }
@@ -188,3 +203,10 @@ export class ServiceDrawerCptComponent {
 export class DrawerContentComponent {
   @Input() data: string;
 }
+
+@Component({
+  template: `component {{ data }}`,
+})
+export class DrawerContent1Component {
+  @Input() data: string;
+}