From a852f7d5272f6a97cae4c47723ba4f094b82280a Mon Sep 17 00:00:00 2001 From: fyf Date: Mon, 10 Oct 2022 18:21:00 +0800 Subject: [PATCH] 1 --- .../DLL/BPASmartClient.Compiler.dll | Bin 55808 -> 55808 bytes .../Controls/CanvasPanelNew.xaml.cs | 3 +- BeDesignerSCADA/Controls/MenuRunCanvas.xaml | 1 + .../Controls/MenuRunCanvas.xaml.cs | 32 ++++++++++++++++++ 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/BPASmartClient.SCADAControl/DLL/BPASmartClient.Compiler.dll b/BPASmartClient.SCADAControl/DLL/BPASmartClient.Compiler.dll index 259a8da684fa51eb5bb6ea66256b247f589450e1..3331c0b18cfedf496661f09e63c8ec8bc13716c3 100644 GIT binary patch delta 16489 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 PwBGOf@Ef+Fwdwx=3Hjpl delta 16242 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 diff --git a/BeDesignerSCADA/Controls/CanvasPanelNew.xaml.cs b/BeDesignerSCADA/Controls/CanvasPanelNew.xaml.cs index ee726882..9bf0d497 100644 --- a/BeDesignerSCADA/Controls/CanvasPanelNew.xaml.cs +++ b/BeDesignerSCADA/Controls/CanvasPanelNew.xaml.cs @@ -1,5 +1,6 @@ using BeDesignerSCADA.Common; using BeDesignerSCADA.View; +using Newtonsoft.Json; using BeDesignerSCADA.ViewModel; using BPASmart.Model; using BPASmartClient.Compiler; @@ -269,7 +270,7 @@ namespace BeDesignerSCADA.Controls runWindows = null; } runWindows = new RunWindows(); - runWindows.LoadingData(viewModel.MenuModel); + runWindows.LoadingData(JsonConvert.DeserializeObject(JsonConvert.SerializeObject(viewModel.MenuModel))); runWindows.Show(); } /// diff --git a/BeDesignerSCADA/Controls/MenuRunCanvas.xaml b/BeDesignerSCADA/Controls/MenuRunCanvas.xaml index 70a30dcb..e63705d6 100644 --- a/BeDesignerSCADA/Controls/MenuRunCanvas.xaml +++ b/BeDesignerSCADA/Controls/MenuRunCanvas.xaml @@ -20,6 +20,7 @@ 0) { menuRunCanvasModel.MenuModel.SelectPageModels = menuRunCanvasModel.MenuModel.pageModels[0]; + menuRunCanvasModel.SelectId = menuRunCanvasModel.MenuModel.pageModels[0].Id; } SelectMenu(); @@ -166,6 +167,7 @@ namespace BeDesignerSCADA.Controls /// public void Run(List canvas) { + Config.GetInstance().Reset(); RootCanvas.Children.Clear(); foreach (FrameworkElement element in canvas) { @@ -245,6 +247,22 @@ namespace BeDesignerSCADA.Controls public class MenuRunCanvasModel : ObservableObject { + /// + /// 选中ID + /// + private string _SelectId; + public string SelectId + { + get + { + return _SelectId; + } + set + { + _SelectId = value; + OnPropertyChanged("SelectId"); + } + } /// /// 菜单Model /// @@ -279,7 +297,9 @@ namespace BeDesignerSCADA.Controls { try { + Rx(SelectId); MenuModel.SelectPageModels = obj as PageModel; + SelectId = MenuModel.SelectPageModels.Id; List Children = new List(); if (MenuModel.SelectPageModels != null) { @@ -298,8 +318,20 @@ namespace BeDesignerSCADA.Controls } } + public void Rx(string id) + { + //(MenuModel?.pageModels?.ToList().Find(par => par.Id == id).visual as CanvasPanel).Children.Clear(); + //foreach (FrameworkElement element in canvas1.Children) + //{ + // string xamlText = XamlWriter.Save(element); + // FrameworkElement item = XamlReader.Parse(xamlText) as FrameworkElement; + // (MenuModel?.pageModels?.ToList().Find(par => par.Id == id).visual as CanvasPanel).Children.Add(item); + //} + } + public void Run(List canvas) { + Config.GetInstance().Reset(); canvas1.Children.Clear(); foreach (FrameworkElement element in canvas) {