优化更新代码,添加界面功能并整合

This commit is contained in:
GG Z
2025-02-10 20:53:40 +08:00
parent 83b846f15f
commit 978e03a67f
1389 changed files with 95739 additions and 22200 deletions

View File

@@ -1,4 +1,4 @@
<ex:FluentWindowEx
<wpf:FluentWindowEx
x:Class="WpfApp.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -7,46 +7,49 @@
xmlns:ex="https://github.com/sherlockforrest/Wpf.Ui.Extend"
xmlns:local="clr-namespace:WpfApp"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:wpf="https://github.com/ShrlAlgo/WPFluent"
Title="MainWindow"
Width="1200"
Height="800"
d:DataContext="{d:DesignInstance Type=local:MainViewModel}"
ui:Design.Background="#252525"
ui:Design.Foreground="#252525"
wpf:Design.Background="{DynamicResource ApplicationBackgroundBrush}"
wpf:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}"
mc:Ignorable="d">
<b:Interaction.Triggers>
<b:EventTrigger EventName="Loaded">
<b:InvokeCommandAction Command="{Binding LoadedCommand}" CommandParameter="{Binding ElementName=SnackbarPresenter}" />
</b:EventTrigger>
</b:Interaction.Triggers>
<!--<ex:FluentWindowEx.TitleIcon>
<ui:FontIcon FontFamily="{StaticResource SegoeFluentIcons}" Glyph="&#xE700;" />
</ex:FluentWindowEx.TitleIcon>-->
<!--<wpf:FluentWindowEx.TitleIcon>
<wpf:FontIcon FontFamily="{StaticResource SegoeFluentIcons}" Glyph="&#xE700;" />
</wpf:FluentWindowEx.TitleIcon>-->
<Window.Resources>
<!--<local:EnumSourceExtension x:Key="EnumSource" EnumType="{x:Type local:Sex}" />-->
<ex:ColorToBrushConverter x:Key="ColorToBrushConverter" />
<wpf:ColorToBrushConverter x:Key="ColorToBrushConverter" />
</Window.Resources>
<!--<ui:TitleBar Title="{Binding Title, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" DockPanel.Dock="Top">
<ui:TitleBar.Icon>
<ui:FontIcon FontFamily="{StaticResource SegoeFluentIcons}" Glyph="&#xE700;" />
</ui:TitleBar.Icon>
</ui:TitleBar>-->
<!--<wpf:TitleBar Title="{Binding Title, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" DockPanel.Dock="Top">
<wpf:TitleBar.Icon>
<wpf:FontIcon FontFamily="{StaticResource SegoeFluentIcons}" Glyph="&#xE700;" />
</wpf:TitleBar.Icon>
</wpf:TitleBar>-->
<Grid>
<ex:AutoGrid ChildMargin="5" Columns="auto,auto,auto,auto,auto">
<ui:SnackbarPresenter />
<wpf:AutoGrid ChildMargin="5" Columns="auto,auto,auto,auto,auto">
<wpf:SnackbarPresenter />
<Button>
<wpf:SymbolIcon Symbol="Accessibility16"></wpf:SymbolIcon>
</Button>
<GroupBox Header="标题">
<CheckBox Content="Check" />
</GroupBox>
<!--<ex:ColorZone Background="#FF1C1A1A" CornerRadius="4">
<!--<wpf:ColorZone Background="#FF1C1A1A" CornerRadius="4">
<Button Background="Brown" Content="Button" />
</ex:ColorZone>-->
</wpf:ColorZone>-->
<TextBox x:Name="DebugTextBox" VerticalAlignment="Center" />
<ui:TextBox
<wpf:TextBox
VerticalAlignment="Center"
PlaceholderText="文本框"
Text="" />
<ex:TextBoxEx
<wpf:TextBoxEx
Header="Sample:"
HeaderPlacement="Left"
PlaceholderText="文本框"
@@ -59,55 +62,55 @@
<ComboBoxItem Content="First" />
<ComboBoxItem Content="第一" />
</ComboBox>
<ex:ComboBoxEx Header="标题" PlaceholderText="请选择选项">
<wpf:ComboBoxEx Header="标题" PlaceholderText="请选择选项">
<ComboBoxItem Content="First" />
<ComboBoxItem Content="第一" />
<ComboBoxItem Content="First" />
<ComboBoxItem Content="第一" />
</ex:ComboBoxEx>
<ex:ComboBoxEx ItemsSource="{Binding Animals}" />
<ex:ColorPicker x:Name="ColorPicker" />
<ex:ChooseBox VerticalAlignment="Center" ChooseBoxType="Folder" />
<ui:DropDownButton>
</wpf:ComboBoxEx>
<wpf:ComboBoxEx ItemsSource="{Binding Animals}" />
<wpf:ColorPicker x:Name="ColorPicker" />
<wpf:ChooseBox VerticalAlignment="Center" ChooseBoxType="Folder" />
<wpf:DropDownButton>
选择剖面框
<ui:DropDownButton.Flyout>
<wpf:DropDownButton.Flyout>
<ContextMenu>
<MenuItem Command="{Binding ShowDialogCommand}" Header="选择剖面框" />
<MenuItem Header="框选剖面框" />
</ContextMenu>
</ui:DropDownButton.Flyout>
</ui:DropDownButton>
<!--<ex:MultiTreeView Width="200">
<ex:MultiTreeViewItem Header="First">
<ex:MultiTreeViewItem Header="First" />
<ex:MultiTreeViewItem Header="Second" />
<ex:MultiTreeViewItem Header="Third" />
</ex:MultiTreeViewItem>
<ui:TreeViewItem Header="Second">
<ui:TreeViewItem Header="First" />
<ui:TreeViewItem Header="Second" />
<ui:TreeViewItem Header="Third" />
</ui:TreeViewItem>
</wpf:DropDownButton.Flyout>
</wpf:DropDownButton>
<!--<wpf:MultiTreeView Width="200">
<wpf:MultiTreeViewItem Header="First">
<wpf:MultiTreeViewItem Header="First" />
<wpf:MultiTreeViewItem Header="Second" />
<wpf:MultiTreeViewItem Header="Third" />
</wpf:MultiTreeViewItem>
<wpf:TreeViewItem Header="Second">
<wpf:TreeViewItem Header="First" />
<wpf:TreeViewItem Header="Second" />
<wpf:TreeViewItem Header="Third" />
</wpf:TreeViewItem>
<TreeViewItem Header="First">
<TreeViewItem Header="First" />
<TreeViewItem Header="Second" />
<TreeViewItem Header="Third" />
</TreeViewItem>
</ex:MultiTreeView>-->
<!--<ui:TreeGrid>
<ui:TreeGridHeader Title="First" />
<ui:TreeGridItem />
<ui:TreeGridItem />
<ui:TreeGridItem />
</ui:TreeGrid>-->
</wpf:MultiTreeView>-->
<!--<wpf:TreeGrid>
<wpf:TreeGridHeader Title="First" />
<wpf:TreeGridItem />
<wpf:TreeGridItem />
<wpf:TreeGridItem />
</wpf:TreeGrid>-->
<TreeView>
<ui:TreeViewItem Header="ui:TreeViewItem">
<ui:TreeViewItem Header="ui:TreeViewItem">
<ui:TreeViewItem Header="ui:TreeViewItem" />
<ui:TreeViewItem Header="ui:TreeViewItem" />
</ui:TreeViewItem>
<ui:TreeViewItem Header="ui:TreeViewItem" />
</ui:TreeViewItem>
<wpf:TreeViewItem Header="wpf:TreeViewItem">
<wpf:TreeViewItem Header="wpf:TreeViewItem">
<wpf:TreeViewItem Header="wpf:TreeViewItem" />
<wpf:TreeViewItem Header="wpf:TreeViewItem" />
</wpf:TreeViewItem>
<wpf:TreeViewItem Header="wpf:TreeViewItem" />
</wpf:TreeViewItem>
<TreeViewItem Header="TreeViewItem">
<TreeViewItem Header="TreeViewItem">
<TreeViewItem Header="TreeViewItem" />
@@ -116,15 +119,15 @@
<TreeViewItem Header="TreeViewItem" />
</TreeViewItem>
</TreeView>
<ex:MultiTreeView>
<ex:MultiTreeViewItem Header="FirstRoot">
<ex:MultiTreeViewItem Header="First">
<ex:MultiTreeViewItem Header="1" />
<ex:MultiTreeViewItem Header="2" />
</ex:MultiTreeViewItem>
<ex:MultiTreeViewItem Header="Second" />
</ex:MultiTreeViewItem>
<ex:MultiTreeViewItem Header="SecondRoot" />
<wpf:MultiTreeView>
<wpf:MultiTreeViewItem Header="FirstRoot">
<wpf:MultiTreeViewItem Header="First">
<wpf:MultiTreeViewItem Header="1" />
<wpf:MultiTreeViewItem Header="2" />
</wpf:MultiTreeViewItem>
<wpf:MultiTreeViewItem Header="Second" />
</wpf:MultiTreeViewItem>
<wpf:MultiTreeViewItem Header="SecondRoot" />
<!--<b:Interaction.Triggers>
<b:EventTrigger EventName="SelectedItemChanged">
@@ -132,9 +135,9 @@
</b:EventTrigger>
</b:Interaction.Triggers>-->
</ex:MultiTreeView>
<ex:MultiTreeView ItemsSource="{Binding Grades}" SelectedItems="{Binding SelectedItems}">
<ex:MultiTreeView.ItemTemplate>
</wpf:MultiTreeView>
<wpf:MultiTreeView ItemsSource="{Binding Grades}" SelectedItems="{Binding SelectedItems}">
<wpf:MultiTreeView.ItemTemplate>
<HierarchicalDataTemplate ItemsSource="{Binding Students}">
<TextBlock Text="{Binding GradeLevel}" />
<HierarchicalDataTemplate.ItemTemplate>
@@ -143,16 +146,16 @@
</HierarchicalDataTemplate>
</HierarchicalDataTemplate.ItemTemplate>
</HierarchicalDataTemplate>
</ex:MultiTreeView.ItemTemplate>
<!--<ex:MultiTreeView.ItemContainerStyle>
<Style BasedOn="{StaticResource DefaultMultiTreeViewItemStyle}" TargetType="ex:MultiTreeViewItem" />
</ex:MultiTreeView.ItemContainerStyle>-->
</ex:MultiTreeView>
<ex:CheckComboBox
</wpf:MultiTreeView.ItemTemplate>
<!--<wpf:MultiTreeView.ItemContainerStyle>
<Style BasedOn="{StaticResource DefaultMultiTreeViewItemStyle}" TargetType="wpf:MultiTreeViewItem" />
</wpf:MultiTreeView.ItemContainerStyle>-->
</wpf:MultiTreeView>
<wpf:CheckComboBox
DisplayMemberPath="GradeLevel"
ItemsSource="{Binding Grades}"
SelectedObjList="{Binding SelectedItems, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
<ex:ColorPickerControl />
<wpf:ColorPickerControl />
<Button Command="{Binding ButtonClickCommand}" Content="显示Snackbar" />
<!--<Border Height="8" CornerRadius="4">s
<Border.Background>
@@ -162,16 +165,17 @@
</LinearGradientBrush>
</Border.Background>
</Border>-->
<!--<ex:TreeComboBox
<!--<wpf:TreeComboBox
Width="315"
MinHeight="30"
Padding="5"
ItemsSource="{Binding Items}" />-->
</ex:AutoGrid>
<ui:SnackbarPresenter
</wpf:AutoGrid>
<wpf:SnackbarPresenter
x:Name="SnackbarPresenter"
VerticalAlignment="Bottom"
DockPanel.Dock="Bottom" />
</Grid>
</ex:FluentWindowEx>
</wpf:FluentWindowEx>