forked from github/dataease
Merge pull request #382 from dataease/pr@dev@test_数据集字段编辑测试
test: 数据集字段编辑测试
This commit is contained in:
commit
ddae50a762
@ -507,14 +507,20 @@
|
|||||||
|
|
||||||
<!--编辑视图使用的数据集的字段-->
|
<!--编辑视图使用的数据集的字段-->
|
||||||
<el-dialog
|
<el-dialog
|
||||||
v-dialogDrag
|
|
||||||
:visible="editDsField"
|
:visible="editDsField"
|
||||||
:show-close="false"
|
:show-close="false"
|
||||||
class="dialog-css"
|
class="dialog-css"
|
||||||
:destroy-on-close="true"
|
:destroy-on-close="true"
|
||||||
:fullscreen="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-dialog>
|
||||||
</el-row>
|
</el-row>
|
||||||
</template>
|
</template>
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
<el-form-item class="form-item">
|
<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-button v-if="hasDataPermission('manage',param.privileges)" size="mini" @click="addCalcField">{{ $t('dataset.add_calc_field') }}</el-button>
|
||||||
</el-form-item>
|
</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
|
<el-input
|
||||||
v-model="searchField"
|
v-model="searchField"
|
||||||
size="mini"
|
size="mini"
|
||||||
@ -241,6 +241,7 @@
|
|||||||
class="dialog-css"
|
class="dialog-css"
|
||||||
:destroy-on-close="true"
|
:destroy-on-close="true"
|
||||||
:title="$t('dataset.add_calc_field')"
|
:title="$t('dataset.add_calc_field')"
|
||||||
|
append-to-body
|
||||||
>
|
>
|
||||||
<calc-field-edit :param="param" :table-fields="tableFields" />
|
<calc-field-edit :param="param" :table-fields="tableFields" />
|
||||||
<div slot="footer" class="dialog-footer">
|
<div slot="footer" class="dialog-footer">
|
||||||
@ -324,10 +325,6 @@ export default {
|
|||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|
||||||
closeEdit() {
|
|
||||||
this.$emit('switchComponent', { name: 'ViewTable', param: this.param })
|
|
||||||
},
|
|
||||||
|
|
||||||
dqTrans(item, val) {
|
dqTrans(item, val) {
|
||||||
if (val === 'd') {
|
if (val === 'd') {
|
||||||
item.groupType = 'q'
|
item.groupType = 'q'
|
||||||
|
Loading…
Reference in New Issue
Block a user