feat(comp:menu): type of MenuItem is optional (#712)

* feat(comp:menu): type of MenuItem is optional * build: fix generateIcons script
IDuxFE · Jan 10, 2022 · 5d1490a · 5d1490a
1 parent 71185fc
commit 5d1490a
Show file tree

Hide file tree

Showing 20 changed files with 188 additions and 122 deletions.
diff --git a/packages/components/menu/__tests__/menu.spec.ts b/packages/components/menu/__tests__/menu.spec.ts
@@ -5,15 +5,15 @@ import { renderWork, wait } from '@tests'
 
 import Menu from '../src/Menu'
 // import MenuDivider from '../src/MenuDivider'
-import MenuItem from '../src/children/MenuItem'
+import MenuItem from '../src/contents/MenuItem'
 // import MenuItemGroup from '../src/MenuItemGroup'
-import MenuSub from '../src/children/menu-sub/MenuSub'
+import MenuSub from '../src/contents/menu-sub/MenuSub'
 import { MenuData, MenuProps } from '../src/types'
 
 const dataSource: MenuData[] = [
-  { type: 'item', key: 'item1', icon: 'home', slots: { label: () => h('a', 'Item 1') } },
-  { type: 'item', key: 'item2', icon: 'mail', label: 'Item 2' },
-  { type: 'item', key: 'item3', icon: 'appstore', label: 'Item 3', disabled: true },
+  { key: 'item1', icon: 'home', slots: { label: () => h('a', 'Item 1') } },
+  { key: 'item2', icon: 'mail', label: 'Item 2' },
+  { key: 'item3', icon: 'appstore', label: 'Item 3', disabled: true },
   { type: 'divider', key: 'divider1' },
   {
     type: 'sub',
@@ -26,8 +26,8 @@ const dataSource: MenuData[] = [
         key: 'itemGroup1',
         label: 'Item Group 1',
         children: [
-          { type: 'item', key: 'item4', label: 'Item 4' },
-          { type: 'item', key: 'item5', label: 'Item 5' },
+          { key: 'item4', label: 'Item 4' },
+          { key: 'item5', label: 'Item 5' },
         ],
       },
       { type: 'divider', key: 'divider2' },
@@ -36,17 +36,17 @@ const dataSource: MenuData[] = [
         key: 'sub2',
         label: 'Menu Sub 2',
         children: [
-          { type: 'item', key: 'item6', label: 'Item 6' },
-          { type: 'item', key: 'item7', label: 'Item 7' },
+          { key: 'item6', label: 'Item 6' },
+          { key: 'item7', label: 'Item 7' },
         ],
       },
       {
         type: 'sub',
         key: 'sub3',
         label: 'Menu Sub 3',
         children: [
-          { type: 'item', key: 'item8', label: 'Item 8' },
-          { type: 'item', key: 'item9', label: 'Item 9' },
+          { key: 'item8', label: 'Item 8' },
+          { key: 'item9', label: 'Item 9' },
         ],
       },
     ],
@@ -58,8 +58,8 @@ const dataSource: MenuData[] = [
     label: 'Menu Sub 4',
     disabled: true,
     children: [
-      { type: 'item', key: 'item10', label: 'Item 10' },
-      { type: 'item', key: 'item11', label: 'Item 11' },
+      { key: 'item10', label: 'Item 10' },
+      { key: 'item11', label: 'Item 11' },
     ],
   },
 ]

diff --git a/packages/components/menu/demo/Horizontal.vue b/packages/components/menu/demo/Horizontal.vue
@@ -7,9 +7,9 @@ import { h } from 'vue'
 import { MenuData } from '@idux/components/menu'
 
 const dataSource: MenuData[] = [
-  { type: 'item', key: 'item1', icon: 'home', slots: { label: () => h('a', 'Item 1') } },
-  { type: 'item', key: 'item2', icon: 'mail', label: 'Item 2' },
-  { type: 'item', key: 'item3', icon: 'appstore', label: 'Item 3', disabled: true },
+  { key: 'item1', icon: 'home', slots: { label: () => h('a', 'Item 1') } },
+  { key: 'item2', icon: 'mail', label: 'Item 2' },
+  { key: 'item3', icon: 'appstore', label: 'Item 3', disabled: true },
   { type: 'divider', key: 'divider1' },
   {
     type: 'sub',
@@ -22,8 +22,8 @@ const dataSource: MenuData[] = [
         key: 'itemGroup1',
         label: 'Item Group 1',
         children: [
-          { type: 'item', key: 'item4', label: 'Item 4' },
-          { type: 'item', key: 'item5', label: 'Item 5' },
+          { key: 'item4', label: 'Item 4' },
+          { key: 'item5', label: 'Item 5' },
         ],
       },
       { type: 'divider', key: 'divider2' },
@@ -32,17 +32,17 @@ const dataSource: MenuData[] = [
         key: 'sub2',
         label: 'Menu Sub 2',
         children: [
-          { type: 'item', key: 'item6', label: 'Item 6' },
-          { type: 'item', key: 'item7', label: 'Item 7' },
+          { key: 'item6', label: 'Item 6' },
+          { key: 'item7', label: 'Item 7' },
         ],
       },
       {
         type: 'sub',
         key: 'sub3',
         label: 'Menu Sub 3',
         children: [
-          { type: 'item', key: 'item8', label: 'Item 8' },
-          { type: 'item', key: 'item9', label: 'Item 9' },
+          { key: 'item8', label: 'Item 8' },
+          { key: 'item9', label: 'Item 9' },
         ],
       },
     ],
@@ -54,8 +54,8 @@ const dataSource: MenuData[] = [
     label: 'Menu Sub 4',
     disabled: true,
     children: [
-      { type: 'item', key: 'item10', label: 'Item 10' },
-      { type: 'item', key: 'item11', label: 'Item 11' },
+      { key: 'item10', label: 'Item 10' },
+      { key: 'item11', label: 'Item 11' },
     ],
   },
 ]

diff --git a/packages/components/menu/demo/Inline.vue b/packages/components/menu/demo/Inline.vue
@@ -1,15 +1,15 @@
 <template>
-  <IxMenu mode="inline" :dataSource="dataSource" style="width: 256px"> </IxMenu>
+  <IxMenu mode="inline" multiple :dataSource="dataSource" style="width: 256px"> </IxMenu>
 </template>
 <script setup lang="ts">
 import { h } from 'vue'
 
 import { MenuData } from '@idux/components/menu'
 
 const dataSource: MenuData[] = [
-  { type: 'item', key: 'item1', icon: 'home', slots: { label: () => h('a', 'Item 1') } },
-  { type: 'item', key: 'item2', icon: 'mail', label: 'Item 2' },
-  { type: 'item', key: 'item3', icon: 'appstore', label: 'Item 3', disabled: true },
+  { key: 'item1', icon: 'home', slots: { label: () => h('a', 'Item 1') } },
+  { key: 'item2', icon: 'mail', label: 'Item 2' },
+  { key: 'item3', icon: 'appstore', label: 'Item 3', disabled: true },
   { type: 'divider', key: 'divider1' },
   {
     type: 'sub',
@@ -22,8 +22,8 @@ const dataSource: MenuData[] = [
         key: 'itemGroup1',
         label: 'Item Group 1',
         children: [
-          { type: 'item', key: 'item4', label: 'Item 4' },
-          { type: 'item', key: 'item5', label: 'Item 5' },
+          { key: 'item4', label: 'Item 4' },
+          { key: 'item5', label: 'Item 5' },
         ],
       },
       { type: 'divider', key: 'divider2' },
@@ -32,17 +32,17 @@ const dataSource: MenuData[] = [
         key: 'sub2',
         label: 'Menu Sub 2',
         children: [
-          { type: 'item', key: 'item6', label: 'Item 6' },
-          { type: 'item', key: 'item7', label: 'Item 7' },
+          { key: 'item6', label: 'Item 6' },
+          { key: 'item7', label: 'Item 7' },
         ],
       },
       {
         type: 'sub',
         key: 'sub3',
         label: 'Menu Sub 3',
         children: [
-          { type: 'item', key: 'item8', label: 'Item 8' },
-          { type: 'item', key: 'item9', label: 'Item 9' },
+          { key: 'item8', label: 'Item 8' },
+          { key: 'item9', label: 'Item 9' },
         ],
       },
     ],
@@ -54,8 +54,8 @@ const dataSource: MenuData[] = [
     label: 'Menu Sub 4',
     disabled: true,
     children: [
-      { type: 'item', key: 'item10', label: 'Item 10' },
-      { type: 'item', key: 'item11', label: 'Item 11' },
+      { key: 'item10', label: 'Item 10' },
+      { key: 'item11', label: 'Item 11' },
     ],
   },
 ]

diff --git a/packages/components/menu/demo/SingleOpen.vue b/packages/components/menu/demo/SingleOpen.vue
@@ -27,8 +27,8 @@ const dataSource: MenuData[] = [
         key: 'itemGroup1',
         label: 'Item Group 1',
         children: [
-          { type: 'item', key: 'item4', label: 'Item 4' },
-          { type: 'item', key: 'item5', label: 'Item 5' },
+          { key: 'item4', label: 'Item 4' },
+          { key: 'item5', label: 'Item 5' },
         ],
       },
       { type: 'divider', key: 'divider2' },
@@ -37,17 +37,17 @@ const dataSource: MenuData[] = [
         key: 'sub2',
         label: 'Menu Sub 2',
         children: [
-          { type: 'item', key: 'item6', label: 'Item 6' },
-          { type: 'item', key: 'item7', label: 'Item 7' },
+          { key: 'item6', label: 'Item 6' },
+          { key: 'item7', label: 'Item 7' },
         ],
       },
       {
         type: 'sub',
         key: 'sub3',
         label: 'Menu Sub 3',
         children: [
-          { type: 'item', key: 'item8', label: 'Item 8' },
-          { type: 'item', key: 'item9', label: 'Item 9' },
+          { key: 'item8', label: 'Item 8' },
+          { key: 'item9', label: 'Item 9' },
         ],
       },
     ],
