From 46b3915b2aa88cb76576fa3d77eec3c56a98c560 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 8 Aug 2024 18:48:57 +0800
Subject: [PATCH] =?UTF-8?q?feat(X-Pack):=20=E5=A2=9E=E5=8A=A0=E8=A1=80?=
 =?UTF-8?q?=E7=BC=98=E5=88=86=E6=9E=90=E3=80=81=E5=91=8A=E8=AD=A6=E7=AE=A1?=
 =?UTF-8?q?=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/resources/i18n/core_zh_CN.properties           | 2 ++
 core/core-frontend/src/assets/svg/association.svg           | 6 ++++++
 core/core-frontend/src/assets/svg/threshold.svg             | 3 +++
 core/core-frontend/src/components/icon-custom/src/Icon.vue  | 4 ++++
 de-xpack                                                    | 2 +-
 5 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 core/core-frontend/src/assets/svg/association.svg
 create mode 100644 core/core-frontend/src/assets/svg/threshold.svg

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 92383858c6..6652b56019 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
@@ -21,6 +21,8 @@ i18n_menu.org=\u7EC4\u7EC7\u7BA1\u7406
 i18n_menu.auth=\u6743\u9650\u914D\u7F6E
 i18n_menu.report=\u5B9A\u65F6\u62A5\u544A
 i18n_menu.sync=\u540C\u6B65\u7BA1\u7406
+i18n_menu.association=\u8840\u7F18\u5206\u6790
+i18n_menu.threshold=\u544A\u8B66\u7BA1\u7406
 i18n_menu.summary=\u6982\u89C8
 i18n_menu.ds=\u6570\u636E\u8FDE\u63A5\u7BA1\u7406
 i18n_menu.task=\u4EFB\u52A1\u7BA1\u7406
