统计页面 修改店铺选择,增加店铺搜索Combobox

This commit is contained in:
chfei committed 2026-08-07 11:25:19 +08:00
1 parent b6b72e6bc3
commit f12a7f14ea
16 files changed
+1801 -41

No files matched your search

@@ -2,10 +2,12 @@
x:Class="_29WxOrderWpf.Ctrls.Statistics.RevenueStatisticsSearchBar"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:c="clr-namespace:_29WxOrderWpf.Ctrls.Commons"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="clr-namespace:_29WxOrderWpf.Ctrls.Statistics.ViewModels"
d:DataContext="{d:DesignInstance Type=vm:ShopRevenueStatisticsViewModel,IsDesignTimeCreatable=True}"
d:DataContext="{d:DesignInstance Type=vm:ShopRevenueStatisticsViewModel,
IsDesignTimeCreatable=True}"
mc:Ignorable="d">
<UserControl.Resources>
<!-- 日期只允许从日历选择,禁止手工输入 -->
@@ -42,21 +44,23 @@
FontSize="14"
Foreground="#666666"
Text="时间" />
<ComboBox IsEnabled="False"
<ComboBox
Width="110"
Height="32"
VerticalContentAlignment="Center"
DisplayMemberPath="Text"
IsReadOnly="True"
BorderThickness="1"
ItemsSource="{Binding TimeRangeOptions}"
SelectedItem="{Binding SelectedTimeRange, Mode=TwoWay}"
Style="{StaticResource BaseComboBoxStyle}" />
Style="{StaticResource RoundedComboBox}" />
<TextBlock
Margin="14,0,6,0"
VerticalAlignment="Center"
FontSize="14"
Foreground="#666666"
Text="日期" />
<DatePicker
<DatePicker BorderBrush="{StaticResource pageColorBrush}"
Height="32"
VerticalContentAlignment="Center"
SelectedDate="{Binding StartDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
@@ -66,7 +70,7 @@
FontSize="14"
Foreground="#666666"
Text="~" />
<DatePicker
<DatePicker BorderBrush="{StaticResource pageColorBrush}"
Height="32"
VerticalContentAlignment="Center"
SelectedDate="{Binding EndDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
@@ -76,14 +80,21 @@
FontSize="14"
Foreground="#666666"
Text="店铺" />
<ComboBox IsEnabled="False"
<c:ShopFilterComboBox
Width="130"
Height="32"
DisplayMemberPath="ShopName"
IsGrouped="True"
ItemsSource="{Binding ShopOptions}"
SelectedItems="{Binding SelectedShops}" />
<!--<ComboBox IsEnabled="False"
Width="130"
Height="32"
VerticalContentAlignment="Center"
DisplayMemberPath="ShopName"
ItemsSource="{Binding ShopOptions}"
SelectedItem="{Binding SelectedShop, Mode=TwoWay}"
Style="{StaticResource BaseComboBoxStyle}" />
Style="{StaticResource BaseComboBoxStyle}" />-->
<Button
Height="32"
Margin="18,0,0,0"