From 986f7fd4711ae8bdd0e1b472da4ef0b2cef14b3b Mon Sep 17 00:00:00 2001
From: kennen <317052920@qq.com>
Date: Mon, 20 Feb 2023 17:31:10 +0800
Subject: [PATCH 01/10] feat(DatabaseForm): add goToAuthorized function in
 schemaScope

---
 .../src/views/connections/DatabaseForm.vue       | 15 ++++++++++++++-
 packages/shared/src/util.js                      | 16 ++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/packages/business/src/views/connections/DatabaseForm.vue b/packages/business/src/views/connections/DatabaseForm.vue
index 5716f32b49..6377fc01a3 100644
--- a/packages/business/src/views/connections/DatabaseForm.vue
+++ b/packages/business/src/views/connections/DatabaseForm.vue
@@ -115,7 +115,7 @@ import i18n from '@tap/i18n'
 import { clusterApi, connectionsApi, databaseTypesApi, pdkApi, externalStorageApi, proxyApi } from '@tap/api'
 import { VIcon, GitBook } from '@tap/component'
 import { SchemaToForm } from '@tap/form'
-import { checkConnectionName, isEmpty } from '@tap/shared'
+import { checkConnectionName, isEmpty, submitForm } from '@tap/shared'
 import Test from './Test'
 import { getConnectionIcon } from './util'
 import DatabaseTypeDialog from './DatabaseTypeDialog'
@@ -898,6 +898,19 @@ export default {
           } catch (e) {
             return []
           }
+        },
+        goToAuthorized: async params => {
+          this.schemaFormInstance?.validate().then(async () => {
+            const { __TAPDATA, ...__TAPDATA_CONFIG } = this.$refs.schemaToForm?.getFormValues?.() || {}
+            const data = Object.assign({}, params, {
+              url: location.href,
+              connectionConfig: {
+                __TAPDATA,
+                __TAPDATA_CONFIG
+              }
+            })
+            submitForm(params?.target, data)
+          })
         }
       }
       this.schemaData = result
diff --git a/packages/shared/src/util.js b/packages/shared/src/util.js
index 8319b4d00b..b5f3878706 100644
--- a/packages/shared/src/util.js
+++ b/packages/shared/src/util.js
@@ -216,6 +216,22 @@ export function openUrl(url, target = '_blank', name = '') {
   window.URL.revokeObjectURL(url)
 }
 
