From 8b9a6ecf5d03aca92cd190307d00db87f7d54042 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8A=9B=E7=9A=93?= <lihao.ylh@alibaba-inc.com>
Date: Tue, 15 Dec 2020 12:51:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=A4=A7=E7=BA=B2?=
 =?UTF-8?q?=E6=A0=91=E5=92=8C=E7=BB=84=E4=BB=B6=E9=9D=A2=E6=9D=BF=E6=9D=A5?=
 =?UTF-8?q?=E5=9B=9E=E7=82=B9=E5=87=BB=E5=BC=82=E5=B8=B8=20fix:=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20onDockShow=20/=20onDockHide=20=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor-preset-vision/src/panes.ts              | 8 ++++----
 packages/editor-skeleton/src/widget/panel.ts            | 5 +++++
 packages/editor-skeleton/src/widget/widget-container.ts | 4 ++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/editor-preset-vision/src/panes.ts b/packages/editor-preset-vision/src/panes.ts
index 840211188..d33d9a77f 100644
--- a/packages/editor-preset-vision/src/panes.ts
+++ b/packages/editor-preset-vision/src/panes.ts
@@ -206,9 +206,9 @@ const dockPane = Object.assign(skeleton.leftArea, {
     const f = (_: any, dock: any) => {
       fn(dock);
     };
-    editor.on('skeleton.panel-dock.show', f);
+    editor.on('skeleton.panel-dock.active', f);
     return () => {
-      editor.removeListener('skeleton.panel-dock.show', f);
+      editor.removeListener('skeleton.panel-dock.active', f);
     };
   },
   /**
@@ -218,9 +218,9 @@ const dockPane = Object.assign(skeleton.leftArea, {
     const f = (_: any, dock: any) => {
       fn(dock);
     };
-    editor.on('skeleton.panel-dock.hide', f);
+    editor.on('skeleton.panel-dock.unactive', f);
     return () => {
-      editor.removeListener('skeleton.panel-dock.hide', f);
+      editor.removeListener('skeleton.panel-dock.unactive', f);
     };
   },
   /**
diff --git a/packages/editor-skeleton/src/widget/panel.ts b/packages/editor-skeleton/src/widget/panel.ts
index 40fbaead4..8ecacc43e 100644
--- a/packages/editor-skeleton/src/widget/panel.ts
+++ b/packages/editor-skeleton/src/widget/panel.ts
@@ -162,6 +162,11 @@ export default class Panel implements IWidget {
     if (flag) {
       this._actived = true;
       this.parent?.active(this);
+      if (this.parent.name === 'leftFloatArea') {
+        this.skeleton.leftFixedArea.container.unactiveAll();
+      } else if (this.parent.name === 'leftFixedArea') {
+        this.skeleton.leftFloatArea.container.unactiveAll();
+      }
       if (!this.inited) {
         this.inited = true;
       }
diff --git a/packages/editor-skeleton/src/widget/widget-container.ts b/packages/editor-skeleton/src/widget/widget-container.ts
index 013268db8..dceeabc5a 100644
--- a/packages/editor-skeleton/src/widget/widget-container.ts
+++ b/packages/editor-skeleton/src/widget/widget-container.ts
@@ -79,6 +79,10 @@ export default class WidgetContainer<T extends WidgetItem = any, G extends Widge
     }
   }
 
+  unactiveAll() {
+    Object.keys(this.maps).forEach(name => this.unactive(name));
+  }
+
   add(item: T | G): T {
     item = this.handle(item);
     const origin = this.get(item.name);