@@ -58,8 +58,8 @@ const dataSource: MenuData[] = [
     icon: 'github',
     label: 'Menu Sub 4',
     children: [
-      { type: 'item', key: 'item10', label: 'Item 10' },
-      { type: 'item', key: 'item11', label: 'Item 11' },
+      { key: 'item10', label: 'Item 10' },
+      { key: 'item11', label: 'Item 11' },
     ],
   },
   {
@@ -68,8 +68,8 @@ const dataSource: MenuData[] = [
     icon: 'github',
     label: 'Menu Sub 5',
     children: [
-      { type: 'item', key: 'item12', label: 'Item 12' },
-      { type: 'item', key: 'item13', label: 'Item 13' },
+      { key: 'item12', label: 'Item 12' },
+      { key: 'item13', label: 'Item 13' },
     ],
   },
 ]

diff --git a/packages/components/menu/demo/Slots.vue b/packages/components/menu/demo/Slots.vue
@@ -16,9 +16,8 @@ import { IxIcon } from '@idux/components/icon'
 import { MenuData } from '@idux/components/menu'
 
 const dataSource: MenuData[] = [
-  { type: 'item', key: 'item1', icon: 'home', label: 'Item 1', slots: { label: 'label' } },
+  { key: 'item1', icon: 'home', label: 'Item 1', slots: { label: 'label' } },
   {
-    type: 'item',
     key: 'item2',
     label: 'Item 2',
     slots: { label: item => h('a', item.label), icon: () => h(IxIcon, { name: 'mail' }) },
@@ -36,8 +35,8 @@ const dataSource: MenuData[] = [
         label: 'Item Group 1',
 
         children: [
-          { type: 'item', key: 'item4', label: 'Item 4', slots: { label: 'label' } },
-          { type: 'item', key: 'item5', label: 'Item 5' },
+          { key: 'item4', label: 'Item 4', slots: { label: 'label' } },
+          { key: 'item5', label: 'Item 5' },
         ],
       },
       { type: 'divider', key: 'divider2' },
@@ -46,17 +45,17 @@ const dataSource: MenuData[] = [
         key: 'sub2',
         label: 'Menu Sub 2',
         children: [
-          { type: 'item', key: 'item6', label: 'Item 6', slots: { label: 'label' } },
-          { type: 'item', key: 'item7', label: 'Item 7' },
+          { key: 'item6', label: 'Item 6', slots: { label: 'label' } },
+          { key: 'item7', label: 'Item 7' },
         ],
       },
       {
         type: 'sub',
         key: 'sub3',
         label: 'Menu Sub 3',
         children: [
-          { type: 'item', key: 'item8', label: 'Item 8' },
-          { type: 'item', key: 'item9', label: 'Item 9' },
+          { key: 'item8', label: 'Item 8' },
+          { key: 'item9', label: 'Item 9' },
         ],
       },
     ],
@@ -67,8 +66,8 @@ const dataSource: MenuData[] = [
     label: 'Menu Sub 4',
     slots: { label: 'label', icon: 'subIcon' },
     children: [
-      { type: 'item', key: 'item10', label: 'Item 10' },
-      { type: 'item', key: 'item11', label: 'Item 911' },
+      { key: 'item10', label: 'Item 10' },
+      { key: 'item11', label: 'Item 911' },
     ],
   },
 ]

