Prechádzať zdrojové kódy

20260611001引入Rubyer UI,并在主界面加入汉堡菜单

向羽 孟 1 týždeň pred
rodič
commit
3bf4cf26ff

+ 5 - 1
MvvmScaffoldFrame48/App.xaml

@@ -4,6 +4,10 @@
              xmlns:local="clr-namespace:MvvmScaffoldFrame48"
              StartupUri="WPFFroms/MainWindow.xaml">
     <Application.Resources>
-         
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="pack://application:,,,/Rubyer;component/Themes/Generic.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
     </Application.Resources>
 </Application>

+ 3 - 0
MvvmScaffoldFrame48/MvvmScaffoldFrame48.csproj

@@ -180,6 +180,9 @@
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf">
       <Version>1.1.141</Version>
     </PackageReference>
+    <PackageReference Include="Rubyer">
+      <Version>2.19.25</Version>
+    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

+ 8 - 22
MvvmScaffoldFrame48/WPFFroms/MainWindow.xaml

@@ -4,7 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:MvvmScaffoldFrame48"
-        xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+        xmlns:i="http://schemas.microsoft.com/xaml/behaviors" xmlns:rubyer="http://rubyer.io/winfx/xaml/toolkit"
         mc:Ignorable="d"
         Title="MainWindow" Height="450" Width="800" Loaded="Window_Loaded">
     <i:Interaction.Triggers>
@@ -13,27 +13,13 @@
         </i:EventTrigger>
     </i:Interaction.Triggers>
     <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="80"/>
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-        <Grid Grid.Row="0" Background="#FF0050FF">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="55"/>
-                <ColumnDefinition Width="*"/>
-            </Grid.ColumnDefinitions>
-            <Button Grid.Column="0" x:Name="HomeButton" HorizontalAlignment="Left" VerticalAlignment="Center" Width="55" Background="{x:Null}" Height="80">
-                <StackPanel>
-                    <Image Source="/FromImage/菜单_白.png" Stretch="Fill" HorizontalAlignment="Center"/>
-                    <TextBlock Text="菜单" HorizontalAlignment="Center" Foreground="White" />
-                </StackPanel>
-            </Button>
-            <StackPanel Grid.Column="1" x:Name="HeardPanel" Orientation="Horizontal">
-                
-            </StackPanel>
-        </Grid>
-        <Grid Grid.Row="1">
+        <rubyer:HamburgerMenu>
+            <rubyer:HamburgerMenuItem Header="PLC参数" IconType="UserLine">
+                <Frame x:Name="ShowFrame" Margin="0,0,0,0" NavigationUIVisibility="Hidden"/>
+            </rubyer:HamburgerMenuItem>
+        </rubyer:HamburgerMenu>
+        <!--<Grid Grid.Row="1">
             <Frame x:Name="ShowFrame" Margin="0,0,0,0" NavigationUIVisibility="Hidden"/>
-        </Grid>
+        </Grid>-->
     </Grid>
 </Window>

+ 2 - 2
MvvmScaffoldFrame48/WPFFroms/MainWindow.xaml.cs

@@ -19,8 +19,8 @@ namespace MvvmScaffoldFrame48
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
-            Uri ShowUri = new Uri("WPFPage\\PlcSettingPage.xaml", UriKind.Relative);
-            ShowFrame.Navigate(ShowUri);
+            Uri showuri = new Uri("wpfpage\\plcsettingpage.xaml", UriKind.Relative);
+            ShowFrame.Navigate(showuri);
         }
     }
 }