+export function submitForm(url, obj = {}, method = 'post') {
+  const form = document.createElement('form')
+  form.action = url
+  form.method = method
+  for (let key in obj) {
+    const dom = document.createElement('input')
+    dom.setAttribute('type', 'hidden')
+    dom.setAttribute('name', key)
+    dom.value = typeof obj[key] === 'object' ? JSON.stringify(obj[key]) : obj[key]
+    form.appendChild(dom)
+  }
+  document.body.appendChild(form)
+  form.submit()
+  form.parentNode.removeChild(form)
+}
+
 // 下载Blob
 export function downloadBlob(res, name = '') {
   if (!res) {

From 07590178dbb10eba54e2cb461373c3a94dc1929a Mon Sep 17 00:00:00 2001
From: kennen <317052920@qq.com>
Date: Mon, 20 Feb 2023 17:37:47 +0800
Subject: [PATCH 02/10] feat(DatabaseForm): setValues when route.query have
 connectionConfig

---
 .../business/src/views/connections/DatabaseForm.vue  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/business/src/views/connections/DatabaseForm.vue b/packages/business/src/views/connections/DatabaseForm.vue
index 6377fc01a3..79d2ad3759 100644
--- a/packages/business/src/views/connections/DatabaseForm.vue
+++ b/packages/business/src/views/connections/DatabaseForm.vue
@@ -772,6 +772,18 @@ export default {
         delete result.properties.START.properties.__TAPDATA.properties.name
       }
 
+      const { connectionConfig } = this.$route.query || {}
+      if (connectionConfig) {
+        const { __TAPDATA, __TAPDATA_CONFIG = {} } = JSON.parse(connectionConfig) || {}
+        Object.assign(this.model, __TAPDATA, {
+          config: __TAPDATA_CONFIG
+        })
+        this.schemaFormInstance.setValues({
+          __TAPDATA,
+          ...__TAPDATA_CONFIG
+        })
+      }
+
       this.schemaScope = {
         isEdit: !!id,
         useAsyncDataSource: (service, fieldName = 'dataSource', ...serviceParams) => {

From b7c5a058a0ca8cf5f061e79ce71e771c3020e6d0 Mon Sep 17 00:00:00 2001
From: kennen <317052920@qq.com>
Date: Mon, 20 Feb 2023 17:41:24 +0800
Subject: [PATCH 03/10] feat(DatabaseForm): setValues when route.query have
 connectionConfig

---
 packages/business/src/views/connections/DatabaseForm.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/business/src/views/connections/DatabaseForm.vue b/packages/business/src/views/connections/DatabaseForm.vue
index 79d2ad3759..1d0ad2b14f 100644
--- a/packages/business/src/views/connections/DatabaseForm.vue
+++ b/packages/business/src/views/connections/DatabaseForm.vue
@@ -774,13 +774,14 @@ export default {
 
       const { connectionConfig } = this.$route.query || {}
       if (connectionConfig) {
-        const { __TAPDATA, __TAPDATA_CONFIG = {} } = JSON.parse(connectionConfig) || {}
+        const { __TAPDATA, __TAPDATA_CONFIG = {}, ...trace } = JSON.parse(connectionConfig) || {}
         Object.assign(this.model, __TAPDATA, {
           config: __TAPDATA_CONFIG
         })
         this.schemaFormInstance.setValues({
           __TAPDATA,
-          ...__TAPDATA_CONFIG
+          ...__TAPDATA_CONFIG,
+          ...trace
         })
       }
 

From 875c61ca926bbac2b428e2467b638bfd9c3adb5a Mon Sep 17 00:00:00 2001
From: kennen <317052920@qq.com>
Date: Mon, 20 Feb 2023 17:46:34 +0800
Subject: [PATCH 04/10] feat(DatabaseForm): add trace

---
 .../business/src/views/connections/DatabaseForm.vue   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/business/src/views/connections/DatabaseForm.vue b/packages/business/src/views/connections/DatabaseForm.vue
index 1d0ad2b14f..ad6c9e6f9a 100644
--- a/packages/business/src/views/connections/DatabaseForm.vue
+++ b/packages/business/src/views/connections/DatabaseForm.vue
@@ -775,9 +775,14 @@ export default {
       const { connectionConfig } = this.$route.query || {}
       if (connectionConfig) {
         const { __TAPDATA, __TAPDATA_CONFIG = {}, ...trace } = JSON.parse(connectionConfig) || {}
-        Object.assign(this.model, __TAPDATA, {
-          config: __TAPDATA_CONFIG
-        })
+        Object.assign(
+          this.model,
+          __TAPDATA,
+          {
+            config: __TAPDATA_CONFIG
+          },
+          trace
+        )
         this.schemaFormInstance.setValues({
           __TAPDATA,
           ...__TAPDATA_CONFIG,

From 1b3d2e4930d5fc3516c821ce33a354d7d6a3b6a7 Mon Sep 17 00:00:00 2001
From: kennen <317052920@qq.com>
Date: Mon, 20 Feb 2023 19:32:20 +0800
Subject: [PATCH 05/10] feat(DatabaseForm): get current url in goToAuthorized
 function

---
 .../business/src/views/connections/DatabaseForm.vue  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/business/src/views/connections/DatabaseForm.vue b/packages/business/src/views/connections/DatabaseForm.vue
index ad6c9e6f9a..5284b73db2 100644
--- a/packages/business/src/views/connections/DatabaseForm.vue
+++ b/packages/business/src/views/connections/DatabaseForm.vue
@@ -110,6 +110,7 @@
 
 <script>
 import { action } from '@formily/reactive'
+import { cloneDeep } from 'lodash'
 
 import i18n from '@tap/i18n'
 import { clusterApi, connectionsApi, databaseTypesApi, pdkApi, externalStorageApi, proxyApi } from '@tap/api'
@@ -918,10 +919,19 @@ export default {
           }
         },
         goToAuthorized: async params => {
+          const routeQuery = cloneDeep(this.$route.query)
+          const routeParams = this.$route.params
+          delete routeQuery['connectionConfig']
+          let routeUrl = this.$router.resolve({
+            name: routeParams?.id ? 'connectionsEdit' : 'connectionCreate',
+            query: routeQuery,
+            params: routeParams
+          })
+
           this.schemaFormInstance?.validate().then(async () => {
             const { __TAPDATA, ...__TAPDATA_CONFIG } = this.$refs.schemaToForm?.getFormValues?.() || {}
             const data = Object.assign({}, params, {
-              url: location.href,
+              url: location.origin + location.pathname + routeUrl.href,
               connectionConfig: {
                 __TAPDATA,
                 __TAPDATA_CONFIG

From a3c083611f4a6f3f23dc3e0fa52637fc2ff991f3 Mon Sep 17 00:00:00 2001
From: kennen <317052920@qq.com>
Date: Mon, 27 Feb 2023 10:59:48 +0800
Subject: [PATCH 06/10] refactor(connection/Form): await getPdkData

---
 packages/business/src/views/connections/DatabaseForm.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/business/src/views/connections/DatabaseForm.vue b/packages/business/src/views/connections/DatabaseForm.vue
index 5284b73db2..2a72483214 100644
--- a/packages/business/src/views/connections/DatabaseForm.vue
+++ b/packages/business/src/views/connections/DatabaseForm.vue
@@ -769,7 +769,7 @@ export default {
         }
       }
       if (id) {
-        this.getPdkData(id)
+        await this.getPdkData(id)
         delete result.properties.START.properties.__TAPDATA.properties.name
       }
 
@@ -944,8 +944,8 @@ export default {
       this.schemaData = result
       this.loadingFrom = false
     },
-    getPdkData(id) {
-      connectionsApi.getNoSchema(id).then(data => {
+    async getPdkData(id) {
+      await connectionsApi.getNoSchema(id).then(data => {
         this.model = data
         let {
           name,

From 4b6496963a8094ad3c0518ec398427bd0d0e3d6d Mon Sep 17 00:00:00 2001
From: kennen <317052920@qq.com>
Date: Mon, 27 Feb 2023 15:05:36 +0800
Subject: [PATCH 07/10] refactor(connection/Form): add setConnectionConfig
 function

---
 .../src/views/connections/DatabaseForm.vue    | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/packages/business/src/views/connections/DatabaseForm.vue b/packages/business/src/views/connections/DatabaseForm.vue
index 2a72483214..07a5f6326d 100644
--- a/packages/business/src/views/connections/DatabaseForm.vue
+++ b/packages/business/src/views/connections/DatabaseForm.vue
@@ -773,23 +773,7 @@ export default {
         delete result.properties.START.properties.__TAPDATA.properties.name
       }
 
-      const { connectionConfig } = this.$route.query || {}
-      if (connectionConfig) {
-        const { __TAPDATA, __TAPDATA_CONFIG = {}, ...trace } = JSON.parse(connectionConfig) || {}
-        Object.assign(
-          this.model,
-          __TAPDATA,
-          {
-            config: __TAPDATA_CONFIG
-          },
-          trace
-        )
-        this.schemaFormInstance.setValues({
-          __TAPDATA,
-          ...__TAPDATA_CONFIG,
-          ...trace
-        })
-      }
+      this.setConnectionConfig()
 
       this.schemaScope = {
         isEdit: !!id,
@@ -988,6 +972,30 @@ export default {
       pdkApi.doc(pdkHash).then(res => {
         this.doc = res?.data
       })
+    },
+    async setConnectionConfig() {
+      const { connectionConfig } = this.$route.query || {}
+      if (connectionConfig) {
+        const params = {
+          connectionConfig: connectionConfig,
+          type: 'OAuth'
+        }
+        const res = proxyApi.command(params)
+        const { __TAPDATA, __TAPDATA_CONFIG = {}, ...trace } = res || JSON.parse(connectionConfig) || {}
+        Object.assign(
+          this.model,
+          __TAPDATA,
+          {
+            config: __TAPDATA_CONFIG
+          },
+          trace
+        )
+        this.schemaFormInstance.setValues({
+          __TAPDATA,
+          ...__TAPDATA_CONFIG,
+          ...trace
+        })
+      }
     }
   }
 }

From 01fa7fc107e4b87ab9a3f1446293bfd8f2381cdb Mon Sep 17 00:00:00 2001
From: kennen <317052920@qq.com>
Date: Mon, 27 Feb 2023 16:25:54 +0800
Subject: [PATCH 08/10] refactor(connection/Form): remove validate in
 goToAuthorized function

---
 .../src/views/connections/DatabaseForm.vue     | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/packages/business/src/views/connections/DatabaseForm.vue b/packages/business/src/views/connections/DatabaseForm.vue
index 07a5f6326d..89add141c5 100644
--- a/packages/business/src/views/connections/DatabaseForm.vue
+++ b/packages/business/src/views/connections/DatabaseForm.vue
@@ -912,17 +912,15 @@ export default {
             params: routeParams
           })
 
-          this.schemaFormInstance?.validate().then(async () => {
-            const { __TAPDATA, ...__TAPDATA_CONFIG } = this.$refs.schemaToForm?.getFormValues?.() || {}
-            const data = Object.assign({}, params, {
-              url: location.origin + location.pathname + routeUrl.href,
-              connectionConfig: {
-                __TAPDATA,
-                __TAPDATA_CONFIG
-              }
-            })
-            submitForm(params?.target, data)
+          const { __TAPDATA, ...__TAPDATA_CONFIG } = this.$refs.schemaToForm?.getFormValues?.() || {}
+          const data = Object.assign({}, params, {
+            url: location.origin + location.pathname + routeUrl.href,
+            connectionConfig: {
+              __TAPDATA,
+              __TAPDATA_CONFIG
+            }
           })
+          submitForm(params?.target, data)
         }
       }
       this.schemaData = result

From 35b83099cbf2ed62e6d429a387035460abdd884c Mon Sep 17 00:00:00 2001
From: kennen <317052920@qq.com>
Date: Mon, 27 Feb 2023 16:39:45 +0800
Subject: [PATCH 09/10] refactor(connection/Form): add pdkHash and command
 params

---
 packages/business/src/views/connections/DatabaseForm.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/business/src/views/connections/DatabaseForm.vue b/packages/business/src/views/connections/DatabaseForm.vue
index 89add141c5..8ebfb917b9 100644
--- a/packages/business/src/views/connections/DatabaseForm.vue
+++ b/packages/business/src/views/connections/DatabaseForm.vue
@@ -972,11 +972,13 @@ export default {
       })
     },
     async setConnectionConfig() {
-      const { connectionConfig } = this.$route.query || {}
+      const { connectionConfig, pdkHash } = this.$route.query || {}
       if (connectionConfig) {
         const params = {
-          connectionConfig: connectionConfig,
-          type: 'OAuth'
+          pdkHash,
+          connectionConfig: JSON.parse(connectionConfig),
+          command: 'OAuth',
+          type: 'connection'
         }
         const res = proxyApi.command(params)
         const { __TAPDATA, __TAPDATA_CONFIG = {}, ...trace } = res || JSON.parse(connectionConfig) || {}

From 15b3aa22948edac4156b38a13fc2fe3a5e596f5a Mon Sep 17 00:00:00 2001
From: kennen <317052920@qq.com>
Date: Mon, 27 Feb 2023 16:45:39 +0800
Subject: [PATCH 10/10] refactor(connection/Form): await proxyApi.command and
 get data

---
 packages/business/src/views/connections/DatabaseForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/business/src/views/connections/DatabaseForm.vue b/packages/business/src/views/connections/DatabaseForm.vue
index 8ebfb917b9..25dce75587 100644
--- a/packages/business/src/views/connections/DatabaseForm.vue
+++ b/packages/business/src/views/connections/DatabaseForm.vue
@@ -980,7 +980,7 @@ export default {
           command: 'OAuth',
           type: 'connection'
         }
-        const res = proxyApi.command(params)
+        const res = await proxyApi.command(params)
         const { __TAPDATA, __TAPDATA_CONFIG = {}, ...trace } = res || JSON.parse(connectionConfig) || {}
         Object.assign(
           this.model,