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 f5e3296bfa..f98fcfcd49 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 @@ -97,6 +97,7 @@ public class MenuManage { || coreMenu.getPid().equals(21L) || coreMenu.getId().equals(25L) || coreMenu.getId().equals(26L) + || coreMenu.getId().equals(27L) || coreMenu.getId().equals(35L) || coreMenu.getId().equals(40L); } 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 926674c050..29ceca0696 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 @@ -20,10 +20,11 @@ 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\u8fde\u63a5\u7ba1\u7406 +i18n_menu.ds=\u6570\u636E\u8FDE\u63A5\u7BA1\u7406 i18n_menu.task=\u4EFB\u52A1\u7BA1\u7406 i18n_menu.embedded=\u5D4C\u5165\u5F0F\u7BA1\u7406 i18n_menu.platform=\u5E73\u53F0\u5BF9\u63A5 +i18n_menu.appearance=\u5916\u89C2\u914D\u7F6E 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/appearance.svg b/core/core-frontend/src/assets/svg/appearance.svg new file mode 100644 index 0000000000..e9100f7102 --- /dev/null +++ b/core/core-frontend/src/assets/svg/appearance.svg @@ -0,0 +1,4 @@ + + + + diff --git a/de-xpack b/de-xpack index d91fad66a0..a8a4094908 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit d91fad66a01390234f04604e699098a6476abe38 +Subproject commit a8a40949083bfab6fe5c632ff67a2f353f64b214