From 0dfbcfad8bbbeae5218293d59aba851fd8e65a90 Mon Sep 17 00:00:00 2001
From: wells <123>
Date: 星期六, 11 七月 2020 12:25:35 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.Common.Model/Forms/FrmDeviceOpConfigEditor.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/Bro.Common.Model/Forms/FrmDeviceOpConfigEditor.cs b/src/Bro.Common.Model/Forms/FrmDeviceOpConfigEditor.cs
index 26b8303..d17062c 100644
--- a/src/Bro.Common.Model/Forms/FrmDeviceOpConfigEditor.cs
+++ b/src/Bro.Common.Model/Forms/FrmDeviceOpConfigEditor.cs
@@ -91,7 +91,7 @@
var attr = device.GetType().GetCustomAttribute<DeviceAttribute>();
if (attr != null)
{
- var opConfig= ConfigFactory.GetOperationConfig(attr.TypeCode);
+ var opConfig = ConfigFactory.GetOperationConfig(attr.TypeCode);
opConfig.DeviceId = device.Id;
propGrid.SelectedObject = opConfig;
}
@@ -120,6 +120,7 @@
{
Bind.Device = cboDevice.SelectedValue.ToString();
Bind.OpConfig = propGrid.SelectedObject as IOperationConfig;
+ Bind.OpConfig.DeviceId = Bind.Device;
this.DialogResult = DialogResult.OK;
}
--
Gitblit v1.8.0