|
@@ -227,7 +227,7 @@
|
|
|
v-for="(item, index) in formOptionList"
|
|
|
:key="index"
|
|
|
:label="item.dfNickname"
|
|
|
- :value="item.dfTableName"
|
|
|
+ :value="item.formKey"
|
|
|
>
|
|
|
<span class="discribe" style="float: left">{{
|
|
|
item.dfNickname
|
|
@@ -285,7 +285,7 @@
|
|
|
v-for="(item, index) in formOptionList"
|
|
|
:key="index"
|
|
|
:label="item.dfNickname"
|
|
|
- :value="item.dfTableName"
|
|
|
+ :value="item.formKey"
|
|
|
>
|
|
|
<span class="discribe" style="float: left">{{
|
|
|
item.dfNickname
|
|
@@ -476,7 +476,7 @@
|
|
|
v-for="item in relaTableOptions"
|
|
|
:key="item.dfTableName"
|
|
|
:label="item.dfName"
|
|
|
- :value="item.dfTableName"
|
|
|
+ :value="item.formKey"
|
|
|
>
|
|
|
<span class="discribe" style="float: left">{{
|
|
|
item.dfName
|
|
@@ -703,13 +703,19 @@ export default {
|
|
|
row.refValue = "";
|
|
|
}
|
|
|
},
|
|
|
+ // 根据formKey获取表单绑定的表名
|
|
|
+ getTableNameByFormKey(formKey) {
|
|
|
+ let temp = this.formOptionList.find((item) => item.formKey == formKey);
|
|
|
+ return temp?.dfTableName || "";
|
|
|
+ },
|
|
|
// 依赖的主表单变化回调
|
|
|
async changeTableName(row) {
|
|
|
if (row.tableName) {
|
|
|
+ let tableName = this.getTableNameByFormKey(row.tableName);
|
|
|
let data = {
|
|
|
databaseName: this.databaseName,
|
|
|
databaseType: this.databaseType,
|
|
|
- tableName: row.tableName,
|
|
|
+ tableName,
|
|
|
};
|
|
|
try {
|
|
|
let res = await getListName(data);
|
|
@@ -717,7 +723,7 @@ export default {
|
|
|
return {
|
|
|
model: item.fieldName,
|
|
|
label: item.fieldDescription,
|
|
|
- tableName: row.tableName,
|
|
|
+ tableName,
|
|
|
};
|
|
|
});
|
|
|
this.conditionTableShow = false;
|
|
@@ -897,7 +903,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
// 主表单变化回调
|
|
|
- async mainFormChange(dfTableName) {
|
|
|
+ async mainFormChange(mainFormName) {
|
|
|
// let targetForm = this.getFormJson(formKey);
|
|
|
// console.log("targetForm", targetForm);
|
|
|
// if (targetForm) {
|
|
@@ -906,6 +912,7 @@ export default {
|
|
|
// );
|
|
|
// this.groupForm.mainFormTable = targetForm.dfTableName;
|
|
|
// }
|
|
|
+ let dfTableName = this.getTableNameByFormKey(mainFormName);
|
|
|
let data = {
|
|
|
databaseName: this.databaseName,
|
|
|
databaseType: this.databaseType,
|
|
@@ -955,10 +962,11 @@ export default {
|
|
|
formItem: "",
|
|
|
});
|
|
|
} else {
|
|
|
+ let tableName = this.getTableNameByFormKey(row.formKey);
|
|
|
let data = {
|
|
|
databaseName: this.databaseName,
|
|
|
databaseType: this.databaseType,
|
|
|
- tableName: row.formKey,
|
|
|
+ tableName: tableName,
|
|
|
};
|
|
|
try {
|
|
|
let res = await getListName(data);
|
|
@@ -966,7 +974,7 @@ export default {
|
|
|
return {
|
|
|
model: item.fieldName,
|
|
|
label: item.fieldDescription,
|
|
|
- tableName: row.formKey,
|
|
|
+ tableName: tableName,
|
|
|
};
|
|
|
});
|
|
|
} catch (error) {
|