Merge pull request #7962 from dataease/pr@dev_one_dot_x

Pr@dev one dot x

core/frontend/src/views/dataset/add/AddSQL.vue

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

core/frontend/src/views/system/datasource/DsFormContent.vue

@@ -694,6 +694,14 @@ export default {
     })
   },
   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) {
       this.$emit('update:canEdit', type)
       this.disabled = !type

core/frontend/src/views/system/datasource/DsTable.vue

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