From 7120fd0bae28ec788badc795d90360aada06bcf3 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 21 Feb 2024 11:47:40 +0800
Subject: [PATCH] =?UTF-8?q?feat(X-Pack):=20=E5=A4=96=E8=A7=82=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/io/dataease/menu/manage/MenuManage.java     | 1 +
 .../src/main/resources/i18n/core_zh_CN.properties             | 3 ++-
 core/core-frontend/src/assets/svg/appearance.svg              | 4 ++++
 de-xpack                                                      | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 core/core-frontend/src/assets/svg/appearance.svg

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 @@
+<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.0084 12.5772L11.0115 12.5735L18.1587 4.05577C17.1334 3.53214 15.9989 3.16579 14.7892 2.98217C13.8653 2.784 12.9121 2.68136 11.9487 2.68054L11.9244 2.68538L11.3862 2.69598L10.8754 2.7255C9.68504 2.81725 8.5066 3.0689 7.36635 3.47566C5.96498 3.98171 4.70342 4.7016 3.61179 5.61824C2.51573 6.53949 1.6519 7.60809 1.04352 8.79431C0.406226 10.0356 0.0839844 11.3413 0.0839844 12.679C0.0839844 14.014 0.407797 15.3086 1.04604 16.5268C1.6538 17.6841 2.51985 18.722 3.61919 19.6104C4.70969 20.4895 5.97173 21.1782 7.37375 21.6585C8.81778 22.1528 10.3554 22.4037 11.9371 22.4037L12.4823 22.394L13.0072 22.3649C13.5318 22.3262 14.0551 22.2584 14.5767 22.1617L15.299 22.0138L15.4949 21.9534C16.009 21.7677 16.4542 21.3876 16.7484 20.8711C17.1175 20.2232 17.2128 19.4248 17.008 18.693L16.9183 18.3439L16.8886 18.126C16.8436 17.6159 16.9673 17.0977 17.2449 16.6724C17.6021 16.128 18.1741 15.8036 18.783 15.8007H20.5511L20.7545 15.7936C22.3693 15.6808 23.6645 14.2349 23.7619 12.4285L23.7678 12.2097L23.7625 11.9698L23.7125 11.537L23.6452 11.1327C23.4394 10.0593 23.0239 9.02274 22.4088 8.0534C22.1962 7.71719 21.9625 7.39249 21.7085 7.08012C21.5761 6.89634 21.4374 6.71753 21.2926 6.54387L13.6472 15.6553C13.6324 15.6729 13.62 15.6888 13.598 15.7171L13.5611 15.7642C13.5216 15.8146 13.4624 15.889 13.3915 15.9649C13.2527 16.1133 13.0039 16.3397 12.6255 16.4369L11.8733 16.6301C10.9243 16.8739 10.0002 16.1572 10.0001 15.1773C10.0001 15.1384 9.99635 15.0834 9.98756 14.9652C9.98006 14.8642 9.96945 14.7213 9.96901 14.5731C9.96829 14.3247 9.98677 13.7947 10.351 13.3606L11.0084 12.5772ZM5.50116 13.0916C6.25903 13.0916 6.87254 13.7076 6.87512 14.4655C6.87512 15.2234 6.25903 15.8395 5.50116 15.8395C4.74071 15.8395 4.1272 15.2234 4.1272 14.4655C4.1272 13.7076 4.74329 13.0916 5.50116 13.0916ZM11.5012 6.09155C12.259 6.09155 12.8725 6.70765 12.8751 7.46552C12.8751 8.22339 12.259 8.83948 11.5012 8.83948C10.7407 8.83948 10.1272 8.22339 10.1272 7.46552C10.1272 6.70765 10.7433 6.09155 11.5012 6.09155ZM6.50116 8.09155C7.25903 8.09155 7.87254 8.70765 7.87512 9.46552C7.87512 10.2234 7.25903 10.8395 6.50116 10.8395C5.74071 10.8395 5.1272 10.2234 5.1272 9.46552C5.1272 8.70765 5.74329 8.09155 6.50116 8.09155Z" fill=""/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.8809 15.0125C12.7387 15.182 12.6041 15.4098 12.3765 15.4683L11.6243 15.6615C11.308 15.7428 10.9999 15.5039 10.9999 15.1773C10.9999 14.8387 10.8779 14.2881 11.1168 14.0034L11.7712 13.2235L11.7743 13.2199L21.8781 1.17862C22.0556 0.967081 22.371 0.939488 22.5825 1.11699L23.3486 1.75978C23.5601 1.93728 23.5877 2.25266 23.4102 2.46419L12.8809 15.0125Z" />
+</svg>
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