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 c1e403287a..a81e5fa41b 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 @@ + + + + + + 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 @@ + + + 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 1afd0616e6..208ad5891e 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 1afd0616e6ba6a59bf93832217363e170374f05d +Subproject commit 208ad5891ebf2177fb4e45af3812236264305189