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

Merge branch 'main' of github.com:dataease/dataease into main

Browse Source
This commit is contained in:
taojinlong 2021-05-19 13:50:31 +08:00
commit 1fb3f2ee3b
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/views/panel/edit/index.vue
View File

@ -86,8 +86,8 @@
</filter-dialog>
<div style="text-align: end !important;margin: 0 15px !important;">
<span slot="footer">
<el-button @click="cancelFilter">{{ $t('commons.cancel') }}</el-button>
<el-button :disabled="!currentFilterCom.options.attrs.fieldId" type="primary" @click="sureFilter">{{ $t('commons.confirm') }}</el-button>
<el-button size="mini" @click="cancelFilter">{{ $t('commons.cancel') }}</el-button>
<el-button :disabled="!currentFilterCom.options.attrs.fieldId" type="primary" size="mini" @click="sureFilter">{{ $t('commons.confirm') }}</el-button>
</span>
</div>
</el-dialog>

8
frontend/src/views/panel/filter/filterDialog.vue
View File

@ -120,7 +120,8 @@
<div class="filter-field">
<div class="field-content">
<div class="field-content-left">
<div class="field-content-text">{{ $t(panel.field) }} </div>
<!-- <div class="field-content-text">{{ $t('panel.field') }} </div> -->
<div class="field-content-text">字段</div>
</div>
<div class="field-content-right">
@ -156,7 +157,7 @@
</div>
</el-col>
<el-col :span="16"><div class="filter-options-right">
<el-checkbox v-model="customRange"><span> {{ $t(panel.custom_scope) }} </span> </el-checkbox>
<el-checkbox v-model="customRange"><span> {{ $t('panel.custom_scope') }} </span> </el-checkbox>
<el-popover
v-model="popovervisible"
@ -239,7 +240,7 @@ export default {
showDomType: 'tree',
comShowDomType: 'view',
dataSetBreads: [
{ label: this.$t('panel.data_list') , link: false, type: 'root' }
{ label: this.$t('panel.data_list'), link: false, type: 'root' }
],
componentSetBreads: [
{ label: this.$t('panel.component_list'), link: false, type: 'root' }
@ -577,6 +578,7 @@ export default {
.filter-dialog-tabs {
border: 1px solid #E6E6E6;
height: 100%;
}
.filter-common {