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

frontend/src/views/chart/group/Group.vue

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

frontend/src/views/dataset/data/UpdateInfo.vue

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

frontend/src/views/dataset/group/Group.vue

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

frontend/src/views/system/user/form.vue

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