File tree Expand file tree Collapse file tree 6 files changed +56
-20
lines changed Expand file tree Collapse file tree 6 files changed +56
-20
lines changed Original file line number Diff line number Diff line change @@ -86,7 +86,7 @@ const routerList = computed(() => {
86
86
}
87
87
}
88
88
89
- .ed-sub-menu .ed-sub-menu__title :hover {
89
+ .ed-sub-menu .ed-sub-menu__title {
90
90
border-radius : 6px ;
91
91
}
92
92
@@ -100,4 +100,24 @@ const routerList = computed(() => {
100
100
margin-right : 8px ;
101
101
}
102
102
}
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
+ }
103
123
</style >
Original file line number Diff line number Diff line change @@ -47,7 +47,9 @@ const languageList = [
47
47
value: 'zh-CN',
48
48
}, */ ,
49
49
]
50
+ const popoverRef = ref ()
50
51
const toSystem = () => {
52
+ popoverRef .value .hide ()
51
53
router .push (' /system' )
52
54
}
53
55
@@ -86,7 +88,12 @@ const logout = () => {
86
88
</script >
87
89
88
90
<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
+ >
90
97
<template #reference >
91
98
<button class =" person" :title =" name" :class =" collapse && 'collapse'" >
92
99
<el-icon size =" 32" >
@@ -155,6 +162,7 @@ const logout = () => {
155
162
</el-icon >
156
163
<div class =" datasource-name" >{{ $t('common.help') }}</div >
157
164
</div >
165
+ <div style =" height : 4px ; width : 100% " ></div >
158
166
<div class =" popover-item mr4" @click =" logout" >
159
167
<el-icon size =" 16" >
160
168
<icon _logout_outlined ></icon _logout_outlined >
@@ -245,6 +253,7 @@ const logout = () => {
245
253
box-shadow : 0px 4px 8px 0px #1f23291a ;
246
254
border : 1px solid #dee0e3 ;
247
255
position : relative ;
256
+ border-radius : 6px ;
248
257
249
258
& ::after {
250
259
content : ' ' ;
@@ -314,7 +323,7 @@ const logout = () => {
314
323
}
315
324
316
325
& .mr4 {
317
- margin : 4px 0 ;
326
+ margin : 4px ;
318
327
}
319
328
320
329
.right {
Original file line number Diff line number Diff line change @@ -221,7 +221,12 @@ const handleConfirmPassword = () => {
221
221
<span class =" title" >{{ chat.brief ?? 'Untitled' }}</span >
222
222
<el-popover :teleported =" false" popper-class =" popover-card" placement =" bottom" >
223
223
<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
+ >
225
230
<icon _more_outlined ></icon _more_outlined >
226
231
</el-icon >
227
232
</template >
Original file line number Diff line number Diff line change @@ -115,7 +115,7 @@ const onClickOutside = () => {
115
115
trigger =" click"
116
116
:teleported =" false"
117
117
popper-class =" popover-card"
118
- placement =" bottom"
118
+ placement =" bottom-end "
119
119
>
120
120
<div class =" content" >
121
121
<div class =" item" @click.stop =" handleEdit" >
@@ -193,12 +193,7 @@ const onClickOutside = () => {
193
193
display : flex ;
194
194
align-items : center ;
195
195
justify-content : space-between ;
196
- height : 28px ;
197
-
198
- .ed-button {
199
- height : 28px ;
200
- min-width : 78px ;
201
- }
196
+ height : 32px ;
202
197
203
198
.form-rate {
204
199
display : flex ;
@@ -220,23 +215,31 @@ const onClickOutside = () => {
220
215
.more {
221
216
position : relative ;
222
217
cursor : pointer ;
218
+ margin-left : 4px ;
219
+ width : 32px ;
220
+ height : 32px ;
221
+
222
+ svg {
223
+ position : relative ;
224
+ z-index : 10 ;
225
+ }
223
226
224
227
& ::after {
225
228
content : ' ' ;
226
- background-color : #1f23291a ;
227
229
position : absolute ;
228
230
border-radius : 6px ;
229
- width : 24 px ;
230
- height : 24 px ;
231
+ width : 32 px ;
232
+ height : 32 px ;
231
233
transform : translate (-50% , -50% );
232
234
top : 50% ;
233
235
left : 50% ;
234
- display : none ;
236
+ background : #fff ;
237
+ border : 1px solid #d9dcdf ;
235
238
}
236
239
237
240
& :hover {
238
241
& ::after {
239
- display : block ;
242
+ background-color : #f5f6f7 ;
240
243
}
241
244
}
242
245
}
Original file line number Diff line number Diff line change @@ -196,7 +196,7 @@ const account = computed(() => userStore.getAccount)
196
196
}
197
197
198
198
& .mr4 {
199
- margin : 4px 0 ;
199
+ margin : 4px ;
200
200
}
201
201
202
202
.right {
Original file line number Diff line number Diff line change @@ -179,7 +179,7 @@ const onClickOutside = () => {
179
179
180
180
& ::after {
181
181
content : ' ' ;
182
- background : #f5f6f7 ;
182
+ background : #fff ;
183
183
position : absolute ;
184
184
border-radius : 6px ;
185
185
width : 30px ;
@@ -189,12 +189,11 @@ const onClickOutside = () => {
189
189
left : 50% ;
190
190
border : 1px solid #d9dcdf ;
191
191
z-index : 1 ;
192
- display : none ;
193
192
}
194
193
195
194
& :hover {
196
195
& ::after {
197
- display : block ;
196
+ background : #f5f6f7 ;
198
197
}
199
198
}
200
199
}
You can’t perform that action at this time.
0 commit comments