Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix(theme): 修复了menu组件覆盖文档的错误 #537

Merged
merged 9 commits into from
Apr 20, 2022
Merged

fix(theme): 修复了menu组件覆盖文档的错误 #537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6fcb230
feat(menu): 菜单组件
GaoNeng-wWw Apr 18, 2022
9eaaf0c
feat(menu): menu组件
GaoNeng-wWw Apr 18, 2022
0bc9a67
fix(theme): 恢复误删除变量
GaoNeng-wWw Apr 18, 2022
0d3d346
Merge branch 'DevCloudFE:dev' into gaonengwWw/menu
GaoNeng-wWw Apr 18, 2022
91f9724
fix(menu): pr#516
GaoNeng-wWw Apr 18, 2022
2d7d561
fix(menu): 修复类型文件丢失
GaoNeng-wWw Apr 18, 2022
db1c9c7
fix(menu): 修复了一个逻辑错误
GaoNeng-wWw Apr 18, 2022
24708b3
fix(theme): 修复了menu组件覆盖了文档主题的错误
GaoNeng-wWw Apr 20, 2022
99eadd6
Merge branch 'dev' of https://github.com/DevCloudFE/vue-devui into ga…
GaoNeng-wWw Apr 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions packages/devui-vue/devui/menu/src/components/menu-item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@ export default defineComponent({
};
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'});
watch(disabled, ()=> {classObject['devui-menu-item-select'] = false;});
watch(defaultSelectKey, (n)=>{
isSelect.value = useInitSelect(n,key,multiple,disabled);
Expand Down
12 changes: 10 additions & 2 deletions packages/devui-vue/devui/menu/src/styles/clear.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
a {
text-decoration: none;
.devui-menu-vertical,
.devui-menu-horizontal {
a {
text-decoration: none;
}

ul,
li {
list-style: none;
}
}