Commit 987fffa08d7628429769494b13d1fadc84528711

Authored by xp.Huang
2 parents c7dcd1d2 cc803959

Merge branch 'main_dev' into 'main'

thingskit1.1.0 version merge

See merge request yunteng/thingskit-front!581
... ... @@ -17,7 +17,6 @@
17 17 icon="ion:document-text-outline"
18 18 />
19 19 <MenuItem
20   - v-if="hasPermission('system:password:view')"
21 20 key="changePassword"
22 21 :text="t('layout.header.dropdownItemChangePassword')"
23 22 icon="ant-design:unlock-twotone"
... ...
... ... @@ -91,9 +91,11 @@
91 91 },
92 92 ];
93 93 });
94   -
95 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 99 return {
98 100 menus,
99 101 beforeClickFn: beforeMenuClickFn,
... ...