Skip to content

Commit f32e3c3

Browse files
committed
fix(Permission Configuration, Dashboard): The background color value needs to follow the theme color
1 parent 5021c14 commit f32e3c3

File tree

13 files changed

+166
-8
lines changed

13 files changed

+166
-8
lines changed
Lines changed: 67 additions & 0 deletions
Loading
-788 Bytes
Binary file not shown.
Lines changed: 11 additions & 0 deletions
Loading
Lines changed: 6 additions & 0 deletions
Loading

frontend/src/components/layout/Menu.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ const routerList = computed(() => {
4545
const list = router.getRoutes().filter((route) => {
4646
return (
4747
!route.path.includes('assistant') &&
48+
!route.path.includes('embeddedPage') &&
4849
!route.path.includes('canvas') &&
4950
!route.path.includes('member') &&
5051
!route.path.includes('permission') &&

frontend/src/style.less

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,3 +331,23 @@ strong {
331331
.ed-popper[data-popper-placement^='right'] > .ed-popper__arrow {
332332
left: -5px !important;
333333
}
334+
335+
.ed-form.last {
336+
.ed-form-item {
337+
&:last-child {
338+
margin-bottom: 0;
339+
}
340+
}
341+
}
342+
343+
.icon-primary.icon-primary {
344+
color: var(--ed-color-primary);
345+
}
346+
347+
.icon-primary_15_d.icon-primary_15_d {
348+
color: var(--ed-color-primary-15-d);
349+
}
350+
351+
.icon-primary_60.icon-primary_60 {
352+
color: var(--ed-color-primary-60);
353+
}

frontend/src/utils/utils.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,13 @@ export const setCurrentColor = (currentColor: any) => {
136136
.mix(new colorTree('ffffff'), new colorTree(currentColor.substr(1)), { value: 80 })
137137
.toRGB()
138138
)
139+
140+
document.documentElement.style.setProperty(
141+
'--ed-color-primary-15-d',
142+
colorFunctions
143+
.mix(new colorTree('000000'), new colorTree(currentColor.substr(1)), { value: 15 })
144+
.toRGB()
145+
)
139146
document.documentElement.style.setProperty('--ed-color-primary-1a', `${currentColor}1a`)
140147
document.documentElement.style.setProperty('--ed-color-primary-14', `${currentColor}14`)
141148
document.documentElement.style.setProperty('--ed-color-primary-33', `${currentColor}33`)
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<script lang="ts" setup>
2+
import nothingSelectDashboard from '@/assets/img/none-dashboard.svg'
3+
defineProps({
4+
imageSize: {
5+
type: Number,
6+
default: 125,
7+
},
8+
description: {
9+
type: String,
10+
default: '',
11+
},
12+
})
13+
</script>
14+
15+
<template>
16+
<div class="ed-empty empty-info">
17+
<div class="ed-empty__image" style="width: 125px">
18+
<el-icon size="125" class="icon-primary">
19+
<nothingSelectDashboard></nothingSelectDashboard>
20+
</el-icon>
21+
</div>
22+
<div class="ed-empty__description">
23+
<p>{{ description }}</p>
24+
</div>
25+
</div>
26+
</template>
27+
28+
<style lang="less" scoped>
29+
.empty-info {
30+
height: 90%;
31+
padding-top: 0;
32+
}
33+
:deep(.ed-empty__description) {
34+
margin-top: 8px;
35+
36+
color: var(--N600, #646a73);
37+
text-align: center;
38+
font-size: 14px;
39+
font-style: normal;
40+
font-weight: 400;
41+
line-height: 22px;
42+
}
43+
</style>

frontend/src/views/dashboard/common/ResourceGroupOpt.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ defineExpose({
175175
require-asterisk-position="right"
176176
:model="resourceForm"
177177
:rules="resourceFormRules"
178+
class="last"
178179
@submit.prevent
179180
>
180181
<el-form-item :label="state.resourceFormNameLabel" prop="name">

frontend/src/views/dashboard/common/ResourceTree.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { treeDraggableChart } from '@/views/dashboard/utils/treeDraggableChart'
44
import icon_searchOutline_outlined from '@/assets/svg/icon_search-outline_outlined.svg'
55
import icon_folder from '@/assets/svg/icon_folder.svg'
66
import ope_add from '@/assets/svg/operate/ope-add.svg'
7-
import icon_dashboard from '@/assets/svg/icon_dashboard.svg'
7+
import icon_dashboard from '@/assets/permission/icon_dashboard.svg'
88
import icon_edit_outlined from '@/assets/svg/icon_edit_outlined.svg'
99
import icon_rename from '@/assets/svg/icon_rename.svg'
1010
import icon_delete from '@/assets/svg/icon_delete.svg'
@@ -422,7 +422,7 @@ defineExpose({
422422
<el-icon v-if="data.node_type !== 'leaf'" style="font-size: 18px">
423423
<Icon name="icon_folder"><icon_folder class="svg-icon" /></Icon>
424424
</el-icon>
425-
<el-icon v-else style="font-size: 18px">
425+
<el-icon v-else class="icon-primary" style="font-size: 18px">
426426
<Icon name="icon_dashboard"><icon_dashboard class="svg-icon" /></Icon>
427427
</el-icon>
428428
<span :title="node.label" class="label-tooltip">

0 commit comments

Comments
 (0)