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 2f0cbaf27f..595b8c9ac2 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 @@ -106,6 +106,7 @@ public class MenuManage { || coreMenu.getId().equals(60L) || coreMenu.getId().equals(61L) || coreMenu.getId().equals(80L) + || coreMenu.getId().equals(90L) || coreMenu.getPid().equals(70L); } } diff --git a/core/core-frontend/src/assets/svg/icon_security.svg b/core/core-frontend/src/assets/svg/icon_security.svg new file mode 100644 index 0000000000..9e2635b633 --- /dev/null +++ b/core/core-frontend/src/assets/svg/icon_security.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/core/core-frontend/src/layout/components/MenuItem.vue b/core/core-frontend/src/layout/components/MenuItem.vue index 6c8e33e190..08247be881 100644 --- a/core/core-frontend/src/layout/components/MenuItem.vue +++ b/core/core-frontend/src/layout/components/MenuItem.vue @@ -19,6 +19,7 @@ import watermark from '@/assets/svg/watermark.svg' import icon_font from '@/assets/svg/icon_font.svg' import icon_msg_fill from '@/assets/svg/icon_msg_fill.svg' import icon_free from '@/assets/svg/icon_free.svg' +import icon_security from '@/assets/svg/icon_security.svg' const iconMap = { appearance: appearance, @@ -32,6 +33,7 @@ const iconMap = { icon_font: icon_font, icon_msg_fill: icon_msg_fill, icon_free: icon_free, + icon_security, auth: auth, association: association, threshold: threshold, diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 95ec8e90c2..fce45c6e8e 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -4144,5 +4144,8 @@ export default { sync_to_org: '迁移至目标组织', sync_org_placeholder: '请选择目标组织', relation_picture: '血缘关系图' + }, + security: { + title: '安全设置' } } diff --git a/de-xpack b/de-xpack index bb65214283..ceef8f4f12 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit bb6521428355868b800aa1f812a8e2a485628908 +Subproject commit ceef8f4f12864df345954da42bf6236cf392331f