提交记录修改UI/Views/CategoryAppListPage.xaml+31 −29看文件
修改UI/Views/CategoryAppListPage.xaml.cs+2 −1看文件
| @@ -1,18 +1,19 @@ | ||
| 1 | 删除:<Page xmlns:Button="clr-namespace:UI.Controls.Button" x:Class="UI.Views.CategoryAppListPage" | |
| 1 | 新增:<c:TPage xmlns:Button="clr-namespace:UI.Controls.Button" x:Class="UI.Views.CategoryAppListPage" | |
| 2 | 2 | xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" |
| 3 | 3 | xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
| 4 | 4 | xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" |
| 5 | 5 | xmlns:d="http://schemas.microsoft.com/expression/blend/2008" |
| 6 | 6 | xmlns:local="clr-namespace:UI.Views" xmlns:base="clr-namespace:UI.Controls.Base" xmlns:select="clr-namespace:UI.Controls.Select" xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" xmlns:input="clr-namespace:UI.Controls.Input" |
| 7 | 新增: xmlns:c="clr-namespace:UI.Controls" | |
| 7 | 8 | mc:Ignorable="d" |
| 8 | 9 | d:DesignHeight="450" d:DesignWidth="800" |
| 9 | 删除: Title="CategoryAppListPage" Foreground="{DynamicResource StandardTextBrush}"> | |
| 10 | 新增: Title="CategoryAppListPage" Foreground="{DynamicResource StandardTextBrush}" IsFillPage="True"> | |
| 10 | 11 | |
| 11 | 12 | <Grid> |
| 12 | 13 | <!--选择应用--> |
| 13 | 14 | <Grid Visibility="{Binding ChooseVisibility}" Panel.ZIndex="2" Margin="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"> |
| 14 | 15 | <Border Background="Black" Opacity=".7"/> |
| 15 | 删除: <Border Height="460" Background="{DynamicResource StandardBackgroundBrush2}" CornerRadius="10" BorderBrush="{DynamicResource WindowContentBorder}" BorderThickness="1" Margin="50" VerticalAlignment="Top"> | |
| 16 | 新增: <Border Background="{DynamicResource PopupBackgroundBrush}" CornerRadius="10" BorderBrush="{DynamicResource PopupBorderBrush}" BorderThickness="1" Margin="50" VerticalAlignment="Top"> | |
| 16 | 17 | <Grid> |
| 17 | 18 | <Grid.RowDefinitions> |
| 18 | 19 | <RowDefinition Height="40"/> |
| @@ -34,7 +35,7 @@ | ||
| 34 | 35 | </i:Interaction.Triggers> |
| 35 | 36 | </input:InputBox> |
| 36 | 37 | </Border> |
| 37 | 删除: <ListView ItemsSource="{Binding AppList}" Margin="20" Grid.Row="2"> | |
| 38 | 新增: <ListView ItemsSource="{Binding AppList}" Margin="20,0" Grid.Row="2" VirtualizingPanel.IsVirtualizing="True" ScrollViewer.CanContentScroll="True"> | |
| 38 | 39 | <ListBox.Resources> |
| 39 | 40 | <Style TargetType="{x:Type ListView}"> |
| 40 | 41 | <Setter Property="OverridesDefaultStyle" Value="True"/> |
| @@ -72,13 +73,13 @@ | ||
| 72 | 73 | </ListBox.ItemsPanel> |
| 73 | 74 | <ListView.ItemTemplate> |
| 74 | 75 | <DataTemplate> |
| 75 | 删除: <StackPanel > | |
| 76 | 删除: <Border HorizontalAlignment="Stretch"> | |
| 76 | 新增: <!--<VirtualizingStackPanel>--> | |
| 77 | 新增: <!--<Border HorizontalAlignment="Stretch">--> | |
| 77 | 78 | <select:Option Visibility="{Binding Visibility}" HorizontalAlignment="Stretch" IsChecked="{Binding IsChoosed,Mode=TwoWay}" Value="{Binding Value}"/> |
| 78 | 79 | |
| 79 | 删除: </Border> | |
| 80 | 新增: <!--</Border>--> | |
| 80 | 81 | |
| 81 | 删除: </StackPanel> | |
| 82 | 新增: <!--</VirtualizingStackPanel>--> | |
| 82 | 83 | </DataTemplate> |
| 83 | 84 | </ListView.ItemTemplate> |
| 84 | 85 | </ListView> |
| @@ -88,20 +89,27 @@ | ||
| 88 | 89 | |
| 89 | 90 | </Border> |
| 90 | 91 | </Grid> |
| 91 | 删除: <StackPanel Margin="20"> | |
| 92 | 新增: | |
| 93 | 新增: | |
| 94 | 新增: <Grid Margin="20"> | |
| 95 | 新增: <Grid.RowDefinitions> | |
| 96 | 新增: <RowDefinition Height="auto"/> | |
| 97 | 新增: <RowDefinition Height="auto"/> | |
| 98 | 新增: <RowDefinition Height="*"/> | |
| 99 | 新增: </Grid.RowDefinitions> | |
| 92 | 100 | <StackPanel Orientation="Horizontal" Margin="0,0,0,20"> |
| 93 | 101 | <TextBlock FontSize="18" Text="分类"/> |
| 94 | 删除: <base:Icon IconType="Forward" Margin="10,0" FontSize="12" Foreground="#ccc"/> | |
| 102 | 新增: <base:Icon IconType="ChevronRightMed" Margin="10,0" FontSize="12" Foreground="#ccc"/> | |
| 95 | 103 | <TextBlock FontSize="18" Text="{Binding Category.Data.Name}"/> |
| 96 | 104 | |
| 97 | 105 | </StackPanel> |
| 98 | 删除: <TextBlock Text="应用列表"/> | |
| 106 | 新增: <TextBlock Grid.Row="1" Text="应用列表"/> | |
| 99 | 107 | |
| 100 | 删除: <Button:Button Content="选择" HorizontalAlignment="Right" Width="150" Command="{Binding ShowChooseCommand}"/> | |
| 101 | 删除: <base:View Condition="empty" Value="{Binding Data}"> | |
| 108 | 新增: <Button:Button Grid.Row="1" Content="选择" HorizontalAlignment="Right" Width="150" Command="{Binding ShowChooseCommand}"/> | |
| 109 | 新增: <base:View Grid.Row="2" Condition="empty" Value="{Binding Data}"> | |
| 102 | 110 | <base:EmptyData/> |
| 103 | 111 | </base:View> |
| 104 | 删除: <ListView ItemsSource="{Binding Data}" SelectedItem="{Binding SelectedItem,Mode=TwoWay}" Margin="0,20,0,0"> | |
| 112 | 新增: <ListView Grid.Row="2" ItemsSource="{Binding Data}" SelectedItem="{Binding SelectedItem,Mode=TwoWay}" Margin="0,20,0,0" VirtualizingPanel.IsVirtualizing="True" ScrollViewer.CanContentScroll="True"> | |
| 105 | 113 | <ListView.ContextMenu> |
| 106 | 114 | <ContextMenu> |
| 107 | 115 | |
| @@ -121,9 +129,9 @@ | ||
| 121 | 129 | <Setter Property="Template"> |
| 122 | 130 | <Setter.Value> |
| 123 | 131 | <ControlTemplate TargetType="{x:Type ListView}"> |
| 124 | 删除: <Border> | |
| 132 | 新增: <ScrollViewer> | |
| 125 | 133 | <ItemsPresenter /> |
| 126 | 删除: </Border> | |
| 134 | 新增: </ScrollViewer> | |
| 127 | 135 | </ControlTemplate> |
| 128 | 136 | </Setter.Value> |
| 129 | 137 | </Setter> |
| @@ -138,7 +146,6 @@ | ||
| 138 | 146 | <Border.Effect> |
| 139 | 147 | <DropShadowEffect Color="#f3f3f3" BlurRadius="1" Direction="300" ShadowDepth="4" Opacity="0.15" RenderingBias="Performance" ></DropShadowEffect> |
| 140 | 148 | </Border.Effect> |
| 141 | 删除: <ContentPresenter/> | |
| 142 | 149 | </Border> |
| 143 | 150 | |
| 144 | 151 | <Border BorderBrush="Transparent" BorderThickness="2" x:Name="Border" Background="{DynamicResource StandardBackgroundBrush2}" Margin="0,0,0,10" Padding="15" CornerRadius="10"> |
| @@ -161,20 +168,15 @@ | ||
| 161 | 168 | </ListBox.Resources> |
| 162 | 169 | <ListBox.ItemsPanel> |
| 163 | 170 | <ItemsPanelTemplate> |
| 164 | 删除: <StackPanel/> | |
| 171 | 新增: <VirtualizingStackPanel/> | |
| 165 | 172 | </ItemsPanelTemplate> |
| 166 | 173 | </ListBox.ItemsPanel> |
| 167 | 174 | <ListView.ItemTemplate> |
| 168 | 175 | <DataTemplate> |
| 169 | 删除: | |
| 170 | 删除: <WrapPanel Orientation="Horizontal"> | |
| 171 | 删除: <Border > | |
| 172 | 删除: | |
| 173 | 删除: | |
| 174 | 176 | <Grid> |
| 175 | 177 | <Grid.ColumnDefinitions> |
| 176 | 178 | <ColumnDefinition Width="50"/> |
| 177 | 删除: <ColumnDefinition Width="*"/> | |
| 179 | 新增: <ColumnDefinition Width="auto"/> | |
| 178 | 180 | </Grid.ColumnDefinitions> |
| 179 | 181 | <Border> |
| 180 | 182 | <base:Img Width="25" Height="25" URL="{Binding IconFile}"/> |
| @@ -189,12 +191,12 @@ | ||
| 189 | 191 | |
| 190 | 192 | |
| 191 | 193 | </Grid> |
| 192 | 删除: </Border> | |
| 193 | 删除: | |
| 194 | 删除: </WrapPanel> | |
| 195 | 194 | </DataTemplate> |
| 196 | 195 | </ListView.ItemTemplate> |
| 197 | 196 | </ListView> |
| 198 | 删除: </StackPanel> | |
| 197 | 新增: </Grid> | |
| 198 | 新增: | |
| 199 | 新增: | |
| 199 | 200 | </Grid> |
| 200 | 删除:</Page> | |
| 201 | 新增: | |
| 202 | 新增:</c:TPage> | |
| @@ -12,6 +12,7 @@ using System.Windows.Media; | ||
| 12 | 12 | using System.Windows.Media.Imaging; |
| 13 | 13 | using System.Windows.Navigation; |
| 14 | 14 | using System.Windows.Shapes; |
| 15 | 新增:using UI.Controls; | |
| 15 | 16 | using UI.ViewModels; |
| 16 | 17 | |
| 17 | 18 | namespace UI.Views |
| @@ -19,7 +20,7 @@ namespace UI.Views | ||
| 19 | 20 | /// <summary> |
| 20 | 21 | /// CategoryAppListPage.xaml 的交互逻辑 |
| 21 | 22 | /// </summary> |
| 22 | 删除: public partial class CategoryAppListPage : Page | |
| 23 | 新增: public partial class CategoryAppListPage : TPage | |
| 23 | 24 | { |
| 24 | 25 | public CategoryAppListPage(CategoryAppListPageVM vm) |
| 25 | 26 | { |

