From 8cbf4a6b9f334246d88c8101ae3db9a21f1bab3f Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期三, 28 四月 2021 11:40:08 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.Common.Model/Model/MonitorSet.cs | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/src/Bro.Common.Model/Model/MonitorSet.cs b/src/Bro.Common.Model/Model/MonitorSet.cs
index 6151b49..c666168 100644
--- a/src/Bro.Common.Model/Model/MonitorSet.cs
+++ b/src/Bro.Common.Model/Model/MonitorSet.cs
@@ -206,15 +206,24 @@
[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>
- [Category("鍥炰紶璁剧疆")]
- [DisplayName("鐩戝惉鍥炰紶")]
- [Description("鐩戝惉杩愬姩鏉垮崱锛屽苟寰�鎸囧畾鐨処O鍐欏叆鏁版嵁")]
- [TypeConverter(typeof(CollectionCountConvert))]
- [Editor(typeof(IOItem), typeof(UITypeEditor))]
- public List<IOItem> ReplyIODatas { get; set; } = new List<IOItem>();
+ //[Category("鍥炰紶璁剧疆")]
+ //[DisplayName("鐩戝惉鍥炰紶")]
+ //[Description("鐩戝惉杩愬姩鏉垮崱锛屽苟寰�鎸囧畾鐨処O鍐欏叆鏁版嵁")]
+ //[TypeConverter(typeof(CollectionCountConvert))]
+ //[Editor(typeof(ComplexCollectionEditor<IOItem>), typeof(UITypeEditor))]
+ //public List<IOItem> ReplyIODatas { get; set; } = new List<IOItem>();
}
public class IOperationConfigEditor : UITypeEditor
@@ -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);
--
Gitblit v1.8.0