From 0883f3177bac1dc56d912c16cdf0cff6efc606e6 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 15 三月 2022 11:23:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into release0123
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 01a0587..f8370df 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -667,6 +667,8 @@
{
if (edit)
{
+ ///
+ this.function = device;
Input inputs = Logic.currlogic.input[index];
//娓呴櫎涔嬪墠鏃ф暟鎹�
dicSateteList.Clear();
@@ -854,6 +856,9 @@
private bool Is_SpkAttribute(string key) {
///淇敼鏂板睘鎬�
///璇嗗埆浣跨敤鍔熻兘鏄惁瀛樺湪灞炴��
+ if (this.function==null) {
+ return false;
+ }
var job = this.function.GetAttribute(key);
if (job != null)
{
--
Gitblit v1.8.0