afee3a24 by lihua

fix

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