Commit 9f5dee1996fdd6869e7d3234873ddb8cd076a2dc
Merge branch 'fix/data-dynamic-display' into 'main_dev'
fix: 修复数据动效显示隐藏失效 See merge request yunteng/thingskit-scada!129
Showing
1 changed file
with
5 additions
and
3 deletions
@@ -9034,7 +9034,7 @@ DataFormatPanel.prototype.addDataFont = function (container) { | @@ -9034,7 +9034,7 @@ DataFormatPanel.prototype.addDataFont = function (container) { | ||
9034 | label: '属性', | 9034 | label: '属性', |
9035 | bindValueFiled: enumDataSourceConst.ATTR, | 9035 | bindValueFiled: enumDataSourceConst.ATTR, |
9036 | layFilter: `${componentFilter}--${enumDataSourceConst.ATTR}`, | 9036 | layFilter: `${componentFilter}--${enumDataSourceConst.ATTR}`, |
9037 | - showSearch: true, | 9037 | + showSearch: true, |
9038 | className: 'data-source__component-select', | 9038 | className: 'data-source__component-select', |
9039 | ...validateRule, | 9039 | ...validateRule, |
9040 | onClick(data) { | 9040 | onClick(data) { |
@@ -14809,7 +14809,7 @@ class DispatchCenter { | @@ -14809,7 +14809,7 @@ class DispatchCenter { | ||
14809 | let scrollDistance = 0 | 14809 | let scrollDistance = 0 |
14810 | const id = $(element).find('.alarm-list').attr('id') | 14810 | const id = $(element).find('.alarm-list').attr('id') |
14811 | 14811 | ||
14812 | - let interval = Number(interval) | 14812 | + interval = Number(interval) |
14813 | interval = isNaN(interval) ? 2 : interval | 14813 | interval = isNaN(interval) ? 2 : interval |
14814 | 14814 | ||
14815 | const cancel = RAFSetInterval(() => { | 14815 | const cancel = RAFSetInterval(() => { |
@@ -16301,7 +16301,7 @@ class HandleDataInteraction { | @@ -16301,7 +16301,7 @@ class HandleDataInteraction { | ||
16301 | 16301 | ||
16302 | 16302 | ||
16303 | const { flag, value } = validateSwitchCommand() | 16303 | const { flag, value } = validateSwitchCommand() |
16304 | - | 16304 | + |
16305 | if (!flag) return | 16305 | if (!flag) return |
16306 | 16306 | ||
16307 | layer.confirm('是否确认下发命令?', async function (index) { | 16307 | layer.confirm('是否确认下发命令?', async function (index) { |
@@ -16869,9 +16869,11 @@ class HandleDynamicEffect { | @@ -16869,9 +16869,11 @@ class HandleDynamicEffect { | ||
16869 | const temp = this.actNodeMapping.get(node.id) | 16869 | const temp = this.actNodeMapping.get(node.id) |
16870 | temp.display = true | 16870 | temp.display = true |
16871 | } | 16871 | } |
16872 | + | ||
16872 | if (condition.title) { | 16873 | if (condition.title) { |
16873 | node.setAttribute('label', condition.title) | 16874 | node.setAttribute('label', condition.title) |
16874 | } | 16875 | } |
16876 | + node.setVisible(isShow) | ||
16875 | } | 16877 | } |
16876 | this.insertOnceUpdateFn(node, updateFn) | 16878 | this.insertOnceUpdateFn(node, updateFn) |
16877 | } | 16879 | } |