mirror of
https://gitee.com/orangeform/orange-admin.git
synced 2026-01-17 10:36:31 +08:00
修复在线表单字典选择数据表bug
This commit is contained in:
@@ -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,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -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;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user