From b83a01eec16b236d099dcea3e7a5051c8cae9c6c Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期五, 03 七月 2020 10:48:37 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.Common.Model/Model/IOItem.cs | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/Bro.Common.Model/Model/IOItem.cs b/src/Bro.Common.Model/Model/IOItem.cs
index 4b59a7c..147880e 100644
--- a/src/Bro.Common.Model/Model/IOItem.cs
+++ b/src/Bro.Common.Model/Model/IOItem.cs
@@ -42,7 +42,7 @@
return false;
}
- public string GetDisplayText()
+ public virtual string GetDisplayText()
{
return $"{IOType.GetEnumDescription()}-{IONum}-{Value}";
}
@@ -56,6 +56,11 @@
public class IODefinition : IOItem
{
[Category("IO閰嶇疆")]
+ [Description("IO棰勫畾涔�")]
+ [TypeConverter(typeof(EnumDescriptionConverter<IOPrestatement>))]
+ public IOPrestatement IOPreStatement { get; set; } = IOPrestatement.Customized;
+
+ [Category("IO閰嶇疆")]
[Description("IO鐢ㄩ�旀弿杩�")]
public string IODesc { get; set; }
@@ -67,9 +72,9 @@
[JsonIgnore]
public override int Value { get; set; }
- public new string GetDisplayText()
+ public override string GetDisplayText()
{
- return $"{IODesc} {IOType.GetEnumDescription()} {IONum}";
+ return $"{(IOPreStatement == IOPrestatement.Customized ? IODesc : IOPreStatement.GetEnumDescription())} {IOType.GetEnumDescription()} {IONum}";
}
}
--
Gitblit v1.8.0