现场修改

patrick.xu

2021-09-15 8bd46da0c9fbfe39a65d75b1d85692d8783f5905

 src/Bro.Common.Model/Model/MonitorSet.cs

@@ -206,6 +206,15 @@
        [DisplayName("触发值")]
        public int TriggerValue { get; set; } = -1;

        ///// <summary>
        ///// 传入数据地址的索引 按照监听地址从0开始的索引集合
        ///// </summary>
        //[Category("监听设置")]
        //[Description("传入数据地址的索引 按照监听地址从0开始的索引")]
        //[DisplayName("传入数据索引")]
        //[TypeConverter(typeof(SimpleCollectionConvert<int>))]
        //public List<int> InputDataIndex { get; set; } = new List<int>();

        /// <summary>
        /// 监听回传
        /// </summary>
@@ -246,18 +255,27 @@
                    }
                }

                FrmOpConfigEdit frm = new FrmOpConfigEdit(ms.MethodCode, ms.Id, value as IOperationConfig)
                FrmDeviceOpConfigEditor frmDeviceOpEditor = new FrmDeviceOpConfigEditor(new DeviceOpBind() { Device = ms.InvokeDevice, OpConfig = value as IOperationConfig }, false)
                {
                    StartPosition = FormStartPosition.CenterScreen
                };
                if (frm.ShowDialog() == DialogResult.OK)
                {
                    return frm.OpConfig;
                }
                else
                {
                    return frm.BackupConfig;
                }
                frmDeviceOpEditor.ShowDialog();
                frmDeviceOpEditor.Bind.OpConfig.MonitorSetId = ms.Id;
                frmDeviceOpEditor.Bind.OpConfig.DeviceId = ms.InvokeDevice;

                return frmDeviceOpEditor.Bind.OpConfig;
                //FrmOpConfigEdit frm = new FrmOpConfigEdit(ms.MethodCode, ms.Id, value as IOperationConfig)
                //{
                //    StartPosition = FormStartPosition.CenterScreen
                //};
                //if (frm.ShowDialog() == DialogResult.OK)
                //{
                //    return frm.OpConfig;
                //}
                //else
                //{
                //    return frm.BackupConfig;
                //}
            }

            return base.EditValue(context, provider, value);