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 = (options: DropdownOptions) => { resolve(res); }) .catch(e => { - reject(e); + resolve([]); }); } else { resolve(dropdownList.value); @@ -73,10 +73,18 @@ export const useDropdown = (options: DropdownOptions) => { 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 = { const dblinkIdWidget = reactive(useDropdown(dropdownDBLinkIdOptions)); const loadTableNameWidgetDropdownList = (): Promise> => { - 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; };