Skip to content

Commit 0f4a213

Browse files
committed
fix(Data Source): The import and export buttons are too close together; it is recommended to add a gap between them.
1 parent becbba3 commit 0f4a213

File tree

2 files changed

+30
-28
lines changed

2 files changed

+30
-28
lines changed

frontend/src/views/ds/DataTable.vue

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -354,16 +354,18 @@ const btnSelectClick = (val: any) => {
354354
<icon_right_outlined></icon_right_outlined>
355355
</el-icon>
356356
<div class="name">{{ info.name }}</div>
357-
<el-button @click="downloadTemplate" class="export-remark" secondary>
358-
<template #icon>
359-
<icon_import_outlined></icon_import_outlined>
360-
</template>
361-
{{ $t('professional.export') }}
362-
</el-button>
363-
<UploaderRemark
364-
:upload-path="`/datasource/uploadDsSchema/${info.id}`"
365-
@upload-finished="init"
366-
></UploaderRemark>
357+
<div class="export-remark">
358+
<el-button style="margin-right: 12px" @click="downloadTemplate" secondary>
359+
<template #icon>
360+
<icon_import_outlined></icon_import_outlined>
361+
</template>
362+
{{ $t('professional.export') }}
363+
</el-button>
364+
<UploaderRemark
365+
:upload-path="`/datasource/uploadDsSchema/${info.id}`"
366+
@upload-finished="init"
367+
></UploaderRemark>
368+
</div>
367369
</div>
368370
<div class="content">
369371
<div class="side-list">
@@ -579,16 +581,18 @@ const btnSelectClick = (val: any) => {
579581
<div class="preview-num">
580582
{{ t('ds.pieces_in_total', { msg: total, ms: showNum }) }}
581583
</div>
582-
<el-table :data="previewData.data" style="width: 100%">
583-
<el-table-column
584-
v-for="(c, index) in previewData.fields"
585-
:key="index"
586-
:prop="c"
587-
:label="c"
588-
min-width="150"
589-
:render-header="renderHeader"
590-
/>
591-
</el-table>
584+
<div class="table-container">
585+
<el-table :data="previewData.data" style="width: 100%; height: 100%">
586+
<el-table-column
587+
v-for="(c, index) in previewData.fields"
588+
:key="index"
589+
:prop="c"
590+
:label="c"
591+
min-width="150"
592+
:render-header="renderHeader"
593+
/>
594+
</el-table>
595+
</div>
592596
</template>
593597
</div>
594598
</div>
@@ -675,7 +679,7 @@ const btnSelectClick = (val: any) => {
675679
676680
.export-remark {
677681
position: absolute;
678-
right: 116px;
682+
right: 24px;
679683
top: 12px;
680684
}
681685
@@ -936,10 +940,6 @@ const btnSelectClick = (val: any) => {
936940
margin-top: 16px;
937941
height: calc(100% - 50px);
938942
939-
&.overflow-preview {
940-
overflow-y: auto;
941-
}
942-
943943
.table-content_preview {
944944
max-height: calc(100% - 50px);
945945
overflow-y: auto;
@@ -1006,6 +1006,11 @@ const btnSelectClick = (val: any) => {
10061006
line-height: 22px;
10071007
color: #646a73;
10081008
}
1009+
1010+
.table-container {
1011+
width: 100%;
1012+
height: calc(100% - 46px);
1013+
}
10091014
}
10101015
}
10111016
}

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,9 +276,6 @@ const submitUpload = () => {
276276
<style scoped lang="less">
277277
.up-loader-remark {
278278
margin: 0;
279-
position: absolute;
280-
top: 12px;
281-
right: 24px;
282279
}
283280
.import-container {
284281
display: flex;

0 commit comments

Comments
 (0)