From df9adc330d1370259b35061dabdc8bbdce433dfc Mon Sep 17 00:00:00 2001 From: zazzaz Date: Thu, 12 Nov 2020 16:17:21 +0800 Subject: [PATCH 1/2] fix: update mune folder structure --- packages/element-plus/index.ts | 9 --------- packages/element-plus/package.json | 5 +---- packages/menu-item-group/doc/index.stories.ts | 5 ----- packages/menu-item-group/index.ts | 5 ----- packages/menu-item-group/package.json | 12 ------------ packages/menu-item/index.ts | 5 ----- packages/menu-item/package.json | 12 ------------ packages/menu/index.ts | 6 ++++++ .../src/index.vue => menu/src/menuItemGroup.vue} | 0 packages/submenu/index.ts | 5 ----- packages/submenu/package.json | 12 ------------ 11 files changed, 7 insertions(+), 69 deletions(-) delete mode 100644 packages/menu-item-group/doc/index.stories.ts delete mode 100644 packages/menu-item-group/index.ts delete mode 100644 packages/menu-item-group/package.json delete mode 100644 packages/menu-item/index.ts delete mode 100644 packages/menu-item/package.json rename packages/{menu-item-group/src/index.vue => menu/src/menuItemGroup.vue} (100%) delete mode 100644 packages/submenu/index.ts delete mode 100644 packages/submenu/package.json diff --git a/packages/element-plus/index.ts b/packages/element-plus/index.ts index 85a0974a72..46270cd47c 100644 --- a/packages/element-plus/index.ts +++ b/packages/element-plus/index.ts @@ -59,9 +59,6 @@ import ElPopover from '@element-plus/popover' import ElCascader from '@element-plus/cascader' import ElCascaderPanel from '@element-plus/cascader-panel' import ElMenu from '@element-plus/menu' -import ElMenuItem from '@element-plus/menu-item' -import ElMenuItemGroup from '@element-plus/menu-item-group' -import ElSubmenu from '@element-plus/submenu' import ElCollapseTransition from '@element-plus/transition' import { use } from '@element-plus/locale' @@ -123,9 +120,6 @@ export { ElCascader, ElCascaderPanel, ElMenu, - ElSubmenu, - ElMenuItem, - ElMenuItemGroup, ElCollapseTransition, } @@ -198,9 +192,6 @@ const install = (app: App, opt: InstallOptions = defaultInstallOpt): void => { ElCascader(app) ElCascaderPanel(app) ElMenu(app) - ElSubmenu(app) - ElMenuItem(app) - ElMenuItemGroup(app) ElCollapseTransition(app) app.config.globalProperties.$ELEMENT = opt diff --git a/packages/element-plus/package.json b/packages/element-plus/package.json index 58f7409e7f..f918f575fc 100644 --- a/packages/element-plus/package.json +++ b/packages/element-plus/package.json @@ -46,9 +46,6 @@ "@element-plus/form": "^0.0.0", "@element-plus/tree": "^0.0.0", "@element-plus/select": "^0.0.0", - "@element-plus/menu": "^0.0.0", - "@element-plus/submenu": "^0.0.0", - "@element-plus/menu-item": "^0.0.0", - "@element-plus/menu-item-group": "^0.0.0" + "@element-plus/menu": "^0.0.0" } } diff --git a/packages/menu-item-group/doc/index.stories.ts b/packages/menu-item-group/doc/index.stories.ts deleted file mode 100644 index 9cc589ac3e..0000000000 --- a/packages/menu-item-group/doc/index.stories.ts +++ /dev/null @@ -1,5 +0,0 @@ -import ElMenuItemGroup from '../index' - -export default { - title: 'MenuItem-group', -} diff --git a/packages/menu-item-group/index.ts b/packages/menu-item-group/index.ts deleted file mode 100644 index f1671e18ef..0000000000 --- a/packages/menu-item-group/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { App } from 'vue' -import MenuItemGroup from '../menu/src/menuGroup.vue' -export default (app: App): void => { - app.component(MenuItemGroup.name, MenuItemGroup) -} diff --git a/packages/menu-item-group/package.json b/packages/menu-item-group/package.json deleted file mode 100644 index 3c2de02994..0000000000 --- a/packages/menu-item-group/package.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "@element-plus/menu-item-group", - "version": "0.0.0", - "main": "dist/index.js", - "license": "MIT", - "peerDependencies": { - "vue": "^3.0.0-rc.9" - }, - "devDependencies": { - "@vue/test-utils": "^2.0.0-beta.3" - } -} diff --git a/packages/menu-item/index.ts b/packages/menu-item/index.ts deleted file mode 100644 index 9d1c00aee5..0000000000 --- a/packages/menu-item/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { App } from 'vue' -import MenuItem from '../menu/src/menuItem.vue' -export default (app: App): void => { - app.component(MenuItem.name, MenuItem) -} diff --git a/packages/menu-item/package.json b/packages/menu-item/package.json deleted file mode 100644 index c3639a0112..0000000000 --- a/packages/menu-item/package.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "@element-plus/menu-item", - "version": "0.0.0", - "main": "dist/index.js", - "license": "MIT", - "peerDependencies": { - "vue": "^3.0.0-rc.9" - }, - "devDependencies": { - "@vue/test-utils": "^2.0.0-beta.3" - } -} diff --git a/packages/menu/index.ts b/packages/menu/index.ts index 362e2ecd4d..b9fbd148c4 100644 --- a/packages/menu/index.ts +++ b/packages/menu/index.ts @@ -1,5 +1,11 @@ import { App } from 'vue' import Menu from './src/menu.vue' +import Submenu from './src/submenu.vue' +import MenuItem from './src/menuItem.vue' +import MenuItemGroup from './src/menuItemGroup.vue' export default (app: App): void => { app.component(Menu.name, Menu) + app.component(Submenu.name, Submenu) + app.component(MenuItem.name, MenuItem) + app.component(MenuItemGroup.name, MenuItemGroup) } diff --git a/packages/menu-item-group/src/index.vue b/packages/menu/src/menuItemGroup.vue similarity index 100% rename from packages/menu-item-group/src/index.vue rename to packages/menu/src/menuItemGroup.vue diff --git a/packages/submenu/index.ts b/packages/submenu/index.ts deleted file mode 100644 index 7243827f4b..0000000000 --- a/packages/submenu/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { App } from 'vue' -import Submenu from '../menu/src/submenu.vue' -export default (app: App): void => { - app.component(Submenu.name, Submenu) -} diff --git a/packages/submenu/package.json b/packages/submenu/package.json deleted file mode 100644 index a273a9a7c5..0000000000 --- a/packages/submenu/package.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "@element-plus/submenu", - "version": "0.0.0", - "main": "dist/index.js", - "license": "MIT", - "peerDependencies": { - "vue": "^3.0.0" - }, - "devDependencies": { - "@vue/test-utils": "^2.0.0-beta.3" - } -} From ef2aa961a7d003bf37c54737c9d41c2a716db1dc Mon Sep 17 00:00:00 2001 From: zazzaz Date: Thu, 12 Nov 2020 16:46:12 +0800 Subject: [PATCH 2/2] docs: update menu doc --- website/docs/en-US/menu.md | 30 +++++++++++++-------------- website/docs/es/menu.md | 42 +++++++++++++++++++------------------- website/docs/fr-FR/menu.md | 30 +++++++++++++-------------- website/docs/jp/menu.md | 30 +++++++++++++-------------- 4 files changed, 66 insertions(+), 66 deletions(-) diff --git a/website/docs/en-US/menu.md b/website/docs/en-US/menu.md index 802e8d96d6..666c9ef7d9 100644 --- a/website/docs/en-US/menu.md +++ b/website/docs/en-US/menu.md @@ -11,12 +11,12 @@ Top bar NavMenu can be used in a variety of scenarios. Processing Center - + item one item two item three - + item one item two item three @@ -36,12 +36,12 @@ Top bar NavMenu can be used in a variety of scenarios. active-text-color="#ffd04b"> Processing Center - + item one item two item three - + item one item two item three @@ -84,7 +84,7 @@ Vertical NavMenu with sub-menus. @open="handleOpen" @close="handleClose"> -