Commit cc80395906cdc735886883c8580ad2f018097e0e
Merge branch 'dev-fix-ww' into 'main_dev'
fix: 修复系统管理修改密码权限控制 See merge request yunteng/thingskit-front!580
Showing
2 changed files
with
4 additions
and
3 deletions
@@ -17,7 +17,6 @@ | @@ -17,7 +17,6 @@ | ||
17 | icon="ion:document-text-outline" | 17 | icon="ion:document-text-outline" |
18 | /> | 18 | /> |
19 | <MenuItem | 19 | <MenuItem |
20 | - v-if="hasPermission('system:password:view')" | ||
21 | key="changePassword" | 20 | key="changePassword" |
22 | :text="t('layout.header.dropdownItemChangePassword')" | 21 | :text="t('layout.header.dropdownItemChangePassword')" |
23 | icon="ant-design:unlock-twotone" | 22 | icon="ant-design:unlock-twotone" |
@@ -91,9 +91,11 @@ | @@ -91,9 +91,11 @@ | ||
91 | }, | 91 | }, |
92 | ]; | 92 | ]; |
93 | }); | 93 | }); |
94 | - | ||
95 | const getCommonProps = computed(() => { | 94 | const getCommonProps = computed(() => { |
96 | - const menus = unref(menusRef); | 95 | + let menus = unref(menusRef); |
96 | + // 子菜单都隐藏后 目录隐藏 | ||
97 | + menus = menus.filter((item) => !item.children?.every((temp) => temp.hideMenu)); | ||
98 | + | ||
97 | return { | 99 | return { |
98 | menus, | 100 | menus, |
99 | beforeClickFn: beforeMenuClickFn, | 101 | beforeClickFn: beforeMenuClickFn, |