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

Merge pull request #260 from dataease/pr@dev@feat_过滤组件调整

Browse Source 
feat: 过滤组件条件调整
This commit is contained in:
XiaJunjie2020 2021-07-19 15:51:01 +08:00 committed by GitHub
commit 15cc4cef7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
frontend/src/views/chart/components/filter/DimensionFilterEditor.vue
View File

@ -64,26 +64,26 @@ export default {
label: this.$t('chart.filter_not_like')
}]
},
{
label: '',
options: [{
value: 'lt',
label: this.$t('chart.filter_lt')
}, {
value: 'gt',
label: this.$t('chart.filter_gt')
}]
},
{
label: '',
options: [{
value: 'le',
label: this.$t('chart.filter_le')
}, {
value: 'ge',
label: this.$t('chart.filter_ge')
}]
},
// {
// label: '',
// options: [{
// value: 'lt',
// label: this.$t('chart.filter_lt')
// }, {
// value: 'gt',
// label: this.$t('chart.filter_gt')
// }]
// },
// {
// label: '',
// options: [{
// value: 'le',
// label: this.$t('chart.filter_le')
// }, {
// value: 'ge',
// label: this.$t('chart.filter_ge')
// }]
// },
{
label: '',
options: [{

20
frontend/src/views/chart/components/filter/QuotaFilterEditor.vue
View File

@ -54,16 +54,16 @@ export default {
label: this.$t('chart.filter_not_eq')
}]
},
{
label: '',
options: [{
value: 'like',
label: this.$t('chart.filter_like')
}, {
value: 'not like',
label: this.$t('chart.filter_not_like')
}]
},
// {
// label: '',
// options: [{
// value: 'like',
// label: this.$t('chart.filter_like')
// }, {
// value: 'not like',
// label: this.$t('chart.filter_not_like')
// }]
// },
{
label: '',
options: [{

12
frontend/src/views/chart/view/ChartEdit.vue
View File

@ -213,7 +213,7 @@
</el-row>
</div>
<div style="overflow:auto;border-top: 1px solid #e6e6e6" class="attr-style">
<el-row>
<el-row style="height: 100%;">
<el-row v-if="chart.type !=='text' && chart.type !== 'gauge'" class="padding-lr">
<span style="width: 80px;text-align: right;">{{ $t('chart.dimension') }}</span>
<draggable
@ -222,7 +222,7 @@
group="dimension"
animation="300"
:move="onMove"
style="padding:2px 0 0 0;width:100%;height: 100%;border-radius: 4px;border: 1px solid #DCDFE6;overflow-x: auto;display: flex;align-items: center;background-color: white;"
style="padding:2px 0 0 0;width:100%;min-height: 32px;border-radius: 4px;border: 1px solid #DCDFE6;overflow-x: auto;display: flex;align-items: center;background-color: white;"
@end="end2"
>
<transition-group class="draggable-group">
@ -230,7 +230,7 @@
</transition-group>
</draggable>
</el-row>
<el-row class="padding-lr">
<el-row class="padding-lr" style="margin-top: 6px;">
<span style="width: 80px;text-align: right;">{{ $t('chart.quota') }}</span>
<draggable
v-model="view.yaxis"
@ -238,7 +238,7 @@
group="quota"
animation="300"
:move="onMove"
style="padding:2px 0 0 0;width:100%;height: 100%;border-radius: 4px;border: 1px solid #DCDFE6;overflow-x: auto;display: flex;align-items: center;background-color: white;"
style="padding:2px 0 0 0;width:100%;min-height: 32px;border-radius: 4px;border: 1px solid #DCDFE6;overflow-x: auto;display: flex;align-items: center;background-color: white;"
@end="end2"
>
<transition-group class="draggable-group">
@ -246,7 +246,7 @@
</transition-group>
</draggable>
</el-row>
<div class="padding-lr filter-class">
<div class="padding-lr filter-class" style="margin-top: 6px;">
<span>{{ $t('chart.result_filter') }}</span>
<el-button :disabled="!hasDataPermission('manage',param.privileges)" size="mini" class="filter-btn-class" @click="showResultFilter">
{{ $t('chart.filter_condition') }}<i class="el-icon-setting el-icon--right" />
@ -1233,7 +1233,7 @@ export default {
}
.attr-style{
height: calc(100vh - 56px - 25vh - 40px - 60px);
height: calc(100vh - 56px - 25vh - 40px - 40px);
}
.attr-selector{