gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【7.2.3】修复权限分配联动问题

pull/30/head
fengshuonan 2022-06-24 19:27:37 +08:00
parent 472339883c
commit ca0a8663c0
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/AntdMenusFactory.java
View File

@ -212,15 +212,21 @@ public class AntdMenusFactory {
} }
} }
// 遍历一遍后，当前菜单没按钮，则直接略过
if (ObjectUtil.isEmpty(menuButtonList)) {
menuAndButtonTreeResponse.setButtons(menuButtonList);
continue;
}
long checkedButtonsNumber = menuButtonList.stream().filter(MenuAndButtonTreeResponse::getChecked).count(); long checkedButtonsNumber = menuButtonList.stream().filter(MenuAndButtonTreeResponse::getChecked).count();
// 统计选中的数量 // 统计选中的数量
if (checkedButtonsNumber == menuButtonList.size()) { if (checkedButtonsNumber == 0) {
menuAndButtonTreeResponse.setChecked(true);
menuAndButtonTreeResponse.setIndeterminate(false);
} else if (checkedButtonsNumber == 0) {
menuAndButtonTreeResponse.setChecked(false); menuAndButtonTreeResponse.setChecked(false);
menuAndButtonTreeResponse.setIndeterminate(false); menuAndButtonTreeResponse.setIndeterminate(false);
} else if (checkedButtonsNumber == menuButtonList.size()) {
menuAndButtonTreeResponse.setChecked(true);
menuAndButtonTreeResponse.setIndeterminate(false);
} else { } else {
menuAndButtonTreeResponse.setChecked(false); menuAndButtonTreeResponse.setChecked(false);
menuAndButtonTreeResponse.setIndeterminate(true); menuAndButtonTreeResponse.setIndeterminate(true);

8
kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/IndeterminateFactory.java
View File

@ -58,12 +58,12 @@ public class IndeterminateFactory {
int childrenSize = children.size(); int childrenSize = children.size();
// 统计选中的数量 // 统计选中的数量
if (selectedCount == childrenSize) { if (selectedCount == 0) {
menuAndButtonTreeRespons.setChecked(true);
menuAndButtonTreeRespons.setIndeterminate(false);
} else if (selectedCount == 0) {
menuAndButtonTreeRespons.setChecked(false); menuAndButtonTreeRespons.setChecked(false);
menuAndButtonTreeRespons.setIndeterminate(false); menuAndButtonTreeRespons.setIndeterminate(false);
} else if (selectedCount == childrenSize) {
menuAndButtonTreeRespons.setChecked(true);
menuAndButtonTreeRespons.setIndeterminate(false);
} else { } else {
menuAndButtonTreeRespons.setChecked(false); menuAndButtonTreeRespons.setChecked(false);
menuAndButtonTreeRespons.setIndeterminate(true); menuAndButtonTreeRespons.setIndeterminate(true);

8
kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java
View File

@ -197,12 +197,12 @@ public class SysResourceServiceImpl extends ServiceImpl<SysResourceMapper, SysRe
} }
// 统计选中的数量 // 统计选中的数量
if (checkedNumber == entry.getValue().size()) { if (checkedNumber == 0) {
item.setChecked(true);
item.setIndeterminate(false);
} else if (checkedNumber == 0) {
item.setChecked(false); item.setChecked(false);
item.setIndeterminate(false); item.setIndeterminate(false);
} else if (checkedNumber == entry.getValue().size()) {
item.setChecked(true);
item.setIndeterminate(false);
} else { } else {
item.setChecked(false); item.setChecked(false);
item.setIndeterminate(true); item.setIndeterminate(true);