diff --git a/frontend/src/assets/img/none-dashboard.svg b/frontend/src/assets/img/none-dashboard.svg new file mode 100644 index 00000000..01b130d5 --- /dev/null +++ b/frontend/src/assets/img/none-dashboard.svg @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/frontend/src/assets/permission/icon_custom-tools_colorful.png b/frontend/src/assets/permission/icon_custom-tools_colorful.png deleted file mode 100644 index 41b09345..00000000 Binary files a/frontend/src/assets/permission/icon_custom-tools_colorful.png and /dev/null differ diff --git a/frontend/src/assets/permission/icon_custom-tools_colorful.svg b/frontend/src/assets/permission/icon_custom-tools_colorful.svg new file mode 100644 index 00000000..affb781a --- /dev/null +++ b/frontend/src/assets/permission/icon_custom-tools_colorful.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/frontend/src/assets/permission/icon_dashboard.svg b/frontend/src/assets/permission/icon_dashboard.svg new file mode 100644 index 00000000..11f5dbb5 --- /dev/null +++ b/frontend/src/assets/permission/icon_dashboard.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/frontend/src/components/layout/Menu.vue b/frontend/src/components/layout/Menu.vue index 8d0107df..00f8c3bf 100644 --- a/frontend/src/components/layout/Menu.vue +++ b/frontend/src/components/layout/Menu.vue @@ -45,6 +45,7 @@ const routerList = computed(() => { const list = router.getRoutes().filter((route) => { return ( !route.path.includes('assistant') && + !route.path.includes('embeddedPage') && !route.path.includes('canvas') && !route.path.includes('member') && !route.path.includes('permission') && diff --git a/frontend/src/style.less b/frontend/src/style.less index 8de643f2..a1db0c73 100644 --- a/frontend/src/style.less +++ b/frontend/src/style.less @@ -331,3 +331,23 @@ strong { .ed-popper[data-popper-placement^='right'] > .ed-popper__arrow { left: -5px !important; } + +.ed-form.last { + .ed-form-item { + &:last-child { + margin-bottom: 0; + } + } +} + +.icon-primary.icon-primary { + color: var(--ed-color-primary); +} + +.icon-primary_15_d.icon-primary_15_d { + color: var(--ed-color-primary-15-d); +} + +.icon-primary_60.icon-primary_60 { + color: var(--ed-color-primary-60); +} diff --git a/frontend/src/utils/utils.ts b/frontend/src/utils/utils.ts index 6c17941e..3ac0c5a0 100644 --- a/frontend/src/utils/utils.ts +++ b/frontend/src/utils/utils.ts @@ -136,6 +136,13 @@ export const setCurrentColor = (currentColor: any) => { .mix(new colorTree('ffffff'), new colorTree(currentColor.substr(1)), { value: 80 }) .toRGB() ) + + document.documentElement.style.setProperty( + '--ed-color-primary-15-d', + colorFunctions + .mix(new colorTree('000000'), new colorTree(currentColor.substr(1)), { value: 15 }) + .toRGB() + ) document.documentElement.style.setProperty('--ed-color-primary-1a', `${currentColor}1a`) document.documentElement.style.setProperty('--ed-color-primary-14', `${currentColor}14`) document.documentElement.style.setProperty('--ed-color-primary-33', `${currentColor}33`) diff --git a/frontend/src/views/dashboard/common/EmptyBackgroundSvg.vue b/frontend/src/views/dashboard/common/EmptyBackgroundSvg.vue new file mode 100644 index 00000000..b5499e99 --- /dev/null +++ b/frontend/src/views/dashboard/common/EmptyBackgroundSvg.vue @@ -0,0 +1,43 @@ + + + + + + + + + + + {{ description }} + + + + + diff --git a/frontend/src/views/dashboard/common/ResourceGroupOpt.vue b/frontend/src/views/dashboard/common/ResourceGroupOpt.vue index bc1cdeeb..ed5faa7b 100644 --- a/frontend/src/views/dashboard/common/ResourceGroupOpt.vue +++ b/frontend/src/views/dashboard/common/ResourceGroupOpt.vue @@ -175,6 +175,7 @@ defineExpose({ require-asterisk-position="right" :model="resourceForm" :rules="resourceFormRules" + class="last" @submit.prevent > diff --git a/frontend/src/views/dashboard/common/ResourceTree.vue b/frontend/src/views/dashboard/common/ResourceTree.vue index 2f9104c1..e0b15bb0 100644 --- a/frontend/src/views/dashboard/common/ResourceTree.vue +++ b/frontend/src/views/dashboard/common/ResourceTree.vue @@ -4,7 +4,7 @@ import { treeDraggableChart } from '@/views/dashboard/utils/treeDraggableChart' import icon_searchOutline_outlined from '@/assets/svg/icon_search-outline_outlined.svg' import icon_folder from '@/assets/svg/icon_folder.svg' import ope_add from '@/assets/svg/operate/ope-add.svg' -import icon_dashboard from '@/assets/svg/icon_dashboard.svg' +import icon_dashboard from '@/assets/permission/icon_dashboard.svg' import icon_edit_outlined from '@/assets/svg/icon_edit_outlined.svg' import icon_rename from '@/assets/svg/icon_rename.svg' import icon_delete from '@/assets/svg/icon_delete.svg' @@ -422,7 +422,7 @@ defineExpose({ - + diff --git a/frontend/src/views/dashboard/preview/SQPreviewShow.vue b/frontend/src/views/dashboard/preview/SQPreviewShow.vue index 84bb5e81..d20495a9 100644 --- a/frontend/src/views/dashboard/preview/SQPreviewShow.vue +++ b/frontend/src/views/dashboard/preview/SQPreviewShow.vue @@ -7,6 +7,7 @@ import ResourceTree from '@/views/dashboard/common/ResourceTree.vue' import SQPreview from '@/views/dashboard/preview/SQPreview.vue' import SQPreviewHead from '@/views/dashboard/preview/SQPreviewHead.vue' import EmptyBackground from '@/views/dashboard/common/EmptyBackground.vue' +import EmptyBackgroundSvg from '@/views/dashboard/common/EmptyBackgroundSvg.vue' import { dashboardStoreWithOut } from '@/stores/dashboard/dashboard.ts' import { useI18n } from 'vue-i18n' const { t } = useI18n() @@ -130,10 +131,7 @@ defineExpose({ - + diff --git a/frontend/src/views/system/appearance/index.vue b/frontend/src/views/system/appearance/index.vue index 42f2872e..0ff0c5d3 100644 --- a/frontend/src/views/system/appearance/index.vue +++ b/frontend/src/views/system/appearance/index.vue @@ -751,6 +751,7 @@ onUnmounted(() => { .is-active { background: var(--ed-color-primary-1a, #1cba901a); + font-weight: 500; } .ed-button:not(.is-active) { diff --git a/frontend/src/views/system/permission/Card.vue b/frontend/src/views/system/permission/Card.vue index 81d602d2..478dbacd 100644 --- a/frontend/src/views/system/permission/Card.vue +++ b/frontend/src/views/system/permission/Card.vue @@ -2,7 +2,7 @@ import delIcon from '@/assets/svg/icon_delete.svg' import icon_key_outlined from '@/assets/svg/icon-key_outlined.svg' import icon_member_outlined from '@/assets/svg/icon_member_outlined.svg' -import Lock from '@/assets/permission/icon_custom-tools_colorful.png' +import Lock from '@/assets/permission/icon_custom-tools_colorful.svg' withDefaults( defineProps<{ name: string @@ -40,7 +40,9 @@ const setUser = () => { - + + + {{ name }} @@ -92,6 +94,7 @@ const setUser = () => { display: flex; align-items: center; margin-bottom: 12px; + .name { margin-left: 12px; font-weight: 500;
{{ description }}