From 26a00e81673461dc4e7220dba30a96a7a9f0aa32 Mon Sep 17 00:00:00 2001 From: Louis Corbet Date: Thu, 29 Aug 2024 16:06:42 +0200 Subject: [PATCH] fix: only first condition eventually applied --- .../wwwroot/SchShapeComp/js/shapecomp-render.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ScadaWeb/OpenPlugins/PlgSchShapeComp/wwwroot/SchShapeComp/js/shapecomp-render.js b/ScadaWeb/OpenPlugins/PlgSchShapeComp/wwwroot/SchShapeComp/js/shapecomp-render.js index 92e0baba5..48d53a569 100644 --- a/ScadaWeb/OpenPlugins/PlgSchShapeComp/wwwroot/SchShapeComp/js/shapecomp-render.js +++ b/ScadaWeb/OpenPlugins/PlgSchShapeComp/wwwroot/SchShapeComp/js/shapecomp-render.js @@ -573,17 +573,15 @@ scada.scheme.DynamicTextRenderer.prototype.updateData = function ( //add condition textContente to set spanText if (props.conditions && cnlDataExt.d.stat > 0) { var cnlVal = cnlDataExt.d.val; + let isConditionSatisfied = false; for (var cond of props.conditions) { - if (scada.scheme.calc.conditionSatisfied(cond, cnlVal)) { + if (!isConditionSatisfied && scada.scheme.calc.conditionSatisfied(cond, cnlVal)) { + isConditionSatisfied = true; if (cond.textContent) { spanText.text(cond.textContent); } - } - //update font size - if (scada.scheme.calc.conditionSatisfied(cond, cnlVal)) { this.setFontSize(spanComp, cond.fontSize); } - break; } }