afee3a24 by lihua

fix

1 parent 61157630
......@@ -654,7 +654,7 @@ const getSubjectTableTreeData = () => {
d.children = d.children?.map(child => {
child.label = child.name + `(${child.tableName})`;
child.isLeaf = true;
child.dataServerName = d.name;
child.dataServerName = child.databaseName;
child.dataSourceGuid = d.guid;
return child;
})
......@@ -1778,13 +1778,13 @@ const submitValueRange = () => {
let valueTableFields = valueRangeTableListData.value[table];
let ruleFields: any = []
for (const field of valueTableFields) {
if (field.startValue == null && field.endValue == null) {
if (dialogSelectSubjectTable.value.enName != table) {
valueCheckFormListRef.value.setSelectList(table, 'enName');
}
ElMessage.error(`表【${table}】的字段【${field.enName}】设置了值域,但范围未填写完整`);
return;
}
// if (field.startValue == null && field.endValue == null) {
// if (dialogSelectSubjectTable.value.enName != table) {
// valueCheckFormListRef.value.setSelectList(table, 'enName');
// }
// ElMessage.error(`表【${table}】的字段【${field.enName}】设置了值域,但范围未填写完整`);
// return;
// }
if (field.startValue != null || field.endValue != null) {
ruleFields.push(field);
} else if (field.dataRange) {
......
......@@ -94,7 +94,7 @@ const getSubjectTableTreeData = () => {
d.label = d.name;
d.children = d.children?.map(child => {
child.label = child.name + `(${child.tableName})`;
child.dataServerName = d.name;
child.dataServerName = child.databaseName;
child.dataSourceGuid = d.guid;
return child;
})
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!