Merge pull request #382 from dataease/pr@dev@test_数据集字段编辑测试

test: 数据集字段编辑测试
This commit is contained in:
XiaJunjie2020 2021-07-28 15:25:19 +08:00 committed by GitHub
commit ddae50a762
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions

View File

@ -507,14 +507,20 @@
<!--编辑视图使用的数据集的字段-->
<el-dialog
v-dialogDrag
:visible="editDsField"
:show-close="false"
class="dialog-css"
:destroy-on-close="true"
:fullscreen="true"
>
<field-edit :param="table" @switchComponent="closeEditDsField" />
<field-edit :param="table" />
<div slot="title" class="dialog-footer">
<span style="font-size: 14px;">
{{ $t('dataset.field_manage') }}
<span v-if="table">[{{ table.name }}]</span>
</span>
<el-button size="mini" style="float: right;" @click="closeEditDsField">{{ $t('chart.close') }}</el-button>
</div>
</el-dialog>
</el-row>
</template>

View File

@ -16,7 +16,7 @@
<el-form-item class="form-item">
<el-button v-if="hasDataPermission('manage',param.privileges)" size="mini" @click="addCalcField">{{ $t('dataset.add_calc_field') }}</el-button>
</el-form-item>
<el-form-item class="form-item" style="float: right;">
<el-form-item class="form-item" style="float: right;margin-right: 0;">
<el-input
v-model="searchField"
size="mini"
@ -241,6 +241,7 @@
class="dialog-css"
:destroy-on-close="true"
:title="$t('dataset.add_calc_field')"
append-to-body
>
<calc-field-edit :param="param" :table-fields="tableFields" />
<div slot="footer" class="dialog-footer">
@ -324,10 +325,6 @@ export default {
})
},
closeEdit() {
this.$emit('switchComponent', { name: 'ViewTable', param: this.param })
},
dqTrans(item, val) {
if (val === 'd') {
item.groupType = 'q'