diff --git a/BPASmartClient.SCADAControl/DLL/BPASmartClient.Compiler.dll b/BPASmartClient.SCADAControl/DLL/BPASmartClient.Compiler.dll
index 77d64357..259a8da6 100644
Binary files a/BPASmartClient.SCADAControl/DLL/BPASmartClient.Compiler.dll and b/BPASmartClient.SCADAControl/DLL/BPASmartClient.Compiler.dll differ
diff --git a/BeDesignerSCADA/BeDesignerSCADA.csproj b/BeDesignerSCADA/BeDesignerSCADA.csproj
index 04580e63..e2cf5a23 100644
--- a/BeDesignerSCADA/BeDesignerSCADA.csproj
+++ b/BeDesignerSCADA/BeDesignerSCADA.csproj
@@ -102,10 +102,6 @@
-
-
-
-
@@ -123,4 +119,8 @@
+
+
+
+
diff --git a/BeDesignerSCADA/Common/MenuModel.cs b/BeDesignerSCADA/Common/MenuModel.cs
new file mode 100644
index 00000000..2eca7889
--- /dev/null
+++ b/BeDesignerSCADA/Common/MenuModel.cs
@@ -0,0 +1,162 @@
+using BPASmartClient.Compiler;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BeDesignerSCADA.Common
+{
+
+ ///
+ /// 页面菜单属性
+ ///
+ public class MenuModel : ObservableObject
+ {
+ ///
+ /// 是否显示菜单
+ ///
+ private bool _IsVisibility;
+ public bool IsVisibility
+ {
+ get
+ {
+ return _IsVisibility;
+ }
+ set
+ {
+ _IsVisibility = value;
+ OnPropertyChanged("IsVisibility");
+ }
+ }
+ ///
+ /// 程序集名称
+ ///
+ private string _Name;
+ public string Name
+ {
+ get
+ {
+ return _Name;
+ }
+ set
+ {
+ _Name = value;
+ OnPropertyChanged("Name");
+ }
+ }
+ ///
+ /// 菜单显示方向
+ ///
+ private MenuAlignment _Alignment;
+ public MenuAlignment Alignment
+ {
+ get
+ {
+ return _Alignment;
+ }
+ set
+ {
+ _Alignment = value;
+ OnPropertyChanged("Alignment");
+ }
+ }
+ ///
+ /// 页面控件集合
+ ///
+ public Dictionary PageChildren = new Dictionary();
+ }
+ ///
+ /// 菜单选择枚举
+ ///
+ public enum MenuAlignment
+ {
+ 左边,
+ 顶部,
+ 右边,
+ 底部,
+ }
+ ///
+ /// 页面Model
+ ///
+ public class PageModel : PageBase
+ {
+ ///
+ /// 页面控件集合
+ ///
+ public CanvasPanel visual { get; set; }
+ }
+ ///
+ /// 页面
+ ///
+ public class PageBase : ObservableObject
+ {
+ ///
+ /// 是否首页
+ ///
+ private bool _IsHome;
+ public bool IsHome
+ {
+ get
+ {
+ return _IsHome;
+ }
+ set
+ {
+ _IsHome = value;
+ OnPropertyChanged("IsHome");
+ }
+ }
+ ///
+ /// 排序
+ ///
+ public int Sort { get; set; }
+ ///
+ /// 页面名称
+ ///
+ private string _Name;
+ public string Name
+ {
+ get
+ {
+ return _Name;
+ }
+ set
+ {
+ _Name = value;
+ OnPropertyChanged("Name");
+ }
+ }
+ ///
+ /// 菜单名称
+ ///
+ private string _MenuName;
+ public string MenuName
+ {
+ get
+ {
+ return _MenuName;
+ }
+ set
+ {
+ _MenuName = value;
+ OnPropertyChanged("MenuName");
+ }
+ }
+ ///
+ /// 页面ID
+ ///
+ public string Id { get; set; }
+ ///
+ /// 页面子控件集合
+ ///
+ public List ChildrenStr { get; set; }
+
+ public PageBase()
+ {
+ ChildrenStr = new List();
+ Id = Guid.NewGuid().ToString();
+ }
+ }
+}
diff --git a/BeDesignerSCADA/Controls/CanvasPanelNew.xaml b/BeDesignerSCADA/Controls/CanvasPanelNew.xaml
index f7e92955..00d7d9f1 100644
--- a/BeDesignerSCADA/Controls/CanvasPanelNew.xaml
+++ b/BeDesignerSCADA/Controls/CanvasPanelNew.xaml
@@ -17,7 +17,6 @@
-
@@ -157,7 +156,7 @@
Foreground="{TemplateBinding Foreground}"
IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
Style="{StaticResource ExpanderDownHeaderStyle}" />
-
-
+
+
-
-
-
-
-
-
-
-
-
- 顶部水平
- 左侧垂直
- 右侧垂直
- 底部水平
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -272,7 +285,6 @@
-
@@ -315,14 +327,12 @@
-
-