From 8bd46da0c9fbfe39a65d75b1d85692d8783f5905 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期三, 15 九月 2021 10:50:54 +0800
Subject: [PATCH] 现场修改
---
src/Bro.Common.Model/Model/MonitorSet.cs | 43 ++++++++++++++++++++++++++-----------------
1 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/src/Bro.Common.Model/Model/MonitorSet.cs b/src/Bro.Common.Model/Model/MonitorSet.cs
index 985da90..c666168 100644
--- a/src/Bro.Common.Model/Model/MonitorSet.cs
+++ b/src/Bro.Common.Model/Model/MonitorSet.cs
@@ -206,14 +206,14 @@
[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>
+ ///// 浼犲叆鏁版嵁鍦板潃鐨勭储寮� 鎸夌収鐩戝惉鍦板潃浠�0寮�濮嬬殑绱㈠紩闆嗗悎
+ ///// </summary>
+ //[Category("鐩戝惉璁剧疆")]
+ //[Description("浼犲叆鏁版嵁鍦板潃鐨勭储寮� 鎸夌収鐩戝惉鍦板潃浠�0寮�濮嬬殑绱㈠紩")]
+ //[DisplayName("浼犲叆鏁版嵁绱㈠紩")]
+ //[TypeConverter(typeof(SimpleCollectionConvert<int>))]
+ //public List<int> InputDataIndex { get; set; } = new List<int>();
/// <summary>
/// 鐩戝惉鍥炰紶
@@ -255,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