修复在线表单字典选择数据表bug

This commit is contained in:
Jerry
2024-08-15 10:17:12 +08:00
parent 3a347a3a1a
commit 8a64b28099
2 changed files with 14 additions and 4 deletions

View File

@@ -51,7 +51,7 @@ export const useDropdown = <T>(options: DropdownOptions<T>) => {
resolve(res); resolve(res);
}) })
.catch(e => { .catch(e => {
reject(e); resolve([]);
}); });
} else { } else {
resolve(dropdownList.value); resolve(dropdownList.value);
@@ -73,10 +73,18 @@ export const useDropdown = <T>(options: DropdownOptions<T>) => {
return Promise.resolve(); return Promise.resolve();
}; };
const setDirty = dirty => {
if (dirty) {
dropdownList.value = [];
}
loaded = !dirty;
};
return { return {
loading, loading,
dropdownList, dropdownList,
onVisibleChange, onVisibleChange,
refresh, refresh,
setDirty,
}; };
}; };

View File

@@ -505,10 +505,11 @@ const dropdownDBLinkIdOptions: DropdownOptions<ANY_OBJECT> = {
const dblinkIdWidget = reactive(useDropdown(dropdownDBLinkIdOptions)); const dblinkIdWidget = reactive(useDropdown(dropdownDBLinkIdOptions));
const loadTableNameWidgetDropdownList = (): Promise<ListData<ANY_OBJECT>> => { const loadTableNameWidgetDropdownList = (): Promise<ListData<ANY_OBJECT>> => {
if (!formOnlineDict.value.dblinkId) {
return Promise.reject();
}
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (!formOnlineDict.value.dblinkId) {
reject('请选择数据表所属数据库');
return;
}
OnlineDblinkController.listDblinkTables({ OnlineDblinkController.listDblinkTables({
dblinkId: formOnlineDict.value.dblinkId, dblinkId: formOnlineDict.value.dblinkId,
}) })
@@ -709,6 +710,7 @@ const onDeleteDictData = (row: ANY_OBJECT) => {
}; };
const onDblinkChange = () => { const onDblinkChange = () => {
clearDictInfo(); clearDictInfo();
tableNameWidget.setDirty(true);
formOnlineDict.value.tableName = undefined; formOnlineDict.value.tableName = undefined;
}; };