Skip to content

Commit cb7e2b7

Browse files
committed
fix(Embedded Management, Data Source): Embedded Management, Data Source More styles are incorrect
1 parent 15c030a commit cb7e2b7

File tree

6 files changed

+56
-20
lines changed

6 files changed

+56
-20
lines changed

frontend/src/components/layout/Menu.vue

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ const routerList = computed(() => {
8686
}
8787
}
8888
89-
.ed-sub-menu .ed-sub-menu__title:hover {
89+
.ed-sub-menu .ed-sub-menu__title {
9090
border-radius: 6px;
9191
}
9292
@@ -100,4 +100,24 @@ const routerList = computed(() => {
100100
margin-right: 8px;
101101
}
102102
}
103+
.ed-popper.is-light:has(.ed-menu--popup) {
104+
border: 1px solid #dee0e3;
105+
border-radius: 6px;
106+
box-shadow: 0px 4px 8px 0px #1f23291a;
107+
background: #eff1f0;
108+
overflow: hidden;
109+
}
110+
.ed-menu--popup {
111+
padding: 8px;
112+
background: #eff1f0;
113+
114+
.ed-menu-item {
115+
padding: 9px 16px;
116+
height: 40px !important;
117+
border-radius: 6px;
118+
&.is-active {
119+
background-color: #fff !important;
120+
}
121+
}
122+
}
103123
</style>

frontend/src/components/layout/Person.vue

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ const languageList = [
4747
value: 'zh-CN',
4848
}, */,
4949
]
50+
const popoverRef = ref()
5051
const toSystem = () => {
52+
popoverRef.value.hide()
5153
router.push('/system')
5254
}
5355
@@ -86,7 +88,12 @@ const logout = () => {
8688
</script>
8789

8890
<template>
89-
<el-popover trigger="click" popper-class="system-person" :placement="collapse ? 'right' : 'top'">
91+
<el-popover
92+
ref="popoverRef"
93+
trigger="click"
94+
popper-class="system-person"
95+
:placement="collapse ? 'right' : 'top-start'"
96+
>
9097
<template #reference>
9198
<button class="person" :title="name" :class="collapse && 'collapse'">
9299
<el-icon size="32">
@@ -155,6 +162,7 @@ const logout = () => {
155162
</el-icon>
156163
<div class="datasource-name">{{ $t('common.help') }}</div>
157164
</div>
165+
<div style="height: 4px; width: 100%"></div>
158166
<div class="popover-item mr4" @click="logout">
159167
<el-icon size="16">
160168
<icon_logout_outlined></icon_logout_outlined>
@@ -245,6 +253,7 @@ const logout = () => {
245253
box-shadow: 0px 4px 8px 0px #1f23291a;
246254
border: 1px solid #dee0e3;
247255
position: relative;
256+
border-radius: 6px;
248257
249258
&::after {
250259
content: '';
@@ -314,7 +323,7 @@ const logout = () => {
314323
}
315324
316325
&.mr4 {
317-
margin: 4px 0;
326+
margin: 4px;
318327
}
319328
320329
.right {

frontend/src/views/chat/ChatList.vue

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,12 @@ const handleConfirmPassword = () => {
221221
<span class="title">{{ chat.brief ?? 'Untitled' }}</span>
222222
<el-popover :teleported="false" popper-class="popover-card" placement="bottom">
223223
<template #reference>
224-
<el-icon class="more" size="16" style="margin-left: auto" @click.stop>
224+
<el-icon
225+
class="more"
226+
size="16"
227+
style="margin-left: auto; color: #646a73"
228+
@click.stop
229+
>
225230
<icon_more_outlined></icon_more_outlined>
226231
</el-icon>
227232
</template>

frontend/src/views/ds/Card.vue

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ const onClickOutside = () => {
115115
trigger="click"
116116
:teleported="false"
117117
popper-class="popover-card"
118-
placement="bottom"
118+
placement="bottom-end"
119119
>
120120
<div class="content">
121121
<div class="item" @click.stop="handleEdit">
@@ -193,12 +193,7 @@ const onClickOutside = () => {
193193
display: flex;
194194
align-items: center;
195195
justify-content: space-between;
196-
height: 28px;
197-
198-
.ed-button {
199-
height: 28px;
200-
min-width: 78px;
201-
}
196+
height: 32px;
202197
203198
.form-rate {
204199
display: flex;
@@ -220,23 +215,31 @@ const onClickOutside = () => {
220215
.more {
221216
position: relative;
222217
cursor: pointer;
218+
margin-left: 4px;
219+
width: 32px;
220+
height: 32px;
221+
222+
svg {
223+
position: relative;
224+
z-index: 10;
225+
}
223226
224227
&::after {
225228
content: '';
226-
background-color: #1f23291a;
227229
position: absolute;
228230
border-radius: 6px;
229-
width: 24px;
230-
height: 24px;
231+
width: 32px;
232+
height: 32px;
231233
transform: translate(-50%, -50%);
232234
top: 50%;
233235
left: 50%;
234-
display: none;
236+
background: #fff;
237+
border: 1px solid #d9dcdf;
235238
}
236239
237240
&:hover {
238241
&::after {
239-
display: block;
242+
background-color: #f5f6f7;
240243
}
241244
}
242245
}

frontend/src/views/system/appearance/Person.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ const account = computed(() => userStore.getAccount)
196196
}
197197
198198
&.mr4 {
199-
margin: 4px 0;
199+
margin: 4px;
200200
}
201201
202202
.right {

frontend/src/views/system/embedded/Card.vue

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ const onClickOutside = () => {
179179
180180
&::after {
181181
content: '';
182-
background: #f5f6f7;
182+
background: #fff;
183183
position: absolute;
184184
border-radius: 6px;
185185
width: 30px;
@@ -189,12 +189,11 @@ const onClickOutside = () => {
189189
left: 50%;
190190
border: 1px solid #d9dcdf;
191191
z-index: 1;
192-
display: none;
193192
}
194193
195194
&:hover {
196195
&::after {
197-
display: block;
196+
background: #f5f6f7;
198197
}
199198
}
200199
}

0 commit comments

Comments
 (0)