From 8a64b280991bf33f4371bc1c49f1e11a79623b42 Mon Sep 17 00:00:00 2001
From: Jerry <707344974@qq.com>
Date: Thu, 15 Aug 2024 10:17:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=A8=E7=BA=BF=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E5=AD=97=E5=85=B8=E9=80=89=E6=8B=A9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=A1=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OrangeFormsOpen-VUE3/src/common/hooks/useDropdown.ts   | 10 +++++++++-
 .../src/pages/online/formOnlineDict/EditOnlineDict.vue |  8 +++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/OrangeFormsOpen-VUE3/src/common/hooks/useDropdown.ts b/OrangeFormsOpen-VUE3/src/common/hooks/useDropdown.ts
index fdcc0ecf..20f6f793 100644
--- a/OrangeFormsOpen-VUE3/src/common/hooks/useDropdown.ts
+++ b/OrangeFormsOpen-VUE3/src/common/hooks/useDropdown.ts
@@ -51,7 +51,7 @@ export const useDropdown = <T>(options: DropdownOptions<T>) => {
             resolve(res);
           })
           .catch(e => {
-            reject(e);
+            resolve([]);
           });
       } else {
         resolve(dropdownList.value);
@@ -73,10 +73,18 @@ export const useDropdown = <T>(options: DropdownOptions<T>) => {
     return Promise.resolve();
   };
 
+  const setDirty = dirty => {
+    if (dirty) {
+      dropdownList.value = [];
+    }
+    loaded = !dirty;
+  };
+
   return {
     loading,
     dropdownList,
     onVisibleChange,
     refresh,
+    setDirty,
   };
 };
diff --git a/OrangeFormsOpen-VUE3/src/pages/online/formOnlineDict/EditOnlineDict.vue b/OrangeFormsOpen-VUE3/src/pages/online/formOnlineDict/EditOnlineDict.vue
index edd2c0a3..e22490de 100644
--- a/OrangeFormsOpen-VUE3/src/pages/online/formOnlineDict/EditOnlineDict.vue
+++ b/OrangeFormsOpen-VUE3/src/pages/online/formOnlineDict/EditOnlineDict.vue
@@ -505,10 +505,11 @@ const dropdownDBLinkIdOptions: DropdownOptions<ANY_OBJECT> = {
 const dblinkIdWidget = reactive(useDropdown(dropdownDBLinkIdOptions));
 
 const loadTableNameWidgetDropdownList = (): Promise<ListData<ANY_OBJECT>> => {
-  if (!formOnlineDict.value.dblinkId) {
-    return Promise.reject();
-  }
   return new Promise((resolve, reject) => {
+    if (!formOnlineDict.value.dblinkId) {
+      reject('请选择数据表所属数据库');
+      return;
+    }
     OnlineDblinkController.listDblinkTables({
       dblinkId: formOnlineDict.value.dblinkId,
     })
@@ -709,6 +710,7 @@ const onDeleteDictData = (row: ANY_OBJECT) => {
 };
 const onDblinkChange = () => {
   clearDictInfo();
+  tableNameWidget.setDirty(true);
   formOnlineDict.value.tableName = undefined;
 };