Skip to content

Commit e86f34d

Browse files
author
zhangtao
committed
merge: 导入导出弹窗布局优化
2 parents a2c10f9 + 187a409 commit e86f34d

2 files changed

Lines changed: 142 additions & 99 deletions

File tree

‎frontend/web/src/components/modal/fa-export-dialog/index.vue‎

Lines changed: 97 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -7,64 +7,97 @@
77
dialog-class="crud-embed-dialog"
88
modal-class="crud-embed-dialog"
99
@close="handleCloseExportsModal"
10-
size="md"
10+
size="lg"
1111
>
12-
<!-- 滚动 -->
13-
<ElScrollbar max-height="60vh">
14-
<!-- 表单 -->
15-
<ElForm
16-
ref="exportsFormRef"
17-
:style="'padding-right: var(--el-dialog-padding-primary)'"
18-
:model="exportsFormData"
19-
:rules="exportsFormRules"
20-
>
21-
<ElFormItem label="文件名" prop="filename">
22-
<ElInput v-model="exportsFormData.filename" placeholder="请输入文件名" clearable />
23-
</ElFormItem>
24-
<ElFormItem label="工作表名" prop="sheetname">
25-
<ElInput v-model="exportsFormData.sheetname" placeholder="请输入工作表名" clearable />
26-
</ElFormItem>
27-
<ElFormItem label="数据源" prop="origin">
28-
<ElSelect v-model="exportsFormData.origin">
29-
<ElOption
30-
label="当前数据 (当前页的数据)"
31-
:value="ExportsOriginEnum.CURRENT"
32-
:disabled="!pageData?.length"
33-
/>
34-
<ElOption
35-
label="选中数据 (所有选中的数据)"
36-
:value="ExportsOriginEnum.SELECTED"
37-
:disabled="!selectionData?.length"
38-
/>
39-
<ElOption
40-
label="全量数据 (所有分页的数据)"
41-
:value="ExportsOriginEnum.REMOTE"
42-
:disabled="!remoteExportEnabled"
43-
/>
44-
</ElSelect>
45-
</ElFormItem>
46-
<ElFormItem label="导出格式" prop="format">
47-
<ElRadioGroup v-model="exportsFormData.format">
48-
<ElRadio value="xlsx">Excel (.xlsx)</ElRadio>
49-
<ElRadio value="csv">CSV (.csv)</ElRadio>
50-
</ElRadioGroup>
51-
</ElFormItem>
52-
<ElFormItem label="字段" prop="fields">
53-
<ElCheckboxGroup v-model="exportsFormData.fields">
54-
<template v-for="col in cols" :key="col.prop">
55-
<ElCheckbox v-if="col.prop" :value="col.prop" :label="col.label" />
56-
</template>
57-
</ElCheckboxGroup>
58-
</ElFormItem>
59-
</ElForm>
60-
</ElScrollbar>
12+
<ElForm
13+
ref="exportsFormRef"
14+
:style="'padding-right: var(--el-dialog-padding-primary)'"
15+
:model="exportsFormData"
16+
:rules="exportsFormRules"
17+
label-width="88px"
18+
>
19+
<ElRow :gutter="16">
20+
<ElCol :span="12">
21+
<ElFormItem label="文件名" prop="filename">
22+
<ElInput v-model="exportsFormData.filename" placeholder="请输入文件名" clearable />
23+
</ElFormItem>
24+
</ElCol>
25+
<ElCol :span="12">
26+
<ElFormItem label="工作表名" prop="sheetname">
27+
<ElInput v-model="exportsFormData.sheetname" placeholder="请输入工作表名" clearable />
28+
</ElFormItem>
29+
</ElCol>
30+
<ElCol :span="12">
31+
<ElFormItem label="数据源" prop="origin">
32+
<ElSelect v-model="exportsFormData.origin">
33+
<ElOption
34+
label="当前页数据"
35+
:value="ExportsOriginEnum.CURRENT"
36+
:disabled="!pageData?.length"
37+
/>
38+
<ElOption
39+
label="选中数据"
40+
:value="ExportsOriginEnum.SELECTED"
41+
:disabled="!selectionData?.length"
42+
/>
43+
<ElOption
44+
label="全量数据"
45+
:value="ExportsOriginEnum.REMOTE"
46+
:disabled="!remoteExportEnabled"
47+
/>
48+
</ElSelect>
49+
</ElFormItem>
50+
</ElCol>
51+
<ElCol :span="12">
52+
<ElFormItem label="导出格式" prop="format">
53+
<ElRadioGroup v-model="exportsFormData.format">
54+
<ElRadio value="xlsx">Excel (.xlsx)</ElRadio>
55+
<ElRadio value="csv">CSV (.csv)</ElRadio>
56+
</ElRadioGroup>
57+
</ElFormItem>
58+
</ElCol>
59+
<ElCol :span="24">
60+
<ElFormItem label="字段" prop="fields">
61+
<div class="w-full">
62+
<div class="mb-2 flex items-center justify-between">
63+
<ElCheckbox
64+
:model-value="allFieldsChecked"
65+
@change="(val) => toggleAllFields(Boolean(val))"
66+
>
67+
全选
68+
</ElCheckbox>
69+
<span class="text-xs text-(--el-text-color-secondary)">
70+
已选 {{ exportsFormData.fields.length }} / {{ allFieldProps.length }}
71+
</span>
72+
</div>
73+
<ElScrollbar
74+
max-height="200px"
75+
class="box-border w-full rounded-md border border-(--el-border-color-lighter) p-3"
76+
>
77+
<ElCheckboxGroup
78+
v-model="exportsFormData.fields"
79+
class="grid grid-cols-2 gap-x-4 gap-y-2"
80+
>
81+
<ElCheckbox
82+
v-for="col in cols.filter((item) => item.prop)"
83+
:key="col.prop"
84+
:value="col.prop"
85+
:label="col.label"
86+
/>
87+
</ElCheckboxGroup>
88+
</ElScrollbar>
89+
</div>
90+
</ElFormItem>
91+
</ElCol>
92+
</ElRow>
93+
</ElForm>
6194
<!-- 弹窗底部操作按钮 -->
6295
<template #footer>
6396
<div :style="'padding-right: var(--el-dialog-padding-primary)'">
97+
<ElButton @click="handleCloseExportsModal">取 消</ElButton>
6498
<ElButton type="primary" :loading="loadingRef" @click="handleExportsSubmit"
6599
>确 定</ElButton
66100
>
67-
<ElButton @click="handleCloseExportsModal">取 消</ElButton>
68101
</div>
69102
</template>
70103
</FaDialog>
@@ -193,6 +226,19 @@ const initFields = () => {
193226
// 初始化
194227
initFields();
195228
229+
const allFieldProps = computed(
230+
() => cols.value.map((item) => item.prop).filter(Boolean) as string[]
231+
);
232+
const allFieldsChecked = computed(
233+
() =>
234+
allFieldProps.value.length > 0 &&
235+
allFieldProps.value.every((prop) => exportsFormData.fields.includes(prop))
236+
);
237+
238+
function toggleAllFields(checked: boolean) {
239+
exportsFormData.fields = checked ? [...allFieldProps.value] : [];
240+
}
241+
196242
// 关闭导出弹窗
197243
function handleCloseExportsModal() {
198244
exportsModalVisible.value = false;

‎frontend/web/src/components/modal/fa-import-dialog/index.vue‎

Lines changed: 45 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -9,54 +9,51 @@
99
modal-class="crud-embed-dialog"
1010
@close="handleClose"
1111
>
12-
<!-- 滚动 -->
13-
<ElScrollbar :max-height="props.maxHeight">
14-
<!-- 表单 -->
15-
<ElForm
16-
ref="importFormRef"
17-
:style="'padding-right: var(--el-dialog-padding-primary)'"
18-
:model="importFormData"
19-
:rules="importFormRules"
20-
>
21-
<ElFormItem prop="files">
22-
<ElUpload
23-
ref="uploadRef"
24-
v-model:file-list="importFormData.files"
25-
class="w-full"
26-
:accept="props.accept"
27-
:drag="true"
28-
:limit="props.limit"
29-
:auto-upload="false"
30-
:on-exceed="handleFileExceed"
31-
>
32-
<ElIcon class="el-icon--upload"><UploadFilled /></ElIcon>
33-
<div class="el-upload__text">
34-
{{ props.dropText || "将文件拖到此处,或" }}
35-
<em>{{ props.browseText || "点击上传" }}</em>
12+
<!-- 表单 -->
13+
<ElForm
14+
ref="importFormRef"
15+
:style="'padding-right: var(--el-dialog-padding-primary)'"
16+
:model="importFormData"
17+
:rules="importFormRules"
18+
>
19+
<ElFormItem prop="files">
20+
<ElUpload
21+
ref="uploadRef"
22+
v-model:file-list="importFormData.files"
23+
class="w-full"
24+
:accept="props.accept"
25+
:drag="true"
26+
:limit="props.limit"
27+
:auto-upload="false"
28+
:on-exceed="handleFileExceed"
29+
>
30+
<ElIcon class="el-icon--upload"><UploadFilled /></ElIcon>
31+
<div class="el-upload__text">
32+
{{ props.dropText || "将文件拖到此处,或" }}
33+
<em>{{ props.browseText || "点击上传" }}</em>
34+
</div>
35+
<template #tip>
36+
<div class="el-upload__tip flex flex-wrap gap-2">
37+
<ElText v-if="props.note" type="warning" class="mx-1">{{ props.note }}</ElText>
38+
<ElText v-if="props.fileTypeWarning" type="danger" class="mx-1">
39+
{{ props.fileTypeWarning }}
40+
</ElText>
41+
<ElLink
42+
v-if="props.showTemplateDownload"
43+
v-hasPerm="[`${props.contentConfig.permPrefix}:download`]"
44+
class="mx-1 inline-flex items-center gap-0.5"
45+
type="primary"
46+
underline="never"
47+
@click="handleDownloadTemplate"
48+
>
49+
<ElIcon class="text-base"><FaSvgIcon icon="ri:download-2-line" /></ElIcon>
50+
<span>{{ props.templateDownloadText || "下载模板" }}</span>
51+
</ElLink>
3652
</div>
37-
<template #tip>
38-
<div class="el-upload__tip flex flex-wrap gap-2">
39-
<ElText v-if="props.note" type="warning" class="mx-1">{{ props.note }}</ElText>
40-
<ElText v-if="props.fileTypeWarning" type="danger" class="mx-1">
41-
{{ props.fileTypeWarning }}
42-
</ElText>
43-
<ElLink
44-
v-if="props.showTemplateDownload"
45-
v-hasPerm="[`${props.contentConfig.permPrefix}:download`]"
46-
class="mx-1 inline-flex items-center gap-0.5"
47-
type="primary"
48-
underline="never"
49-
@click="handleDownloadTemplate"
50-
>
51-
<ElIcon class="text-base"><FaSvgIcon icon="ri:download-2-line" /></ElIcon>
52-
<span>{{ props.templateDownloadText || "下载模板" }}</span>
53-
</ElLink>
54-
</div>
55-
</template>
56-
</ElUpload>
57-
</ElFormItem>
58-
</ElForm>
59-
</ElScrollbar>
53+
</template>
54+
</ElUpload>
55+
</ElFormItem>
56+
</ElForm>
6057
<template #footer>
6158
<div :style="'padding-right: var(--el-dialog-padding-primary)'">
6259
<ElButton @click="handleClose">{{ props.cancelButtonText || "取 消" }}</ElButton>
@@ -188,7 +185,7 @@ const props = withDefaults(defineProps<Props>(), {
188185
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel",
189186
limit: 1,
190187
showTemplateDownload: true,
191-
note: "注意事项:",
188+
note: "请先下载模板,按模板字段填写后再上传",
192189
fileTypeWarning: "格式为*.xlsx / *.xls,文件不超过 5MB",
193190
uploadFileName: "file",
194191
uploadData: () => ({}),

0 commit comments

Comments
 (0)