From a74d7eb0f10ce8864e43c6f99f160bd9af638c22 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 16 May 2025 18:27:23 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE-=E6=B7=BB=E5=8A=A0DB=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E4=BF=9D=E5=AD=98=E6=95=B0=E6=8D=AE=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=94=99=E8=AF=AF=20=20-=20[=E5=85=B3=E8=81=94]#[1422?=
 =?UTF-8?q?543905325056]=E5=BA=94=E7=94=A8=E9=85=8D=E7=BD=AE-=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0DB=E9=85=8D=E7=BD=AE=E6=97=B6=EF=BC=8C=E5=85=88?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=B8=80=E4=B8=AA=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=EF=BC=8C=E7=84=B6=E5=90=8E=E5=9C=A8=E6=B7=BB=E5=8A=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=EF=BC=8C=E4=BF=9D=E5=AD=98=E5=90=8E=E6=8A=8A?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=93=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BA=86=20http://192.168.0.96:8090/demo/rdm.html#/bu?=
 =?UTF-8?q?g-detail/939050947543040/939050947543057/1422543905325056?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/env/db-resource-setting-dialog.vue |   2 +-
 .../config/env/env-db-config-edit.vue         |   1 +
 .../config/env/env-db-config-list.vue         | 141 +++++++++---------
 3 files changed, 76 insertions(+), 68 deletions(-)

diff --git a/src/views/pages/deploy/application-config/config/env/db-resource-setting-dialog.vue b/src/views/pages/deploy/application-config/config/env/db-resource-setting-dialog.vue
index fbcd63f80..ee69e1ea5 100644
--- a/src/views/pages/deploy/application-config/config/env/db-resource-setting-dialog.vue
+++ b/src/views/pages/deploy/application-config/config/env/db-resource-setting-dialog.vue
@@ -180,7 +180,7 @@ export default {
         ip: this.formValue.ip,
         port: this.formValue.port
       };
