From d8faf46ada56fdc0d84f8d91dc83e21da4b35f5b Mon Sep 17 00:00:00 2001
From: jeremywu <15975785+JeremyWuuuuu@users.noreply.github.com>
Date: Thu, 7 Jan 2021 11:52:28 +0800
Subject: [PATCH] fix(menu): fix/menu-item-group-not-working (#1217)

- Make the menu-item-group exported correctly
---
 packages/menu/__tests__/menu.spec.ts |  2 +-
 packages/menu/src/menuGroup.vue      | 66 ----------------------------
 packages/menu/src/menuItemGroup.vue  | 66 +++++++++++++++++++++++++---
 3 files changed, 61 insertions(+), 73 deletions(-)
 delete mode 100644 packages/menu/src/menuGroup.vue

diff --git a/packages/menu/__tests__/menu.spec.ts b/packages/menu/__tests__/menu.spec.ts
index 7d864a0c99..ed3f64ae48 100644
--- a/packages/menu/__tests__/menu.spec.ts
+++ b/packages/menu/__tests__/menu.spec.ts
@@ -3,7 +3,7 @@ import { nextTick } from 'vue'
 import { sleep } from '@element-plus/test-utils'
 
 import Menu from '../src/menu.vue'
-import MenuGroup from '../src/menuGroup.vue'
+import MenuGroup from '../src/menuItemGroup.vue'
 import MenuItem from '../src/menuItem.vue'
 import SubMenu from '../src/submenu.vue'
 
diff --git a/packages/menu/src/menuGroup.vue b/packages/menu/src/menuGroup.vue
deleted file mode 100644
index 6cd82f6810..0000000000
--- a/packages/menu/src/menuGroup.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-<template>
-  <li class="el-menu-item-group">
-    <div
-      class="el-menu-item-group__title"
-      :style="{ paddingLeft: levelPadding + 'px' }"
-    >
-      <template v-if="!slots.title">{{ title }}</template>
-      <slot v-else name="title"></slot>
-    </div>
-    <ul>
-      <slot></slot>
-    </ul>
-  </li>
-</template>
-
-<script lang="ts">
-import {
-  defineComponent,
-  computed,
-  getCurrentInstance,
-  inject,
-  reactive,
-} from 'vue'
-import { IMenuGroupProps, RootMenuProvider } from './menu'
-
-export default defineComponent({
-  name: 'ElMenuItemGroup',
-  componentName: 'ElMenuItemGroup',
-
-  props: {
-    title: {
-      type: String,
-    },
-  },
-  setup(props: IMenuGroupProps, { slots }) {
-    // data
-    const data = reactive({
-      paddingLeft: 20,
-    })
-    const instance = getCurrentInstance()
-    // computed
-    const levelPadding = computed(() => {
-      let padding = 20
-      let parent = instance.parent
-      if (rootProps.collapse) return 20
-      while (parent && parent.type.name !== 'ElMenu') {
-        if (parent.type.name === 'ElSubmenu') {
-          padding += 20
-        }
-        parent = parent.parent
-      }
-      return padding
-    })
-
-    // inject
-    const { props: rootProps } = inject<RootMenuProvider>('rootMenu')
-
-    return {
-      data,
-      levelPadding,
-      props,
-      slots,
-    }
-  },
-})
-</script>
diff --git a/packages/menu/src/menuItemGroup.vue b/packages/menu/src/menuItemGroup.vue
index cf4b12972d..6cd82f6810 100644
--- a/packages/menu/src/menuItemGroup.vue
+++ b/packages/menu/src/menuItemGroup.vue
@@ -1,12 +1,66 @@
 <template>
-  <div>
-    <slot></slot>
-  </div>
+  <li class="el-menu-item-group">
+    <div
+      class="el-menu-item-group__title"
+      :style="{ paddingLeft: levelPadding + 'px' }"
+    >
+      <template v-if="!slots.title">{{ title }}</template>
+      <slot v-else name="title"></slot>
+    </div>
+    <ul>
+      <slot></slot>
+    </ul>
+  </li>
 </template>
-<script lang='ts'>
-import { defineComponent } from 'vue'
+
+<script lang="ts">
+import {
+  defineComponent,
+  computed,
+  getCurrentInstance,
+  inject,
+  reactive,
+} from 'vue'
+import { IMenuGroupProps, RootMenuProvider } from './menu'
+
 export default defineComponent({
   name: 'ElMenuItemGroup',
-  props: { },
+  componentName: 'ElMenuItemGroup',
+
+  props: {
+    title: {
+      type: String,
+    },
+  },
+  setup(props: IMenuGroupProps, { slots }) {
+    // data
+    const data = reactive({
+      paddingLeft: 20,
+    })
+    const instance = getCurrentInstance()
+    // computed
+    const levelPadding = computed(() => {
+      let padding = 20
+      let parent = instance.parent
+      if (rootProps.collapse) return 20
+      while (parent && parent.type.name !== 'ElMenu') {
+        if (parent.type.name === 'ElSubmenu') {
+          padding += 20
+        }
+        parent = parent.parent
+      }
+      return padding
+    })
+
+    // inject
+    const { props: rootProps } = inject<RootMenuProvider>('rootMenu')
+
+    return {
+      data,
+      levelPadding,
+      props,
+      slots,
+    }
+  },
 })
 </script>