From 18a4542466ce7f0cfa445b424b7576e84bc4bfd4 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 8 Aug 2024 20:22:07 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/menu/manage/MenuManage.java | 4 +++- .../src/main/resources/db/migration/V2.10__ddl.sql | 2 ++ .../src/main/resources/i18n/core_zh_CN.properties | 3 ++- core/core-frontend/src/assets/svg/icon_font.svg | 4 ++++ core/core-frontend/src/components/icon-custom/src/Icon.vue | 4 +++- core/core-frontend/src/views/system/font/index.vue | 3 +++ de-xpack | 2 +- 7 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 core/core-frontend/src/assets/svg/icon_font.svg create mode 100644 core/core-frontend/src/views/system/font/index.vue 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 56c0b8c20a..6810a625db 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 @@ -14,6 +14,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; import java.util.ArrayList; +import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -31,7 +32,8 @@ public class MenuManage { @XpackInteract(value = "menuApi") public List query(List coreMenus) { - List menuTreeNodes = coreMenus.stream().map(menu -> BeanUtils.copyBean(new MenuTreeNode(), menu)).toList(); + List menuTreeNodes = new ArrayList<>(coreMenus.stream().map(menu -> BeanUtils.copyBean(new MenuTreeNode(), menu)).toList()); + menuTreeNodes.sort(Comparator.comparing(MenuTreeNode::getMenuSort)); List treeNodes = buildPOTree(menuTreeNodes); return convertTree(treeNodes); } diff --git a/core/core-backend/src/main/resources/db/migration/V2.10__ddl.sql b/core/core-backend/src/main/resources/db/migration/V2.10__ddl.sql index f6a904983a..2101e37556 100644 --- a/core/core-backend/src/main/resources/db/migration/V2.10__ddl.sql +++ b/core/core-backend/src/main/resources/db/migration/V2.10__ddl.sql @@ -6,3 +6,5 @@ alter table `core_dataset_table_field` add params text null comment '计算字 alter table `core_datasource` add `enable_data_fill` tinyint default 0 null comment '启用数据填报功能'; + +INSERT INTO `core_menu` VALUES (64, 15, 2, 'font', 'system/font', 10, 'icon_font', '/font', 0, 1, 0); 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 a81e5fa41b..b63511eede 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 @@ -31,7 +31,8 @@ i18n_menu.plugin=\u63D2\u4EF6\u7BA1\u7406 i18n_menu.platform=\u5E73\u53F0\u5BF9\u63A5 i18n_menu.appearance=\u5916\u89C2\u914D\u7F6E i18n_menu.sysVariable=\u7CFB\u7EDF\u53D8\u91CF -i18n_menu.sysTypeface=\u5b57\u4f53\u7ba1\u7406 +i18n_menu.sysTypeface=\u5B57\u4F53\u7BA1\u7406 +i18n_menu.font=\u5B57\u4F53\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/icon_font.svg b/core/core-frontend/src/assets/svg/icon_font.svg new file mode 100644 index 0000000000..769b6a5b96 --- /dev/null +++ b/core/core-frontend/src/assets/svg/icon_font.svg @@ -0,0 +1,4 @@ + + + + diff --git a/core/core-frontend/src/components/icon-custom/src/Icon.vue b/core/core-frontend/src/components/icon-custom/src/Icon.vue index 3aa6244007..1fd078397e 100644 --- a/core/core-frontend/src/components/icon-custom/src/Icon.vue +++ b/core/core-frontend/src/components/icon-custom/src/Icon.vue @@ -669,6 +669,7 @@ import icon_radio_outlined from '@/assets/svg/icon_radio_outlined.svg' import icon_single_line_outlined from '@/assets/svg/icon_single-line_outlined.svg' import icon_todo_outlined from '@/assets/svg/icon_todo_outlined.svg' import icon_file_doc_colorful from '@/assets/svg/icon_file-doc_colorful.svg' +import icon_font from '@/assets/svg/icon_font.svg' const iconMap = { '401': _401, '403': _403, @@ -1336,7 +1337,8 @@ const iconMap = { 'word-cloud-origin': wordCloudOrigin, 'word-cloud': wordCloud, calculate, - 'icon_file-doc_colorful': icon_file_doc_colorful + 'icon_file-doc_colorful': icon_file_doc_colorful, + icon_font } const props = defineProps({ diff --git a/core/core-frontend/src/views/system/font/index.vue b/core/core-frontend/src/views/system/font/index.vue new file mode 100644 index 0000000000..cecb5820c8 --- /dev/null +++ b/core/core-frontend/src/views/system/font/index.vue @@ -0,0 +1,3 @@ + diff --git a/de-xpack b/de-xpack index 208ad5891e..4481e6aa51 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 208ad5891ebf2177fb4e45af3812236264305189 +Subproject commit 4481e6aa512c3f1e37975ef8f34a8fb14a9d9962