From 7971d855ba2cf9772b46a7f67e2b669c0afcb91b Mon Sep 17 00:00:00 2001 From: patrick <patrick.xu@broconcentric.com> Date: 星期二, 22 十月 2019 11:30:35 +0800 Subject: [PATCH] 1. 添加标定操作及界面 2. 修改配置界面方法调用参数 3. SeerAGV添加电池信息监听 4. 添加AGV电池充电操作 5. 修改AGV状态变化操作,添加操作锁 --- src/Bro.Common.Model/Helper/UIHelper.cs | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/Bro.Common.Model/Helper/UIHelper.cs b/src/Bro.Common.Model/Helper/UIHelper.cs index 8040fd0..2a0c8f9 100644 --- a/src/Bro.Common.Model/Helper/UIHelper.cs +++ b/src/Bro.Common.Model/Helper/UIHelper.cs @@ -14,21 +14,30 @@ { cbo.DataSource = dataSource; cbo.DisplayMember = display; - cbo.ValueMember = value; + if (!string.IsNullOrWhiteSpace(value)) + { + cbo.ValueMember = value; + } } public static void SetCombo(ToolStripComboBox cbo, object dataSource, string display, string value) { cbo.ComboBox.DataSource = dataSource; cbo.ComboBox.DisplayMember = display; - cbo.ComboBox.ValueMember = value; + if (!string.IsNullOrWhiteSpace(value)) + { + cbo.ComboBox.ValueMember = value; + } } public static void SetCombo(DataGridViewComboBoxColumn cbo, object dataSource, string display, string value) { cbo.DataSource = dataSource; cbo.DisplayMember = display; - cbo.ValueMember = value; + if (!string.IsNullOrWhiteSpace(value)) + { + cbo.ValueMember = value; + } } } -- Gitblit v1.8.0