dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13424 from dataease/pr@dev-v2@feat_free_resource

Browse Source 
feat(X-Pack): 增加游离资源管理菜单
This commit is contained in:
xuwei-fit2cloud 2024-11-19 18:27:38 +08:00 committed by GitHub
commit 4cb20994d2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java
View File

@ -105,6 +105,7 @@ public class MenuManage {
|| coreMenu.getId().equals(50L)
|| coreMenu.getId().equals(60L)
|| coreMenu.getId().equals(61L)
|| coreMenu.getId().equals(80L)
|| coreMenu.getPid().equals(70L);
}
}

4
core/core-frontend/src/assets/svg/icon_free.svg Normal file
View File

@ -0,0 +1,4 @@
<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="M0.833344 3.75C0.833344 2.82952 1.57954 2.08333 2.50001 2.08333H7.91668C8.16399 2.08333 8.39853 2.19319 8.55686 2.38318L10.3903 4.58333H15.625C16.5455 4.58333 17.2917 5.32951 17.2917 6.25V8.75C17.2917 9.21024 16.9186 9.58333 16.4583 9.58333H4.40066L2.47513 17.2854C2.37305 17.6937 1.98257 17.9618 1.56486 17.9104C1.14715 17.859 0.833344 17.5042 0.833344 17.0833V3.75ZM7.52636 3.75H2.50001V10.3141L2.94156 8.54789C3.0343 8.17691 3.36762 7.91667 3.75001 7.91667H15.625V6.25H10C9.75269 6.25 9.51815 6.14015 9.35983 5.95015L7.52636 3.75Z" fill=""/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2.86165 8.55504C2.95176 8.18059 3.28672 7.91667 3.67186 7.91667H18.3333C18.583 7.91667 18.8195 8.0286 18.9778 8.22168C19.1361 8.41475 19.1994 8.66862 19.1505 8.91343L17.4838 17.2468C17.4059 17.6363 17.0639 17.9167 16.6667 17.9167H1.66665C1.41133 17.9167 1.1701 17.7996 1.01209 17.5991C0.854075 17.3985 0.796715 17.1366 0.856446 16.8884L2.86165 8.55504ZM4.32846 9.58333L2.72429 16.25H15.9835L17.3168 9.58333H4.32846Z" fill=""/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

4
core/core-frontend/src/layout/components/MenuItem.vue
View File

@ -18,6 +18,7 @@ import variable from '@/assets/svg/variable.svg'
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'
const iconMap = {
appearance: appearance,
@ -29,7 +30,8 @@ const iconMap = {
variable: variable,
watermark: watermark,
icon_font: icon_font,
icon_msg_fill,
icon_msg_fill: icon_msg_fill,
icon_free: icon_free,
auth: auth,
association: association,
threshold: threshold,

3
core/core-frontend/src/locales/zh-CN.ts
View File

@ -3825,5 +3825,8 @@ export default {
delete_api_key: '确定删除该 API key 吗? ',
api_key_desc:
'API Key 是您访问 DataEase API 的密钥，具有账户的完全权限，请您务必妥善保管！不要以任何方式公开 API Key 到外部渠道，避免被他人利用造成安全威胁。'
},
free: {
title: '游离资源管理'
}
}

2
de-xpack

@ -1 +1 @@
Subproject commit b8975525241b57a4f753113bc860c16fbd8fca21
Subproject commit 4ade726502814434828dc4b6195c35dfeb4d3379