fix
Showing
2 changed files
with
9 additions
and
2 deletions
| ... | @@ -1778,14 +1778,14 @@ const submitValueRange = () => { | ... | @@ -1778,14 +1778,14 @@ 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 || (field.endValue != null && field.startValue == 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) { | 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) { |
| 1791 | ruleFields.push(field); | 1791 | ruleFields.push(field); | ... | ... |
| ... | @@ -424,10 +424,17 @@ const transformRulesInfo = (info: any) => { | ... | @@ -424,10 +424,17 @@ const transformRulesInfo = (info: any) => { |
| 424 | databaseName: tableInfo.dataServerName, | 424 | databaseName: tableInfo.dataServerName, |
| 425 | dataSource: route.query.dataSource ? parseInt(<string>route.query.dataSource) : null, | 425 | dataSource: route.query.dataSource ? parseInt(<string>route.query.dataSource) : null, |
| 426 | modelRuleConfList: [Object.assign({}, info, { | 426 | modelRuleConfList: [Object.assign({}, info, { |
| 427 | ruleField: info.ruleFields.map(row => { | ||
| 428 | return { | ||
| 429 | // guid: row.mainTable, | ||
| 427 | enName: row.mainTableField, | 430 | enName: row.mainTableField, |
| 431 | //chName: row.chName, | ||
| 428 | compareTableGuid: row.compareTableGuid, | 432 | compareTableGuid: row.compareTableGuid, |
| 429 | compareTableName: row.compareTableName, | 433 | compareTableName: row.compareTableName, |
| 430 | compareEnName: row.compareEnName | 434 | compareEnName: row.compareEnName |
| 435 | } | ||
| 436 | }), | ||
| 437 | ruleFields: '' | ||
| 431 | })] | 438 | })] |
| 432 | })); | 439 | })); |
| 433 | } | 440 | } | ... | ... |
-
Please register or sign in to post a comment