From a5bb8ca5b5136ff232bad283e3680bd1a60d1f8f Mon Sep 17 00:00:00 2001 From: Feynman Date: Fri, 27 Oct 2023 01:23:03 +0800 Subject: [PATCH] refactor: connection list search params save on the url, return to the url after the connection is saved --- .../src/views/connections/DatabaseForm.vue | 17 ++--------------- .../business/src/views/connections/List.vue | 13 +++++++------ 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/packages/business/src/views/connections/DatabaseForm.vue b/packages/business/src/views/connections/DatabaseForm.vue index 2de9696672..8ed1826b46 100644 --- a/packages/business/src/views/connections/DatabaseForm.vue +++ b/packages/business/src/views/connections/DatabaseForm.vue @@ -281,9 +281,7 @@ export default { name: 'connections' }) } else { - this.$router.push({ - path: this.pathUrl - }) + this.$router.back() } }) }, @@ -334,18 +332,7 @@ export default { result: true }) this.$message.success(this.$t('public_message_save_ok')) - if (this.$route.query.step) { - this.$router.push({ - name: 'connections', - query: { - step: this.$route.query.step - } - }) - } else { - this.$router.push({ - name: 'connections' - }) - } + this.$router.back() }) .catch(() => { this.buried('connectionSubmit', '', { diff --git a/packages/business/src/views/connections/List.vue b/packages/business/src/views/connections/List.vue index 62b56d6d36..98e884fb74 100644 --- a/packages/business/src/views/connections/List.vue +++ b/packages/business/src/views/connections/List.vue @@ -347,15 +347,16 @@ export default { }) }, mounted() { - const { step, action, keyword } = this.$route.query || {} - if (step) { - this.handleGuide() - } + const { action } = this.$route.query || {} + if (action === 'create') { this.checkTestConnectionAvailable() } - if (keyword) { - this.searchParams.keyword = keyword + + for (const key in this.searchParams) { + if (key in this.$route.query) { + this.searchParams[key] = this.$route.query[key] + } } }, destroyed() {