Merge pull request #11453 from dataease/pr@dev-v2@feat_font_manage

feat: 增加字体管理菜单

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<MenuVO> query(List<CoreMenu> coreMenus) {
-        List<MenuTreeNode> menuTreeNodes = coreMenus.stream().map(menu -> BeanUtils.copyBean(new MenuTreeNode(), menu)).toList();
+        List<MenuTreeNode> menuTreeNodes = new ArrayList<>(coreMenus.stream().map(menu -> BeanUtils.copyBean(new MenuTreeNode(), menu)).toList());
+        menuTreeNodes.sort(Comparator.comparing(MenuTreeNode::getMenuSort));
         List<MenuTreeNode> treeNodes = buildPOTree(menuTreeNodes);
         return convertTree(treeNodes);
     }

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);

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

core/core-frontend/src/assets/svg/icon_font.svg

@@ -0,0 +1,4 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.83333 4.83335H12.75C12.9801 4.83335 13.1667 5.0199 13.1667 5.25002V6.08335C13.1667 6.31347 12.9801 6.50002 12.75 6.50002H9.83333V12.75C9.83333 12.9801 9.64678 13.1667 9.41667 13.1667H8.58333C8.35321 13.1667 8.16667 12.9801 8.16667 12.75V6.50002H5.25C5.01988 6.50002 4.83333 6.31347 4.83333 6.08335V5.25002C4.83333 5.0199 5.01988 4.83335 5.25 4.83335H8.16667C8.16667 4.83335 9.83333 4.85696 9.83333 4.83335Z" fill=""/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.666666 1.50002C0.666666 1.03978 1.03976 0.666687 1.5 0.666687H16.5C16.9602 0.666687 17.3333 1.03978 17.3333 1.50002V16.5C17.3333 16.9603 16.9602 17.3334 16.5 17.3334H1.5C1.03976 17.3334 0.666666 16.9603 0.666666 16.5V1.50002ZM2.33333 15.6667V2.33335H15.6667V15.6667H2.33333Z" fill=""/>
+</svg>

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({

core/core-frontend/src/views/system/font/index.vue

@@ -0,0 +1,3 @@
+<template>
+  <h2>This is "Font manage page" for su.tong</h2>
+</template>