dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7962 from dataease/pr@dev_one_dot_x

Browse Source 
Pr@dev one dot x
This commit is contained in:
dataeaseShu 2024-02-01 13:37:52 +08:00 committed by GitHub
commit db2af20827
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/frontend/src/views/dataset/add/AddSQL.vue
View File

@ -966,8 +966,8 @@ export default {
table.info.replace(/\n/g, '\\n').replace(/\r/g, '\\r') table.info.replace(/\n/g, '\\n').replace(/\r/g, '\\r')
).sql ).sql
} }
if(JSON.parse(table.info).hasOwnProperty("setKey")){ if (JSON.parse(table.info).hasOwnProperty("setKey")) {
this.param.setKey = JSON.parse(table.info).setKey this.$set(this.param, 'setKey', JSON.parse(table.info).setKey)
this.param.keys = JSON.parse(table.info).keys this.param.keys = JSON.parse(table.info).keys
} }
this.variables = JSON.parse(table.sqlVariableDetails) this.variables = JSON.parse(table.sqlVariableDetails)

8
core/frontend/src/views/system/datasource/DsFormContent.vue
View File

@ -694,6 +694,14 @@ export default {
}) })
}, },
methods: { methods: {
async cancelEdit() {
const params = this.configFromTabs?.id ? this.configFromTabs : this.$route.query
let { id, showModel } = params
await this.getDatasourceDetail(id, showModel)
this.edit(this.params)
this.changeType(true)
this.editDatasource(false)
},
editDatasource(type) { editDatasource(type) {
this.$emit('update:canEdit', type) this.$emit('update:canEdit', type)
this.disabled = !type this.disabled = !type

6
core/frontend/src/views/system/datasource/DsTable.vue
View File

@ -24,7 +24,7 @@
v-if="privileges && canEdit" v-if="privileges && canEdit"
key="cancel" key="cancel"
secondary secondary
@click="editDatasource(false)" @click="cancelEdit"
>{{ $t('commons.cancel') }} >{{ $t('commons.cancel') }}
</deBtn> </deBtn>
<deBtn <deBtn
@ -109,6 +109,10 @@ export default {
this.$refs.DsFormContent.editDatasource(type) this.$refs.DsFormContent.editDatasource(type)
this.canEdit = type this.canEdit = type
}, },
cancelEdit() {
this.$refs.DsFormContent.cancelEdit()
this.canEdit = false
},
validaDatasource() { validaDatasource() {
this.$refs.DsFormContent.validaDatasource() this.$refs.DsFormContent.validaDatasource()
}, },