diff --git a/core/core-frontend/src/assets/svg/association.svg b/core/core-frontend/src/assets/svg/association.svg
new file mode 100644
index 0000000000..5d8243d560
--- /dev/null
+++ b/core/core-frontend/src/assets/svg/association.svg
@@ -0,0 +1,6 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.55055 8.44446C4.20381 7.54988 4.78204 5.96571 5.35886 3.66363C5.68818 2.34934 6.08868 1.7778 6.43613 1.7778C6.74295 1.7778 6.99168 1.52907 6.99168 1.22224C6.99168 0.915418 6.74295 0.666687 6.43613 0.666687C5.39921 0.666687 4.72228 1.63271 4.28107 3.39357C3.78639 5.36783 3.28341 6.7504 2.84258 7.51417C2.65364 7.39943 2.43186 7.33335 2.19466 7.33335H1.36133C0.670972 7.33335 0.111328 7.893 0.111328 8.58335V9.41669C0.111328 10.107 0.670972 10.6667 1.36133 10.6667H2.19466C2.4011 10.6667 2.59585 10.6166 2.76745 10.528C3.17348 11.3576 3.6237 12.6971 4.06629 14.5236C4.50649 16.3404 5.17939 17.3334 6.22238 17.3334C6.52921 17.3334 6.77794 17.0846 6.77794 16.7778C6.77794 16.471 6.52921 16.2222 6.22238 16.2222C5.88102 16.2222 5.47648 15.6253 5.14615 14.262C4.61474 12.0688 4.08324 10.5087 3.49219 9.55558H7.08353C7.2216 9.55558 7.33353 9.44365 7.33353 9.30558V8.69446C7.33353 8.55639 7.2216 8.44446 7.08353 8.44446H3.55055Z" fill=""/>
+<path d="M9.00024 1.63891C9.00024 1.40879 9.18679 1.22224 9.41691 1.22224H17.4725C17.7026 1.22224 17.8891 1.40879 17.8891 1.63891V3.0278C17.8891 3.25792 17.7026 3.44447 17.4725 3.44447H9.41691C9.18679 3.44447 9.00024 3.25792 9.00024 3.0278V1.63891Z" fill=""/>
+<path d="M9.41691 7.88891C9.18679 7.88891 9.00024 8.07546 9.00024 8.30558V9.69447C9.00024 9.92458 9.18679 10.1111 9.41691 10.1111H17.4725C17.7026 10.1111 17.8891 9.92458 17.8891 9.69446V8.30558C17.8891 8.07546 17.7026 7.88891 17.4725 7.88891H9.41691Z" fill=""/>
+<path d="M9.00024 14.9722C9.00024 14.7421 9.18679 14.5556 9.41691 14.5556H17.4725C17.7026 14.5556 17.8891 14.7421 17.8891 14.9722V16.3611C17.8891 16.5913 17.7026 16.7778 17.4725 16.7778H9.41691C9.18679 16.7778 9.00024 16.5913 9.00024 16.3611V14.9722Z" fill=""/>
+</svg>
diff --git a/core/core-frontend/src/assets/svg/threshold.svg b/core/core-frontend/src/assets/svg/threshold.svg
new file mode 100644
index 0000000000..d3dc3de113
--- /dev/null
+++ b/core/core-frontend/src/assets/svg/threshold.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.4163 0.833313H9.58299C9.35287 0.833313 9.16632 1.01986 9.16632 1.24998V2.91665C9.16632 3.14676 9.35287 3.33331 9.58299 3.33331H10.4163C10.6464 3.33331 10.833 3.14676 10.833 2.91665V1.24998C10.833 1.01986 10.6464 0.833313 10.4163 0.833313ZM5.92675 2.41117L5.89112 2.35693C5.72517 2.13369 5.41458 2.06537 5.16784 2.20782L4.73046 2.46035L4.67622 2.49598C4.45298 2.66192 4.38466 2.97251 4.52711 3.21925L5.18368 4.35645L5.21931 4.4107C5.38525 4.63393 5.69584 4.70226 5.94258 4.5598L6.37997 4.30728L6.43421 4.27165C6.65744 4.1057 6.72577 3.79511 6.58331 3.54837L5.92675 2.41117ZM2.67934 5.45788L2.73732 5.48704L3.52461 5.94158C3.77135 6.08403 3.86748 6.38718 3.75712 6.64251L3.72796 6.70048L3.47544 7.13787C3.33298 7.38461 3.02984 7.48073 2.77451 7.37038L2.71653 7.34122L1.92924 6.88667C1.6825 6.74422 1.58638 6.44107 1.69673 6.18575L1.72589 6.12777L1.97842 5.69038C2.12087 5.44364 2.42401 5.34752 2.67934 5.45788ZM18.0209 5.69038L18.2734 6.12777C18.4268 6.39349 18.3358 6.73326 18.0701 6.88667L17.2828 7.34122C17.0171 7.49463 16.6773 7.40359 16.5239 7.13787L16.2713 6.70048C16.1179 6.43477 16.209 6.09499 16.4747 5.94158L17.262 5.48704C17.5277 5.33362 17.8675 5.42466 18.0209 5.69038ZM14.8315 2.20782L15.2688 2.46035C15.5346 2.61376 15.6256 2.95353 15.4722 3.21925L14.8156 4.35645C14.6622 4.62217 14.3224 4.71321 14.0567 4.5598L13.6193 4.30728C13.3536 4.15386 13.2626 3.81409 13.416 3.54837L14.0726 2.41117C14.226 2.14545 14.5657 2.05441 14.8315 2.20782ZM16.6668 10.6313C16.6668 7.06097 13.5895 4.16665 9.99965 4.16665C6.4098 4.16665 3.34009 7.06097 3.34009 10.6313L3.34004 17.5H2.08446C1.77596 17.5 1.66632 17.6128 1.66632 17.9197V18.7521C1.66632 19.0589 1.77552 19.1666 2.08403 19.1666H17.918C18.2265 19.1666 18.333 19.0589 18.333 18.7521V17.9197C18.333 17.6177 18.2298 17.5036 17.9324 17.5001L17.918 17.5H17.9157H16.6663L16.6668 10.6313ZM14.9997 17.4999L15.0001 10.6313C15 8.04424 12.733 5.83331 9.99965 5.83331C7.26873 5.83331 5.00676 8.04181 5.00676 10.6313L5.00671 17.5L14.9997 17.4999ZM7.91632 9.99998H7.08299C6.85287 9.99998 6.66632 10.1865 6.66632 10.4166V12.0833C6.66632 12.3134 6.85287 12.5 7.08299 12.5H7.91632C8.14644 12.5 8.33299 12.3134 8.33299 12.0833V10.4166C8.33299 10.1865 8.14644 9.99998 7.91632 9.99998Z" fill=""/>
+</svg>
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 98d900aaec..3aa6244007 100644
--- a/core/core-frontend/src/components/icon-custom/src/Icon.vue
+++ b/core/core-frontend/src/components/icon-custom/src/Icon.vue
@@ -219,6 +219,8 @@ import editIn from '@/assets/svg/edit-in.svg'
 import edit from '@/assets/svg/edit.svg'
 import emailTask from '@/assets/svg/email-task.svg'
 import embedded from '@/assets/svg/embedded.svg'
+import association from '@/assets/svg/association.svg'
+import threshold from '@/assets/svg/threshold.svg'
 import example from '@/assets/svg/example.svg'
 import exclamationmark from '@/assets/svg/exclamationmark.svg'
 import exclamationmark2 from '@/assets/svg/exclamationmark2.svg'
@@ -884,6 +886,8 @@ const iconMap = {
   edit: edit,
   'email-task': emailTask,
   embedded: embedded,
+  association: association,
+  threshold: threshold,
   example: example,
   exclamationmark: exclamationmark,
   exclamationmark2: exclamationmark2,
diff --git a/de-xpack b/de-xpack
index 1690590b4e..208ad5891e 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 1690590b4e0d2306500c93b8035bb477e190cb3f
+Subproject commit 208ad5891ebf2177fb4e45af3812236264305189