111

HeBianGu · Aug 4, 2023 · f5d49c8 · f5d49c8
1 parent 8fce4a5
commit f5d49c8
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 19 deletions.
diff --git a/Source/Application/HeBianGu.App.Creator.Share/App.xaml.cs b/Source/Application/HeBianGu.App.Creator.Share/App.xaml.cs
@@ -13,7 +13,7 @@ namespace HeBianGu.App.Creator
     /// </summary>
     public partial class App : ApplicationBase
     {
-        protected override System.Windows.Window CreateMainWindow(StartupEventArgs e)
+        protected override MainWindowBase CreateMainWindow(StartupEventArgs e)
         {
             return new ShellWindow();
         }
@@ -51,10 +51,10 @@ protected override void ConfigureServices(IServiceCollection services)
             services.AddWindowAnimation();
 
             //  Do ：启用消息提示 需要引用 HeBianGu.Control.Message
-            services.AddMessage();
+            services.AddMessageProxy();
 
             //  Do ：启用对话框 需要引用HeBianGu.Window.MessageDialog
-            services.AddMessageDialog();
+            services.AddWindowDialog();
 
             services.AddTheme();
 

diff --git a/Source/Application/HeBianGu.App.Creator.Share/View/Loyout/AccountControl.xaml b/Source/Application/HeBianGu.App.Creator.Share/View/Loyout/AccountControl.xaml
@@ -9,11 +9,11 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
         <StackPanel>
-            <TextBlock Text="产品" FontSize="{DynamicResource {x:Static h:FontSizeKeys.Header1}}"/>
+            <TextBlock Text="产品" FontSize="{StaticResource {x:Static h:FontSizeKeys.Header1}}"/>
 
             <TextBlock Text="Create" FontSize="55" Margin=" 0 10"/>
 
-            <TextBlock Text="激活的产品" FontSize="{DynamicResource {x:Static h:FontSizeKeys.Header2}}" Margin="0,10"/>
+            <TextBlock Text="激活的产品" FontSize="{StaticResource {x:Static h:FontSizeKeys.Header2}}" Margin="0,10"/>
             <h:PagedDataGrid x:Name="grid" DataSource="{Binding Licenses}" SelectedItem="{Binding SelectedLicense}" AutoGenerateColumns="False" TopVisibility="Collapsed" Style="{DynamicResource S.PageDataGrid.Clear}">
                 <DataGrid.Columns>
                     <DataGridTextColumn Header="模块" Binding="{Binding ModuleName}" Width="*"/>

diff --git a/Source/Application/HeBianGu.App.Creator.Share/View/Loyout/ConnectControl.xaml b/Source/Application/HeBianGu.App.Creator.Share/View/Loyout/ConnectControl.xaml
@@ -9,7 +9,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
-        <h:PropertyGrid Style="{DynamicResource {x:Static h:PropertyGrid.SingleKey}}" Margin="200">
+        <h:PropertyGrid Style="{DynamicResource {x:Static h:PropertyGrid.ClearlyKey}}" Margin="200">
             <h:PropertyGrid.SelectObject>
                 <office:Connect IP="192.168.0.112" Port="8080"/>
             </h:PropertyGrid.SelectObject>

diff --git a/Source/Application/HeBianGu.App.Creator.Share/View/Loyout/InfoControl.xaml b/Source/Application/HeBianGu.App.Creator.Share/View/Loyout/InfoControl.xaml
@@ -12,7 +12,7 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
         <StackPanel>
-            <TextBlock Text="信息" FontSize="{DynamicResource {x:Static h:FontSizeKeys.Header1}}" Margin="0,20"/>
+            <TextBlock Text="信息" FontSize="{StaticResource {x:Static h:FontSizeKeys.Header1}}" Margin="0,20"/>
 
             <StackPanel>
                 <h:Row Style="{DynamicResource {x:Static h:Row.Column1Key}}">

diff --git a/Source/Application/HeBianGu.App.Creator.Share/View/Loyout/NewControl.xaml b/Source/Application/HeBianGu.App.Creator.Share/View/Loyout/NewControl.xaml
@@ -12,7 +12,7 @@
              mc:Ignorable="d">
     <Grid>
         <StackPanel>
-            <TextBlock Margin="0,20" FontSize="{DynamicResource {x:Static h:FontSizeKeys.Header1}}" Text="新建" />
+            <TextBlock Margin="0,20" FontSize="{StaticResource {x:Static h:FontSizeKeys.Header1}}" Text="新建" />
 
             <DockPanel>
                 <h:Row DockPanel.Dock="Top">

diff --git a/Source/Application/HeBianGu.App.Creator.Share/View/Loyout/OpenControl.xaml b/Source/Application/HeBianGu.App.Creator.Share/View/Loyout/OpenControl.xaml
@@ -12,7 +12,7 @@
              mc:Ignorable="d">
     <Grid>
         <StackPanel>
-            <TextBlock Margin="0,20" FontSize="{DynamicResource {x:Static h:FontSizeKeys.Header1}}" Text="打开" />
+            <TextBlock Margin="0,20" FontSize="{StaticResource {x:Static h:FontSizeKeys.Header1}}" Text="打开" />
 
             <DockPanel>
                 <TabControl BorderBrush="Transparent" TabStripPlacement="Left" h:Cattach.SearchDock="Top" h:Cattach.SearchWidth="200">

diff --git a/Source/Application/HeBianGu.App.Creator.Share/View/Loyout/SaveControl.xaml b/Source/Application/HeBianGu.App.Creator.Share/View/Loyout/SaveControl.xaml
@@ -8,7 +8,7 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
         <StackPanel>
-            <TextBlock Text="另存为" FontSize="{DynamicResource {x:Static h:FontSizeKeys.Header1}}" Margin="0,20"/>
+            <TextBlock Text="另存为" FontSize="{StaticResource {x:Static h:FontSizeKeys.Header1}}" Margin="0,20"/>
 
             <DockPanel>
                 <StackPanel Width="200">

diff --git a/Source/Application/HeBianGu.App.Creator.Share/View/SettingDialog.xaml b/Source/Application/HeBianGu.App.Creator.Share/View/SettingDialog.xaml
@@ -21,7 +21,7 @@
 
         <DockPanel Margin="10">
             <DockPanel LastChildFill="False" DockPanel.Dock="Top">
-                <TextBlock Text="数据导入配置"  FontSize="{DynamicResource {x:Static h:FontSizeKeys.Header4}}" HorizontalAlignment="Left" FontWeight="Bold"/>
+                <TextBlock Text="数据导入配置"  FontSize="{StaticResource {x:Static h:FontSizeKeys.Header4}}" HorizontalAlignment="Left" FontWeight="Bold"/>
                 <Button Style="{DynamicResource {x:Static h:ButtonKeys.Close}}" DockPanel.Dock="Right" h:Cattach.MouseOverForeground="{DynamicResource {x:Static h:BrushKeys.Red}}" Click="Button_Close" HorizontalAlignment="Right" VerticalAlignment="Top"/>
             </DockPanel>
 

diff --git a/Source/Application/HeBianGu.App.Creator.Share/View/SettingDialog.xaml.cs b/Source/Application/HeBianGu.App.Creator.Share/View/SettingDialog.xaml.cs
@@ -17,7 +17,7 @@ public SettingDialog()
 
         private void Button_Close(object sender, RoutedEventArgs e)
         {
-            Message.Instance.CloseLayer();
+            MessageProxy.Container.Close();
         }
 
         private void Button_Sumit(object sender, RoutedEventArgs e)
@@ -26,7 +26,7 @@ private void Button_Sumit(object sender, RoutedEventArgs e)
 
             Result = true;
 
-            Message.Instance.CloseLayer();
+            MessageProxy.Container.Close();
         }
 
 

