From 0baec3e532011b6ae8d019e311d471d4be76ef51 Mon Sep 17 00:00:00 2001
From: parisma <parisma@tencent.com>
Date: Tue, 27 Sep 2022 15:14:35 +0800
Subject: [PATCH] =?UTF-8?q?fix(editor):=20slot=E4=BF=AE=E6=94=B9,schema?=
 =?UTF-8?q?=E5=A3=B0=E6=98=8E=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor/src/Editor.vue                                | 4 ++--
 packages/editor/src/layouts/sidebar/Sidebar.vue               | 4 ++--
 packages/editor/src/layouts/sidebar/TabPane.vue               | 4 ++--
 .../editor/src/layouts/sidebar/code-block/CodeBlockList.vue   | 4 ++--
 packages/editor/src/type.ts                                   | 4 +++-
 packages/schema/src/index.ts                                  | 2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/packages/editor/src/Editor.vue b/packages/editor/src/Editor.vue
index 6d0c1648..8bcdbb93 100644
--- a/packages/editor/src/Editor.vue
+++ b/packages/editor/src/Editor.vue
@@ -27,8 +27,8 @@
             <slot name="code-block-panel-header"></slot>
           </template>
 
-          <template #code-block-panel-tool="{ id }">
-            <slot name="code-block-panel-tool" :id="id"></slot>
+          <template #code-block-panel-tool="{ id, data }">
+            <slot name="code-block-panel-tool" :id="id" :data="data"></slot>
           </template>
 
           <template #code-block-edit-panel-header="{ id }">
diff --git a/packages/editor/src/layouts/sidebar/Sidebar.vue b/packages/editor/src/layouts/sidebar/Sidebar.vue
index 0d9bcd12..82e4677a 100644
--- a/packages/editor/src/layouts/sidebar/Sidebar.vue
+++ b/packages/editor/src/layouts/sidebar/Sidebar.vue
@@ -27,8 +27,8 @@
         <slot name="code-block-panel-header"></slot>
       </template>
 
-      <template #code-block-panel-tool="{ id }" v-if="item === 'code-block'">
-        <slot name="code-block-panel-tool" :id="id"></slot>
+      <template #code-block-panel-tool="{ id, data }" v-if="item === 'code-block'">
+        <slot name="code-block-panel-tool" :id="id" :data="data"></slot>
       </template>
 
       <template #code-block-edit-panel-header="{ id }" v-if="item === 'code-block'">
diff --git a/packages/editor/src/layouts/sidebar/TabPane.vue b/packages/editor/src/layouts/sidebar/TabPane.vue
index 05b273e9..32426927 100644
--- a/packages/editor/src/layouts/sidebar/TabPane.vue
+++ b/packages/editor/src/layouts/sidebar/TabPane.vue
@@ -35,8 +35,8 @@
         <component v-else-if="config.slots?.codeBlockPanelHeader" :is="config.slots.codeBlockPanelHeader" />
       </template>
 
-      <template #code-block-panel-tool="{ id }" v-if="data === 'code-block' || config.slots?.codeBlockPanelTool">
-        <slot v-if="data === 'code-block'" name="code-block-panel-tool" :id="id"></slot>
+      <template #code-block-panel-tool="{ id, data }" v-if="data === 'code-block' || config.slots?.codeBlockPanelTool">
+        <slot v-if="data === 'code-block'" name="code-block-panel-tool" :id="id" :data="data"></slot>
         <component v-else-if="config.slots?.codeBlockPanelTool" :is="config.slots.codeBlockPanelTool" />
       </template>
 
diff --git a/packages/editor/src/layouts/sidebar/code-block/CodeBlockList.vue b/packages/editor/src/layouts/sidebar/code-block/CodeBlockList.vue
index 07d9e828..6bc5576a 100644
--- a/packages/editor/src/layouts/sidebar/code-block/CodeBlockList.vue
+++ b/packages/editor/src/layouts/sidebar/code-block/CodeBlockList.vue
@@ -47,7 +47,7 @@
               <el-tooltip effect="dark" content="删除" placement="bottom" v-if="editable">
                 <Icon :icon="Close" class="edit-icon" @click.stop="deleteCode(`${data.id}`)"></Icon>
               </el-tooltip>
-              <slot name="code-block-panel-tool" :id="data.id"></slot>
+              <slot name="code-block-panel-tool" :id="data.id" :data="data.codeBlockContent"></slot>
             </div>
           </div>
           <!-- 展示代码块下绑定的组件 -->
@@ -148,7 +148,7 @@ const initList = async () => {
     state.codeList.push({
       id: codeId,
       name: value.name,
-      content: value.content,
+      codeBlockContent: value,
       showRelation: true,
     });
   });
diff --git a/packages/editor/src/type.ts b/packages/editor/src/type.ts
index 956582cb..de693255 100644
--- a/packages/editor/src/type.ts
+++ b/packages/editor/src/type.ts
@@ -358,7 +358,7 @@ export interface CodeDslList {
   /** 代码块名称 */
   name: string;
   /** 代码块函数内容 */
-  content: any;
+  codeBlockContent: CodeBlockContent;
   /** 是否展示代码绑定关系 */
   showRelation?: boolean;
 }
@@ -374,6 +374,8 @@ export interface ListRelationState extends ListState {
     /** 代码块id : 组件信息 */
     [id: string]: MNode[];
   };
+  /** codeDsl内容用于暴露给业务方 */
+  // codeDsl: CodeBlockDSL | null;
 }
 
 export enum CodeDeleteErrorType {
diff --git a/packages/schema/src/index.ts b/packages/schema/src/index.ts
index 8f6e0085..3e7d59f3 100644
--- a/packages/schema/src/index.ts
+++ b/packages/schema/src/index.ts
@@ -69,7 +69,7 @@ export interface MApp extends MComponent {
   /** */
   items: MPage[];
   /** 代码块 */
-  method: CodeBlockDSL;
+  codeBlocks?: CodeBlockDSL;
 }
 
 export interface CodeBlockDSL {