From 0d10528b430721512e0e93e0d455fcec44207ec9 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期二, 14 七月 2020 18:27:10 +0800
Subject: [PATCH] 1. 板卡驱动实现运动暂停/继续功能，板卡动作衔接实现暂停/继续 2. 修复部分调试bug 3. 安全光幕/安全门功能调整
---
src/Bro.Common.Model/Selector/DeviceSelector.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/Bro.Common.Model/Selector/DeviceSelector.cs b/src/Bro.Common.Model/Selector/DeviceSelector.cs
index 1b289c8..34c25f7 100644
--- a/src/Bro.Common.Model/Selector/DeviceSelector.cs
+++ b/src/Bro.Common.Model/Selector/DeviceSelector.cs
@@ -3,13 +3,14 @@
using Bro.Common.Interface;
using System.Collections;
using System.Collections.Generic;
+using System.ComponentModel;
using System.Linq;
namespace Bro.Common.Model
{
- public class DeviceSelectorConverter<T> : ComboBoxItemTypeConvert where T : IDevice
+ public class DeviceSelectorConverter<T> : ComboBoxItemTypeConvert //where T : IDevice
{
- public override Hashtable GetConvertHash()
+ public override Hashtable GetConvertHash(ITypeDescriptorContext context)
{
Hashtable table = new Hashtable();
using (var scope = GlobalVar.Container.BeginLifetimeScope())
--
Gitblit v1.8.0