From be4df0fc9b8985ae7b9d6fd7a8d1402487790a12 Mon Sep 17 00:00:00 2001
From: roymondchen <roymondchen@tencent.com>
Date: Fri, 1 Apr 2022 11:37:03 +0800
Subject: [PATCH] =?UTF-8?q?fix(editor):=20=E7=BB=84=E4=BB=B6=E6=A0=91?=
 =?UTF-8?q?=E5=8F=B3=E9=94=AE=E8=8F=9C=E5=8D=95=E5=AD=90=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E5=87=BA=E4=B8=8D=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editor/src/layouts/sidebar/LayerMenu.vue  | 53 +++++--------------
 1 file changed, 14 insertions(+), 39 deletions(-)

diff --git a/packages/editor/src/layouts/sidebar/LayerMenu.vue b/packages/editor/src/layouts/sidebar/LayerMenu.vue
index c1c4c85f..658fb5dc 100644
--- a/packages/editor/src/layouts/sidebar/LayerMenu.vue
+++ b/packages/editor/src/layouts/sidebar/LayerMenu.vue
@@ -3,8 +3,8 @@
     <div
       v-if="node.items"
       class="magic-editor-content-menu-item"
-      @mouseenter="setSubVisiable(true)"
-      @mouseleave="setSubVisiable(false)"
+      @mouseenter="setSubVisitable(true)"
+      @mouseleave="setSubVisitable(false)"
     >
       新增
     </div>
@@ -16,7 +16,7 @@
     >
       删除
     </div>
-    <div class="subMenu" v-show="subVisible" @mouseenter="setSubVisiable(true)" @mouseleave="setSubVisiable(false)">
+    <div class="subMenu" v-show="subVisible" @mouseenter="setSubVisitable(true)" @mouseleave="setSubVisitable(false)">
       <el-scrollbar>
         <template v-if="node.type === 'tabs'">
           <div
@@ -31,20 +31,8 @@
             标签
           </div>
         </template>
-
-        <template v-else-if="node.type === 'app'">
-          <div
-            class="magic-editor-content-menu-item"
-            v-for="item in menu.app"
-            :key="item.type"
-            @click="() => append(item)"
-          >
-            {{ item.text }}
-          </div>
-        </template>
-
         <template v-else-if="node.items">
-          <div v-for="list in menu.component" :key="list.title">
+          <div v-for="list in componentGroupList" :key="list.title">
             <template v-for="item in list.items">
               <div class="magic-editor-content-menu-item" v-if="item" :key="item.type" @click="() => append(item)">
                 {{ item.text }}
@@ -59,21 +47,16 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, inject, PropType, ref } from 'vue';
+import { computed, defineComponent, inject, ref } from 'vue';
 
-import type { ComponentGroup, Services } from '@editor/type';
+import type { MNode } from '@tmagic/schema';
+
+import type { AddMNode, Services } from '@editor/type';
 
 export default defineComponent({
   name: 'magic-editor-content-menu',
 
-  props: {
-    componentGroupList: {
-      type: Array as PropType<ComponentGroup[]>,
-      default: () => [],
-    },
-  },
-
-  setup(props) {
+  setup() {
     const services = inject<Services>('services');
     const subVisible = ref(false);
     const node = computed(() => services?.editorService.get('node'));
@@ -83,17 +66,9 @@ export default defineComponent({
 
       node,
 
-      menu: computed(() => ({
-        app: [
-          {
-            type: 'page',
-            text: '页面',
-          },
-        ],
-        component: props.componentGroupList,
-      })),
+      componentGroupList: computed(() => services?.componentListService.getList()),
 
-      append(config: any) {
+      append(config: AddMNode) {
         services?.editorService.add({
           name: config.text,
           type: config.type,
@@ -104,11 +79,11 @@ export default defineComponent({
         node.value && services?.editorService.remove(node.value);
       },
 
-      copy(node: any) {
-        services?.editorService.copy(node);
+      copy(node?: MNode) {
+        node && services?.editorService.copy(node);
       },
 
-      setSubVisiable(v: any) {
+      setSubVisitable(v: boolean) {
         subVisible.value = v;
       },
     };