xaml用制表符缩进 优化订单分配逻辑

This commit is contained in:
wule committed 2026-08-28 04:28:48 +08:00
1 parent 237fad81eb
commit aeb30c1171
22 files changed
+680 -230

No files matched your search

@@ -1048,7 +1048,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
bool isUpdate = false; bool isUpdate = false;
PddBuyerAfterSaleLiteInfo afterSale = null; PddBuyerAfterSaleLiteInfo afterSale = null;
if (!lstPddBuyerAfterSaleInfoLite.ToList().Any(or => or.afterSalesId == af.afterSalesId)) if (!lstPddBuyerAfterSaleInfoLite.Any(or => or.afterSalesId == af.afterSalesId))
{ {
isUpdate = true; isUpdate = true;
afterSale = af; afterSale = af;
@@ -642,8 +642,24 @@
<ColumnDefinition Width="auto" /> <ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" /> <ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" /> <ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<CheckBox
x:Name="chkNeedCheckExpress"
Margin="6,8"
HorizontalAlignment="Left"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Click="chkNeedCheckExpress_Click"
Content="需核对物流"
FontSize="12" />
<WrapPanel
Grid.Column="2"
d:Opacity="0.2"
d:Visibility="Visible"
Visibility="Collapsed">
<CheckBox <CheckBox
x:Name="chkWaitReceiveBuyerIsNotSend" x:Name="chkWaitReceiveBuyerIsNotSend"
Margin="6,8" Margin="6,8"
@@ -713,6 +729,7 @@
Click="chkWaitReceiveWarehouseStatus_Click" Click="chkWaitReceiveWarehouseStatus_Click"
Content="中转已出库" Content="中转已出库"
FontSize="12" /> FontSize="12" />
</WrapPanel>
</Grid> </Grid>
</Border> </Border>
</TabItem> </TabItem>
@@ -1459,6 +1459,14 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
if (!order.IsWaitReceive) if (!order.IsWaitReceive)
return true; return true;
if (chkNeedCheckExpress.IsChecked == true)
{
var rst1 = order.orderItems.Any(oi => !oi.TransitRefundStatusStr.IsNullOrEmpty() && !oi.TransitRefundStatusStr.Contains("退款成功"));
var rst2 = order.out_shipped == 2 && !string.IsNullOrEmpty(order.out_express_no);
if (!rst1 && !rst2)
return true;
}
if (chkWaitReceiveBuyerIsNotSend.IsChecked == true && order.orderItems.All(oi => oi.BuyerTransitWaybillStatusStr != "买手未发货")) if (chkWaitReceiveBuyerIsNotSend.IsChecked == true && order.orderItems.All(oi => oi.BuyerTransitWaybillStatusStr != "买手未发货"))
return true; return true;
if (chkWaitReceiveBuyerIsSend.IsChecked == true && order.orderItems.All(oi => oi.BuyerTransitWaybillStatusStr != "买手已发货")) if (chkWaitReceiveBuyerIsSend.IsChecked == true && order.orderItems.All(oi => oi.BuyerTransitWaybillStatusStr != "买手已发货"))
@@ -2524,6 +2532,17 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{ {
FilterOrders(); FilterOrders();
} }
private void chkNeedCheckExpress_Click(object sender, RoutedEventArgs e)
{
if (sender is CheckBox chk)
{
var isCheck = !chk.IsChecked.ParseToBool();
chkNeedCheckExpress.IsChecked = false;
chk.IsChecked = !isCheck;
}
FilterOrders();
}
} }
public class OrderFilterConfig : PropertyNotifyObject public class OrderFilterConfig : PropertyNotifyObject
@@ -1,11 +1,14 @@
<UserControl x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderListRowHeaderCtrl" <UserControl
x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderListRowHeaderCtrl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls" xmlns:uc="clr-namespace:_29WxOrderWpf.UserControls" xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
mc:Ignorable="d" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="50" d:DesignWidth="800"> xmlns:uc="clr-namespace:_29WxOrderWpf.UserControls"
d:DesignHeight="50"
d:DesignWidth="800"
mc:Ignorable="d">
<Border Background="{StaticResource ListRowBorderColorBrush}" CornerRadius="12,12,0,0"> <Border Background="{StaticResource ListRowBorderColorBrush}" CornerRadius="12,12,0,0">
<Grid> <Grid>
@@ -22,15 +25,59 @@
<ColumnDefinition Width="auto" /> <ColumnDefinition Width="auto" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="auto" /> <ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="20" /> <ColumnDefinition Width="20" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBox Grid.Column="0" Margin="8,8,-4,8" VerticalAlignment="Center" FontSize="20" Background="Transparent" IsReadOnly="True" Text="{Binding OrderBuyType}" BorderThickness="0" <TextBox
Visibility="{Binding OrderBuyType, Converter={StaticResource HasTextVisibility}}" Foreground="{Binding OrderBuyTypeColor}" FontWeight="ExtraBold"/> Grid.Column="0"
<TextBox Grid.Column="1" Margin="8,8,-4,8" VerticalAlignment="Center" FontSize="14" Background="Transparent" IsReadOnly="True" Text="店铺单号:" BorderThickness="0" /> Margin="8,8,-4,8"
<uc:UcWaterMarkTextBox1 Grid.Column="2" Foreground="{StaticResource PageLinkBrush}" Cursor="Hand" WaterMark="订单号" x:Name="txtOrderId" Margin="0,8,4,8" VerticalAlignment="Center" FontSize="14" Background="Transparent" IsReadOnly="True" Text="{Binding order_id}" BorderThickness="0" /> VerticalAlignment="Center"
<Border Grid.Column="3" Width="12" Background="Transparent" Height="12" VerticalAlignment="Center" Cursor="Hand" Background="Transparent"
Tag="{Binding order_id}" MouseLeftButtonDown="Path_MouseLeftButtonDown"> BorderThickness="0"
<Path Margin="0,0,0,0" Fill="{StaticResource PageLinkBrush}" Tag="{Binding order_id}" MouseLeftButtonDown="Path_MouseLeftButtonDown" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z" Stretch="Uniform" /> FontSize="20"
FontWeight="ExtraBold"
Foreground="{Binding OrderBuyTypeColor}"
IsReadOnly="True"
Text="{Binding OrderBuyType}"
Visibility="{Binding OrderBuyType, Converter={StaticResource HasTextVisibility}}" />
<TextBox
Grid.Column="1"
Margin="8,8,-4,8"
VerticalAlignment="Center"
Background="Transparent"
BorderThickness="0"
FontSize="14"
IsReadOnly="True"
Text="店铺单号:" />
<uc:UcWaterMarkTextBox1
x:Name="txtOrderId"
Grid.Column="2"
Margin="0,8,4,8"
VerticalAlignment="Center"
Background="Transparent"
BorderThickness="0"
Cursor="Hand"
FontSize="14"
Foreground="{StaticResource PageLinkBrush}"
IsReadOnly="True"
Text="{Binding order_id}"
WaterMark="订单号" />
<Border
Grid.Column="3"
Width="12"
Height="12"
VerticalAlignment="Center"
Background="Transparent"
Cursor="Hand"
MouseLeftButtonDown="Path_MouseLeftButtonDown"
Tag="{Binding order_id}">
<Path
Margin="0,0,0,0"
Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
Fill="{StaticResource PageLinkBrush}"
MouseLeftButtonDown="Path_MouseLeftButtonDown"
Stretch="Uniform"
Tag="{Binding order_id}" />
</Border> </Border>
<!--<Border x:Name="borderDeadline" Grid.Column="3" Margin="8,0,0,0" Background="#e8fbf9" BorderBrush="#d0fbea" BorderThickness="1" MinWidth="30" Height="24" CornerRadius="2"> <!--<Border x:Name="borderDeadline" Grid.Column="3" Margin="8,0,0,0" Background="#e8fbf9" BorderBrush="#d0fbea" BorderThickness="1" MinWidth="30" Height="24" CornerRadius="2">
@@ -47,45 +94,154 @@
Text="{Binding DeliveryDeadlineStr}" BorderThickness="0" /> Text="{Binding DeliveryDeadlineStr}" BorderThickness="0" />
</Grid> </Grid>
</Border>--> </Border>-->
<Border Grid.Column="4" x:Name="borderDeadline" Margin="8,0,0,0" Background="{Binding StatusBoxBackColor}" BorderBrush="{Binding StatusBoxBorderColor}" BorderThickness="1" MinWidth="30" Height="24" CornerRadius="2"> <Border
x:Name="borderDeadline"
Grid.Column="4"
Height="24"
MinWidth="30"
Margin="8,0,0,0"
Background="{Binding StatusBoxBackColor}"
BorderBrush="{Binding StatusBoxBorderColor}"
BorderThickness="1"
CornerRadius="2">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition></ColumnDefinition> <ColumnDefinition />
<ColumnDefinition></ColumnDefinition> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Border x:Name="borderDeadlineHead" Background="{Binding StatusBoxForeColor}" CornerRadius="2,0,10,2"> <Border
<TextBox Grid.Column="0" Margin="2,0,2,1" Foreground="White" VerticalContentAlignment="Center" VerticalAlignment="Center" Background="Transparent" IsReadOnly="True" MinWidth="20" x:Name="borderDeadlineHead"
Text="{Binding DeliveryDeadlineStatusStr}" BorderThickness="0" /> Background="{Binding StatusBoxForeColor}"
CornerRadius="2,0,10,2">
<TextBox
Grid.Column="0"
MinWidth="20"
Margin="2,0,2,1"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Background="Transparent"
BorderThickness="0"
Foreground="White"
IsReadOnly="True"
Text="{Binding DeliveryDeadlineStatusStr}" />
</Border> </Border>
<TextBox x:Name="txtDeadline" Grid.Column="1" Margin="2,0,2,1" Foreground="{Binding StatusBoxForeColor}" VerticalContentAlignment="Center" VerticalAlignment="Center" Background="Transparent" IsReadOnly="True" MinWidth="20" <TextBox
Text="{Binding DeliveryDeadlineStr}" BorderThickness="0" /> x:Name="txtDeadline"
Grid.Column="1"
MinWidth="20"
Margin="2,0,2,1"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Background="Transparent"
BorderThickness="0"
Foreground="{Binding StatusBoxForeColor}"
IsReadOnly="True"
Text="{Binding DeliveryDeadlineStr}" />
</Grid> </Grid>
</Border> </Border>
<Image Grid.Column="5" Margin="8,8,0,8" Width="24" Height="24" Source="{StaticResource imgOrderWeishopIcon}"></Image> <Image
<uc:UcWaterMarkTextBox1 WaterMark="店铺状态" x:Name="txtShopLoginStatus" Grid.Column="5" HorizontalAlignment="Right" Margin="0,12,-6,0" Padding="0" FontWeight="Bold" Grid.Column="5"
VerticalAlignment="Center" FontSize="7" Background="{StaticResource ListHeadBackColorBrush}" IsReadOnly="True" Width="24"
Text="{Binding Shop.LoginStatusStr}" BorderThickness="0" Height="24"
Foreground="{Binding Shop.LoginStatusStr, Converter={StaticResource statusToColorBrushConverter}}"/> Margin="8,8,0,8"
<uc:UcWaterMarkTextBox1 Grid.Column="6" Foreground="{StaticResource PageLinkBrush}" Cursor="Hand" WaterMark="店铺名称" x:Name="txtShopName" Margin="4,8,4,8" VerticalAlignment="Center" Source="{StaticResource imgOrderWeishopIcon}" />
FontSize="14" Background="Transparent" IsReadOnly="True" Text="{Binding shop_name}" BorderThickness="0" /> <uc:UcWaterMarkTextBox1
x:Name="txtShopLoginStatus"
Grid.Column="5"
Margin="0,12,-6,0"
Padding="0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Background="{StaticResource ListHeadBackColorBrush}"
BorderThickness="0"
FontSize="7"
FontWeight="Bold"
Foreground="{Binding Shop.LoginStatusStr, Converter={StaticResource statusToColorBrushConverter}}"
IsReadOnly="True"
Text="{Binding Shop.LoginStatusStr}"
WaterMark="店铺状态" />
<uc:UcWaterMarkTextBox1
x:Name="txtShopName"
Grid.Column="6"
Margin="4,8,4,8"
VerticalAlignment="Center"
Background="Transparent"
BorderThickness="0"
Cursor="Hand"
FontSize="14"
Foreground="{StaticResource PageLinkBrush}"
IsReadOnly="True"
Text="{Binding shop_name}"
WaterMark="店铺名称" />
<Border Grid.Column="7" Width="12" Background="Transparent" Height="12" VerticalAlignment="Center" Cursor="Hand" <Border
Tag="{Binding order_id}" MouseLeftButtonDown="pathShop_MouseLeftButtonDown"> Grid.Column="7"
<Path Margin="0,0,0,0" Fill="{StaticResource PageLinkBrush}" Tag="{Binding order_id}" MouseLeftButtonDown="pathShop_MouseLeftButtonDown" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z" Stretch="Uniform" /> Width="12"
Height="12"
VerticalAlignment="Center"
Background="Transparent"
Cursor="Hand"
MouseLeftButtonDown="pathShop_MouseLeftButtonDown"
Tag="{Binding order_id}">
<Path
Margin="0,0,0,0"
Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
Fill="{StaticResource PageLinkBrush}"
MouseLeftButtonDown="pathShop_MouseLeftButtonDown"
Stretch="Uniform"
Tag="{Binding order_id}" />
</Border> </Border>
<uc:UcWaterMarkTextBox1 WaterMark="该订单共有 1 条不同商品记录" x:Name="txtCount" Grid.Column="9" Margin="8,8,0,8" VerticalAlignment="Center" FontSize="14" Background="Transparent" IsReadOnly="True" BorderThickness="0" /> <uc:UcWaterMarkTextBox1
x:Name="txtCount"
Grid.Column="9"
Margin="8,8,0,8"
VerticalAlignment="Center"
d:Text="该订单共有 x 条不同商品记录"
Background="Transparent"
BorderThickness="0"
FontSize="14"
Foreground="Gray"
IsReadOnly="True"
WaterMark="该订单共有 1 条不同商品记录" />
<TextBlock
Grid.Column="11"
Margin="10"
VerticalAlignment="Center"
d:Text="仅退款/退货退款"
Foreground="Gray"
Text="{Binding RefundTypeStr}" />
<Border Grid.Column="11" Width="auto" Height="15" Background="Transparent" VerticalAlignment="Center" Cursor="Hand" Margin="2" x:Name="borderFlag" MouseLeftButtonDown="borderFlag_MouseLeftButtonDown"> <Border
x:Name="borderFlag"
Grid.Column="12"
Width="auto"
Height="15"
Margin="2"
VerticalAlignment="Center"
Background="Transparent"
Cursor="Hand"
MouseLeftButtonDown="borderFlag_MouseLeftButtonDown">
<!--<Path Margin="0,0,0,0" Fill="{StaticResource FlagGrayBrush}" Data="M 0,0 L 1,0 L 1,1 L 10,1 L 7,4 L 10,7 L 1,7 L 1,12 L 0,12 Z" Stretch="Uniform" />--> <!--<Path Margin="0,0,0,0" Fill="{StaticResource FlagGrayBrush}" Data="M 0,0 L 1,0 L 1,1 L 10,1 L 7,4 L 10,7 L 1,7 L 1,12 L 0,12 Z" Stretch="Uniform" />-->
<WrapPanel VerticalAlignment="Center"> <WrapPanel VerticalAlignment="Center">
<TextBlock Text="隐藏标记" FontSize="12" VerticalAlignment="Center" Foreground="Gray"></TextBlock> <TextBlock
<Path Margin="2,0,0,0" Height="15" Width="15" Fill="{Binding colour_flag,Converter={StaticResource flagColorConverter}}" Data="M 0,0 L 1,0 L 1,1 L 10,1 L 7,4 L 10,7 L 1,7 L 1,12 L 0,12 Z" Stretch="Uniform" /> VerticalAlignment="Center"
FontSize="12"
Foreground="Gray"
Text="隐藏标记" />
<Path
Width="15"
Height="15"
Margin="2,0,0,0"
d:Fill="SkyBlue"
Data="M 0,0 L 1,0 L 1,1 L 10,1 L 7,4 L 10,7 L 1,7 L 1,12 L 0,12 Z"
Fill="{Binding colour_flag, Converter={StaticResource flagColorConverter}}"
Stretch="Uniform" />
</WrapPanel> </WrapPanel>
</Border> </Border>
@@ -547,7 +547,8 @@
Style="{StaticResource TextBlockIcon}" Style="{StaticResource TextBlockIcon}"
Text="{StaticResource txt-gift}" /> Text="{StaticResource txt-gift}" />
<TextBlock <TextBlock
VerticalAlignment="Center" d:Text="礼物发货成功" VerticalAlignment="Center"
d:Text="礼物发货成功"
Foreground="{Binding ElementName=b_gift, Path=BorderBrush}" Foreground="{Binding ElementName=b_gift, Path=BorderBrush}"
Text="{Binding ItemOrder.GiftOrderStatusStr}" /> Text="{Binding ItemOrder.GiftOrderStatusStr}" />
</WrapPanel> </WrapPanel>
@@ -1114,7 +1114,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{ {
if (this.DataContext is oms_wei_order_item_info orderItem) if (this.DataContext is oms_wei_order_item_info orderItem)
{ {
if (orderItem.ItemTransitOrder?.warehouse_status != 2 && orderItem.ItemTransitOrder?.warehouse_status != 1 && orderItem.AddEditTransitWarehouseAfterSaleStr == "添加") if (orderItem.ItemTransitOrder?.warehouse_status != 3 && orderItem.ItemTransitOrder?.warehouse_status != 2 && orderItem.ItemTransitOrder?.warehouse_status != 1 && orderItem.AddEditTransitWarehouseAfterSaleStr == "添加")
{ {
BaseMsgWindow.ShowError("商品未出库,请选择中转仓拒收!"); BaseMsgWindow.ShowError("商品未出库,请选择中转仓拒收!");
return; return;
@@ -1,12 +1,11 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> <Style x:Key="LineEllipse" TargetType="Ellipse">
<Style TargetType="Ellipse" x:Key="LineEllipse"> <Setter Property="Width" Value="7" />
<Setter Property="Width" Value="7"></Setter> <Setter Property="Height" Value="7" />
<Setter Property="Height" Value="7"></Setter> <Setter Property="Fill" Value="White" />
<Setter Property="Fill" Value="White"></Setter> <Setter Property="Stroke" Value="#1677ff" />
<Setter Property="Stroke" Value="#1677ff"></Setter> <Setter Property="StrokeThickness" Value="2" />
<Setter Property="StrokeThickness" Value="2"></Setter> <Setter Property="ToolTipService.InitialShowDelay" Value="50" />
<Setter Property="ToolTipService.InitialShowDelay" Value="50"></Setter>
<Setter Property="ToolTipService.BetweenShowDelay" Value="0" /> <Setter Property="ToolTipService.BetweenShowDelay" Value="0" />
<Style.Triggers> <Style.Triggers>
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
+1 -2
View File
@@ -1,5 +1,4 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="Charts\Chart.xaml" /> <ResourceDictionary Source="Charts\Chart.xaml" />
+82 -53
View File
@@ -1,5 +1,4 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- 使用自定义属性模板去除Button高亮显示框 --> <!-- 使用自定义属性模板去除Button高亮显示框 -->
<!--<Style TargetType="Button"> <!--<Style TargetType="Button">
<Setter Property="Cursor" Value="Hand"></Setter> <Setter Property="Cursor" Value="Hand"></Setter>
@@ -40,22 +39,27 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="Button"> <ControlTemplate TargetType="Button">
<Border x:Name="buttonBorder" Background="{DynamicResource mainColorBrush}" Cursor="Hand" <Border
BorderBrush="{DynamicResource mainColorDarkBrush}" CornerRadius="0" x:Name="buttonBorder"
BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}"> Padding="{TemplateBinding Padding}"
<ContentPresenter Content="{TemplateBinding Content}" Background="{DynamicResource mainColorBrush}"
ContentStringFormat="{TemplateBinding ContentStringFormat}" BorderBrush="{DynamicResource mainColorDarkBrush}"
ContentTemplate="{TemplateBinding ContentTemplate}" BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="0"
Cursor="Hand">
<ContentPresenter
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"> VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
</ContentPresenter> Content="{TemplateBinding Content}"
ContentStringFormat="{TemplateBinding ContentStringFormat}"
ContentTemplate="{TemplateBinding ContentTemplate}" />
</Border> </Border>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" TargetName="buttonBorder" Value="{DynamicResource mainColorDarkBrush}"/> <Setter TargetName="buttonBorder" Property="Background" Value="{DynamicResource mainColorDarkBrush}" />
</Trigger> </Trigger>
<Trigger Property="IsPressed" Value="True"> <Trigger Property="IsPressed" Value="True">
<Setter Property="Background" TargetName="buttonBorder" Value="{DynamicResource mainColorDarkBrush}"/> <Setter TargetName="buttonBorder" Property="Background" Value="{DynamicResource mainColorDarkBrush}" />
</Trigger> </Trigger>
<Trigger Property="IsEnabled" Value="False"> <Trigger Property="IsEnabled" Value="False">
<Setter Property="Opacity" Value="0.5" /> <Setter Property="Opacity" Value="0.5" />
@@ -71,23 +75,28 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="Button"> <ControlTemplate TargetType="Button">
<Border x:Name="buttonBorder" Background="{DynamicResource mainColorLightBrush}" Cursor="Hand" <Border
BorderBrush="{DynamicResource mainColorBrush}" CornerRadius="0" x:Name="buttonBorder"
BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}"> Padding="{TemplateBinding Padding}"
<ContentPresenter Content="{TemplateBinding Content}" Background="{DynamicResource mainColorLightBrush}"
ContentStringFormat="{TemplateBinding ContentStringFormat}" BorderBrush="{DynamicResource mainColorBrush}"
ContentTemplate="{TemplateBinding ContentTemplate}" BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="0"
Cursor="Hand">
<ContentPresenter
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"> VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
</ContentPresenter> Content="{TemplateBinding Content}"
ContentStringFormat="{TemplateBinding ContentStringFormat}"
ContentTemplate="{TemplateBinding ContentTemplate}" />
</Border> </Border>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" TargetName="buttonBorder" Value="{DynamicResource mainColorDarkBrush}"/> <Setter TargetName="buttonBorder" Property="Background" Value="{DynamicResource mainColorDarkBrush}" />
<Setter Property="Foreground" Value="{DynamicResource mainColorLightBrush}" /> <Setter Property="Foreground" Value="{DynamicResource mainColorLightBrush}" />
</Trigger> </Trigger>
<Trigger Property="IsPressed" Value="True"> <Trigger Property="IsPressed" Value="True">
<Setter Property="Background" TargetName="buttonBorder" Value="{DynamicResource mainColorDarkBrush}"/> <Setter TargetName="buttonBorder" Property="Background" Value="{DynamicResource mainColorDarkBrush}" />
<Setter Property="Foreground" Value="{DynamicResource mainColorLightBrush}" /> <Setter Property="Foreground" Value="{DynamicResource mainColorLightBrush}" />
</Trigger> </Trigger>
<Trigger Property="IsEnabled" Value="False"> <Trigger Property="IsEnabled" Value="False">
@@ -104,22 +113,27 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="Button"> <ControlTemplate TargetType="Button">
<Border x:Name="buttonBorder" Background="{DynamicResource pageColorBrush}" Cursor="Hand" <Border
BorderBrush="{DynamicResource pageColorDarkBrush}" CornerRadius="4" x:Name="buttonBorder"
BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}"> Padding="{TemplateBinding Padding}"
<ContentPresenter Content="{TemplateBinding Content}" Background="{DynamicResource pageColorBrush}"
ContentStringFormat="{TemplateBinding ContentStringFormat}" BorderBrush="{DynamicResource pageColorDarkBrush}"
ContentTemplate="{TemplateBinding ContentTemplate}" BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="4"
Cursor="Hand">
<ContentPresenter
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"> VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
</ContentPresenter> Content="{TemplateBinding Content}"
ContentStringFormat="{TemplateBinding ContentStringFormat}"
ContentTemplate="{TemplateBinding ContentTemplate}" />
</Border> </Border>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" TargetName="buttonBorder" Value="{DynamicResource pageColorDarkBrush}"/> <Setter TargetName="buttonBorder" Property="Background" Value="{DynamicResource pageColorDarkBrush}" />
</Trigger> </Trigger>
<Trigger Property="IsPressed" Value="True"> <Trigger Property="IsPressed" Value="True">
<Setter Property="Background" TargetName="buttonBorder" Value="{DynamicResource pageColorDarkBrush}"/> <Setter TargetName="buttonBorder" Property="Background" Value="{DynamicResource pageColorDarkBrush}" />
</Trigger> </Trigger>
<Trigger Property="IsEnabled" Value="False"> <Trigger Property="IsEnabled" Value="False">
<Setter Property="Opacity" Value="0.5" /> <Setter Property="Opacity" Value="0.5" />
@@ -135,22 +149,27 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="Button"> <ControlTemplate TargetType="Button">
<Border x:Name="buttonBorder" Background="{DynamicResource pageColorBrush}" Cursor="Hand" <Border
BorderBrush="{DynamicResource pageColorDarkBrush}" CornerRadius="0 4 4 0" x:Name="buttonBorder"
BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}"> Padding="{TemplateBinding Padding}"
<ContentPresenter Content="{TemplateBinding Content}" Background="{DynamicResource pageColorBrush}"
ContentStringFormat="{TemplateBinding ContentStringFormat}" BorderBrush="{DynamicResource pageColorDarkBrush}"
ContentTemplate="{TemplateBinding ContentTemplate}" BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="0 4 4 0"
Cursor="Hand">
<ContentPresenter
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"> VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
</ContentPresenter> Content="{TemplateBinding Content}"
ContentStringFormat="{TemplateBinding ContentStringFormat}"
ContentTemplate="{TemplateBinding ContentTemplate}" />
</Border> </Border>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" TargetName="buttonBorder" Value="{DynamicResource pageColorDarkBrush}"/> <Setter TargetName="buttonBorder" Property="Background" Value="{DynamicResource pageColorDarkBrush}" />
</Trigger> </Trigger>
<Trigger Property="IsPressed" Value="True"> <Trigger Property="IsPressed" Value="True">
<Setter Property="Background" TargetName="buttonBorder" Value="{DynamicResource pageColorDarkBrush}"/> <Setter TargetName="buttonBorder" Property="Background" Value="{DynamicResource pageColorDarkBrush}" />
</Trigger> </Trigger>
<Trigger Property="IsEnabled" Value="False"> <Trigger Property="IsEnabled" Value="False">
<Setter Property="Opacity" Value="0.5" /> <Setter Property="Opacity" Value="0.5" />
@@ -168,29 +187,39 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="Button"> <ControlTemplate TargetType="Button">
<Border x:Name="btnBorder" Background="{TemplateBinding Background}" Cursor="Hand" <Border
BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="4" x:Name="btnBorder"
BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}"> Padding="{TemplateBinding Padding}"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="4"
Cursor="Hand">
<!--<ContentPresenter Content="{TemplateBinding Content}" <!--<ContentPresenter Content="{TemplateBinding Content}"
ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentStringFormat="{TemplateBinding ContentStringFormat}"
ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplate="{TemplateBinding ContentTemplate}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"> VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
</ContentPresenter>--> </ContentPresenter>-->
<Label Content="{TemplateBinding Content}" Foreground="{TemplateBinding Foreground}" <Label
ContentStringFormat="{TemplateBinding ContentStringFormat}" x:Name="lblContent" x:Name="lblContent"
ContentTemplate="{TemplateBinding ContentTemplate}" Padding="0" Margin="0" Margin="0"
Padding="0"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/> VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Content="{TemplateBinding Content}"
ContentStringFormat="{TemplateBinding ContentStringFormat}"
ContentTemplate="{TemplateBinding ContentTemplate}"
Foreground="{TemplateBinding Foreground}" />
</Border> </Border>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
<Setter Property="Foreground" TargetName="lblContent" Value="{DynamicResource pageColorLightBrush}"/> <Setter TargetName="lblContent" Property="Foreground" Value="{DynamicResource pageColorLightBrush}" />
<Setter Property="Background" TargetName="btnBorder" Value="{DynamicResource pageColorDarkBrush}"/> <Setter TargetName="btnBorder" Property="Background" Value="{DynamicResource pageColorDarkBrush}" />
</Trigger> </Trigger>
<Trigger Property="IsPressed" Value="True"> <Trigger Property="IsPressed" Value="True">
<Setter Property="Foreground" TargetName="lblContent" Value="{DynamicResource pageColorLightBrush}"/> <Setter TargetName="lblContent" Property="Foreground" Value="{DynamicResource pageColorLightBrush}" />
<Setter Property="Background" TargetName="btnBorder" Value="{DynamicResource pageColorDarkBrush}"/> <Setter TargetName="btnBorder" Property="Background" Value="{DynamicResource pageColorDarkBrush}" />
</Trigger> </Trigger>
<Trigger Property="IsEnabled" Value="False"> <Trigger Property="IsEnabled" Value="False">
<Setter Property="Opacity" Value="0.5" /> <Setter Property="Opacity" Value="0.5" />
+198 -79
View File
@@ -1,12 +1,16 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- xmlns:theme="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero" --> <!-- xmlns:theme="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero" -->
<Style x:Key="FocusVisual"> <Style x:Key="FocusVisual">
<Setter Property="Control.Template"> <Setter Property="Control.Template">
<Setter.Value> <Setter.Value>
<ControlTemplate> <ControlTemplate>
<Rectangle Margin="2" StrokeDashArray="1 2" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" SnapsToDevicePixels="true" StrokeThickness="1"/> <Rectangle
Margin="2"
SnapsToDevicePixels="true"
Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
StrokeDashArray="1 2"
StrokeThickness="1" />
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
@@ -24,7 +28,12 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type TextBox}"> <ControlTemplate TargetType="{x:Type TextBox}">
<ScrollViewer x:Name="PART_ContentHost" Background="Transparent" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/> <ScrollViewer
x:Name="PART_ContentHost"
Background="Transparent"
Focusable="false"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Hidden" />
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
@@ -40,30 +49,30 @@
<SolidColorBrush x:Key="ComboBox.Static.Editable.Border" Color="#FFABADB3" /> <SolidColorBrush x:Key="ComboBox.Static.Editable.Border" Color="#FFABADB3" />
<SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Background" Color="Transparent" /> <SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Background" Color="Transparent" />
<SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Border" Color="Transparent" /> <SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Border" Color="Transparent" />
<LinearGradientBrush x:Key="ComboBox.MouseOver.Background" EndPoint="0,1" StartPoint="0,0"> <LinearGradientBrush x:Key="ComboBox.MouseOver.Background" StartPoint="0,0" EndPoint="0,1">
<GradientStop Color="#FFECF4FC" Offset="0.0"/> <GradientStop Offset="0.0" Color="#FFECF4FC" />
<GradientStop Color="#FFDCECFC" Offset="1.0"/> <GradientStop Offset="1.0" Color="#FFDCECFC" />
</LinearGradientBrush> </LinearGradientBrush>
<SolidColorBrush x:Key="ComboBox.MouseOver.Border" Color="#FF7EB4EA" /> <SolidColorBrush x:Key="ComboBox.MouseOver.Border" Color="#FF7EB4EA" />
<SolidColorBrush x:Key="ComboBox.MouseOver.Glyph" Color="#FF000000" /> <SolidColorBrush x:Key="ComboBox.MouseOver.Glyph" Color="#FF000000" />
<SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Background" Color="#FFFFFFFF" /> <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Background" Color="#FFFFFFFF" />
<SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Border" Color="#FF7EB4EA" /> <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Border" Color="#FF7EB4EA" />
<LinearGradientBrush x:Key="ComboBox.MouseOver.Editable.Button.Background" EndPoint="0,1" StartPoint="0,0"> <LinearGradientBrush x:Key="ComboBox.MouseOver.Editable.Button.Background" StartPoint="0,0" EndPoint="0,1">
<GradientStop Color="#FFEBF4FC" Offset="0.0"/> <GradientStop Offset="0.0" Color="#FFEBF4FC" />
<GradientStop Color="#FFDCECFC" Offset="1.0"/> <GradientStop Offset="1.0" Color="#FFDCECFC" />
</LinearGradientBrush> </LinearGradientBrush>
<SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Button.Border" Color="#FF7EB4EA" /> <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Button.Border" Color="#FF7EB4EA" />
<LinearGradientBrush x:Key="ComboBox.Pressed.Background" EndPoint="0,1" StartPoint="0,0"> <LinearGradientBrush x:Key="ComboBox.Pressed.Background" StartPoint="0,0" EndPoint="0,1">
<GradientStop Color="#FFDAECFC" Offset="0.0"/> <GradientStop Offset="0.0" Color="#FFDAECFC" />
<GradientStop Color="#FFC4E0FC" Offset="1.0"/> <GradientStop Offset="1.0" Color="#FFC4E0FC" />
</LinearGradientBrush> </LinearGradientBrush>
<SolidColorBrush x:Key="ComboBox.Pressed.Border" Color="#FF569DE5" /> <SolidColorBrush x:Key="ComboBox.Pressed.Border" Color="#FF569DE5" />
<SolidColorBrush x:Key="ComboBox.Pressed.Glyph" Color="#FF000000" /> <SolidColorBrush x:Key="ComboBox.Pressed.Glyph" Color="#FF000000" />
<SolidColorBrush x:Key="ComboBox.Pressed.Editable.Background" Color="#FFFFFFFF" /> <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Background" Color="#FFFFFFFF" />
<SolidColorBrush x:Key="ComboBox.Pressed.Editable.Border" Color="#FF569DE5" /> <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Border" Color="#FF569DE5" />
<LinearGradientBrush x:Key="ComboBox.Pressed.Editable.Button.Background" EndPoint="0,1" StartPoint="0,0"> <LinearGradientBrush x:Key="ComboBox.Pressed.Editable.Button.Background" StartPoint="0,0" EndPoint="0,1">
<GradientStop Color="#FFDAEBFC" Offset="0.0"/> <GradientStop Offset="0.0" Color="#FFDAEBFC" />
<GradientStop Color="#FFC4E0FC" Offset="1.0"/> <GradientStop Offset="1.0" Color="#FFC4E0FC" />
</LinearGradientBrush> </LinearGradientBrush>
<SolidColorBrush x:Key="ComboBox.Pressed.Editable.Button.Border" Color="#FF569DE5" /> <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Button.Border" Color="#FF569DE5" />
<SolidColorBrush x:Key="ComboBox.Disabled.Background" Color="#FFF0F0F0" /> <SolidColorBrush x:Key="ComboBox.Disabled.Background" Color="#FFF0F0F0" />
@@ -81,9 +90,27 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type ToggleButton}"> <ControlTemplate TargetType="{x:Type ToggleButton}">
<Border x:Name="templateRoot" Background="{StaticResource ComboBox.Static.Background}" BorderBrush="{StaticResource ComboBox.Static.Border}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true"> <Border
<Border x:Name="splitBorder" BorderBrush="Transparent" BorderThickness="1" HorizontalAlignment="Right" Margin="0" SnapsToDevicePixels="true" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}"> x:Name="templateRoot"
<Path x:Name="arrow" Data="F1 M 0,0 L 2.667,2.66665 L 5.3334,0 L 5.3334,-1.78168 L 2.6667,0.88501 L0,-1.78168 L0,0 Z" Fill="{StaticResource ComboBox.Static.Glyph}" HorizontalAlignment="Center" Margin="0" VerticalAlignment="Center"/> Background="{StaticResource ComboBox.Static.Background}"
BorderBrush="{StaticResource ComboBox.Static.Border}"
BorderThickness="{TemplateBinding BorderThickness}"
SnapsToDevicePixels="true">
<Border
x:Name="splitBorder"
Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}"
Margin="0"
HorizontalAlignment="Right"
BorderBrush="Transparent"
BorderThickness="1"
SnapsToDevicePixels="true">
<Path
x:Name="arrow"
Margin="0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Data="F1 M 0,0 L 2.667,2.66665 L 5.3334,0 L 5.3334,-1.78168 L 2.6667,0.88501 L0,-1.78168 L0,0 Z"
Fill="{StaticResource ComboBox.Static.Glyph}" />
</Border> </Border>
</Border> </Border>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
@@ -94,73 +121,73 @@
<Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="false" /> <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="false" />
<Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="true" /> <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="true" />
</MultiDataTrigger.Conditions> </MultiDataTrigger.Conditions>
<Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.Static.Editable.Background}"/> <Setter TargetName="templateRoot" Property="Background" Value="{StaticResource ComboBox.Static.Editable.Background}" />
<Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.Static.Editable.Border}"/> <Setter TargetName="templateRoot" Property="BorderBrush" Value="{StaticResource ComboBox.Static.Editable.Border}" />
<Setter Property="Background" TargetName="splitBorder" Value="{StaticResource ComboBox.Static.Editable.Button.Background}"/> <Setter TargetName="splitBorder" Property="Background" Value="{StaticResource ComboBox.Static.Editable.Button.Background}" />
<Setter Property="BorderBrush" TargetName="splitBorder" Value="{StaticResource ComboBox.Static.Editable.Button.Border}"/> <Setter TargetName="splitBorder" Property="BorderBrush" Value="{StaticResource ComboBox.Static.Editable.Button.Border}" />
</MultiDataTrigger> </MultiDataTrigger>
<Trigger Property="IsMouseOver" Value="true"> <Trigger Property="IsMouseOver" Value="true">
<Setter Property="Fill" TargetName="arrow" Value="{StaticResource ComboBox.MouseOver.Glyph}"/> <Setter TargetName="arrow" Property="Fill" Value="{StaticResource ComboBox.MouseOver.Glyph}" />
</Trigger> </Trigger>
<MultiDataTrigger> <MultiDataTrigger>
<MultiDataTrigger.Conditions> <MultiDataTrigger.Conditions>
<Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true" /> <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true" />
<Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="false" /> <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="false" />
</MultiDataTrigger.Conditions> </MultiDataTrigger.Conditions>
<Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.MouseOver.Background}"/> <Setter TargetName="templateRoot" Property="Background" Value="{StaticResource ComboBox.MouseOver.Background}" />
<Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.MouseOver.Border}"/> <Setter TargetName="templateRoot" Property="BorderBrush" Value="{StaticResource ComboBox.MouseOver.Border}" />
</MultiDataTrigger> </MultiDataTrigger>
<MultiDataTrigger> <MultiDataTrigger>
<MultiDataTrigger.Conditions> <MultiDataTrigger.Conditions>
<Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true" /> <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true" />
<Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="true" /> <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="true" />
</MultiDataTrigger.Conditions> </MultiDataTrigger.Conditions>
<Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.MouseOver.Editable.Background}"/> <Setter TargetName="templateRoot" Property="Background" Value="{StaticResource ComboBox.MouseOver.Editable.Background}" />
<Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.MouseOver.Editable.Border}"/> <Setter TargetName="templateRoot" Property="BorderBrush" Value="{StaticResource ComboBox.MouseOver.Editable.Border}" />
<Setter Property="Background" TargetName="splitBorder" Value="{StaticResource ComboBox.MouseOver.Editable.Button.Background}"/> <Setter TargetName="splitBorder" Property="Background" Value="{StaticResource ComboBox.MouseOver.Editable.Button.Background}" />
<Setter Property="BorderBrush" TargetName="splitBorder" Value="{StaticResource ComboBox.MouseOver.Editable.Button.Border}"/> <Setter TargetName="splitBorder" Property="BorderBrush" Value="{StaticResource ComboBox.MouseOver.Editable.Button.Border}" />
</MultiDataTrigger> </MultiDataTrigger>
<Trigger Property="IsPressed" Value="true"> <Trigger Property="IsPressed" Value="true">
<Setter Property="Fill" TargetName="arrow" Value="{StaticResource ComboBox.Pressed.Glyph}"/> <Setter TargetName="arrow" Property="Fill" Value="{StaticResource ComboBox.Pressed.Glyph}" />
</Trigger> </Trigger>
<MultiDataTrigger> <MultiDataTrigger>
<MultiDataTrigger.Conditions> <MultiDataTrigger.Conditions>
<Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="true" /> <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="true" />
<Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="false" /> <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="false" />
</MultiDataTrigger.Conditions> </MultiDataTrigger.Conditions>
<Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.Pressed.Background}"/> <Setter TargetName="templateRoot" Property="Background" Value="{StaticResource ComboBox.Pressed.Background}" />
<Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.Pressed.Border}"/> <Setter TargetName="templateRoot" Property="BorderBrush" Value="{StaticResource ComboBox.Pressed.Border}" />
</MultiDataTrigger> </MultiDataTrigger>
<MultiDataTrigger> <MultiDataTrigger>
<MultiDataTrigger.Conditions> <MultiDataTrigger.Conditions>
<Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="true" /> <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="true" />
<Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="true" /> <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="true" />
</MultiDataTrigger.Conditions> </MultiDataTrigger.Conditions>
<Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.Pressed.Editable.Background}"/> <Setter TargetName="templateRoot" Property="Background" Value="{StaticResource ComboBox.Pressed.Editable.Background}" />
<Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.Pressed.Editable.Border}"/> <Setter TargetName="templateRoot" Property="BorderBrush" Value="{StaticResource ComboBox.Pressed.Editable.Border}" />
<Setter Property="Background" TargetName="splitBorder" Value="{StaticResource ComboBox.Pressed.Editable.Button.Background}"/> <Setter TargetName="splitBorder" Property="Background" Value="{StaticResource ComboBox.Pressed.Editable.Button.Background}" />
<Setter Property="BorderBrush" TargetName="splitBorder" Value="{StaticResource ComboBox.Pressed.Editable.Button.Border}"/> <Setter TargetName="splitBorder" Property="BorderBrush" Value="{StaticResource ComboBox.Pressed.Editable.Button.Border}" />
</MultiDataTrigger> </MultiDataTrigger>
<Trigger Property="IsEnabled" Value="false"> <Trigger Property="IsEnabled" Value="false">
<Setter Property="Fill" TargetName="arrow" Value="{StaticResource ComboBox.Disabled.Glyph}"/> <Setter TargetName="arrow" Property="Fill" Value="{StaticResource ComboBox.Disabled.Glyph}" />
</Trigger> </Trigger>
<MultiDataTrigger> <MultiDataTrigger>
<MultiDataTrigger.Conditions> <MultiDataTrigger.Conditions>
<Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false" /> <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false" />
<Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="false" /> <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="false" />
</MultiDataTrigger.Conditions> </MultiDataTrigger.Conditions>
<Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.Disabled.Background}"/> <Setter TargetName="templateRoot" Property="Background" Value="{StaticResource ComboBox.Disabled.Background}" />
<Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.Disabled.Border}"/> <Setter TargetName="templateRoot" Property="BorderBrush" Value="{StaticResource ComboBox.Disabled.Border}" />
</MultiDataTrigger> </MultiDataTrigger>
<MultiDataTrigger> <MultiDataTrigger>
<MultiDataTrigger.Conditions> <MultiDataTrigger.Conditions>
<Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false" /> <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false" />
<Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="true" /> <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="true" />
</MultiDataTrigger.Conditions> </MultiDataTrigger.Conditions>
<Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.Disabled.Editable.Background}"/> <Setter TargetName="templateRoot" Property="Background" Value="{StaticResource ComboBox.Disabled.Editable.Background}" />
<Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.Disabled.Editable.Border}"/> <Setter TargetName="templateRoot" Property="BorderBrush" Value="{StaticResource ComboBox.Disabled.Editable.Border}" />
<Setter Property="Background" TargetName="splitBorder" Value="{StaticResource ComboBox.Disabled.Editable.Button.Background}"/> <Setter TargetName="splitBorder" Property="Background" Value="{StaticResource ComboBox.Disabled.Editable.Button.Background}" />
<Setter Property="BorderBrush" TargetName="splitBorder" Value="{StaticResource ComboBox.Disabled.Editable.Button.Border}"/> <Setter TargetName="splitBorder" Property="BorderBrush" Value="{StaticResource ComboBox.Disabled.Editable.Button.Border}" />
</MultiDataTrigger> </MultiDataTrigger>
</ControlTemplate.Triggers> </ControlTemplate.Triggers>
</ControlTemplate> </ControlTemplate>
@@ -171,7 +198,7 @@
<Grid x:Name="templateRoot" SnapsToDevicePixels="true"> <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0"/> <ColumnDefinition Width="0" MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<!--<Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" Placement="Bottom" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}"> <!--<Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" Placement="Bottom" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
<theme:SystemDropShadowChrome x:Name="shadow" Color="Transparent" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" MaxHeight="{TemplateBinding MaxDropDownHeight}"> <theme:SystemDropShadowChrome x:Name="shadow" Color="Transparent" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" MaxHeight="{TemplateBinding MaxDropDownHeight}">
@@ -187,14 +214,30 @@
</Border> </Border>
</theme:SystemDropShadowChrome> </theme:SystemDropShadowChrome>
</Popup>--> </Popup>-->
<ToggleButton x:Name="toggleButton" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}"/> <ToggleButton
<Border x:Name="border" Background="{StaticResource TextBox.Static.Background}" Margin="{TemplateBinding BorderThickness}"> x:Name="toggleButton"
<TextBox x:Name="PART_EditableTextBox" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/> Grid.ColumnSpan="2"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
Style="{StaticResource ComboBoxToggleButton}" />
<Border
x:Name="border"
Margin="{TemplateBinding BorderThickness}"
Background="{StaticResource TextBox.Static.Background}">
<TextBox
x:Name="PART_EditableTextBox"
Margin="{TemplateBinding Padding}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
Style="{StaticResource ComboBoxEditableTextBox}" />
</Border> </Border>
</Grid> </Grid>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsEnabled" Value="false"> <Trigger Property="IsEnabled" Value="false">
<Setter Property="Opacity" TargetName="border" Value="0.56"/> <Setter TargetName="border" Property="Opacity" Value="0.56" />
</Trigger> </Trigger>
<Trigger Property="IsKeyboardFocusWithin" Value="true"> <Trigger Property="IsKeyboardFocusWithin" Value="true">
<Setter Property="Foreground" Value="Black" /> <Setter Property="Foreground" Value="Black" />
@@ -223,9 +266,16 @@
<Grid x:Name="templateRoot" SnapsToDevicePixels="true"> <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0"/> <ColumnDefinition Width="0" MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" Placement="Bottom" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}"> <Popup
x:Name="PART_Popup"
Grid.ColumnSpan="2"
Margin="1"
AllowsTransparency="true"
IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
Placement="Bottom"
PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
<!--<theme:SystemDropShadowChrome x:Name="shadow" Color="Transparent" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" MaxHeight="{TemplateBinding MaxDropDownHeight}"> <!--<theme:SystemDropShadowChrome x:Name="shadow" Color="Transparent" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" MaxHeight="{TemplateBinding MaxDropDownHeight}">
<Border x:Name="dropDownBorder" Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1"> <Border x:Name="dropDownBorder" Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1">
<ScrollViewer x:Name="DropDownScrollViewer"> <ScrollViewer x:Name="DropDownScrollViewer">
@@ -239,11 +289,28 @@
</Border> </Border>
</theme:SystemDropShadowChrome>--> </theme:SystemDropShadowChrome>-->
</Popup> </Popup>
<ToggleButton x:Name="toggleButton" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}"/> <ToggleButton
<ContentPresenter x:Name="contentPresenter" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" Content="{TemplateBinding SelectionBoxItem}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/> x:Name="toggleButton"
Grid.ColumnSpan="2"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
Style="{StaticResource ComboBoxToggleButton}" />
<ContentPresenter
x:Name="contentPresenter"
Margin="{TemplateBinding Padding}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Content="{TemplateBinding SelectionBoxItem}"
ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}"
ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
IsHitTestVisible="false"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</Grid> </Grid>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="HasDropShadow" SourceName="PART_Popup" Value="true"> <Trigger SourceName="PART_Popup" Property="HasDropShadow" Value="true">
<!--<Setter Property="Margin" TargetName="shadow" Value="0,0,5,5"/>--> <!--<Setter Property="Margin" TargetName="shadow" Value="0,0,5,5"/>-->
<!--<Setter Property="Color" TargetName="shadow" Value="#71000000"/>--> <!--<Setter Property="Color" TargetName="shadow" Value="#71000000"/>-->
</Trigger> </Trigger>
@@ -285,7 +352,7 @@
</Style.Triggers> </Style.Triggers>
</Style> </Style>
<Style x:Key="BaseComboBoxStyle" TargetType="ComboBox"> <Style x:Key="BaseComboBoxStyle" TargetType="ComboBox">
<Setter Property="IsEditable" Value="True"></Setter> <Setter Property="IsEditable" Value="True" />
<Setter Property="Background" Value="Transparent" /> <Setter Property="Background" Value="Transparent" />
<Setter Property="BorderBrush" Value="Transparent" /> <Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="BorderThickness" Value="0" /> <Setter Property="BorderThickness" Value="0" />
@@ -300,23 +367,34 @@
<Style x:Key="RoundedComboBox" TargetType="{x:Type ComboBox}"> <Style x:Key="RoundedComboBox" TargetType="{x:Type ComboBox}">
<Setter Property="Width" Value="auto"></Setter> <Setter Property="Width" Value="auto" />
<Setter Property="HorizontalAlignment" Value="Stretch"></Setter> <Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="BorderBrush" Value="{DynamicResource pageColorBrush}"></Setter> <Setter Property="BorderBrush" Value="{DynamicResource pageColorBrush}" />
<Setter Property="BorderThickness" Value="1"></Setter> <Setter Property="BorderThickness" Value="1" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type ComboBox}"> <ControlTemplate TargetType="{x:Type ComboBox}">
<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="4" Background="Transparent"> <Border
Background="Transparent"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="4">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*"></ColumnDefinition> <ColumnDefinition Width="*" />
<ColumnDefinition Width="auto"></ColumnDefinition> <ColumnDefinition Width="auto" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<!-- 下拉箭头 --> <!-- 下拉箭头 -->
<ToggleButton Grid.Column="1" ClickMode="Press" Focusable="False" Cursor="Hand" <ToggleButton
IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="1"
Margin="2" MinWidth="0" MinHeight="0" Width="Auto"> Width="Auto"
MinWidth="0"
MinHeight="0"
Margin="2"
ClickMode="Press"
Cursor="Hand"
Focusable="False"
IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}">
<ToggleButton.Style> <ToggleButton.Style>
<Style TargetType="{x:Type ToggleButton}"> <Style TargetType="{x:Type ToggleButton}">
<Setter Property="MinWidth" Value="0" /> <Setter Property="MinWidth" Value="0" />
@@ -329,13 +407,24 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type ToggleButton}"> <ControlTemplate TargetType="{x:Type ToggleButton}">
<DockPanel Background="{TemplateBinding Background}" LastChildFill="False" SnapsToDevicePixels="True"> <DockPanel
<Border x:Name="Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" DockPanel.Dock="Right" > Background="{TemplateBinding Background}"
<Path Data="M0,0L3.5,4 7,0z" Fill="{TemplateBinding Foreground}" HorizontalAlignment="Center" VerticalAlignment="Center"/> LastChildFill="False"
SnapsToDevicePixels="True">
<Border
x:Name="Border"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
DockPanel.Dock="Right">
<Path
HorizontalAlignment="Center"
VerticalAlignment="Center"
Data="M0,0L3.5,4 7,0z"
Fill="{TemplateBinding Foreground}" />
</Border> </Border>
</DockPanel> </DockPanel>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="True"></Trigger> <Trigger Property="IsChecked" Value="True" />
</ControlTemplate.Triggers> </ControlTemplate.Triggers>
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
@@ -349,19 +438,42 @@
</ToggleButton.Style> </ToggleButton.Style>
</ToggleButton> </ToggleButton>
<!-- 项内容 --> <!-- 项内容 -->
<ContentPresenter IsHitTestVisible="False" Content="{TemplateBinding SelectionBoxItem}" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" VerticalAlignment="Center" Margin="3" HorizontalAlignment="Stretch" /> <ContentPresenter
<TextBox x:Name="PART_EditableTextBox" HorizontalAlignment="Stretch" Focusable="True" Visibility="Collapsed" IsReadOnly="False"/> Margin="3"
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
Content="{TemplateBinding SelectionBoxItem}"
ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
IsHitTestVisible="False" />
<TextBox
x:Name="PART_EditableTextBox"
HorizontalAlignment="Stretch"
Focusable="True"
IsReadOnly="False"
Visibility="Collapsed" />
<!-- 下拉显示面板HorizontalOffset:设置下拉面板的相对位置 --> <!-- 下拉显示面板HorizontalOffset:设置下拉面板的相对位置 -->
<Popup HorizontalOffset="-1" Width="{TemplateBinding ActualWidth}" <Popup
IsOpen="{TemplateBinding IsDropDownOpen}" Focusable="False" PopupAnimation="Slide"> Width="{TemplateBinding ActualWidth}"
<Grid SnapsToDevicePixels="True" HorizontalAlignment="Stretch"> Focusable="False"
<Border BorderThickness="1,1,1,1" BorderBrush="{TemplateBinding BorderBrush}" HorizontalAlignment="Stretch" CornerRadius="0"> HorizontalOffset="-1"
IsOpen="{TemplateBinding IsDropDownOpen}"
PopupAnimation="Slide">
<Grid HorizontalAlignment="Stretch" SnapsToDevicePixels="True">
<Border
HorizontalAlignment="Stretch"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="1,1,1,1"
CornerRadius="0">
<Border.Background> <Border.Background>
<SolidColorBrush Color="White" /> <SolidColorBrush Color="White" />
</Border.Background> </Border.Background>
</Border> </Border>
<ScrollViewer SnapsToDevicePixels="True" HorizontalAlignment="Stretch" > <ScrollViewer HorizontalAlignment="Stretch" SnapsToDevicePixels="True">
<StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Contained" HorizontalAlignment="Stretch" /> <StackPanel
HorizontalAlignment="Stretch"
IsItemsHost="True"
KeyboardNavigation.DirectionalNavigation="Contained" />
</ScrollViewer> </ScrollViewer>
</Grid> </Grid>
</Popup> </Popup>
@@ -381,8 +493,15 @@
<!-- 自定义下拉按钮的外观 --> <!-- 自定义下拉按钮的外观 -->
<ToggleButton.Template> <ToggleButton.Template>
<ControlTemplate TargetType="ToggleButton"> <ControlTemplate TargetType="ToggleButton">
<Border Background="LightGray" BorderBrush="Gray" BorderThickness="1" Padding="5"> <Border
<Path Data="M0,0 L8,8 16,0z" Fill="Black" HorizontalAlignment="Right"/> Padding="5"
Background="LightGray"
BorderBrush="Gray"
BorderThickness="1">
<Path
HorizontalAlignment="Right"
Data="M0,0 L8,8 16,0z"
Fill="Black" />
</Border> </Border>
</ControlTemplate> </ControlTemplate>
</ToggleButton.Template> </ToggleButton.Template>
+1 -2
View File
@@ -1,5 +1,4 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style x:Key="BaseDataGridColumnHeaderStyle" TargetType="DataGridColumnHeader"> <Style x:Key="BaseDataGridColumnHeaderStyle" TargetType="DataGridColumnHeader">
<Setter Property="Background" Value="{DynamicResource ListHeadBackColorBrush}" /> <Setter Property="Background" Value="{DynamicResource ListHeadBackColorBrush}" />
<Setter Property="Foreground" Value="{DynamicResource mainForegroundColorBrush}" /> <Setter Property="Foreground" Value="{DynamicResource mainForegroundColorBrush}" />
+13 -5
View File
@@ -1,5 +1,4 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style x:Key="BaseTextBoxStyle" TargetType="TextBox"> <Style x:Key="BaseTextBoxStyle" TargetType="TextBox">
<Setter Property="Background" Value="Transparent" /> <Setter Property="Background" Value="Transparent" />
<Setter Property="BorderBrush" Value="Transparent" /> <Setter Property="BorderBrush" Value="Transparent" />
@@ -30,9 +29,18 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type TextBox}"> <ControlTemplate TargetType="{x:Type TextBox}">
<Border x:Name="border" CornerRadius="4" BorderBrush="{TemplateBinding BorderBrush}" <Border
BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True"> x:Name="border"
<ScrollViewer x:Name="PART_ContentHost" Focusable="False" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/> Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="4"
SnapsToDevicePixels="True">
<ScrollViewer
x:Name="PART_ContentHost"
Focusable="False"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Hidden" />
</Border> </Border>
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
+1 -2
View File
@@ -1,5 +1,4 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style x:Key="BaseWindowStyle" TargetType="Window"> <Style x:Key="BaseWindowStyle" TargetType="Window">
<Setter Property="Background" Value="{DynamicResource mainColorBrush}" /> <Setter Property="Background" Value="{DynamicResource mainColorBrush}" />
@@ -1,5 +1,10 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> <ImageBrush
<ImageBrush x:Key="imgBrushClose" ImageSource="/Resources/WindowBoxes/close.png" Stretch="Uniform"/> x:Key="imgBrushClose"
<ImageBrush x:Key="imgBrushCloseHover" ImageSource="/Resources/WindowBoxes/close.hover.png" Stretch="Uniform"/> ImageSource="/Resources/WindowBoxes/close.png"
Stretch="Uniform" />
<ImageBrush
x:Key="imgBrushCloseHover"
ImageSource="/Resources/WindowBoxes/close.hover.png"
Stretch="Uniform" />
</ResourceDictionary> </ResourceDictionary>
@@ -1,5 +1,4 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<BitmapImage x:Key="main29WeixinIcon" UriSource="/Resources/main_29weixin_icon.png" /> <BitmapImage x:Key="main29WeixinIcon" UriSource="/Resources/main_29weixin_icon.png" />
<BitmapImage x:Key="imgMin" UriSource="/Resources/WindowBoxes/min.png" /> <BitmapImage x:Key="imgMin" UriSource="/Resources/WindowBoxes/min.png" />
<BitmapImage x:Key="imgMinHover" UriSource="/Resources/WindowBoxes/min.hover.png" /> <BitmapImage x:Key="imgMinHover" UriSource="/Resources/WindowBoxes/min.hover.png" />
+27 -15
View File
@@ -1,32 +1,44 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" <ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:_29WxOrderWpf.UserControls"> xmlns:local="clr-namespace:_29WxOrderWpf.UserControls">
<Style TargetType="{x:Type local:UcImageButton}"> <Style TargetType="{x:Type local:UcImageButton}">
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type local:UcImageButton}"> <ControlTemplate TargetType="{x:Type local:UcImageButton}">
<Border Background="{TemplateBinding Background}" <Border
Padding="{TemplateBinding Padding}"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}">
Padding="{TemplateBinding Padding}">
<Grid Background="Transparent"> <Grid Background="Transparent">
<Image x:Name="buttonImage" Source="{TemplateBinding ButtonImage}" Stretch="Uniform"/> <Image
<Image x:Name="mouseOverButtonImage" Visibility="Collapsed" Source="{TemplateBinding MouseOverButtonImage}" Stretch="Uniform"/> x:Name="buttonImage"
<Image x:Name="mousePressButtonImage" Visibility="Collapsed" Source="{TemplateBinding MousePressButtonImage}" Stretch="Uniform"/> Source="{TemplateBinding ButtonImage}"
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"> Stretch="Uniform" />
</ContentPresenter> <Image
x:Name="mouseOverButtonImage"
Source="{TemplateBinding MouseOverButtonImage}"
Stretch="Uniform"
Visibility="Collapsed" />
<Image
x:Name="mousePressButtonImage"
Source="{TemplateBinding MousePressButtonImage}"
Stretch="Uniform"
Visibility="Collapsed" />
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
</Grid> </Grid>
</Border> </Border>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
<Setter Property="Visibility" TargetName="buttonImage" Value="Collapsed"/> <Setter TargetName="buttonImage" Property="Visibility" Value="Collapsed" />
<Setter Property="Visibility" TargetName="mouseOverButtonImage" Value="Visible"/> <Setter TargetName="mouseOverButtonImage" Property="Visibility" Value="Visible" />
<Setter Property="Visibility" TargetName="mousePressButtonImage" Value="Collapsed"/> <Setter TargetName="mousePressButtonImage" Property="Visibility" Value="Collapsed" />
</Trigger> </Trigger>
<Trigger Property="IsPressed" Value="True"> <Trigger Property="IsPressed" Value="True">
<Setter Property="Visibility" TargetName="buttonImage" Value="Collapsed"/> <Setter TargetName="buttonImage" Property="Visibility" Value="Collapsed" />
<Setter Property="Visibility" TargetName="mouseOverButtonImage" Value="Collapsed"/> <Setter TargetName="mouseOverButtonImage" Property="Visibility" Value="Collapsed" />
<Setter Property="Visibility" TargetName="mousePressButtonImage" Value="Visible"/> <Setter TargetName="mousePressButtonImage" Property="Visibility" Value="Visible" />
</Trigger> </Trigger>
<Trigger Property="IsEnabled" Value="False"> <Trigger Property="IsEnabled" Value="False">
<Setter Property="Opacity" Value="0.5" /> <Setter Property="Opacity" Value="0.5" />
@@ -1,4 +1,5 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" <ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:_29WxOrderWpf.UserControls"> xmlns:local="clr-namespace:_29WxOrderWpf.UserControls">
@@ -11,11 +12,20 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type local:UcWaterMarkTextBox1}"> <ControlTemplate TargetType="{x:Type local:UcWaterMarkTextBox1}">
<Border x:Name="border" CornerRadius="4" BorderBrush="{TemplateBinding BorderBrush}" <Border
BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True"> x:Name="border"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="4"
SnapsToDevicePixels="True">
<Grid> <Grid>
<!--<ScrollViewer x:Name="PART_ContentHost" Focusable="False" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>--> <!--<ScrollViewer x:Name="PART_ContentHost" Focusable="False" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>-->
<ScrollViewer x:Name="PART_ContentHost" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"></ScrollViewer> <ScrollViewer
x:Name="PART_ContentHost"
HorizontalScrollBarVisibility="Hidden"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
VerticalScrollBarVisibility="Hidden" />
<!--<TextBlock Text="{TemplateBinding WaterMark}" Grid.Column="2" Margin="8,0,8,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray" <!--<TextBlock Text="{TemplateBinding WaterMark}" Grid.Column="2" Margin="8,0,8,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray"
Visibility="{Binding ElementName=txtGoodsName,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>--> Visibility="{Binding ElementName=txtGoodsName,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>-->
<!--<TextBlock Text="{TemplateBinding WaterMark}" Grid.Column="2" Margin="8,0,8,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray" <!--<TextBlock Text="{TemplateBinding WaterMark}" Grid.Column="2" Margin="8,0,8,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray"
@@ -23,9 +33,16 @@
<!--<TextBlock Text="33333" Grid.Column="2" Margin="8,0,8,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray" <!--<TextBlock Text="33333" Grid.Column="2" Margin="8,0,8,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray"
></TextBlock>--> ></TextBlock>-->
<TextBlock x:Name="tbWaterMark" Text="{TemplateBinding WaterMark}" Grid.Column="2" Margin="{TemplateBinding Padding}" <TextBlock
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}" x:Name="tbWaterMark"
IsHitTestVisible="False" Foreground="LightGray" Visibility="Collapsed"></TextBlock> Grid.Column="2"
Margin="{TemplateBinding Padding}"
HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Foreground="LightGray"
IsHitTestVisible="False"
Text="{TemplateBinding WaterMark}"
Visibility="Collapsed" />
</Grid> </Grid>
</Border> </Border>
<!--<ControlTemplate.Triggers> <!--<ControlTemplate.Triggers>
@@ -295,7 +295,37 @@
HorizontalAlignment="Left" HorizontalAlignment="Left"
Click="btnAdd_Click" Click="btnAdd_Click"
Content="添 加" Content="添 加"
IsEnabled="False"
Style="{StaticResource BasePageButtonStyle}" /> Style="{StaticResource BasePageButtonStyle}" />
<Image
x:Name="imgLoading"
Grid.Row="9"
Grid.Column="1"
Width="20"
Height="20"
Margin="48,0,0,0"
HorizontalAlignment="Left"
IsEnabled="False"
Source="{StaticResource imgLoadingPic}">
<Image.RenderTransform>
<RotateTransform Angle="45" CenterX="10" CenterY="10" />
</Image.RenderTransform>
<Image.Triggers>
<EventTrigger RoutedEvent="Image.Loaded">
<BeginStoryboard>
<Storyboard>
<DoubleAnimation
RepeatBehavior="Forever"
Storyboard.TargetName="imgLoading"
Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
From="0"
To="360"
Duration="0:0:3" />
</Storyboard>
</BeginStoryboard>
</EventTrigger>
</Image.Triggers>
</Image>
<Label <Label
x:Name="lblMsg" x:Name="lblMsg"
Grid.Row="9" Grid.Row="9"
@@ -46,6 +46,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
private async void TransitAfterSaleWindow_Loaded(object sender, RoutedEventArgs e) private async void TransitAfterSaleWindow_Loaded(object sender, RoutedEventArgs e)
{ {
btnAdd.IsEnabled = true;
foreach (var warehouse in TransitWarehouseData.TransitWarehouseList) foreach (var warehouse in TransitWarehouseData.TransitWarehouseList)
{ {
this.cmbWareHouse.Items.Add(warehouse.TransName); this.cmbWareHouse.Items.Add(warehouse.TransName);
@@ -71,12 +72,29 @@ namespace _29WxOrderWpf.Windows.OrderWindows
} }
else else
{ {
if (!string.IsNullOrEmpty(OrderItem.ItemTransitOrderWithVoid?.out_order_no) && OrderItem.PddBuyerAfterSaleAddressStr.IsNullOrEmpty() &&
OrderItem.TransitRefundStatusStr.Contains("需手动申请售后") || OrderItem.TransitRefundStatusStr.Contains("待用户发货"))
{
btnAdd.IsEnabled = false;
imgLoading.Visibility = Visibility.Visible;
await MainWindow.Instance.orderListCtrl.DoBuyerRefend(new List<oms_wei_order_item_info>() { OrderItem });
var order = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == OrderItem.order_id);
if (order != null)
{
var orderItemTmp = order.orderItems.FirstOrDefault(oi => oi.sku_id == OrderItem.sku_id);
if (orderItemTmp != null)
OrderItem = orderItemTmp;
}
btnAdd.IsEnabled = true;
}
if (OrderItem.PddBuyerAfterSale?.orderSn == OrderItem.ItemTransitOrder?.out_order_no && !string.IsNullOrEmpty(OrderItem.PddBuyerAfterSale?.afterSaleAddress)) if (OrderItem.PddBuyerAfterSale?.orderSn == OrderItem.ItemTransitOrder?.out_order_no && !string.IsNullOrEmpty(OrderItem.PddBuyerAfterSale?.afterSaleAddress))
{ {
txtAddressAnalysis.Text = OrderItem.PddBuyerAfterSale?.afterSaleAddress; txtAddressAnalysis.Text = OrderItem.PddBuyerAfterSale?.afterSaleAddress;
btnAddressAnalysis_Click(null, null); btnAddressAnalysis_Click(null, null);
} }
} }
imgLoading.Visibility = Visibility.Collapsed;
var workOrderInfo = await GetWorkOrder(); var workOrderInfo = await GetWorkOrder();
var issueType = BaseRegex.GetStringJson(ref workOrderInfo, "issueType"); var issueType = BaseRegex.GetStringJson(ref workOrderInfo, "issueType");
@@ -234,6 +252,9 @@ namespace _29WxOrderWpf.Windows.OrderWindows
public string AddWorkOrder() public string AddWorkOrder()
{ {
if (OrderItem.ItemTransitOrder?.warehouse_status == 3)
return "\"success\":true,\"message\":\"已到仓,无需拦截工单\"";
string url = HttpResponseTransitWorkOrderBLL.WorkOrderUrl + "/api/open/v1/customer-work-orders/intercept-return-cloud-warehouse-after-outbound"; string url = HttpResponseTransitWorkOrderBLL.WorkOrderUrl + "/api/open/v1/customer-work-orders/intercept-return-cloud-warehouse-after-outbound";
JObject obj = new JObject(); JObject obj = new JObject();
obj["appId"] = this.OrderItem.Shop.ShopId; obj["appId"] = this.OrderItem.Shop.ShopId;
+1 -1
View File
@@ -36,7 +36,7 @@ namespace AllBase
/// 版本ID /// 版本ID
/// </summary> /// </summary>
public static int VersionCount = 263; public static int VersionCount = 265;
public static string ServerUrl { get; set; } = "http://1.13.195.131:9000"; public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
public static string DebugUrl { get; set; } = "http://localhost:9000"; public static string DebugUrl { get; set; } = "http://localhost:9000";
+31 -9
View File
@@ -169,6 +169,12 @@ namespace AllBase.Model.DBModel
set { } set { }
} }
public string RefundTypeStr
{
get { return this.GetValue(x => x.RefundTypeStr); }
set { this.SetValue(x => x.RefundTypeStr, value); }
}
public DateTime RefundDatetime public DateTime RefundDatetime
{ {
@@ -313,11 +319,13 @@ namespace AllBase.Model.DBModel
{ {
get get
{ {
if (order_id == "3738523900304581376") if (order_id == "3738634560083228416")
{ {
} }
return this.out_express_no + ((this.out_shipped != 2 || string.IsNullOrEmpty(this.out_express_no)) ? "" : " ×"); if (this.out_shipped == 2 && !string.IsNullOrEmpty(this.out_express_no))
return this.out_express_no + " ×";
return this.out_express_no;
} }
set { } set { }
} }
@@ -675,6 +683,13 @@ namespace AllBase.Model.DBModel
else else
OrderBuyType = ""; OrderBuyType = "";
if (this.orderItems.Any(oi => oi.ItemRefund?.type == "REFUND"))
this.RefundTypeStr = "仅退款";
else if (this.orderItems.Any(oi => oi.ItemRefund?.type == "RETURN"))
this.RefundTypeStr = "退货退款";
else if (this.orderItems.Any(oi => oi.ItemRefund?.type == "REFUND") && this.orderItems.Any(oi => oi.ItemRefund?.type == "RETURN"))
this.RefundTypeStr = "仅退款/退货退款";
IsWaitBuy = GetIsWaitBuy(); IsWaitBuy = GetIsWaitBuy();
IsWaitSend = GetIsWaitSend(); IsWaitSend = GetIsWaitSend();
IsWaitReceive = GetIsWaitReceive(); IsWaitReceive = GetIsWaitReceive();
@@ -712,6 +727,11 @@ namespace AllBase.Model.DBModel
private bool GetIsWaitSend() private bool GetIsWaitSend()
{ {
if (order_id == "3738622310043515392")
{
}
if (status != 20 && status != 21) if (status != 20 && status != 21)
return false; return false;
if (refundItems?.Any(r => r.IsRefund) == true) if (refundItems?.Any(r => r.IsRefund) == true)
@@ -723,19 +743,19 @@ namespace AllBase.Model.DBModel
return false; return false;
// 店铺未发货,外采已采购 // 店铺未发货,外采已采购
// out_after_sale_status 新拍订单也不会变,内存里直接根据退款单修改掉 // out_after_sale_status 新拍订单也不会变,内存里直接根据退款单修改掉
if (!orderItems.All(oi => oi.ItemTransitOrder != null) && purchase_status != 1 && (string.IsNullOrEmpty(out_order_no) || out_after_sale_status == "退款成功")) if (!orderItems.All(oi => oi.ItemTransitOrder != null) && purchase_status != 1 &&
(string.IsNullOrEmpty(out_order_no) || out_after_sale_status == "退款成功"))
return false; return false;
return true; return true;
} }
private bool GetIsWaitReceive() private bool GetIsWaitReceive()
{ {
if (order_id == "3738687160199289344") if (order_id == "3738622310043515392")
{ {
} }
if (refundItems?.Any(r => r.IsRefund) == true) if (refundItems?.Any(r => r.IsRefund) == true)
return false; return false;
if (orderItems?.Any(oi => oi.refund_status > 1) == true) if (orderItems?.Any(oi => oi.refund_status > 1) == true)
@@ -747,10 +767,12 @@ namespace AllBase.Model.DBModel
public bool GetIsAbnormal() public bool GetIsAbnormal()
{ {
if (order_id == "3738000949931831296") // 如果有售后,直接作为售后单处理
{ if (orderItems.All(oi => oi.refund_status > 1))
return false;
} // 直发或者云改直已购买且未退货,从异常单移除
if (orderItems.All(oi => oi.DirectPddBuyerOrder != null && oi.DirectPddBuyerAfterSale == null) /*&& (out_shipped != 2 || string.IsNullOrEmpty(this.out_express_no))*/)
return false;
if (orderItems.Any(oi => !(oi.OrderItemExt?.abnormal_text).IsNullOrEmpty())) if (orderItems.Any(oi => !(oi.OrderItemExt?.abnormal_text).IsNullOrEmpty()))
return true; return true;
@@ -10,10 +10,9 @@
<ResourceDictionary <ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:PresentationOptions="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:PresentationOptions="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
> xmlns:sys="clr-namespace:System;assembly=mscorlib">
<sys:String x:Key="txt-fapiao">&#xed35;</sys:String> <sys:String x:Key="txt-fapiao">&#xed35;</sys:String>