From 9a2f369bcee572ba086ca83d76a562a0ecaa587b Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期四, 16 七月 2020 17:22:09 +0800
Subject: [PATCH] 板卡修复回原点bug 主流程注释部分log信息，添加部分图片对象主动释放操作 修复Excel输出Alignment最后一项第一次无数据bug 添加平面补偿
---
src/Bro.Common.Model/Helper/PropertyConvertHelper.cs | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 106 insertions(+), 2 deletions(-)
diff --git a/src/Bro.Common.Model/Helper/PropertyConvertHelper.cs b/src/Bro.Common.Model/Helper/PropertyConvertHelper.cs
index 71787f8..ab855ea 100644
--- a/src/Bro.Common.Model/Helper/PropertyConvertHelper.cs
+++ b/src/Bro.Common.Model/Helper/PropertyConvertHelper.cs
@@ -1,5 +1,7 @@
-锘縰sing Bro.Common.Factory;
+锘縰sing Autofac;
+using Bro.Common.Factory;
using Bro.Common.Interface;
+using Bro.Common.Model;
using Newtonsoft.Json;
using System;
using System.Collections;
@@ -182,6 +184,13 @@
}
return "";
}
+
+ //foreach (DictionaryEntry myDE in Hash)
+ //{
+ // if (myDE.Key.Equals(v))
+ // return myDE.Value;
+ //}
+ return null;
}
}
catch (Exception)
@@ -383,6 +392,100 @@
return true;
}
}
+
+ public class EnumDescriptionConverter<T> : TypeConverter where T : Enum
+ {
+ Dictionary<T, string> itemDict = new Dictionary<T, string>();
+ public override StandardValuesCollection GetStandardValues(ITypeDescriptorContext context)
+ {
+ typeof(T).GetEnumNames().ToList().ForEach(e =>
+ {
+ T temp = (T)Enum.Parse(typeof(T), e);
+ itemDict[temp] = temp.GetEnumDescription();
+ });
+
+ return new StandardValuesCollection(itemDict.Keys);
+ }
+ public override bool GetStandardValuesSupported(ITypeDescriptorContext context)
+ {
+ return true;
+ }
+
+ public override bool GetStandardValuesExclusive(ITypeDescriptorContext context)
+ {
+ return true;
+ }
+
+ public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+ {
+ if (sourceType == typeof(String))
+ return true;
+
+ return base.CanConvertFrom(context, sourceType);
+ }
+
+ public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+ {
+ return base.CanConvertTo(context, destinationType);
+ }
+
+ public override object CreateInstance(ITypeDescriptorContext context, IDictionary propertyValues)
+ {
+ return base.CreateInstance(context, propertyValues);
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="context"></param>
+ /// <param name="culture"></param>
+ /// <param name="value">string</param>
+ /// <returns></returns>
+ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+ {
+ try
+ {
+ foreach (string e in typeof(T).GetEnumNames().ToList())
+ {
+ T temp = (T)Enum.Parse(typeof(T), e);
+
+ if (temp.GetEnumDescription() == value.ToString())
+ return temp;
+ }
+ }
+ catch (Exception ex)
+ {
+ }
+
+ return base.ConvertFrom(context, culture, value);
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="context"></param>
+ /// <param name="culture"></param>
+ /// <param name="value">IOItem</param>
+ /// <param name="destinationType"></param>
+ /// <returns></returns>
+ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+ {
+ if (value is T temp)
+ {
+ //foreach (KeyValuePair<T, string> pair in itemDict)
+ //{
+ // if (Convert.ToInt32(pair.Key) == Convert.ToInt32(temp))
+ // {
+ // return pair.Value;
+ // }
+ //}
+
+ return temp.GetEnumDescription();
+ }
+
+ return base.ConvertTo(context, culture, value, destinationType);
+ }
+ }
#endregion
#region UITypeEditor
@@ -576,7 +679,8 @@
TextBox tbox = new TextBox
{
Dock = DockStyle.Fill,
- Multiline = true
+ Multiline = true,
+ ScrollBars = ScrollBars.Both,
};
form.Controls.Add(tbox);
--
Gitblit v1.8.0