Skip to content

Commit 3acdcba

Browse files
committed
fix(User Management): The default password for added users is not centered.
1 parent 94f52e2 commit 3acdcba

File tree

3 files changed

+127
-96
lines changed

3 files changed

+127
-96
lines changed

frontend/src/views/system/excel-upload/Uploader.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ const submitUpload = () => {
224224
v-model="dialogShow"
225225
:title="t('user.batch_import')"
226226
width="600px"
227-
class="user-import-class"
227+
modal-class="user-import-class"
228228
@close="close"
229229
>
230230
<div class="import-container">

frontend/src/views/system/user/User.vue

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@
237237
v-model="dialogFormVisible"
238238
:title="dialogTitle"
239239
destroy-on-close
240+
modal-class="user-add-class"
240241
size="600px"
241242
:before-close="onFormClose"
242243
>
@@ -1033,4 +1034,32 @@ onMounted(() => {
10331034
align-items: center;
10341035
}
10351036
}
1037+
.user-add-class {
1038+
.down-template {
1039+
display: flex;
1040+
width: 100%;
1041+
height: 40px;
1042+
align-items: center;
1043+
line-height: 40px;
1044+
background: var(--ed-color-primary-80, #d2f1e9);
1045+
border-radius: 4px;
1046+
padding-left: 10px;
1047+
.icon-span {
1048+
color: var(--ed-color-primary);
1049+
font-size: 18px;
1050+
i {
1051+
top: 3px;
1052+
}
1053+
}
1054+
.down-template-content {
1055+
font-size: 14px;
1056+
display: flex;
1057+
flex-direction: row;
1058+
margin-left: 10px;
1059+
.down-button {
1060+
height: 40px;
1061+
}
1062+
}
1063+
}
1064+
}
10361065
</style>

frontend/src/views/system/user/UserImport.vue

Lines changed: 97 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,8 @@ defineExpose({
258258
<el-dialog
259259
v-model="dialogShow"
260260
:title="t('user.batch_import')"
261-
width="600px"
262-
model-class="user-import-class"
261+
width="400px"
262+
modal-class="user-import-class"
263263
@before-close="closeDialog"
264264
>
265265
<div class="down-template">
@@ -358,119 +358,121 @@ defineExpose({
358358
</template>
359359

360360
<style lang="less">
361-
.upload-user {
362-
height: 32px;
363-
.ed-upload {
364-
width: 100% !important;
365-
}
366-
}
367-
.color-danger {
368-
:deep(.el-link--inner) {
369-
color: var(--deDanger, #f54a45) !important;
361+
.user-import-class {
362+
.upload-user {
363+
height: 32px;
364+
.ed-upload {
365+
width: 100% !important;
366+
}
370367
}
371-
}
372-
.font12 {
373-
color: #8f959e !important;
374-
font-family: var(--de-custom_font, 'PingFang');
375-
font-size: 14px;
376-
font-style: normal;
377-
font-weight: 400;
378-
line-height: 22px;
379-
}
380-
.down-template {
381-
display: flex;
382-
flex-direction: row;
383-
width: 100%;
384-
height: 40px;
385-
line-height: 40px;
386-
background: var(--ed-color-primary-80, #d2f1e9);
387-
border-radius: 4px;
388-
padding-left: 10px;
389-
.icon-span {
390-
color: var(--ed-color-primary);
391-
font-size: 18px;
392-
i {
393-
top: 3px;
368+
.color-danger {
369+
:deep(.el-link--inner) {
370+
color: var(--deDanger, #f54a45) !important;
394371
}
395372
}
396-
.down-template-content {
373+
.font12 {
374+
color: #8f959e !important;
375+
font-family: var(--de-custom_font, 'PingFang');
397376
font-size: 14px;
398-
display: flex;
399-
flex-direction: row;
400-
margin-left: 10px;
401-
.down-button {
402-
height: 40px;
403-
}
377+
font-style: normal;
378+
font-weight: 400;
379+
line-height: 22px;
404380
}
405-
}
406-
.import-form {
407-
margin-top: 16px;
408-
409-
.pdf-card {
410-
width: 100%;
411-
height: 58px;
381+
.down-template {
412382
display: flex;
383+
width: 100%;
384+
height: 40px;
413385
align-items: center;
414-
padding: 0 16px 0 12px;
415-
border: 1px solid #dee0e3;
416-
border-radius: 6px;
417-
418-
.file-name {
419-
margin-left: 8px;
420-
.name {
421-
font-weight: 400;
422-
font-size: 14px;
423-
line-height: 22px;
386+
line-height: 40px;
387+
background: var(--ed-color-primary-80, #d2f1e9);
388+
border-radius: 4px;
389+
padding-left: 10px;
390+
.icon-span {
391+
color: var(--ed-color-primary);
392+
font-size: 18px;
393+
i {
394+
top: 3px;
424395
}
425-
426-
.size {
427-
font-weight: 400;
428-
font-size: 12px;
429-
line-height: 20px;
430-
color: #8f959e;
396+
}
397+
.down-template-content {
398+
font-size: 14px;
399+
display: flex;
400+
flex-direction: row;
401+
margin-left: 10px;
402+
.down-button {
403+
height: 40px;
431404
}
432405
}
406+
}
407+
.import-form {
408+
margin-top: 16px;
433409
434-
.action-btn {
435-
margin-left: auto;
436-
}
410+
.pdf-card {
411+
width: 100%;
412+
height: 58px;
413+
display: flex;
414+
align-items: center;
415+
padding: 0 16px 0 12px;
416+
border: 1px solid #dee0e3;
417+
border-radius: 6px;
437418
438-
.ed-icon {
439-
position: relative;
440-
cursor: pointer;
441-
color: #646a73;
419+
.file-name {
420+
margin-left: 8px;
421+
.name {
422+
font-weight: 400;
423+
font-size: 14px;
424+
line-height: 22px;
425+
}
442426
443-
&::after {
444-
content: '';
445-
background-color: #1f23291a;
446-
position: absolute;
447-
border-radius: 6px;
448-
width: 24px;
449-
height: 24px;
450-
transform: translate(-50%, -50%);
451-
top: 50%;
452-
left: 50%;
453-
display: none;
427+
.size {
428+
font-weight: 400;
429+
font-size: 12px;
430+
line-height: 20px;
431+
color: #8f959e;
432+
}
454433
}
455434
456-
&:hover {
435+
.action-btn {
436+
margin-left: auto;
437+
}
438+
439+
.ed-icon {
440+
position: relative;
441+
cursor: pointer;
442+
color: #646a73;
443+
457444
&::after {
458-
display: block;
445+
content: '';
446+
background-color: #1f23291a;
447+
position: absolute;
448+
border-radius: 6px;
449+
width: 24px;
450+
height: 24px;
451+
transform: translate(-50%, -50%);
452+
top: 50%;
453+
left: 50%;
454+
display: none;
455+
}
456+
457+
&:hover {
458+
&::after {
459+
display: block;
460+
}
459461
}
460462
}
461463
}
462464
}
463-
}
464-
.import-tip-box {
465-
strong {
466-
font-size: 16px;
467-
}
468-
span {
469-
font-size: 13px;
470-
}
471-
.error-record-tip {
472-
font-size: 13px;
473-
flex-flow: wrap;
465+
.import-tip-box {
466+
strong {
467+
font-size: 16px;
468+
}
469+
span {
470+
font-size: 13px;
471+
}
472+
.error-record-tip {
473+
font-size: 13px;
474+
flex-flow: wrap;
475+
}
474476
}
475477
}
476478
</style>

0 commit comments

Comments
 (0)