Merge remote-tracking branch 'origin/wjc' into release0123

wxr

2022-03-15 0883f3177bac1dc56d912c16cdf0cff6efc606e6

 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)
            {