From c80ea829ac54b76323f221f99d6655ad1a943239 Mon Sep 17 00:00:00 2001
From: moonszhang <moonszhang@tencent.com>
Date: Thu, 16 Nov 2023 20:20:15 +0800
Subject: [PATCH] =?UTF-8?q?fix(editor):=20=E4=BF=AE=E5=A4=8Dslide=20?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E6=8B=96=E5=87=BA=E6=9D=A5=E5=86=8D=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E5=9B=9E=E5=8E=BB=E6=97=B6=E4=B8=8D=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?slide=E6=93=8D=E4=BD=9C=E6=A0=8F=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editor/src/layouts/sidebar/Sidebar.vue    | 22 ++++++++++++++-----
 packages/editor/src/type.ts                   |  8 +++++++
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/packages/editor/src/layouts/sidebar/Sidebar.vue b/packages/editor/src/layouts/sidebar/Sidebar.vue
index 8039995c..49864c25 100644
--- a/packages/editor/src/layouts/sidebar/Sidebar.vue
+++ b/packages/editor/src/layouts/sidebar/Sidebar.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="m-editor-sidebar" v-if="data.type === 'tabs' && data.items.length" v-show="!isHideSlideBar">
+  <div class="m-editor-sidebar" v-if="data.type === 'tabs' && data.items.length">
     <div class="m-editor-sidebar-header">
       <div
         class="m-editor-sidebar-header-item"
@@ -114,8 +114,8 @@
         <div class="m-editor-float-box-body">
           <component
             v-if="config && floatBoxStates?.get(config.$key)?.status"
-            :is="config.component"
-            v-bind="{ ...config.props, slideType: 'box' }"
+            :is="config.boxComponentConfig?.component || config.component"
+            v-bind="config.boxComponentConfig?.props || config.props || {}"
             v-on="config?.listeners || {}"
           />
         </div>
@@ -193,6 +193,11 @@ const getItemConfig = (data: SideItem): SideComponent => {
       text: '代码编辑',
       component: CodeBlockListPanel,
       slots: {},
+      boxComponentConfig: {
+        props: {
+          slideType: 'box',
+        },
+      },
     },
     'data-source': {
       $key: 'data-source',
@@ -201,6 +206,11 @@ const getItemConfig = (data: SideItem): SideComponent => {
       text: '数据源',
       component: DataSourceListPanel,
       slots: {},
+      boxComponentConfig: {
+        props: {
+          slideType: 'box',
+        },
+      },
     },
   };
 
@@ -217,20 +227,20 @@ watch(
 );
 
 const slideKeys = computed(() => sideBarItems.value.map((sideBarItem) => sideBarItem.$key));
-const isHideSlideBar = computed(() => services?.uiService.get('hideSlideBar'));
 
 const { showFloatBox, closeFloatBox, dragstartHandler, dragendHandler, floatBoxStates, floatBox, showingBoxKeys } =
   useFloatBox(slideKeys);
 
 watch(
-  () => showingBoxKeys.value,
+  () => showingBoxKeys.value.length,
   () => {
     const isActiveTabShow = showingBoxKeys.value.some(
       (key) => activeTabName.value === sideBarItems.value.find((v) => v.$key === key)?.text,
     );
-    if (!isActiveTabShow) return;
+    if (!isActiveTabShow && activeTabName.value) return;
     const nextSlideBarItem = sideBarItems.value.find((sideBarItem) => !showingBoxKeys.value.includes(sideBarItem.$key));
     if (!nextSlideBarItem) {
+      activeTabName.value = '';
       services?.uiService.set('hideSlideBar', true);
       return;
     }
diff --git a/packages/editor/src/type.ts b/packages/editor/src/type.ts
index cd95f5b8..f81f601d 100644
--- a/packages/editor/src/type.ts
+++ b/packages/editor/src/type.ts
@@ -334,6 +334,14 @@ export interface SideComponent extends MenuComponent {
   icon: Component<{}, {}, any>;
   /** slide 唯一标识 key */
   $key: string;
+
+  /** 组件扩展参数 */
+  boxComponentConfig?: {
+    /** Vue3组件 */
+    component?: any;
+    /** 传入组件的props对象 */
+    props?: Record<string, any>;
+  };
 }
 
 /**