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

Merge pull request #825 from dataease/pr@dev@fix_custom_calc

Browse Source 
fix: 计算字段不参与关联于制作自定义数据集
This commit is contained in:
XiaJunjie2020 2021-09-15 18:25:03 +08:00 committed by GitHub
commit 3dad2bfdee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/views/dataset/common/DatasetCustomField.vue
View File

@ -57,7 +57,7 @@ export default {
watch: {
'table': function() {
fieldList(this.table.id).then(response => {
this.fields = response.data
this.fields = JSON.parse(JSON.stringify(response.data)).filter(ele => ele.extField === 0)
this.checkedFields = []
this.checkedList.forEach(ele => {
@ -78,7 +78,7 @@ export default {
initField() {
if (this.table.id) {
fieldList(this.table.id).then(response => {
this.fields = response.data
this.fields = JSON.parse(JSON.stringify(response.data)).filter(ele => ele.extField === 0)
})
}
},

4
frontend/src/views/dataset/data/UnionView.vue
View File

@ -222,7 +222,7 @@ export default {
// if (response.data) {
this.union.sourceTableId = this.table.id
fieldList(this.table.id).then(response => {
this.sourceFieldOption = response.data
this.sourceFieldOption = JSON.parse(JSON.stringify(response.data)).filter(ele => ele.extField === 0)
})
this.editUnion = true
// } else {
@ -320,7 +320,7 @@ export default {
this.union.targetTableId = param.id
this.union.targetTableFieldId = ''
fieldList(param.id).then(response => {
this.targetFieldOption = response.data
this.targetFieldOption = JSON.parse(JSON.stringify(response.data)).filter(ele => ele.extField === 0)
})
this.$refs['targetTable'].doClose()
}