-      if (!this.$utils.isEmpty(this.dbResourceData)) {
+      if (!this.isNewData) {
         data.id = this.dbResourceData.id;
       }
       this.$api.deploy.env.saveEnvDbResource(data).then((res) => {
diff --git a/src/views/pages/deploy/application-config/config/env/env-db-config-edit.vue b/src/views/pages/deploy/application-config/config/env/env-db-config-edit.vue
index a70133543..d32edc888 100644
--- a/src/views/pages/deploy/application-config/config/env/env-db-config-edit.vue
+++ b/src/views/pages/deploy/application-config/config/env/env-db-config-edit.vue
@@ -520,6 +520,7 @@ export default {
     },
     closeDbResourceSettingDialog(id) {
       this.isLoading = true;
+      this.dbResourceData = null;
       if (id && !this.dbResourceId) {
         this.$set(this.formValue, 'dbResourceId', id);
         this.changeDbResourceId(id);
diff --git a/src/views/pages/deploy/application-config/config/env/env-db-config-list.vue b/src/views/pages/deploy/application-config/config/env/env-db-config-list.vue
index 79f9425fe..d9fd6d9e4 100644
--- a/src/views/pages/deploy/application-config/config/env/env-db-config-list.vue
+++ b/src/views/pages/deploy/application-config/config/env/env-db-config-list.vue
@@ -34,74 +34,77 @@
           </Tooltip>
         </template>
       </ul>
-      <div
-        v-for="(item, index) in dbConfigList"
-        :key="index"
-        class="pb-lg db-list-box border-color"
-        :class="index == 0 ? (!item.isShow ? 'pt-nm pb-nm' : 'pt-nm') : (!item.isShow ? 'pt-nm pb-nm' : 'pt-lg')"
-      >
-        <header class="header-box pl-nm pr-nm" :class="item.isShow ? 'pb-nm' : ''">
-          <div>
-            <span class="text-grey title">{{ $t('term.deploy.databaseschema') }}</span>
-            <span>{{ item.dbSchema }}</span>
-          </div>
-          <div class="action-group">
-            <span v-if="hasEditConfigAuth" class="action-item tsfont-edit" @click="editDbConfig(item.id)"></span>
-            <template v-else>
-              <Tooltip
-                max-width="400"
-                placement="right"
-                transfer
-              >
-                <span class="text-disabled action-item tsfont-edit"></span>
-                <ul slot="content">
-                  <li>{{ $t('term.deploy.noconfigauthtip') }}</li>
-                </ul>
-              </Tooltip>
-            </template>
-            <span v-if="hasEditConfigAuth" class="action-item tsfont-trash-o" @click="delDbConfig(item)"></span>
-            <template v-else>
-              <Tooltip
-                max-width="400"
-                placement="right"
-                transfer
-              >
-                <span class="text-disabled action-item tsfont-trash-o"></span>
-                <ul slot="content">
-                  <li>{{ $t('term.deploy.noconfigauthtip') }}</li>
-                </ul>
-              </Tooltip>
-            </template>
-            <span class="action-item" :class="item.isShow ? 'tsfont-down' : 'tsfont-up'" @click="handleDownUp(item, index)"></span>
-          </div>
-        </header>
-        <ul v-if="item.isShow" class="ul-box pl-nm pr-nm">
-          <li class="pb-nm">
-            <span class="text-grey title">{{ $t('page.database') }}</span>
-            <span class="db-user-text-box">
-              <TsFormSelect
-                v-model="item.dbResourceId"
-                v-bind="dbSetting"
-              ></TsFormSelect>
-            </span>
-          </li>
-          <li class="pb-nm flex-box">
-            <span class="text-grey title">{{ $t('page.account') }}</span>
-            <span class="db-user-text-box">
-              <TsFormSelect
-                v-model="item.accountId"
-                v-bind="userSetting"
-              ></TsFormSelect>
-            </span>
-          </li>
-          <template v-if="item.config">
-            <li v-for="(configItem, key , cIndex) of item.config" :key="cIndex" class="pb-nm">
-              <span class="text-grey title">{{ advancedConfig[key] }}</span>
-              <span>{{ handleShowText(key, configItem) }}</span>
+      <Loading :loadingShow="loadingShow" type="fix"></Loading>
+      <template v-if="!loadingShow">
+        <div
+          v-for="(item, index) in dbConfigList"
+          :key="index"
+          class="pb-lg db-list-box border-color"
+          :class="index == 0 ? (!item.isShow ? 'pt-nm pb-nm' : 'pt-nm') : (!item.isShow ? 'pt-nm pb-nm' : 'pt-lg')"
+        >
+          <header class="header-box pl-nm pr-nm" :class="item.isShow ? 'pb-nm' : ''">
+            <div>
+              <span class="text-grey title">{{ $t('term.deploy.databaseschema') }}</span>
+              <span>{{ item.dbSchema }}</span>
+            </div>
+            <div class="action-group">
+              <span v-if="hasEditConfigAuth" class="action-item tsfont-edit" @click="editDbConfig(item.id)"></span>
+              <template v-else>
+                <Tooltip
+                  max-width="400"
+                  placement="right"
+                  transfer
+                >
+                  <span class="text-disabled action-item tsfont-edit"></span>
+                  <ul slot="content">
+                    <li>{{ $t('term.deploy.noconfigauthtip') }}</li>
+                  </ul>
+                </Tooltip>
+              </template>
+              <span v-if="hasEditConfigAuth" class="action-item tsfont-trash-o" @click="delDbConfig(item)"></span>
+              <template v-else>
+                <Tooltip
+                  max-width="400"
+                  placement="right"
+                  transfer
+                >
+                  <span class="text-disabled action-item tsfont-trash-o"></span>
+                  <ul slot="content">
+                    <li>{{ $t('term.deploy.noconfigauthtip') }}</li>
+                  </ul>
+                </Tooltip>
+              </template>
+              <span class="action-item" :class="item.isShow ? 'tsfont-down' : 'tsfont-up'" @click="handleDownUp(item, index)"></span>
+            </div>
+          </header>
+          <ul v-if="item.isShow" class="ul-box pl-nm pr-nm">
+            <li class="pb-nm">
+              <span class="text-grey title">{{ $t('page.database') }}</span>
+              <span class="db-user-text-box">
+                <TsFormSelect
+                  v-model="item.dbResourceId"
+                  v-bind="dbSetting"
+                ></TsFormSelect>
+              </span>
             </li>
-          </template>
-        </ul>
-      </div>
+            <li class="pb-nm flex-box">
+              <span class="text-grey title">{{ $t('page.account') }}</span>
+              <span class="db-user-text-box">
+                <TsFormSelect
+                  v-model="item.accountId"
+                  v-bind="userSetting"
+                ></TsFormSelect>
+              </span>
+            </li>
+            <template v-if="item.config">
+              <li v-for="(configItem, key , cIndex) of item.config" :key="cIndex" class="pb-nm">
+                <span class="text-grey title">{{ advancedConfig[key] }}</span>
+                <span>{{ handleShowText(key, configItem) }}</span>
+              </li>
+            </template>
+          </ul>
+        </div>
+      </template>
     </template>
   
     <EnvDbConfigEdit
@@ -134,6 +137,7 @@ export default {
   },
   data() {
     return {
+      loadingShow: false,
       dbConfigId: null,
       isShowDbConfigEdit: false,
       hasDbConfig: false,
@@ -217,6 +221,7 @@ export default {
     },
     searchDbConfig() {
       if (this.params) {
+        this.loadingShow = true;
         this.$api.deploy.applicationConfig.getEnvInfo(this.params).then((res) => {
           if (res && res.Status == 'OK') {
             let {DBConfigList} = res.Return;
@@ -232,6 +237,8 @@ export default {
               this.dbConfigList = [];
             }
           }
+        }).finally(() => {
+          this.loadingShow = false;
         });
       }
     },
-- 
Gitee