-
Notifications
You must be signed in to change notification settings - Fork 288
feat(menu): 菜单组件 #516
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
feat(menu): 菜单组件 #516
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
6fcb230
feat(menu): 菜单组件
GaoNeng-wWw 9eaaf0c
feat(menu): menu组件
GaoNeng-wWw 0bc9a67
fix(theme): 恢复误删除变量
GaoNeng-wWw 0d3d346
Merge branch 'DevCloudFE:dev' into gaonengwWw/menu
GaoNeng-wWw 91f9724
fix(menu): pr#516
GaoNeng-wWw 2d7d561
fix(menu): 修复类型文件丢失
GaoNeng-wWw db1c9c7
fix(menu): 修复了一个逻辑错误
GaoNeng-wWw File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| import { mount, shallowMount } from '@vue/test-utils'; | ||
| import { reactive, ref } from 'vue'; | ||
| import { Menu,SubMenu,MenuItem } from '../index'; | ||
|
|
||
| const factory_Menu = (value: Record<string,unknown>) => shallowMount(Menu, value); | ||
|
|
||
| describe('menu test', () => { | ||
| it('menu - defaultMode test', async ()=>{ | ||
| // | ||
| const menu = factory_Menu({}); | ||
| expect(menu.classes().indexOf('vertical')).toBe(1); | ||
| }); | ||
| it('menu - dynamic - mode', async ()=>{ | ||
| const menu = factory_Menu({ | ||
| props: { | ||
| 'mode': 'horizontal' | ||
| } | ||
| }); | ||
| expect(menu.classes().indexOf('horizontal')).not.toBe(-1); | ||
| }); | ||
|
|
||
| // 参数动态测试 - defaultSelectKeys | ||
| it('menu - dynamic attr - defaultSelectKeys ', async ()=>{ | ||
| // | ||
| const wrapper = mount({ | ||
| components: { | ||
| Menu, | ||
| SubMenu, | ||
| MenuItem | ||
| }, | ||
| template: ` | ||
| <Menu :default-select-keys="selectKeys"> | ||
| <MenuItem key='test'> | ||
| Test | ||
| </MenuItem> | ||
| </Menu> | ||
| <button @click="clickHandle">Change key</button> | ||
| `, | ||
| setup(){ | ||
| const selectKeys = ref(['test']); | ||
| const clickHandle = () => { | ||
| selectKeys.value.pop(); | ||
| }; | ||
| return { | ||
| selectKeys, | ||
| clickHandle | ||
| }; | ||
| } | ||
| }); | ||
| expect(wrapper.find('li').classes().indexOf('devui-menu-item-select')).not.toBe(-1); | ||
| await wrapper.find('button').trigger('click'); | ||
| expect(wrapper.find('li').classes().indexOf('devui-menu-item-select')).toBe(-1); | ||
| }); | ||
| // 参数动态测试 - openKeys | ||
| it('menu - dynamic attr - openKeys', async () => { | ||
| // | ||
| const wrapper = mount({ | ||
| components: {Menu,SubMenu,MenuItem}, | ||
| template: ` | ||
| <Menu :open-keys="defaultOpenKey"> | ||
| <SubMenu key="1"> | ||
| <MenuItem> | ||
| SubMenu > Item 1 | ||
| </MenuItem> | ||
| <MenuItem> | ||
| SubMenu > Item 2 | ||
| </MenuItem> | ||
| </SubMenu> | ||
| <SubMenu key="2"> | ||
| <MenuItem> | ||
| SubMenu2 > Item 1 | ||
| </MenuItem> | ||
| <MenuItem> | ||
| SubMenu2 > Item 2 | ||
| </MenuItem> | ||
| </SubMenu> | ||
| </Menu> | ||
| <button @click=change>Click to Change openKeys</button> | ||
| `, | ||
| setup(){ | ||
| const defaultOpenKey = ref(['1']); | ||
| const change = ()=>{ | ||
| if (defaultOpenKey.value.length < 2){ | ||
| defaultOpenKey.value.push('2'); | ||
| } else { | ||
| defaultOpenKey.value.pop(); | ||
| } | ||
| }; | ||
| return { | ||
| defaultOpenKey, | ||
| change | ||
| }; | ||
| } | ||
| }); | ||
| console.log(wrapper.findAll('ul')[2].classes()); | ||
| await wrapper.find('button').trigger('click'); | ||
| console.log(wrapper.findAll('ul')[2].classes()); | ||
| await wrapper.find('button').trigger('click'); | ||
| console.log(wrapper.findAll('ul')[2].classes()); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| import type { App } from 'vue'; | ||
| import MenuItem from './src/components/menu-item'; | ||
| import SubMenu from './src/components/sub-menu'; | ||
| import Menu from './src/menu'; | ||
|
|
||
| export { Menu,SubMenu,MenuItem }; | ||
|
|
||
| export default { | ||
| title: 'Menu 菜单', | ||
| category: '布局', | ||
| status: "90%", // TODO: 组件若开发完成则填入"100%",并删除该注释 | ||
| install(app: App): void { | ||
| app.component(Menu.name, Menu); | ||
| app.component(MenuItem.name, MenuItem); | ||
| app.component(SubMenu.name, SubMenu); | ||
| } | ||
| }; | ||
175 changes: 175 additions & 0 deletions
175
packages/devui-vue/devui/menu/src/components/menu-item.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,175 @@ | ||
| import { changeKey } from '../composables/layer-composables'; | ||
| import { defineComponent, | ||
| getCurrentInstance, | ||
| onMounted, | ||
| ref, | ||
| Transition, | ||
| watch, | ||
| inject, | ||
| Ref, | ||
| reactive, | ||
| toRefs, | ||
| } from "vue"; | ||
| import { MenuItemProps, menuItemProps } from "../types/menu-item-types"; | ||
| import { useInitSelect } from '../composables/init-select'; | ||
| import { addActiveParent } from '../composables/add-active-parent'; | ||
|
|
||
|
|
||
| export default defineComponent({ | ||
| name: 'DMenuItem', | ||
| props: menuItemProps, | ||
| setup(props: MenuItemProps, ctx){ | ||
| const instance = getCurrentInstance(); | ||
| const key = String(instance?.vnode.key); | ||
| const mode = inject('mode') as Ref<('vertical' | 'horizontal')>; | ||
| const multiple = inject('multiple') as boolean; | ||
| const indent = inject('defaultIndent'); | ||
| const isCollapsed = inject('isCollapsed') as Ref<boolean>; | ||
| const defaultSelectKey = (inject('defaultSelectKey') as string[]); | ||
| const {disabled} = toRefs(props); | ||
| const isSelect = ref(useInitSelect(defaultSelectKey, key, multiple, disabled)); | ||
| const isLayer1 = ref(true); | ||
| const rootMenuEmit = inject('rootMenuEmit') as (eventName: string, ...args: unknown[]) => void; | ||
| const classObject: Record<string,boolean> = reactive({ | ||
| 'devui-menu-item': true, | ||
| 'devui-menu-item-isCollapsed': isCollapsed.value, | ||
| 'devui-isCollapsed-item': isCollapsed.value, | ||
| 'devui-menu-item-select': isSelect.value, | ||
| 'devui-menu-item-disabled': disabled.value | ||
| }); | ||
| const onClick = (e: MouseEvent) => { | ||
| e.preventDefault(); | ||
| e.stopPropagation(); | ||
| const ele = e.currentTarget as HTMLElement; | ||
| if (!props.disabled){ | ||
| if (!multiple){ | ||
| changeKey(ele,e); | ||
| ele.classList.add('devui-menu-item-select'); | ||
| } else { | ||
| if (ele.classList.contains('devui-menu-item-select')){ | ||
| ele.classList.remove('devui-menu-item-select'); | ||
| rootMenuEmit('deselect', {type: 'deselect', el: ele, e}); | ||
| return; | ||
| } else { | ||
| ele.classList.add('devui-menu-item-select'); | ||
| } | ||
| } | ||
| rootMenuEmit('select', {type: 'select', el: ele, e}); | ||
| } | ||
| if (mode.value === 'vertical'){ | ||
| const target = (e.currentTarget as HTMLElement); | ||
| addActiveParent(target); | ||
| } | ||
| if (mode.value === 'horizontal') { | ||
| const ul = ele.parentElement?.parentElement; | ||
| ul?.classList.add('devui-menu-active-parent'); | ||
| } | ||
| }; | ||
| const icons = <span class="devui-menu-icon">{ctx.slots.icon?.()}</span>; | ||
| const menuItems = ref(null); | ||
| // watchEffect(()=>{ | ||
| // pushItem({el: menuItems.value as HTMLElement | null}); | ||
| // },{flush:'post'}); | ||
kagol marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| watch(disabled, ()=> {classObject['devui-menu-item-select'] = false;}); | ||
| watch(defaultSelectKey, (n)=>{ | ||
| isSelect.value = useInitSelect(n,key,multiple,disabled); | ||
| classObject['devui-menu-item-select'] = isSelect.value; | ||
| }); | ||
| onMounted(()=>{ | ||
| let oldPadding = ''; | ||
| const ele = (menuItems.value) as unknown as HTMLElement; | ||
| if (mode.value === 'vertical'){ | ||
| if (ele.parentElement?.parentElement?.classList.contains('devui-menu')){ | ||
| isLayer1.value = true; | ||
| if (isLayer1.value){ | ||
| ele.style.paddingRight = ``; | ||
| ele.style.paddingLeft = `${indent}px`; | ||
| } | ||
| watch(isCollapsed, (val)=>{ | ||
| if (val){ | ||
| if (ele.style.padding !== '0'){ | ||
| oldPadding = ele.style.padding; | ||
| } | ||
| setTimeout(() => { | ||
| ele.style.padding = '0'; | ||
| ele.style.width = ''; | ||
| ele.style.textAlign = `center`; | ||
| }, 300); | ||
| ele.style.display=`block`; | ||
| } else { | ||
| ele.style.padding = `${oldPadding}`; | ||
| ele.style.textAlign = ``; | ||
| ele.style.display=`flex`; | ||
| } | ||
| }); | ||
| } else { | ||
| isLayer1.value = false; | ||
| } | ||
| } | ||
| }); | ||
| return () => { | ||
| return ( | ||
| mode.value === 'vertical' ? | ||
| <div class='devui-menu-item-vertical-wrapper'> | ||
| <li | ||
| class = { | ||
| [ | ||
| classObject, | ||
| props['disabled'] ? 'devui-menu-item-disabled' : '', | ||
| isLayer1.value ? 'layer_1' : '', | ||
| ] | ||
| } | ||
| onClick={onClick} | ||
| ref={menuItems} | ||
| > | ||
| {ctx.slots.icon !== undefined && | ||
| icons | ||
| } | ||
| { props.href === '' ? | ||
| <Transition name='fade'> | ||
| <span v-show={!isCollapsed.value}> | ||
| {ctx.slots.default?.()} | ||
| </span> | ||
| </Transition> | ||
| : | ||
| <a href={props.href}> | ||
| <Transition name='fade'> | ||
| {ctx.slots.default?.()} | ||
| </Transition> | ||
| </a> | ||
| } | ||
| </li> | ||
| </div> | ||
| : | ||
| <li | ||
| class = { | ||
| [ | ||
| classObject, | ||
| props['disabled'] ? 'devui-menu-item-disabled' : '', | ||
| isLayer1.value ? 'layer_1' : '', | ||
| ] | ||
| } | ||
| onClick={onClick} | ||
| ref={menuItems} | ||
| > | ||
| {ctx.slots.icon !== undefined && | ||
| icons | ||
| } | ||
| { props.href === '' ? | ||
| <Transition name='fade'> | ||
| <span v-show={!isCollapsed.value}> | ||
| {ctx.slots.default?.()} | ||
| </span> | ||
| </Transition> | ||
| : | ||
| <a href={props.href}> | ||
| <Transition name='fade'> | ||
| {ctx.slots.default?.()} | ||
| </Transition> | ||
| </a> | ||
| } | ||
| </li> | ||
| ); | ||
| }; | ||
| }, | ||
| }); | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.