diff --git a/README.md b/README.md index 039922f7..f843b83d 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,248 @@ -# WPF-ControlBase -## OverView -### 动画封装 +# WPF-Controls | [English](README.md) -https://blog.csdn.net/u010975589/article/details/95974854 +

+ dotnet-version + dotnet-version + dotnet-version + dotnet-version + dotnet-version + dotnet-version + dotnet-version + dotnet-version + dotnet-version + dotnet-version + dotnet-version + dotnet-version + dotnet-version + dotnet-version +

-### 属性表单 +

+ csharp-version + IDE-version +

-https://blog.csdn.net/u010975589/article/details/95970200 +

+ + nuget-version + + + Github-build-status + +

-### 消息对话 + ## 关于 + ### Star -https://blog.csdn.net/u010975589/article/details/95985190 +[![Stargazers over time](https://starchart.cc/HeBianGu/WPF-ControlBase.svg)](https://starchart.cc/HeBianGu/WPF-ControlBase) + + ## 预览 + [![AutoCompleteTextBox](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/AutoCompleteTextBox.gif)](url) + +## 案例 +### Creator +### Map +### Chart +### Office +### Disk +### Scene +### Manager +### Menu +### Above +### Blur +### Blur +### Tool +### Touch +### Repository +### Main -### 在WPF中应用MVC +## 基础控件 +### Button +### TextBox +### CheckBox +### RadioButton +### ToggleButton +### ComboBox +### DatePicker +### Slider +### ProgressBar +### Expander +### ListBox +### DataGrid +### TreeView +### TabControl +### ContextMenu +### Menu +### Label +### TextBlock +### ToolTip -https://blog.csdn.net/u010975589/article/details/100019431 +## 自定义控件 +### PropertyGrid +### Chart2D +### Diagram +### Drawer +### Explorer +### ExplorerTree +### FilterBox +### FilterColumn +### SearchBox +### SelectionBox +### GridSplitter +### Guide +### ImagePlayer +### AnimationBox +### AnimatedTabControl +### LeftMenu +### Message +### MessageContainer +### MessageListBox +### MultiComboBox +### PagedDataGrid +### Panel +### PasswordBox +### Ping +### ScrollInto +### ScrollVewerLocator +### SearchComboBox +### Shape +### Shuttle +### StoryBoard +### TextEditor +### ThemeSet +### ToggleExpander +### TopContainer +### TransformAdorner +### TreeListView -### 其他功能说明 +## 自定义窗口 +### Blur +### Float +### Link +### Login +### Main +### Menu +### MessageDialog +### Notify +### Ribbon +### Start + +## 特性 +### Identity +### Setting +### Repository +### Upgrade +### XmlSerialize +### Project +### Operation +### License +### Component +### Automation +### Module +### Mvc +### Mvp +### Validation +### ViewModel +### Animation +### MarkupExtension +### AppConfig +### Command +### Converter +### Interactivity +### TypeConverter + +## 使用 + +### 示例 +#### 这是一个最简单的使用方式示例 +#### 这是一个基础控件中的ResourceKey示例 +#### 这是一个公用基础的ResourceKey示例 +#### 这是一个最简单的MainWindow窗口示例 +#### 这是一个注册主题设置和注册保存配置信息的示例 +#### 这是一个注册框架对话框的示例 +#### 这是一个注册框架配置页面的示例 +#### 这是一个注册启动页面的示例 +#### 这是一个注册登录页面的示例 +#### 这是一个注册登录页面的示例 + +### 模板 +#### Main + +## NuGet包 + +| **名称** | **NuGet** | +|----------|:-------------| +| **HeBianGu.Base.WpfBase** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Base.WpfBase)](https://www.nuget.org/packages/HeBianGu.Base.WpfBase)** | +| **HeBianGu.General.WpfControlLib** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.General.WpfControlLib)](https://www.nuget.org/packages/HeBianGu.General.WpfControlLib)** | +| **HeBianGu.Service.Animation** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Service.Animation)](https://www.nuget.org/packages/HeBianGu.Service.Animation)** | +| **HeBianGu.Service.AppConfig** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Service.AppConfig)](https://www.nuget.org/packages/HeBianGu.Service.AppConfig)** | +| **HeBianGu.Service.Converter** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Service.Converter)](https://www.nuget.org/packages/HeBianGu.Service.Converter)** | +| **HeBianGu.Service.License** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Service.License)](https://www.nuget.org/packages/HeBianGu.Service.License)** | +| **HeBianGu.Service.MarkupExtension** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Service.MarkupExtension)](https://www.nuget.org/packages/HeBianGu.Service.MarkupExtension)** | +| **HeBianGu.Service.Mvc** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Service.Mvc)](https://www.nuget.org/packages/HeBianGu.Service.Mvc)** | +| **HeBianGu.Service.Mvp** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Service.Mvp)](https://www.nuget.org/packages/HeBianGu.Service.Mvp)** | +| **HeBianGu.Service.TypeConverter** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Service.TypeConverter)](https://www.nuget.org/packages/HeBianGu.Service.TypeConverter)** | +| **HeBianGu.Service.Validation** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Service.Validation)](https://www.nuget.org/packages/HeBianGu.Service.Validation)** | +| **HeBianGu.Common.Expression** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Common.Expression)](https://www.nuget.org/packages/HeBianGu.Common.Expression)** | +| **HeBianGu.Control.Adorner** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Control.Adorner)](https://www.nuget.org/packages/HeBianGu.Control.Adorner)** | +| **HeBianGu.Control.Chart2D** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Control.Chart2D)](https://www.nuget.org/packages/HeBianGu.Control.Chart2D)** | +| **HeBianGu.Control.Diagram** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Control.Diagram)](https://www.nuget.org/packages/HeBianGu.Control.Diagram)** | +| **HeBianGu.Control.Drawer** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Control.Drawer)](https://www.nuget.org/packages/HeBianGu.Control.Drawer)** | +| **HeBianGu.Control.Explorer** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Control.Explorer)](https://www.nuget.org/packages/HeBianGu.Control.Explorer)** | +| **HeBianGu.Control.Filter** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Control.Filter)](https://www.nuget.org/packages/HeBianGu.Control.Filter)** | +| **HeBianGu.Control.GridSplitter** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Control.GridSplitter)](https://www.nuget.org/packages/HeBianGu.Control.GridSplitter)** | +| **HeBianGu.Control.ImagePlayer** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Control.ImagePlayer)](https://www.nuget.org/packages/HeBianGu.Control.ImagePlayer)** | +| **HeBianGu.Control.LeftMenu** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Control.LeftMenu)](https://www.nuget.org/packages/HeBianGu.Control.LeftMenu)** | +| **HeBianGu.Control.Message** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Control.Message)](https://www.nuget.org/packages/HeBianGu.Control.Message)** | +| **HeBianGu.Control.MessageContainer** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Control.MessageContainer)](https://www.nuget.org/packages/HeBianGu.Control.MessageContainer)** | +| **HeBianGu.Control.MessageListBox** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Control.MessageListBox)](https://www.nuget.org/packages/HeBianGu.Control.MessageListBox)** | +| **HeBianGu.Control.MultiComboBox** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Control.MultiComboBox)](https://www.nuget.org/packages/HeBianGu.Control.MultiComboBox)** | +| **HeBianGu.Control.PagedDataGrid** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Control.PagedDataGrid)](https://www.nuget.org/packages/HeBianGu.Control.PagedDataGrid)** | +| **HeBianGu.Control.Panel** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Control.Panel)](https://www.nuget.org/packages/HeBianGu.Control.Panel)** | +| **HeBianGu.Control.PasswordBox** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Control.PasswordBox)](https://www.nuget.org/packages/HeBianGu.Control.PasswordBox)** | +| **HeBianGu.Control.Ping** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Control.Ping)](https://www.nuget.org/packages/HeBianGu.Control.Ping)** | +| **HeBianGu.Control.PropertyGrid** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Control.PropertyGrid)](https://www.nuget.org/packages/HeBianGu.Control.PropertyGrid)** | +| **HeBianGu.Control.ScrollInto** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Control.ScrollInto)](https://www.nuget.org/packages/HeBianGu.Control.ScrollInto)** | +| **HeBianGu.Control.ScrollVewerLocator** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Control.ScrollVewerLocator)](https://www.nuget.org/packages/HeBianGu.Control.ScrollVewerLocator)** | +| **HeBianGu.Control.Shape** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Control.Shape)](https://www.nuget.org/packages/HeBianGu.Control.Shape)** | +| **HeBianGu.Control.Shuttle** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Control.Shuttle)](https://www.nuget.org/packages/HeBianGu.Control.Shuttle)** | +| **HeBianGu.Control.Step** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Control.Step)](https://www.nuget.org/packages/HeBianGu.Control.Step)** | +| **HeBianGu.Control.StoryBoard** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Control.StoryBoard)](https://www.nuget.org/packages/HeBianGu.Control.StoryBoard)** | +| **HeBianGu.Control.ThemeSet** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Control.ThemeSet)](https://www.nuget.org/packages/HeBianGu.Control.ThemeSet)** | +| **HeBianGu.Control.ToggleExpander** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Control.ToggleExpander)](https://www.nuget.org/packages/HeBianGu.Control.ToggleExpander)** | +| **HeBianGu.Control.TopContainer** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Control.TopContainer)](https://www.nuget.org/packages/HeBianGu.Control.TopContainer)** | +| **HeBianGu.Control.TreeListView** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Control.TreeListView)](https://www.nuget.org/packages/HeBianGu.Control.TreeListView)** | +| **HeBianGu.Window.Blur** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Window.Blur)](https://www.nuget.org/packages/HeBianGu.Window.Blur)** | +| **HeBianGu.Window.Float** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Window.Float)](https://www.nuget.org/packages/HeBianGu.Window.Float)** | +| **HeBianGu.Window.Link** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Window.Link)](https://www.nuget.org/packages/HeBianGu.Window.Link)** | +| **HeBianGu.Window.Login** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Window.Login)](https://www.nuget.org/packages/HeBianGu.Window.Login)** | +| **HeBianGu.Window.Menu** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Window.Menu)](https://www.nuget.org/packages/HeBianGu.Window.Menu)** | +| **HeBianGu.Window.Message** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Window.Message)](https://www.nuget.org/packages/HeBianGu.Window.Message)** | +| **HeBianGu.Window.MessageDialog** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Window.MessageDialog)](https://www.nuget.org/packages/HeBianGu.Window.MessageDialog)** | +| **HeBianGu.Window.Notify** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Window.Notify)](https://www.nuget.org/packages/HeBianGu.Window.Notify)** | +| **HeBianGu.Window.Start** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Window.Start)](https://www.nuget.org/packages/HeBianGu.Window.Start)** | +| **HeBianGu.Systems.Component** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Systems.Component)](https://www.nuget.org/packages/HeBianGu.Systems.Component)** | +| **HeBianGu.Systems.Identity** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Systems.Identity)](https://www.nuget.org/packages/HeBianGu.Systems.Identity)** | +| **HeBianGu.Systems.Project** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Systems.Project)](https://www.nuget.org/packages/HeBianGu.Systems.Project)** | +| **HeBianGu.Systems.Repository** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Systems.Repository)](https://www.nuget.org/packages/HeBianGu.Systems.Repository)** | +| **HeBianGu.Systems.Setting** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Systems.Setting)](https://www.nuget.org/packages/HeBianGu.Systems.Setting)** | +| **HeBianGu.Systems.Upgrade** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Systems.Upgrade)](https://www.nuget.org/packages/HeBianGu.Systems.Upgrade)** | +| **HeBianGu.Systems.XmlSerialize** | **[![NuGet](https://buildstats.info/nuget/HeBianGu.Systems.XmlSerialize)](https://www.nuget.org/packages/HeBianGu.Systems.XmlSerialize)** | + +## 作者 + + +## 赞助支持 + +### 支付宝 + + +### 微信 + + +## 博客 +[https://blog.csdn.net/u010975589?type=blog](https://blog.csdn.net/u010975589?type=blog) -https://blog.csdn.net/u010975589/article/details/103083605 diff --git a/Solution/hebiangu/WPF-ControlBase-Demo.sln b/Solution/hebiangu/WPF-ControlBase-Demo.sln index 76def2ba..9c3c2f59 100644 --- a/Solution/hebiangu/WPF-ControlBase-Demo.sln +++ b/Solution/hebiangu/WPF-ControlBase-Demo.sln @@ -133,9 +133,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Level - 1", "Level - 1", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Level - 2", "Level - 2", "{C88729FD-E7E4-486F-948E-3EE54BEBD91C}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeBianGu.App.Creator", "..\..\Source\Application\HeBianGu.App.Creator\HeBianGu.App.Creator.csproj", "{0BB365CE-AF08-423C-899F-9080DAE3AC81}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Creator", "Creator", "{27CD0240-564D-41ED-857E-BF8CB2E331C2}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HeBianGu.App.Creator.Share", "..\..\Source\Application\HeBianGu.App.Creator.Share\HeBianGu.App.Creator.Share.shproj", "{D44586A9-376F-41DF-BC29-30C6B3564FBD}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\..\Source\Application\HeBianGu.App.Above.Share\HeBianGu.App.Above.Share.projitems*{0a96004e-40ce-453e-abf0-472072b97a5e}*SharedItemsImports = 4 + ..\..\Source\Application\HeBianGu.App.Creator.Share\HeBianGu.App.Creator.Share.projitems*{0bb365ce-af08-423c-899f-9080dae3ac81}*SharedItemsImports = 4 ..\..\Source\Base\HeBianGu.Base.WpfBase.Share\HeBianGu.Base.WpfBase.Share.projitems*{1d0c91e1-6f91-4728-8546-e0fd619de3b6}*SharedItemsImports = 5 ..\..\Source\Application\HeBianGu.App.Manager.Share\HeBianGu.App.Manager.Share.projitems*{249dafbf-cbe2-4013-a545-13c23a4e22fe}*SharedItemsImports = 13 ..\..\Source\Application\HeBianGu.App.Scene.Share\HeBianGu.App.Scene.Share.projitems*{29984796-34eb-440a-9261-a8dfdc4058e2}*SharedItemsImports = 4 @@ -159,6 +166,7 @@ Global ..\..\Source\Application\HeBianGu.App.Manager.Share\HeBianGu.App.Manager.Share.projitems*{bde0a926-86e5-46dd-96ec-cc8e78eb1d9c}*SharedItemsImports = 4 ..\..\Source\General\HeBianGu.General.WpfControlLib.Share\HeBianGu.General.WpfControlLib.Share.projitems*{c59a933c-7ae0-4dbc-8530-99bf90bb8cd7}*SharedItemsImports = 13 ..\..\Source\Application\HeBianGu.App.Chart.Share\HeBianGu.App.Chart.Share.projitems*{c690ccb1-dcab-4aec-bf26-20a5df03540f}*SharedItemsImports = 13 + ..\..\Source\Application\HeBianGu.App.Creator.Share\HeBianGu.App.Creator.Share.projitems*{d44586a9-376f-41df-bc29-30c6b3564fbd}*SharedItemsImports = 13 ..\..\Source\General\HeBianGu.General.WpfControlLib.Share\HeBianGu.General.WpfControlLib.Share.projitems*{d5857f58-4c71-45d4-a1cf-9808f5fffb70}*SharedItemsImports = 5 ..\..\Source\Application\HeBianGu.App.Chart.Share\HeBianGu.App.Chart.Share.projitems*{e01739d3-553d-49ea-ac60-804c108eb3d1}*SharedItemsImports = 4 ..\..\Source\Application\HeBianGu.App.Above.Share\HeBianGu.App.Above.Share.projitems*{ebac0667-7abd-49d8-90e4-a79b4a99c66a}*SharedItemsImports = 13 @@ -427,6 +435,14 @@ Global {0C6D93AD-FAEA-4C4F-9BEA-99D8F427F46B}.Release|Any CPU.Build.0 = Release|Any CPU {0C6D93AD-FAEA-4C4F-9BEA-99D8F427F46B}.Release|x86.ActiveCfg = Release|Any CPU {0C6D93AD-FAEA-4C4F-9BEA-99D8F427F46B}.Release|x86.Build.0 = Release|Any CPU + {0BB365CE-AF08-423C-899F-9080DAE3AC81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0BB365CE-AF08-423C-899F-9080DAE3AC81}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0BB365CE-AF08-423C-899F-9080DAE3AC81}.Debug|x86.ActiveCfg = Debug|Any CPU + {0BB365CE-AF08-423C-899F-9080DAE3AC81}.Debug|x86.Build.0 = Debug|Any CPU + {0BB365CE-AF08-423C-899F-9080DAE3AC81}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0BB365CE-AF08-423C-899F-9080DAE3AC81}.Release|Any CPU.Build.0 = Release|Any CPU + {0BB365CE-AF08-423C-899F-9080DAE3AC81}.Release|x86.ActiveCfg = Release|Any CPU + {0BB365CE-AF08-423C-899F-9080DAE3AC81}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -492,6 +508,9 @@ Global {0C6D93AD-FAEA-4C4F-9BEA-99D8F427F46B} = {C88729FD-E7E4-486F-948E-3EE54BEBD91C} {9E4CF368-4059-4249-9B3B-8E06B1BA04CC} = {F28654EC-C22D-4CF8-A8FA-8C112C45840D} {C88729FD-E7E4-486F-948E-3EE54BEBD91C} = {F28654EC-C22D-4CF8-A8FA-8C112C45840D} + {0BB365CE-AF08-423C-899F-9080DAE3AC81} = {27CD0240-564D-41ED-857E-BF8CB2E331C2} + {27CD0240-564D-41ED-857E-BF8CB2E331C2} = {F89CC7DD-BD6D-4AD6-99F0-6933833435E7} + {D44586A9-376F-41DF-BC29-30C6B3564FBD} = {27CD0240-564D-41ED-857E-BF8CB2E331C2} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3AFA651F-BC04-4393-B7B1-9B92532583D5} diff --git a/Source/Application/HeBianGu.App.Above.Share/App.xaml b/Source/Application/HeBianGu.App.Above.Share/App.xaml index 875c5874..0c63a43e 100644 --- a/Source/Application/HeBianGu.App.Above.Share/App.xaml +++ b/Source/Application/HeBianGu.App.Above.Share/App.xaml @@ -26,6 +26,7 @@ diff --git a/Source/Application/HeBianGu.App.Above.Share/View/Loyout/ButtonControl.xaml b/Source/Application/HeBianGu.App.Above.Share/View/Loyout/ButtonControl.xaml index 252728f9..f71684ae 100644 --- a/Source/Application/HeBianGu.App.Above.Share/View/Loyout/ButtonControl.xaml +++ b/Source/Application/HeBianGu.App.Above.Share/View/Loyout/ButtonControl.xaml @@ -101,7 +101,7 @@ ]]> - + + + + + + + + + ]]> + + + + + diff --git a/Source/Application/HeBianGu.App.Above.Share/View/Loyout/ComboBoxControl.xaml b/Source/Application/HeBianGu.App.Above.Share/View/Loyout/ComboBoxControl.xaml index bec2d824..4f7bef4d 100644 --- a/Source/Application/HeBianGu.App.Above.Share/View/Loyout/ComboBoxControl.xaml +++ b/Source/Application/HeBianGu.App.Above.Share/View/Loyout/ComboBoxControl.xaml @@ -9,7 +9,7 @@ xmlns:system="clr-namespace:System;assembly=mscorlib" d:DesignHeight="450" d:DesignWidth="800" - mc:Ignorable="d"> + mc:Ignorable="d"> @@ -344,6 +344,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + ]]> + + + + + + + + + ]]> + + + + + + + + + ]]> + + + + + + + + + ]]> + + + + + + + ]]> + + + + + + + + + - --> + - - - - - - - - - - + + + + + + + + + ]]> - - + + - - - - + + + ]]> - - + + - - - - - - + + + + + - - + + - - - - - + + + + - - + @@ -90,22 +91,22 @@ ]]> - + - + - - + + - - + ]]> - - + + - + + + + + + - - - - - + + + + ]]> - - - + + + + + + + + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + diff --git a/Source/Application/HeBianGu.App.Above.Share/View/Loyout/TextBoxControl.xaml b/Source/Application/HeBianGu.App.Above.Share/View/Loyout/TextBoxControl.xaml index 131c3fdc..82ef3950 100644 --- a/Source/Application/HeBianGu.App.Above.Share/View/Loyout/TextBoxControl.xaml +++ b/Source/Application/HeBianGu.App.Above.Share/View/Loyout/TextBoxControl.xaml @@ -15,7 +15,7 @@ - + @@ -249,8 +249,125 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + ]]> + + + + + + + + + + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + ]]> + + + + + + @@ -329,9 +446,7 @@ - - diff --git a/Source/Application/HeBianGu.App.Above.Share/View/Loyout/TreeViewControl.xaml b/Source/Application/HeBianGu.App.Above.Share/View/Loyout/TreeViewControl.xaml index 56e6e74c..8b97d68d 100644 --- a/Source/Application/HeBianGu.App.Above.Share/View/Loyout/TreeViewControl.xaml +++ b/Source/Application/HeBianGu.App.Above.Share/View/Loyout/TreeViewControl.xaml @@ -32,9 +32,8 @@ - + - @@ -55,7 +54,7 @@ - + @@ -78,7 +77,55 @@ - + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + + + + + + + + ]]> + + + + + @@ -102,8 +149,10 @@ - - + + + + @@ -125,6 +174,7 @@ ]]> + diff --git a/Source/Application/HeBianGu.App.Above/HeBianGu.App.Above.csproj b/Source/Application/HeBianGu.App.Above/HeBianGu.App.Above.csproj index e2d874c1..dad48f5f 100644 --- a/Source/Application/HeBianGu.App.Above/HeBianGu.App.Above.csproj +++ b/Source/Application/HeBianGu.App.Above/HeBianGu.App.Above.csproj @@ -38,77 +38,77 @@ - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Base.WpfBase.4.0.2\lib\net45\HeBianGu.Base.WpfBase.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Base.WpfBase.4.0.3\lib\net45\HeBianGu.Base.WpfBase.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Common.Expression.4.0.2\lib\net45\HeBianGu.Common.Expression.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Common.Expression.4.0.3\lib\net45\HeBianGu.Common.Expression.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.LeftMenu.4.0.1\lib\net45\HeBianGu.Control.LeftMenu.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.LeftMenu.4.0.3\lib\net45\HeBianGu.Control.LeftMenu.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Message.4.0.2\lib\net45\HeBianGu.Control.Message.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Message.4.0.3\lib\net45\HeBianGu.Control.Message.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MessageContainer.4.0.2\lib\net45\HeBianGu.Control.MessageContainer.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MessageContainer.4.0.3\lib\net45\HeBianGu.Control.MessageContainer.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MultiComboBox.4.0.2\lib\net45\HeBianGu.Control.MultiComboBox.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MultiComboBox.4.0.3\lib\net45\HeBianGu.Control.MultiComboBox.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Panel.4.0.2\lib\net45\HeBianGu.Control.Panel.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Panel.4.0.3\lib\net45\HeBianGu.Control.Panel.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PropertyGrid.4.0.2\lib\net45\HeBianGu.Control.PropertyGrid.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PropertyGrid.4.0.3\lib\net45\HeBianGu.Control.PropertyGrid.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ScrollInto.4.0.2\lib\net45\HeBianGu.Control.ScrollInto.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ScrollInto.4.0.3\lib\net45\HeBianGu.Control.ScrollInto.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ScrollVewerLocator.4.0.2\lib\net45\HeBianGu.Control.ScrollVewerLocator.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ScrollVewerLocator.4.0.3\lib\net45\HeBianGu.Control.ScrollVewerLocator.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ThemeSet.4.0.2\lib\net45\HeBianGu.Control.ThemeSet.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ThemeSet.4.0.3\lib\net45\HeBianGu.Control.ThemeSet.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ToggleExpander.4.0.2\lib\net45\HeBianGu.Control.ToggleExpander.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ToggleExpander.4.0.3\lib\net45\HeBianGu.Control.ToggleExpander.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.General.WpfControlLib.4.0.2\lib\net45\HeBianGu.General.WpfControlLib.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.General.WpfControlLib.4.0.3\lib\net45\HeBianGu.General.WpfControlLib.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Animation.4.0.2\lib\net45\HeBianGu.Service.Animation.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Animation.4.0.3\lib\net45\HeBianGu.Service.Animation.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.AppConfig.4.0.2\lib\net45\HeBianGu.Service.AppConfig.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.AppConfig.4.0.3\lib\net45\HeBianGu.Service.AppConfig.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.MarkupExtension.4.0.2\lib\net45\HeBianGu.Service.MarkupExtension.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.MarkupExtension.4.0.3\lib\net45\HeBianGu.Service.MarkupExtension.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvc.4.0.2\lib\net45\HeBianGu.Service.Mvc.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvc.4.0.3\lib\net45\HeBianGu.Service.Mvc.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvp.4.0.2\lib\net45\HeBianGu.Service.Mvp.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvp.4.0.3\lib\net45\HeBianGu.Service.Mvp.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.TypeConverter.4.0.2\lib\net45\HeBianGu.Service.TypeConverter.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.TypeConverter.4.0.3\lib\net45\HeBianGu.Service.TypeConverter.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Validation.4.0.2\lib\net45\HeBianGu.Service.Validation.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Validation.4.0.3\lib\net45\HeBianGu.Service.Validation.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Setting.4.0.2\lib\net45\HeBianGu.Systems.Setting.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Setting.4.0.3\lib\net45\HeBianGu.Systems.Setting.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Link.4.0.2\lib\net45\HeBianGu.Window.Link.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Link.4.0.3\lib\net45\HeBianGu.Window.Link.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Message.4.0.2\lib\net45\HeBianGu.Window.Message.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Message.4.0.3\lib\net45\HeBianGu.Window.Message.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.MessageDialog.4.0.2\lib\net45\HeBianGu.Window.MessageDialog.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.MessageDialog.4.0.3\lib\net45\HeBianGu.Window.MessageDialog.dll @@ -156,8 +156,6 @@ - - diff --git a/Source/Application/HeBianGu.App.Above/packages.config b/Source/Application/HeBianGu.App.Above/packages.config index 2d3eadfc..2537ea2a 100644 --- a/Source/Application/HeBianGu.App.Above/packages.config +++ b/Source/Application/HeBianGu.App.Above/packages.config @@ -1,28 +1,28 @@  - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/Application/HeBianGu.App.Blur.Share/App.xaml b/Source/Application/HeBianGu.App.Blur.Share/App.xaml index 363dd881..839f13b5 100644 --- a/Source/Application/HeBianGu.App.Blur.Share/App.xaml +++ b/Source/Application/HeBianGu.App.Blur.Share/App.xaml @@ -15,7 +15,7 @@ diff --git a/Source/Application/HeBianGu.App.Blur/HeBianGu.App.Blur.csproj b/Source/Application/HeBianGu.App.Blur/HeBianGu.App.Blur.csproj index 21013045..89837eeb 100644 --- a/Source/Application/HeBianGu.App.Blur/HeBianGu.App.Blur.csproj +++ b/Source/Application/HeBianGu.App.Blur/HeBianGu.App.Blur.csproj @@ -71,92 +71,92 @@ - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Base.WpfBase.4.0.2\lib\net45\HeBianGu.Base.WpfBase.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Base.WpfBase.4.0.3\lib\net45\HeBianGu.Base.WpfBase.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Common.Expression.4.0.2\lib\net45\HeBianGu.Common.Expression.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Common.Expression.4.0.3\lib\net45\HeBianGu.Common.Expression.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.LeftMenu.4.0.1\lib\net45\HeBianGu.Control.LeftMenu.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.LeftMenu.4.0.3\lib\net45\HeBianGu.Control.LeftMenu.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Message.4.0.2\lib\net45\HeBianGu.Control.Message.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Message.4.0.3\lib\net45\HeBianGu.Control.Message.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MessageContainer.4.0.2\lib\net45\HeBianGu.Control.MessageContainer.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MessageContainer.4.0.3\lib\net45\HeBianGu.Control.MessageContainer.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MultiComboBox.4.0.2\lib\net45\HeBianGu.Control.MultiComboBox.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MultiComboBox.4.0.3\lib\net45\HeBianGu.Control.MultiComboBox.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PagedDataGrid.4.0.2\lib\net45\HeBianGu.Control.PagedDataGrid.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PagedDataGrid.4.0.3\lib\net45\HeBianGu.Control.PagedDataGrid.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Panel.4.0.2\lib\net45\HeBianGu.Control.Panel.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Panel.4.0.3\lib\net45\HeBianGu.Control.Panel.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PasswordBox.4.0.2\lib\net45\HeBianGu.Control.PasswordBox.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PasswordBox.4.0.3\lib\net45\HeBianGu.Control.PasswordBox.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PropertyGrid.4.0.2\lib\net45\HeBianGu.Control.PropertyGrid.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PropertyGrid.4.0.3\lib\net45\HeBianGu.Control.PropertyGrid.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ScrollInto.4.0.2\lib\net45\HeBianGu.Control.ScrollInto.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ScrollInto.4.0.3\lib\net45\HeBianGu.Control.ScrollInto.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.StoryBoard.4.0.2\lib\net45\HeBianGu.Control.StoryBoard.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.StoryBoard.4.0.3\lib\net45\HeBianGu.Control.StoryBoard.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ThemeSet.4.0.2\lib\net45\HeBianGu.Control.ThemeSet.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ThemeSet.4.0.3\lib\net45\HeBianGu.Control.ThemeSet.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.TreeListView.4.0.2\lib\net45\HeBianGu.Control.TreeListView.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.TreeListView.4.0.3\lib\net45\HeBianGu.Control.TreeListView.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.General.WpfControlLib.4.0.2\lib\net45\HeBianGu.General.WpfControlLib.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.General.WpfControlLib.4.0.3\lib\net45\HeBianGu.General.WpfControlLib.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Animation.4.0.2\lib\net45\HeBianGu.Service.Animation.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Animation.4.0.3\lib\net45\HeBianGu.Service.Animation.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.AppConfig.4.0.2\lib\net45\HeBianGu.Service.AppConfig.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.AppConfig.4.0.3\lib\net45\HeBianGu.Service.AppConfig.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.MarkupExtension.4.0.2\lib\net45\HeBianGu.Service.MarkupExtension.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.MarkupExtension.4.0.3\lib\net45\HeBianGu.Service.MarkupExtension.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvp.4.0.2\lib\net45\HeBianGu.Service.Mvp.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvp.4.0.3\lib\net45\HeBianGu.Service.Mvp.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.TypeConverter.4.0.2\lib\net45\HeBianGu.Service.TypeConverter.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.TypeConverter.4.0.3\lib\net45\HeBianGu.Service.TypeConverter.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Validation.4.0.2\lib\net45\HeBianGu.Service.Validation.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Validation.4.0.3\lib\net45\HeBianGu.Service.Validation.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Setting.4.0.2\lib\net45\HeBianGu.Systems.Setting.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Setting.4.0.3\lib\net45\HeBianGu.Systems.Setting.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Upgrade.4.0.2\lib\net45\HeBianGu.Systems.Upgrade.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Upgrade.4.0.3\lib\net45\HeBianGu.Systems.Upgrade.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.XmlSerialize.4.0.2\lib\net45\HeBianGu.Systems.XmlSerialize.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.XmlSerialize.4.0.3\lib\net45\HeBianGu.Systems.XmlSerialize.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Blur.4.0.2\lib\net45\HeBianGu.Window.Blur.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Blur.4.0.3\lib\net45\HeBianGu.Window.Blur.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Login.4.0.2\lib\net45\HeBianGu.Window.Login.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Login.4.0.3\lib\net45\HeBianGu.Window.Login.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Message.4.0.2\lib\net45\HeBianGu.Window.Message.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Message.4.0.3\lib\net45\HeBianGu.Window.Message.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.MessageDialog.4.0.2\lib\net45\HeBianGu.Window.MessageDialog.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.MessageDialog.4.0.3\lib\net45\HeBianGu.Window.MessageDialog.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Notify.4.0.2\lib\net45\HeBianGu.Window.Notify.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Notify.4.0.3\lib\net45\HeBianGu.Window.Notify.dll ..\..\..\Solution\hebiangu\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -219,8 +219,6 @@ - - diff --git a/Source/Application/HeBianGu.App.Blur/packages.config b/Source/Application/HeBianGu.App.Blur/packages.config index e018212d..86a02e12 100644 --- a/Source/Application/HeBianGu.App.Blur/packages.config +++ b/Source/Application/HeBianGu.App.Blur/packages.config @@ -1,33 +1,33 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/Application/HeBianGu.App.Chart/HeBianGu.App.Chart.csproj b/Source/Application/HeBianGu.App.Chart/HeBianGu.App.Chart.csproj index 1e962587..8c0659b1 100644 --- a/Source/Application/HeBianGu.App.Chart/HeBianGu.App.Chart.csproj +++ b/Source/Application/HeBianGu.App.Chart/HeBianGu.App.Chart.csproj @@ -38,68 +38,68 @@ - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Base.WpfBase.4.0.2\lib\net45\HeBianGu.Base.WpfBase.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Base.WpfBase.4.0.3\lib\net45\HeBianGu.Base.WpfBase.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Common.Expression.4.0.2\lib\net45\HeBianGu.Common.Expression.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Common.Expression.4.0.3\lib\net45\HeBianGu.Common.Expression.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Chart2D.4.0.2\lib\net45\HeBianGu.Control.Chart2D.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Chart2D.4.0.3\lib\net45\HeBianGu.Control.Chart2D.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.LeftMenu.4.0.1\lib\net45\HeBianGu.Control.LeftMenu.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.LeftMenu.4.0.3\lib\net45\HeBianGu.Control.LeftMenu.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Message.4.0.2\lib\net45\HeBianGu.Control.Message.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Message.4.0.3\lib\net45\HeBianGu.Control.Message.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MessageContainer.4.0.2\lib\net45\HeBianGu.Control.MessageContainer.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MessageContainer.4.0.3\lib\net45\HeBianGu.Control.MessageContainer.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Panel.4.0.2\lib\net45\HeBianGu.Control.Panel.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Panel.4.0.3\lib\net45\HeBianGu.Control.Panel.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PropertyGrid.4.0.2\lib\net45\HeBianGu.Control.PropertyGrid.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PropertyGrid.4.0.3\lib\net45\HeBianGu.Control.PropertyGrid.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ThemeSet.4.0.2\lib\net45\HeBianGu.Control.ThemeSet.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ThemeSet.4.0.3\lib\net45\HeBianGu.Control.ThemeSet.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ToggleExpander.4.0.2\lib\net45\HeBianGu.Control.ToggleExpander.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ToggleExpander.4.0.3\lib\net45\HeBianGu.Control.ToggleExpander.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.General.WpfControlLib.4.0.2\lib\net45\HeBianGu.General.WpfControlLib.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.General.WpfControlLib.4.0.3\lib\net45\HeBianGu.General.WpfControlLib.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Animation.4.0.2\lib\net45\HeBianGu.Service.Animation.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Animation.4.0.3\lib\net45\HeBianGu.Service.Animation.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.AppConfig.4.0.2\lib\net45\HeBianGu.Service.AppConfig.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.AppConfig.4.0.3\lib\net45\HeBianGu.Service.AppConfig.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.MarkupExtension.4.0.2\lib\net45\HeBianGu.Service.MarkupExtension.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.MarkupExtension.4.0.3\lib\net45\HeBianGu.Service.MarkupExtension.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvc.4.0.2\lib\net45\HeBianGu.Service.Mvc.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvc.4.0.3\lib\net45\HeBianGu.Service.Mvc.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvp.4.0.2\lib\net45\HeBianGu.Service.Mvp.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvp.4.0.3\lib\net45\HeBianGu.Service.Mvp.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.TypeConverter.4.0.2\lib\net45\HeBianGu.Service.TypeConverter.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.TypeConverter.4.0.3\lib\net45\HeBianGu.Service.TypeConverter.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Link.4.0.2\lib\net45\HeBianGu.Window.Link.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Link.4.0.3\lib\net45\HeBianGu.Window.Link.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Message.4.0.2\lib\net45\HeBianGu.Window.Message.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Message.4.0.3\lib\net45\HeBianGu.Window.Message.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.MessageDialog.4.0.2\lib\net45\HeBianGu.Window.MessageDialog.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.MessageDialog.4.0.3\lib\net45\HeBianGu.Window.MessageDialog.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Start.4.0.2\lib\net45\HeBianGu.Window.Start.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Start.4.0.3\lib\net45\HeBianGu.Window.Start.dll diff --git a/Source/Application/HeBianGu.App.Chart/packages.config b/Source/Application/HeBianGu.App.Chart/packages.config index d180de74..fa6b781e 100644 --- a/Source/Application/HeBianGu.App.Chart/packages.config +++ b/Source/Application/HeBianGu.App.Chart/packages.config @@ -1,25 +1,25 @@  - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/Application/HeBianGu.App.Creator.Share/App.config b/Source/Application/HeBianGu.App.Creator.Share/App.config new file mode 100644 index 00000000..8e156463 --- /dev/null +++ b/Source/Application/HeBianGu.App.Creator.Share/App.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Source/Application/HeBianGu.App.Creator.Share/App.xaml b/Source/Application/HeBianGu.App.Creator.Share/App.xaml new file mode 100644 index 00000000..b0f66e21 --- /dev/null +++ b/Source/Application/HeBianGu.App.Creator.Share/App.xaml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + diff --git a/Source/Application/HeBianGu.App.Creator.Share/App.xaml.cs b/Source/Application/HeBianGu.App.Creator.Share/App.xaml.cs new file mode 100644 index 00000000..130caff0 --- /dev/null +++ b/Source/Application/HeBianGu.App.Creator.Share/App.xaml.cs @@ -0,0 +1,132 @@ +using HeBianGu.Base.WpfBase; +using HeBianGu.Control.ThemeSet; +using HeBianGu.General.WpfControlLib; +using HeBianGu.Systems.Project; +using System; +using System.Windows; +using System.Windows.Media; + +namespace HeBianGu.App.Creator +{ + /// + /// App.xaml 的交互逻辑 + /// + public partial class App : ApplicationBase + { + protected override System.Windows.Window CreateMainWindow(StartupEventArgs e) + { + return new ShellWindow(); + } + + + protected override void ConfigureServices(IServiceCollection services) + { + base.ConfigureServices(services); + //// Do :注册本地化配置读写服务 + //services.AddSingleton(); + + // Do :注入领域模型服务 + services.AddSingleton(); + + // Do :注册日志服务 + services.AddSingleton(); + + //services.UseMessageWindow(); + + //services.UseWindowAnimation(); + + //services.AddThemeSave(); + + services.AddSingleton(); + + services.AddSetting(); + + //services.AddIdentity(); + + //services.AddUpgrade(); + + //services.AddStart(); + + // Do :启用窗口加载和隐藏动画 需要引用 HeBianGu.Service.Animation + services.AddWindowAnimation(); + + // Do :启用消息提示 需要引用 HeBianGu.Control.Message + services.AddMessage(); + + // Do :启用对话框 需要引用HeBianGu.Window.MessageDialog + services.AddMessageDialog(); + + services.AddTheme(); + + //services.AddIdentity(); + + //services.AddUpgrade(); + + services.AddStart(); + + //services.AddOperation(); + + //services.AddLicense(); + + //services.AddStudentDemo(); + + // Do :启用右上见配置按钮 需要添加引用HeBianGu.Systems.Setting + services.AddSetting(); + services.AddSettingViewPrenter(); + services.AddSettingPath(); + + services.AddXmlSerialize(); + services.AddXmlMeta(); + + } + + protected override void Configure(IApplicationBuilder app) + { + base.Configure(app); + // Do:注册Mvc模式 + app.UseMvc(); + + // Do:设置默认主题 + app.UseLocalTheme(l => + { + l.AccentColor = (Color)ColorConverter.ConvertFromString("#FF003D99"); + + l.SmallFontSize = 14D; + l.LargeFontSize = 16D; + l.FontSize = FontSize.Small; + + l.ItemHeight = 36; + l.RowHeight = 40; + //l.ItemWidth = 120; + l.ItemCornerRadius = 2; + + l.AnimalSpeed = 5000; + l.AccentColorSelectType = 0; + l.IsUseAnimal = false; + + l.ThemeType = ThemeType.Light; + + l.Language = Language.Chinese; + + l.AccentBrushType = AccentBrushType.LinearGradientBrush; + }); + + app.UseProject(l => + { + l.Extenstion = "wf"; + l.SaveMode = ProjectSaveMode.OnProjectChanged; + }); + + app.UseSettingDefault(); + + app.UseStart(l => + { + l.Title = "自动化测试系统"; + l.TitleFontSize = 50; + }); + + //app.UseStart(l => l.Type = Window.Start.WindowType.Message); + } + + } +} diff --git a/Source/Application/HeBianGu.App.Creator.Share/Controller/LoyoutController.cs b/Source/Application/HeBianGu.App.Creator.Share/Controller/LoyoutController.cs new file mode 100644 index 00000000..43b78b5c --- /dev/null +++ b/Source/Application/HeBianGu.App.Creator.Share/Controller/LoyoutController.cs @@ -0,0 +1,53 @@ +using HeBianGu.Base.WpfBase; +using HeBianGu.Service.Mvc; +using System; +using System.Threading.Tasks; + +namespace HeBianGu.App.Creator +{ + [Controller("Loyout")] + internal class LoyoutController : Controller + { + [Action(DisplayName = "信息")] + public async Task Info() + { + return await ViewAsync(); + } + + [Action(DisplayName = "新建")] + public async Task New() + { + return await ViewAsync(); + } + + [Action(DisplayName = "打开")] + public async Task Open() + { + return await ViewAsync(); + } + + [Action(DisplayName = "账户")] + public async Task Account() + { + return await ViewAsync(); + } + + [Action(DisplayName = "连接")] + public async Task Connect() + { + return await ViewAsync(); + } + + [Action(DisplayName = "共享")] + public async Task Home() + { + return await ViewAsync(); + } + + [Action(DisplayName = "保存")] + public async Task Save() + { + return await ViewAsync(); + } + } +} diff --git a/Source/Application/HeBianGu.App.Creator.Share/DataSourceLocator.cs b/Source/Application/HeBianGu.App.Creator.Share/DataSourceLocator.cs new file mode 100644 index 00000000..0400d267 --- /dev/null +++ b/Source/Application/HeBianGu.App.Creator.Share/DataSourceLocator.cs @@ -0,0 +1,14 @@ +using HeBianGu.Base.WpfBase; + +namespace HeBianGu.App.Creator +{ + class DataSourceLocator + { + public DataSourceLocator() + { + ServiceRegistry.Instance.Register(); + } + public ShellViewModel ShellViewModel => ServiceRegistry.Instance.GetInstance(); + + } +} diff --git a/Source/Application/HeBianGu.App.Creator.Share/Domain/AssemblyDomain.cs b/Source/Application/HeBianGu.App.Creator.Share/Domain/AssemblyDomain.cs new file mode 100644 index 00000000..09e4548c --- /dev/null +++ b/Source/Application/HeBianGu.App.Creator.Share/Domain/AssemblyDomain.cs @@ -0,0 +1,7 @@ +namespace HeBianGu.App.Creator +{ + public class AssemblyDomain : IAssemblyDomain + { + + } +} diff --git a/Source/Application/HeBianGu.App.Creator.Share/Domain/IAssemblyDomain.cs b/Source/Application/HeBianGu.App.Creator.Share/Domain/IAssemblyDomain.cs new file mode 100644 index 00000000..ab09f520 --- /dev/null +++ b/Source/Application/HeBianGu.App.Creator.Share/Domain/IAssemblyDomain.cs @@ -0,0 +1,8 @@ + +namespace HeBianGu.App.Creator +{ + public interface IAssemblyDomain + { + + } +} \ No newline at end of file diff --git a/Source/Application/HeBianGu.App.Creator.Share/HeBianGu.App.Creator.Share.projitems b/Source/Application/HeBianGu.App.Creator.Share/HeBianGu.App.Creator.Share.projitems new file mode 100644 index 00000000..c36d7de2 --- /dev/null +++ b/Source/Application/HeBianGu.App.Creator.Share/HeBianGu.App.Creator.Share.projitems @@ -0,0 +1,107 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + d44586a9-376f-41df-bc29-30c6b3564fbd + + + HeBianGu.App.Creator.Share + + + + Code + App.xaml + + + + + + + + + + + + + AccountControl.xaml + + + ConnectControl.xaml + + + HomeControl.xaml + + + InfoControl.xaml + + + NewControl.xaml + + + OpenControl.xaml + + + SaveControl.xaml + + + SettingDialog.xaml + + + Code + ShellWindow.xaml + + + + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + + + + + + Designer + MSBuild:Compile + + + \ No newline at end of file diff --git a/Source/Application/HeBianGu.App.Creator.Share/HeBianGu.App.Creator.Share.shproj b/Source/Application/HeBianGu.App.Creator.Share/HeBianGu.App.Creator.Share.shproj new file mode 100644 index 00000000..d32b7033 --- /dev/null +++ b/Source/Application/HeBianGu.App.Creator.Share/HeBianGu.App.Creator.Share.shproj @@ -0,0 +1,13 @@ + + + + d44586a9-376f-41df-bc29-30c6b3564fbd + 14.0 + + + + + + + + diff --git a/Source/Application/HeBianGu.App.Creator.Share/Provider/ComponentData.cs b/Source/Application/HeBianGu.App.Creator.Share/Provider/ComponentData.cs new file mode 100644 index 00000000..e7408024 --- /dev/null +++ b/Source/Application/HeBianGu.App.Creator.Share/Provider/ComponentData.cs @@ -0,0 +1,190 @@ +using HeBianGu.Base.WpfBase; +using HeBianGu.Systems.Component; +using System; +using System.Collections.Generic; +using System.Linq; + +namespace HeBianGu.App.Creator +{ + public class ComponentData + { + public List Nodes { get; set; } + + public List Ports { get; set; } + + public List Links { get; set; } + + + public Tuple, IEnumerable> GetDatas() + { + List nodes = new List(); + + List links = new List(); + + if (this.Nodes == null) return null; + + var ass = ComponentService.GetAssemblys(); + + ass.Add(typeof(ComponentPort).Assembly); + + List ports = new List(); + + foreach (var config in this.Ports) + { + var a = ass.FirstOrDefault(l => l.FullName == config.Dll); + + var c = a.CreateInstance(config.FullName) as ComponentPort; + + c.DeSerialize(config); + + ports.Add(c); + } + + foreach (var config in this.Nodes) + { + var a = ass.FirstOrDefault(l => l.FullName == config.Dll); + + if (a == null) continue; + + var node = a.CreateInstance(config.FullName) as ComponentNode; + + node.DeSerialize(config); + + nodes.Add(node); + + IEnumerable ps = ports.Where(l => l.NodeID == node.ID).ToList(); + + node.PortDatas = ps.ToList(); + } + + foreach (var config in this.Links) + { + var a = ass.FirstOrDefault(l => l.FullName == config.Dll); + + var c = a.CreateInstance(config.FullName) as ComponentLink; + + c.DeSerialize(config); + + var fromNode = nodes.FirstOrDefault(l => l.ID == c.FromNodeID); + + var toNode = nodes.FirstOrDefault(l => l.ID == c.ToNodeID); + + c.RefreshData(fromNode, toNode); + + links.Add(c); + } + + return new Tuple, IEnumerable>(nodes, links); + + } + } + + + + public class ProjectData : NotifyPropertyChangedBase + { + private SystemSet _systemSet = new SystemSet(); + /// 说明 + public SystemSet SystemSet + { + get { return _systemSet; } + set + { + _systemSet = value; + RaisePropertyChanged("SystemSet"); + } + } + + + private ComponentData _diagramData = new ComponentData(); + + /// 说明 + public ComponentData DiagramData + { + get { return _diagramData; } + set + { + _diagramData = value; + RaisePropertyChanged("DiagramData"); + } + } + + } + + /// 说明 + public class SystemSet : NotifyPropertyChangedBase + { + private double _diagramWidth = 100; + /// 说明 + public double DiagramWidth + { + get { return _diagramWidth; } + set + { + _diagramWidth = value; + RaisePropertyChanged("DiagramWidth"); + } + } + + private double _diagramHeight = 1000; + /// 说明 + public double DiagramHeight + { + get { return _diagramHeight; } + set + { + _diagramHeight = value; + RaisePropertyChanged("DiagramHeight"); + } + } + + private bool _isToolboxVisible = true; + /// 说明 + public bool IsToolboxVisble + { + get { return _isToolboxVisible; } + set + { + _isToolboxVisible = value; + RaisePropertyChanged("IsToolboxVisble"); + } + } + + private bool _isPropertyGridVisible = true; + /// 说明 + public bool IsPropertyGridVisible + { + get { return _isPropertyGridVisible; } + set + { + _isPropertyGridVisible = value; + RaisePropertyChanged("IsPropertyGridVisible"); + } + } + + private bool _isLocatorVisible = true; + /// 说明 + public bool IsLocatorVisible + { + get { return _isLocatorVisible; } + set + { + _isLocatorVisible = value; + RaisePropertyChanged("IsLocatorVisible"); + } + } + + private bool _isLogVisible = false; + /// 说明 + public bool IsLogVisible + { + get { return _isLogVisible; } + set + { + _isLogVisible = value; + RaisePropertyChanged("IsLogVisible"); + } + } + + } +} diff --git a/Source/Application/HeBianGu.App.Creator.Share/Provider/LocalizeService.cs b/Source/Application/HeBianGu.App.Creator.Share/Provider/LocalizeService.cs new file mode 100644 index 00000000..d17975a0 --- /dev/null +++ b/Source/Application/HeBianGu.App.Creator.Share/Provider/LocalizeService.cs @@ -0,0 +1,20 @@ +using HeBianGu.Control.ThemeSet; + +namespace HeBianGu.App.Creator +{ + //class LocalizeService : IThemeSerializeService + //{ + // LocalConfigService _localConfigService = new LocalConfigService(); + + // public ThemeConfig LoadTheme() + // { + // return _localConfigService.LoadConfig(); + // } + + // public bool SaveTheme(ThemeConfig theme) + // { + // return _localConfigService.SaveConfig(theme); + // } + + //} +} diff --git a/Source/Application/HeBianGu.App.Creator.Share/Provider/LogService.cs b/Source/Application/HeBianGu.App.Creator.Share/Provider/LogService.cs new file mode 100644 index 00000000..b65c4fde --- /dev/null +++ b/Source/Application/HeBianGu.App.Creator.Share/Provider/LogService.cs @@ -0,0 +1,60 @@ +using HeBianGu.Base.WpfBase; +using HeBianGu.Control.MessageListBox; +using System; + +namespace HeBianGu.App.Creator +{ + class LogService : ILogService + { + public ShellViewModel ShellViewModel => ServiceRegistry.Instance.GetInstance(); + + public void Debug(params string[] messages) + { + throw new NotImplementedException(); + } + + public void Error(params Exception[] messages) + { + foreach (var item in messages) + { + ShellViewModel?.Errors.Add(new ErrorMessage() { Title = "运行错误", Data = item.Message, Exception = item }); + } + } + + public void Error(params string[] messages) + { + foreach (var item in messages) + { + ShellViewModel?.Errors.Add(new ErrorMessage() { Title = "运行错误", Data = item }); + } + } + + public void Fatal(params string[] messages) + { + throw new NotImplementedException(); + } + + public void Fatal(params Exception[] messages) + { + + } + + public void Info(params string[] messages) + { + foreach (var item in messages) + { + ShellViewModel?.Infos.Add(new InfoMessage() { Title = "运行完成", Data = item, }); + } + } + + public void Trace(params string[] messages) + { + + } + + public void Warn(params string[] messages) + { + + } + } +} diff --git a/Source/Application/HeBianGu.App.Creator.Share/Provider/WorkflowProjectSerializeService.cs b/Source/Application/HeBianGu.App.Creator.Share/Provider/WorkflowProjectSerializeService.cs new file mode 100644 index 00000000..1a70fa6f --- /dev/null +++ b/Source/Application/HeBianGu.App.Creator.Share/Provider/WorkflowProjectSerializeService.cs @@ -0,0 +1,9 @@ +using HeBianGu.Systems.Project; + +namespace HeBianGu.App.Creator +{ + public class WorkflowProjectService : ProjectService + { + + } +} diff --git a/Source/Application/HeBianGu.App.Creator.Share/Theme/Default.xaml b/Source/Application/HeBianGu.App.Creator.Share/Theme/Default.xaml new file mode 100644 index 00000000..6e0704cf --- /dev/null +++ b/Source/Application/HeBianGu.App.Creator.Share/Theme/Default.xaml @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/Application/HeBianGu.App.Creator.Share/View/Loyout/AccountControl.xaml b/Source/Application/HeBianGu.App.Creator.Share/View/Loyout/AccountControl.xaml new file mode 100644 index 00000000..3e63009c --- /dev/null +++ b/Source/Application/HeBianGu.App.Creator.Share/View/Loyout/AccountControl.xaml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + True + + + + diff --git a/Source/Application/HeBianGu.App.Map.Share/View/ShellWindow.xaml b/Source/Application/HeBianGu.App.Map.Share/View/ShellWindow.xaml index 23f1f51f..31a05aa3 100644 --- a/Source/Application/HeBianGu.App.Map.Share/View/ShellWindow.xaml +++ b/Source/Application/HeBianGu.App.Map.Share/View/ShellWindow.xaml @@ -13,19 +13,7 @@ CaptionHeight="50" DataContext="{Binding Source={StaticResource S.DataSource.Locator}, Path=ShellViewModel}" Icon="" - Style="{DynamicResource S.Window.Menu.Default}" mc:Ignorable="d"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + @@ -1431,8 +1272,8 @@ - - + + - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Base.WpfBase.4.0.2\lib\net45\HeBianGu.Base.WpfBase.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Base.WpfBase.4.0.3\lib\net45\HeBianGu.Base.WpfBase.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Common.Expression.4.0.2\lib\net45\HeBianGu.Common.Expression.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Common.Expression.4.0.3\lib\net45\HeBianGu.Common.Expression.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Drawer.4.0.2\lib\net45\HeBianGu.Control.Drawer.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Drawer.4.0.3\lib\net45\HeBianGu.Control.Drawer.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ImagePlayer.4.0.2\lib\net45\HeBianGu.Control.ImagePlayer.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ImagePlayer.4.0.3\lib\net45\HeBianGu.Control.ImagePlayer.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.LeftMenu.4.0.1\lib\net45\HeBianGu.Control.LeftMenu.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.LeftMenu.4.0.3\lib\net45\HeBianGu.Control.LeftMenu.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Message.4.0.2\lib\net45\HeBianGu.Control.Message.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Message.4.0.3\lib\net45\HeBianGu.Control.Message.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MessageContainer.4.0.2\lib\net45\HeBianGu.Control.MessageContainer.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MessageContainer.4.0.3\lib\net45\HeBianGu.Control.MessageContainer.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MultiComboBox.4.0.2\lib\net45\HeBianGu.Control.MultiComboBox.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.MultiComboBox.4.0.3\lib\net45\HeBianGu.Control.MultiComboBox.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PagedDataGrid.4.0.2\lib\net45\HeBianGu.Control.PagedDataGrid.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PagedDataGrid.4.0.3\lib\net45\HeBianGu.Control.PagedDataGrid.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Panel.4.0.2\lib\net45\HeBianGu.Control.Panel.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Panel.4.0.3\lib\net45\HeBianGu.Control.Panel.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Ping.4.0.2\lib\net45\HeBianGu.Control.Ping.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Ping.4.0.3\lib\net45\HeBianGu.Control.Ping.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PropertyGrid.4.0.2\lib\net45\HeBianGu.Control.PropertyGrid.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.PropertyGrid.4.0.3\lib\net45\HeBianGu.Control.PropertyGrid.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ScrollInto.4.0.2\lib\net45\HeBianGu.Control.ScrollInto.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ScrollInto.4.0.3\lib\net45\HeBianGu.Control.ScrollInto.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Shape.4.0.2\lib\net45\HeBianGu.Control.Shape.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.Shape.4.0.3\lib\net45\HeBianGu.Control.Shape.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ThemeSet.4.0.2\lib\net45\HeBianGu.Control.ThemeSet.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ThemeSet.4.0.3\lib\net45\HeBianGu.Control.ThemeSet.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ToggleExpander.4.0.2\lib\net45\HeBianGu.Control.ToggleExpander.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.ToggleExpander.4.0.3\lib\net45\HeBianGu.Control.ToggleExpander.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.TopContainer.4.0.2\lib\net45\HeBianGu.Control.TopContainer.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Control.TopContainer.4.0.3\lib\net45\HeBianGu.Control.TopContainer.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.General.WpfControlLib.4.0.2\lib\net45\HeBianGu.General.WpfControlLib.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.General.WpfControlLib.4.0.3\lib\net45\HeBianGu.General.WpfControlLib.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Animation.4.0.2\lib\net45\HeBianGu.Service.Animation.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Animation.4.0.3\lib\net45\HeBianGu.Service.Animation.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.AppConfig.4.0.2\lib\net45\HeBianGu.Service.AppConfig.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.AppConfig.4.0.3\lib\net45\HeBianGu.Service.AppConfig.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.License.4.0.2\lib\net45\HeBianGu.Service.License.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.License.4.0.3\lib\net45\HeBianGu.Service.License.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.MarkupExtension.4.0.2\lib\net45\HeBianGu.Service.MarkupExtension.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.MarkupExtension.4.0.3\lib\net45\HeBianGu.Service.MarkupExtension.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvc.4.0.2\lib\net45\HeBianGu.Service.Mvc.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvc.4.0.3\lib\net45\HeBianGu.Service.Mvc.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvp.4.0.2\lib\net45\HeBianGu.Service.Mvp.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.Mvp.4.0.3\lib\net45\HeBianGu.Service.Mvp.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.TypeConverter.4.0.2\lib\net45\HeBianGu.Service.TypeConverter.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Service.TypeConverter.4.0.3\lib\net45\HeBianGu.Service.TypeConverter.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Setting.4.0.2\lib\net45\HeBianGu.Systems.Setting.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.Setting.4.0.3\lib\net45\HeBianGu.Systems.Setting.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.XmlSerialize.4.0.2\lib\net45\HeBianGu.Systems.XmlSerialize.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Systems.XmlSerialize.4.0.3\lib\net45\HeBianGu.Systems.XmlSerialize.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Link.4.0.2\lib\net45\HeBianGu.Window.Link.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Link.4.0.3\lib\net45\HeBianGu.Window.Link.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Menu.4.0.2\lib\net45\HeBianGu.Window.Menu.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Menu.4.0.3\lib\net45\HeBianGu.Window.Menu.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Message.4.0.2\lib\net45\HeBianGu.Window.Message.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Message.4.0.3\lib\net45\HeBianGu.Window.Message.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.MessageDialog.4.0.2\lib\net45\HeBianGu.Window.MessageDialog.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.MessageDialog.4.0.3\lib\net45\HeBianGu.Window.MessageDialog.dll - - ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Notify.4.0.2\lib\net45\HeBianGu.Window.Notify.dll + + ..\..\..\Solution\hebiangu\packages\HeBianGu.Window.Notify.4.0.3\lib\net45\HeBianGu.Window.Notify.dll diff --git a/Source/Application/HeBianGu.App.Map/packages.config b/Source/Application/HeBianGu.App.Map/packages.config index 9a8e4f76..1496b4c8 100644 --- a/Source/Application/HeBianGu.App.Map/packages.config +++ b/Source/Application/HeBianGu.App.Map/packages.config @@ -1,36 +1,36 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/Application/HeBianGu.App.Menu.Share/View/Flash/FlashControl.xaml b/Source/Application/HeBianGu.App.Menu.Share/View/Flash/FlashControl.xaml index c94cbbff..88121a90 100644 --- a/Source/Application/HeBianGu.App.Menu.Share/View/Flash/FlashControl.xaml +++ b/Source/Application/HeBianGu.App.Menu.Share/View/Flash/FlashControl.xaml @@ -12,7 +12,6 @@ - - + + + + + + + + + + + + + @@ -78,28 +92,27 @@ - + + True + + + @@ -367,6 +353,11 @@ Header="Others" Style="{DynamicResource {x:Static h:GroupBoxKeys.UnderLine}}"> + + + @@ -438,7 +429,6 @@