center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

feat: 数据集导出分页样式优化

Browse Source
This commit is contained in:
dataeaseShu 2022-11-09 18:04:00 +08:00
parent 9df64d83fb
commit 1ba31d4ea9
3 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js
View File

@ -279,8 +279,8 @@ class TimeDateRangeServiceImpl extends WidgetService {
if (element.options.attrs.showTime && element.options.attrs.accuracy) { if (element.options.attrs.showTime && element.options.attrs.accuracy) {
labelFormat = labelFormat + ' ' + element.options.attrs.accuracy labelFormat = labelFormat + ' ' + element.options.attrs.accuracy
} }
let [ start, end ] = values let [start, end] = values
const attrs = element.options.attrs const attrs = element.options.attrs
if (attrs.default.sDynamicSuffixTime && attrs.default.isDynamic && attrs.default.dkey === 4 && attrs.showTime) { if (attrs.default.sDynamicSuffixTime && attrs.default.isDynamic && attrs.default.dkey === 4 && attrs.showTime) {

15
frontend/src/views/dataset/data/ViewTable.vue
View File

@ -191,7 +191,7 @@
v-if="showExport" v-if="showExport"
v-dialogDrag v-dialogDrag
:visible.sync="showExport" :visible.sync="showExport"
width="600px" width="800px"
class="de-dialog-form form-tree-cont" class="de-dialog-form form-tree-cont"
:title="$t('dataset.export_dataset')" :title="$t('dataset.export_dataset')"
append-to-body append-to-body
@ -219,7 +219,9 @@
prop="expressionTree" prop="expressionTree"
> >
<div class="tree-cont"> <div class="tree-cont">
<rowAuth ref="rowAuth" /> <div class="content">
<rowAuth ref="rowAuth" />
</div>
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -518,7 +520,14 @@ export default {
.tree-cont { .tree-cont {
height: 200px; height: 200px;
width: 100%; width: 100%;
overflow-x: auto; padding: 16px;
border-radius: 4px;
border: 1px solid var(--deBorderBase, #DCDFE6);
overflow: auto;
.content {
height: 100%;
width: 100%;
}
} }
} }
.icon-class { .icon-class {

16
frontend/src/views/dataset/data/components/filterFiled.vue
View File

@ -14,6 +14,7 @@
> >
<el-input <el-input
v-model="item.name" v-model="item.name"
class="w100"
:placeholder="$t('auth.selct_filter_fields')" :placeholder="$t('auth.selct_filter_fields')"
size="mini" size="mini"
@input="cancel" @input="cancel"
@ -55,6 +56,7 @@
<el-select <el-select
v-model="item.filterType" v-model="item.filterType"
size="mini" size="mini"
class="w100"
:placeholder="$t('auth.select')" :placeholder="$t('auth.select')"
@change="filterTypeChange" @change="filterTypeChange"
> >
@ -69,7 +71,7 @@
<template v-if="item.filterType === 'logic'"> <template v-if="item.filterType === 'logic'">
<el-select <el-select
v-model="item.term" v-model="item.term"
class="w100" class="w120"
size="mini" size="mini"
:placeholder="$t('auth.default_method')" :placeholder="$t('auth.default_method')"
@change="onOptionsChange" @change="onOptionsChange"
@ -93,7 +95,7 @@
<template v-else-if="!['null', 'empty', 'not_null', 'not_empty'].includes(item.term)"> <template v-else-if="!['null', 'empty', 'not_null', 'not_empty'].includes(item.term)">
<el-input <el-input
v-model="item.value" v-model="item.value"
class="w70 mar5" class="w120 mar5"
size="mini" size="mini"
/> />
<div class="de-bottom-line" /> <div class="de-bottom-line" />
@ -293,7 +295,7 @@ export default {
const { term, fieldId, filterType } = this.item const { term, fieldId, filterType } = this.item
const isNull = ['null', 'empty', 'not_null', 'not_empty'].includes(term) && filterType === 'logic' const isNull = ['null', 'empty', 'not_null', 'not_empty'].includes(term) && filterType === 'logic'
return { return {
width: !fieldId ? '270px' : isNull ? '670px' : '750px' width: !fieldId ? '240px' : isNull ? '540px' : '670px'
} }
}, },
operators() { operators() {
@ -491,10 +493,14 @@ export default {
width: 170px; width: 170px;
} }
.w100.el-select { .w100 {
width: 100px; width: 100px;
} }
.w120 {
width: 120px;
}
.w70 { .w70 {
width: 70px; width: 70px;
} }
@ -543,7 +549,7 @@ export default {
position: absolute; position: absolute;
right: 5px; right: 5px;
bottom: 9px; bottom: 9px;
width: 70px; width: 100px;
z-index: 10; z-index: 10;
} }