diff --git a/packages/components/menu/demo/StateSwitching.vue b/packages/components/menu/demo/StateSwitching.vue
@@ -52,9 +52,9 @@ const selectedKeys = ref([])
 const expandedKeys = ref([])
 
 const dataSource: MenuData[] = [
-  { type: 'item', key: 'item1', icon: 'home', slots: { label: () => h('a', 'Item 1') } },
-  { type: 'item', key: 'item2', icon: 'mail', label: 'Item 2' },
-  { type: 'item', key: 'item3', icon: 'appstore', label: 'Item 3', disabled: true },
+  { key: 'item1', icon: 'home', slots: { label: () => h('a', 'Item 1') } },
+  { key: 'item2', icon: 'mail', label: 'Item 2' },
+  { key: 'item3', icon: 'appstore', label: 'Item 3', disabled: true },
   { type: 'divider', key: 'divider1' },
   {
     type: 'sub',
@@ -67,8 +67,8 @@ const dataSource: MenuData[] = [
         key: 'itemGroup1',
         label: 'Item Group 1',
         children: [
-          { type: 'item', key: 'item4', label: 'Item 4' },
-          { type: 'item', key: 'item5', label: 'Item 5' },
+          { key: 'item4', label: 'Item 4' },
+          { key: 'item5', label: 'Item 5' },
         ],
       },
       { type: 'divider', key: 'divider2' },
@@ -77,17 +77,17 @@ const dataSource: MenuData[] = [
         key: 'sub2',
         label: 'Menu Sub 2',
         children: [
-          { type: 'item', key: 'item6', label: 'Item 6' },
-          { type: 'item', key: 'item7', label: 'Item 7' },
+          { key: 'item6', label: 'Item 6' },
+          { key: 'item7', label: 'Item 7' },
         ],
       },
       {
         type: 'sub',
         key: 'sub3',
         label: 'Menu Sub 3',
         children: [
-          { type: 'item', key: 'item8', label: 'Item 8' },
-          { type: 'item', key: 'item9', label: 'Item 9' },
+          { key: 'item8', label: 'Item 8' },
+          { key: 'item9', label: 'Item 9' },
         ],
       },
     ],
@@ -99,8 +99,8 @@ const dataSource: MenuData[] = [
     label: 'Menu Sub 4',
     disabled: true,
     children: [
-      { type: 'item', key: 'item10', label: 'Item 10' },
-      { type: 'item', key: 'item11', label: 'Item 11' },
+      { key: 'item10', label: 'Item 10' },
+      { key: 'item11', label: 'Item 11' },
     ],
   },
 ]