|
@@ -638,16 +638,13 @@ export function convertToFCDataChange(data) {
|
|
// 6. 单位:取frequencyUnit(默认空字符串)
|
|
// 6. 单位:取frequencyUnit(默认空字符串)
|
|
const unit = data && data.frequencyUnit ? data.frequencyUnit : '';
|
|
const unit = data && data.frequencyUnit ? data.frequencyUnit : '';
|
|
|
|
|
|
- // 7. 停止元素:优先coordinationTags数组 → 再stopConditionParamTags数组 → 最后fallback到stopConditionParamTag单个标签
|
|
|
|
|
|
+ // 7. stopConditionParamTags → 再stopConditionParamTags数组 → 最后fallback到stopConditionParamTag单个标签
|
|
let stopElement = '';
|
|
let stopElement = '';
|
|
- // 优先取coordinationTags数组
|
|
|
|
- if (data && data.coordinationTags && data.coordinationTags.length > 0 && data.coordinationTags[0].tableElementKey) {
|
|
|
|
- stopElement = `E[${data.coordinationTags[0].tableElementKey}]`;
|
|
|
|
- }
|
|
|
|
- // coordinationTags无值时,取stopConditionParamTags数组
|
|
|
|
- else if (data && data.stopConditionParamTags && data.stopConditionParamTags.length > 0 && data.stopConditionParamTags[0].tableElementKey) {
|
|
|
|
|
|
+ // stopConditionParamTags
|
|
|
|
+ if (data && data.stopConditionParamTags && data.stopConditionParamTags.length > 0 && data.stopConditionParamTags[0].tableElementKey) {
|
|
stopElement = `E[${data.stopConditionParamTags[0].tableElementKey}]`;
|
|
stopElement = `E[${data.stopConditionParamTags[0].tableElementKey}]`;
|
|
}
|
|
}
|
|
|
|
+
|
|
// 两个数组都无值时,取stopConditionParamTag单个标签(需非空)
|
|
// 两个数组都无值时,取stopConditionParamTag单个标签(需非空)
|
|
else if (data && data.stopConditionParamTag && data.stopConditionParamTag.trim() !== '') {
|
|
else if (data && data.stopConditionParamTag && data.stopConditionParamTag.trim() !== '') {
|
|
stopElement = data.stopConditionParamTag;
|
|
stopElement = data.stopConditionParamTag;
|