From dbae9c048fa0cd67c2e1161e5b6b693f87064154 Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期三, 01 七月 2020 17:53:15 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.M071.Process/M071Config.cs | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/Bro.M071.Process/M071Config.cs b/src/Bro.M071.Process/M071Config.cs
index 1c1d42d..b3ae3f3 100644
--- a/src/Bro.M071.Process/M071Config.cs
+++ b/src/Bro.M071.Process/M071Config.cs
@@ -1,4 +1,5 @@
-锘縰sing Bro.Common.Helper;
+锘縰sing Bro.Common.Base;
+using Bro.Common.Helper;
using Bro.Common.Model;
using Bro.Process;
using System;
@@ -22,10 +23,10 @@
public List<string> KeyNameCollection { get; set; } = new List<string>();
[Category("鍏叡瀛楀吀閰嶇疆")]
- [Description("妫�娴嬫爣鍑嗛泦鍚�")]
+ [Description("妫�娴嬬被鍨嬪拰鏍囧噯闆嗗悎")]
[TypeConverter(typeof(CollectionCountConvert))]
- [Editor(typeof(ComplexCollectionEditor<Spec>), typeof(UITypeEditor))]
- public List<Spec> MeasureSpecCollection { get; set; } = new List<Spec>();
+ [Editor(typeof(ComplexCollectionEditor<MeasureType>), typeof(UITypeEditor))]
+ public List<MeasureType> MeasureTypeCollection { get; set; } = new List<MeasureType>();
[Category("鍏叡瀛楀吀閰嶇疆")]
[Description("鍗曢敭绠楁硶閰嶇疆闆嗗悎")]
@@ -62,5 +63,16 @@
[TypeConverter(typeof(CollectionCountConvert))]
[Editor(typeof(ComplexCollectionEditor<MeasurementUint>), typeof(UITypeEditor))]
public List<MeasurementUint> MeasurementUnitCollection { get; set; } = new List<MeasurementUint>();
+
+ [Category("鍥剧墖淇濆瓨閰嶇疆")]
+ [Description("鍗曢敭鍥剧墖淇濆瓨閰嶇疆")]
+ [TypeConverter(typeof(ComplexObjectConvert))]
+ [Editor(typeof(PropertyObjectEditor), typeof(UITypeEditor))]
+ public ImageSaveOption ImageSaveOption { get; set; } = new ImageSaveOption();
+
+ [Category("鍥剧墖淇濆瓨閰嶇疆")]
+ [Description("鍗曢敭鍥剧墖淇濆瓨鐩綍璺緞")]
+ [Editor(typeof(FoldDialogEditor),typeof(UITypeEditor))]
+ public string ImageSaveFolder { get; set; } = "";
}
}
--
Gitblit v1.8.0