diff --git a/Source/Application/HeBianGu.App.Creator.Share/View/ShellWindow.xaml b/Source/Application/HeBianGu.App.Creator.Share/View/ShellWindow.xaml
@@ -282,7 +282,7 @@
                                 DeclaredOnly="False"
                                 DockPanel.Dock="Right"
                                 SelectObject="{Binding SelectedPart.Content}"
-                                Style="{DynamicResource {x:Static h:PropertyGrid.SingleKey}}" />
+                                Style="{DynamicResource {x:Static h:PropertyGrid.ClearlyKey}}" />
             </Grid>
 
             <Grid>

diff --git a/Source/Application/HeBianGu.App.Creator.Share/ViewModel/ShellViewModel.cs b/Source/Application/HeBianGu.App.Creator.Share/ViewModel/ShellViewModel.cs
@@ -134,7 +134,7 @@ public Part SelectedPart
 
                  RefreshNodes(project);
 
-                 Message.Instance.ShowSnackMessageWithNotice(project.Title);
+                 MessageProxy.Snacker.ShowTime(project.Title);
              }
          });
 
@@ -175,7 +175,7 @@ private void RefreshComponents(WorkflowProject project)
         {
             View.SettingDialog setting = new View.SettingDialog();
 
-            Message.Instance.ShowLayer(setting);
+            MessageProxy.Container.Show(setting);
         });
 
         private void RefreshNodes(WorkflowProject project)
@@ -215,7 +215,7 @@ private async void Start()
 
             if (start == null)
             {
-                Message.Instance.ShowSnackMessageWithNotice("请先添加一个StartAction");
+                MessageProxy.Snacker.ShowTime("请先添加一个StartAction");
                 return;
             }
 
@@ -228,7 +228,7 @@ private async void Start()
 
             State = b ? ProjectState.Success : ProjectState.Error;
 
-            CommandService.InvalidateRequerySuggested();
+            Commander.InvalidateRequerySuggested();
         }
 
         protected override void Init()
@@ -305,7 +305,7 @@ protected override async void RelayMethod(object obj)
             {
                 if (WorkflowProjectService.Instance.Current == null)
                 {
-                    Message.Instance.ShowSnackMessageWithNotice("当前工程不能为空,请新建工程");
+                    MessageProxy.Snacker.ShowTime("当前工程不能为空,请新建工程");
                     return;
                 }
                 string extention = WorkflowProjectService.Instance.Extenstion;