Commit 0540cea6f3ab3aadf749d912e34947ba15bff090
Merge branch 'fix/dynamic-effect' into 'main_dev'
fix: 修复数据动效显示隐藏动效启用时未设置标签时会回显最新值 See merge request yunteng/thingskit-scada!232
Showing
2 changed files
with
1 additions
and
2 deletions
| @@ -90,7 +90,7 @@ export class DataDynamicEffectHandler { | @@ -90,7 +90,7 @@ export class DataDynamicEffectHandler { | ||
| 90 | node.classList.add(ActAnimationName.VISIBLE) | 90 | node.classList.add(ActAnimationName.VISIBLE) |
| 91 | node.classList.remove(ActAnimationName.HIDDEN) | 91 | node.classList.remove(ActAnimationName.HIDDEN) |
| 92 | }) | 92 | }) |
| 93 | - this.nodeUtils.updateCellValue(cell, record?.title ? record.title : latestValue) | 93 | + record?.title && this.nodeUtils.updateCellValue(cell, record?.title) |
| 94 | } | 94 | } |
| 95 | else if (type === ActRangListItemTypeEnum.HIDDEN) { | 95 | else if (type === ActRangListItemTypeEnum.HIDDEN) { |
| 96 | nodeEl.forEach((node) => { | 96 | nodeEl.forEach((node) => { |
| @@ -27,7 +27,6 @@ export class MessageHandler { | @@ -27,7 +27,6 @@ export class MessageHandler { | ||
| 27 | 27 | ||
| 28 | const { commandSource } = telemetrySubscriber | 28 | const { commandSource } = telemetrySubscriber |
| 29 | const { dataType } = commandSource | 29 | const { dataType } = commandSource |
| 30 | - | ||
| 31 | if (dataType === DataSourceTypeEnum.DATASOURCE) | 30 | if (dataType === DataSourceTypeEnum.DATASOURCE) |
| 32 | this.updateDataSource(commandSource, message) | 31 | this.updateDataSource(commandSource, message) |
| 33 | else if (dataType === DataSourceTypeEnum.ACT) | 32 | else if (dataType === DataSourceTypeEnum.ACT) |