diff --git a/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java b/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java index 7081cead3c..0f5685a76c 100644 --- a/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java +++ b/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java @@ -11,7 +11,6 @@ import io.dataease.menu.dao.auto.mapper.CoreMenuMapper; import io.dataease.utils.BeanUtils; import jakarta.annotation.Resource; import org.apache.commons.lang3.StringUtils; -import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Component; import java.util.ArrayList; @@ -19,8 +18,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static io.dataease.constant.CacheConstant.OrgCacheConstant.CORE_MENU_CACHE; - @Component public class MenuManage { @@ -39,7 +36,7 @@ public class MenuManage { return convertTree(treeNodes); } -// @Cacheable(cacheNames = CORE_MENU_CACHE, key = "'-dataease-'") + // @Cacheable(cacheNames = CORE_MENU_CACHE, key = "'-dataease-'") public List coreMenus() { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.orderByAsc("menu_sort"); @@ -67,7 +64,7 @@ public class MenuManage { if (CollectionUtil.isNotEmpty(children = menuTreeNode.getChildren())) { vo.setChildren(convertTree(children)); } - if (CollectionUtil.isNotEmpty(children) || menuTreeNode.getType() != 1) { + if (CollectionUtil.isNotEmpty(vo.getChildren()) || menuTreeNode.getType() != 1) { result.add(vo); } } @@ -91,6 +88,12 @@ public class MenuManage { } private boolean isXpackMenu(CoreMenu coreMenu) { - return coreMenu.getId().equals(7L) || coreMenu.getPid().equals(7L) || coreMenu.getId().equals(14L) || coreMenu.getId().equals(17L) || coreMenu.getId().equals(18L); + return coreMenu.getId().equals(7L) + || coreMenu.getPid().equals(7L) + || coreMenu.getId().equals(14L) + || coreMenu.getId().equals(17L) + || coreMenu.getId().equals(18L) + || coreMenu.getId().equals(21L) + || coreMenu.getPid().equals(21L); } } diff --git a/core/core-backend/src/main/resources/i18n/core_zh_CN.properties b/core/core-backend/src/main/resources/i18n/core_zh_CN.properties index 0aa7d104fe..a4c4d2a969 100644 --- a/core/core-backend/src/main/resources/i18n/core_zh_CN.properties +++ b/core/core-backend/src/main/resources/i18n/core_zh_CN.properties @@ -18,6 +18,10 @@ i18n_menu.datasource=\u6570\u636E\u6E90 i18n_menu.user=\u7528\u6237\u7BA1\u7406 i18n_menu.org=\u7EC4\u7EC7\u7BA1\u7406 i18n_menu.auth=\u6743\u9650\u914D\u7F6E +i18n_menu.sync=\u540C\u6B65\u7BA1\u7406 +i18n_menu.summary=\u6982\u89C8 +i18n_menu.ds=\u6570\u636E\u6E90\u7BA1\u7406 +i18n_menu.task=\u4EFB\u52A1\u7BA1\u7406 i18n_field_name_repeat=\u6709\u91CD\u590D\u5B57\u6BB5\u540D\uFF1A i18n_pid_not_eq_id=\u79FB\u52A8\u76EE\u6807\u4E0D\u80FD\u662F\u81EA\u5DF1\u6216\u5B50\u76EE\u5F55 i18n_ds_name_exists=\u8BE5\u5206\u7EC4\u4E0B\u540D\u79F0\u91CD\u590D diff --git a/core/core-frontend/src/assets/svg/sync.svg b/core/core-frontend/src/assets/svg/sync.svg new file mode 100644 index 0000000000..ce1fb9cc4a --- /dev/null +++ b/core/core-frontend/src/assets/svg/sync.svg @@ -0,0 +1,3 @@ + + + diff --git a/de-xpack b/de-xpack index 9088bf9f2f..5de0ff0ed8 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 9088bf9f2fcea60e26db765c1307b04e6567cf93 +Subproject commit 5de0ff0ed89e42656795c09ddc236c77a321d43e