From e47b78d23cfccd3f11dfaa41622fc987590d784f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <peiyu_ren@163.com>
Date: Mon, 20 Nov 2023 15:51:36 +0800
Subject: [PATCH] =?UTF-8?q?Datasource=20=E5=88=87=E6=8D=A2=E4=B9=8B?=
 =?UTF-8?q?=E5=90=8E=20table=20=E4=B9=9F=E8=A6=81=E6=B8=85=E7=A9=BA=20db?=
 =?UTF-8?q?=20monitor=20=E6=A8=A1=E5=9D=97=20overview=20add=20=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=20Name=20=E6=98=AF=E5=BF=85=E5=A1=AB=E9=A1=B9?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E6=98=AF=20Test=20=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../databaseMonitor/instances/tableSpace.vue           |  1 +
 .../abnormalAlarm/databaseMonitor/overview/index.vue   | 10 ++--------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/views/abnormalAlarm/databaseMonitor/instances/tableSpace.vue b/src/views/abnormalAlarm/databaseMonitor/instances/tableSpace.vue
index d1ca8ee..243332b 100644
--- a/src/views/abnormalAlarm/databaseMonitor/instances/tableSpace.vue
+++ b/src/views/abnormalAlarm/databaseMonitor/instances/tableSpace.vue
@@ -174,6 +174,7 @@ export default {
     onDbChange(val) {
       this.name = val
       this.dbName = undefined
+      this.dataSource = []
       this.getDbNameList()
     },
     ondbNameChange(val) {
diff --git a/src/views/abnormalAlarm/databaseMonitor/overview/index.vue b/src/views/abnormalAlarm/databaseMonitor/overview/index.vue
index 2e3ba90..7687c6a 100644
--- a/src/views/abnormalAlarm/databaseMonitor/overview/index.vue
+++ b/src/views/abnormalAlarm/databaseMonitor/overview/index.vue
@@ -83,7 +83,7 @@
             v-decorator="[
               'name',
               {
-                rules: [{ required: nameRequired, message: 'Please input name!' }],
+                rules: [{ required: true, message: 'Please input name!' }],
                 initialVale: this.formVal.name,
               },
             ]"
@@ -237,7 +237,6 @@ export default {
   },
   data() {
     return {
-      nameRequired: false,
       loading: false,
       isAdd: true,
       visible: false,
@@ -444,8 +443,7 @@ export default {
       this.currentId = ''
     },
     onTest() {
-      this.nameRequired = false
-      this.form.validateFields((err, values) => {
+      this.form.validateFields(['dbType', 'dbDriver', 'dbUrl', 'dbUsername', 'dbPassword'], (err, values) => {
         if (!err) {
           let loading = this.$message.loading('连接中……', 0)
           postAction('/online/cgreport/api/testConnection', values)
@@ -462,10 +460,6 @@ export default {
       })
     },
     onSave() {
-      this.nameRequired = true
-      this.$nextTick(() => {
-        this.form.validateFields(['name'], { force: true })
-      })
       this.form.validateFields((err, values) => {
         if (!err) {
           if (this.isAdd) {