From 7136b651588fe1ea556bd869b3c7050848348dda 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: Wed, 15 Nov 2023 14:28:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=B5=8B=E8=AF=95=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E7=9A=84=E6=A0=A1=E9=AA=8C=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=20=E5=A4=84=E7=90=86=E5=80=99=E5=8E=BBdb=20name=20=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E7=9A=84=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/abnormalAlarm/databaseMonitor/instances/tableSpace.vue b/src/views/abnormalAlarm/databaseMonitor/instances/tableSpace.vue
index 7f6e08a..c54968b 100644
--- a/src/views/abnormalAlarm/databaseMonitor/instances/tableSpace.vue
+++ b/src/views/abnormalAlarm/databaseMonitor/instances/tableSpace.vue
@@ -131,7 +131,6 @@ export default {
   },
   mounted() {
     this.getDbList()
-    this.getDbNameList()
   },
   methods: {
     filterOption(input, option) {
@@ -141,6 +140,7 @@ export default {
       getAction('/sysDatabase/sourceList').then((res) => {
         if (res.success) {
           this.name = this.$route.query.id || res.result[0].sourceId
+          this.getDbNameList()
           this.DbOptions = res.result.map((item) => {
             return {
               label: item.sourceName,
@@ -172,6 +172,7 @@ export default {
     },
     onDbChange(val) {
       this.name = val
+      this.getDbNameList()
     },
     ondbNameChange(val) {
       this.loading = true
diff --git a/src/views/abnormalAlarm/databaseMonitor/overview/index.vue b/src/views/abnormalAlarm/databaseMonitor/overview/index.vue
index 9a92eae..f88a2ca 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: true, message: 'Please input name!' }],
+                rules: [{ required: nameRequired, message: 'Please input name!' }],
                 initialVale: this.formVal.name,
               },
             ]"
@@ -237,6 +237,7 @@ export default {
   },
   data() {
     return {
+      nameRequired: false,
       loading: false,
       isAdd: true,
       visible: false,
@@ -443,6 +444,7 @@ export default {
       this.currentId = ''
     },
     onTest() {
+      this.nameRequired = false
       this.form.validateFields((err, values) => {
         if (!err) {
           let loading = this.$message.loading('连接中……', 0)
@@ -460,6 +462,10 @@ export default {
       })
     },
     onSave() {
+      this.nameRequired = true
+      this.$nextTick(() => {
+        this.form.validateFields(['name'], { force: true })
+      })
       this.form.validateFields((err, values) => {
         if (!err) {
           if (this.isAdd) {