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

Merge remote-tracking branch 'origin/main' into main

Browse Source
This commit is contained in:
wangjiahao 2021-06-23 15:28:22 +08:00
commit 9cf6919b2e
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/views/chart/group/Group.vue
View File

@ -899,7 +899,7 @@ export default {
authModel(queryCondition).then(res => { authModel(queryCondition).then(res => {
// this.highlights(res.data) // this.highlights(res.data)
this.tData = this.buildTree(res.data) this.tData = this.buildTree(res.data)
console.log(this.tData) // console.log(this.tData)
}) })
}, },

2
frontend/src/views/dataset/data/UpdateInfo.vue
View File

@ -468,7 +468,7 @@ export default {
post('/dataset/table/incrementalConfig', { tableId: this.table.id }).then(response => { post('/dataset/table/incrementalConfig', { tableId: this.table.id }).then(response => {
this.incrementalConfig = response.data this.incrementalConfig = response.data
this.incrementalUpdateType = 'incrementalAdd' this.incrementalUpdateType = 'incrementalAdd'
console.log(this.sql) // console.log(this.sql)
if (this.incrementalConfig.incrementalAdd) { if (this.incrementalConfig.incrementalAdd) {
this.sql = this.incrementalConfig.incrementalAdd this.sql = this.incrementalConfig.incrementalAdd
} else { } else {

2
frontend/src/views/dataset/group/Group.vue
View File

@ -857,7 +857,7 @@ export default {
authModel(queryCondition).then(res => { authModel(queryCondition).then(res => {
// this.highlights(res.data) // this.highlights(res.data)
this.tData = this.buildTree(res.data) this.tData = this.buildTree(res.data)
console.log(this.tData) // console.log(this.tData)
}) })
}, },

1
frontend/src/views/system/user/form.vue
View File

@ -285,6 +285,7 @@ export default {
save() { save() {
this.$refs.createUserForm.validate(valid => { this.$refs.createUserForm.validate(valid => {
if (valid) { if (valid) {
!this.form.deptId && (this.form.deptId = 0)
const method = this.formType === 'add' ? addUser : editUser const method = this.formType === 'add' ? addUser : editUser
method(this.form).then(res => { method(this.form).then(res => {
this.$success(this.$t('commons.save_success')) this.$success(this.$t('commons.save_success'))