From 80fa15d5c3b239a4da7ebb86c534266300d6cdcd Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期五, 03 七月 2020 10:47:44 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.UI.Config/MenuForms/FrmConfig.cs | 4 +++-
src/Bro.UI.Config/MenuForms/FrmOperation.cs | 10 ++++++++++
src/Bro.Common.Model/Helper/EnumHelper.cs | 17 +++++++++++++++++
3 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/src/Bro.Common.Model/Helper/EnumHelper.cs b/src/Bro.Common.Model/Helper/EnumHelper.cs
index 2b56867..52c5349 100644
--- a/src/Bro.Common.Model/Helper/EnumHelper.cs
+++ b/src/Bro.Common.Model/Helper/EnumHelper.cs
@@ -576,5 +576,22 @@
[Description("OUTPUT")]
OUTPUT = 1
}
+
+ /// <summary>
+ /// PubSubCenter浜嬩欢涓績鐨勬秷鎭被鍨�
+ /// </summary>
+ public enum PubSubCenterMessageType
+ {
+ /// <summary>
+ /// 杩愯鐣岄潰鏇存柊浜у搧涓嬫媺
+ /// </summary>
+ [Description("鏇存柊浜у搧涓嬫媺")]
+ UpdateProductionCodes,
+ ///// <summary>
+ ///// 鏇存柊鏁版嵁
+ ///// </summary>
+ //[Description("鏇存柊鏁版嵁")]
+ //UpdateData,
+ }
}
}
diff --git a/src/Bro.UI.Config/MenuForms/FrmConfig.cs b/src/Bro.UI.Config/MenuForms/FrmConfig.cs
index 16331d8..ef01a46 100644
--- a/src/Bro.UI.Config/MenuForms/FrmConfig.cs
+++ b/src/Bro.UI.Config/MenuForms/FrmConfig.cs
@@ -3,6 +3,8 @@
using System;
using Microsoft.VisualBasic;
using System.Windows.Forms;
+using Bro.Common.PubSub;
+using static Bro.Common.Helper.EnumHelper;
namespace Bro.UI.Config.MenuForms
{
@@ -58,8 +60,8 @@
return;
}
Process.CreateNewConfig(propGrid.SelectedObject as IProcessConfig, pCode);
-
MessageBox.Show("鍒涘缓鏂伴厤缃畬鎴�");
+ PubSubCenter.GetInstance().Publish(PubSubCenterMessageType.UpdateProductionCodes.ToString(), null, null);
}
}
}
diff --git a/src/Bro.UI.Config/MenuForms/FrmOperation.cs b/src/Bro.UI.Config/MenuForms/FrmOperation.cs
index 9175789..891d678 100644
--- a/src/Bro.UI.Config/MenuForms/FrmOperation.cs
+++ b/src/Bro.UI.Config/MenuForms/FrmOperation.cs
@@ -1,5 +1,6 @@
锘縰sing Bro.Common.Factory;
using Bro.Common.Helper;
+using Bro.Common.PubSub;
using Bro.UI.Model.Winform;
using System;
using System.Collections.Generic;
@@ -9,6 +10,7 @@
using System.Threading.Tasks;
using System.Windows.Forms;
using WeifenLuo.WinFormsUI.Docking;
+using static Bro.Common.Helper.EnumHelper;
namespace Bro.UI.Config.MenuForms
{
@@ -20,6 +22,8 @@
public FrmOperation()
{
InitializeComponent();
+ PubSubCenter.GetInstance().RemoveSubscribers(PubSubCenterMessageType.UpdateProductionCodes.ToString());
+ PubSubCenter.GetInstance().Subscribe(PubSubCenterMessageType.UpdateProductionCodes.ToString(), OnUpdateProductionCodes);
LoadProcessCode();
LoadProductionCode();
@@ -40,6 +44,12 @@
string _processCode = "";
string _productionCode = "";
+ private object OnUpdateProductionCodes(ISubscriber arg1, object arg2, object arg3)
+ {
+ LoadProductionCode();
+ return null;
+ }
+
private void LoadProcessCode()
{
var systemProcessCodes = ProcessFactory.GetProcessCodes();
--
Gitblit v1.8.0