mxg:提交

.gitignore

@@ -3,3 +3,8 @@
 ################################################################################
 
 /.vs/Test/v15
+/FirmLib/Com.FirmLib/obj
+/FirmLib/Com.FirmLib.UI/obj
+/OutputDll
+/Test/.vs/Test/v15/.suo
+/Test/obj

FirmLib/Com.FirmLib.UI/Insuer/WinInsuerProjectInfo.xaml

@@ -10,6 +10,7 @@
              xmlns:behaviors="clr-namespace:FWindSoft.Wpf.Behaviors;assembly=FWindSoft.Wpf"
              xmlns:ui="clr-namespace:Com.FirmLib.UI"
              xmlns:insuer="clr-namespace:Com.FirmLib.UI.Insuer"
+             xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="500"  Name="this" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
                  Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}">
@@ -82,6 +83,7 @@
                 SelectionUnit="Cell"
                 HeadersVisibility="Column" 
                 CanUserSortColumns="True"   
+                              dgx:DataGridFilter.IsAutoFilterEnabled="True"
 
                 CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2"
@@ -194,6 +196,7 @@
                 SelectionUnit="FullRow"
                 HeadersVisibility="Column" 
                 CanUserSortColumns="True"   
+                                 dgx:DataGridFilter.IsAutoFilterEnabled="True"
                 CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2"
                 >

FirmLib/Com.FirmLib.UI/Insuer/WinPolicySaveEnsure.xaml

@@ -5,6 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:fw="http://schemas.FWind/xaml"
              xmlns:uc="clr-namespace:Com.FirmLib.UI.Common"
+             xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
              Name="this" Title="确认提示"
             Height="350" Width="500" ResizeMode="NoResize" WindowStartupLocation="CenterOwner">
     <Grid Margin="5">
@@ -50,6 +51,7 @@
                   SelectionUnit="FullRow"
                   HeadersVisibility="Column" 
                   CanUserSortColumns="True"   
+                      dgx:DataGridFilter.IsAutoFilterEnabled="True"
                   CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2"
         >

FirmLib/Com.FirmLib.UI/Maintainer/VmAddProductType.cs

@@ -126,7 +126,7 @@ namespace Com.FirmLib.UI.Maintainer
                     MessageTip.Show(this.GetWindow(), "添加成功");
                     if (window != null)
                     {
-                        window.DialogResult = true;
+                        //window.DialogResult = true;
                     }
 
                 }

FirmLib/Com.FirmLib.UI/Maintainer/WinAddProductType.xaml

@@ -6,6 +6,7 @@
              xmlns:fw="http://schemas.FWind/xaml"
              xmlns:uc="clr-namespace:Com.FirmLib.UI.Common"
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+             xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
              Name="this" Title="添加维修商型号"
             Height="550" Width="500" WindowStartupLocation="CenterOwner">
     <fw:BaseWindow.Resources>
@@ -48,7 +49,7 @@
                   HorizontalScrollBarVisibility="Auto"
                   SelectionUnit="FullRow"
                   HeadersVisibility="Column" 
-                  CanUserSortColumns="True"   
+                  CanUserSortColumns="True"      dgx:DataGridFilter.IsAutoFilterEnabled="True"
                   CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2">
                 <DataGrid.Columns>
@@ -64,7 +65,7 @@
                   HorizontalScrollBarVisibility="Auto"
                   SelectionUnit="FullRow"
                   HeadersVisibility="Column" 
-                  CanUserSortColumns="True"   
+                  CanUserSortColumns="True"      dgx:DataGridFilter.IsAutoFilterEnabled="True"
                   CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2">
                 <DataGrid.Columns>

FirmLib/Com.FirmLib.UI/Maintainer/WinAddProductType.xaml.cs

@@ -29,7 +29,14 @@ namespace Com.FirmLib.UI.Maintainer
             this.m_Vm = vm;
             this.m_Vm.SetRefView(this);
             this.DataContext = this.m_Vm;
+            this.Closing += WinAddProductType_Closing;
         }
+
+        private void WinAddProductType_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            this.DialogResult = true;
+        }
+
         protected override void LoadData(LoadParameter parameter)
         {
             //初始化数据

FirmLib/Com.FirmLib.UI/Maintainer/WinMaintainerInfo.xaml

@@ -7,7 +7,8 @@
              xmlns:wpf="clr-namespace:FWindSoft.Wpf;assembly=FWindSoft.Wpf"
              xmlns:uc="clr-namespace:Com.FirmLib.UI.Common"
                    xmlns:bllCommon="clr-namespace:Com.FirmLib.UI.BllCommon"
-             mc:Ignorable="d" Title="维修商信息"
+                   xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
+                   mc:Ignorable="d" Title="维修商信息"
              d:DesignHeight="300" d:DesignWidth="500" Name="this" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
                  Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}" >
     <fw:NChildWindow.Resources>
@@ -106,6 +107,7 @@
                 SelectionUnit="FullRow"
                 HeadersVisibility="Column" 
                 CanUserSortColumns="True"  
+                           dgx:DataGridFilter.IsAutoFilterEnabled="True"
                 CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2"
                 >

FirmLib/Com.FirmLib.UI/Maintainer/WinMaintainerSaveEnsure.xaml

@@ -5,6 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:fw="http://schemas.FWind/xaml"
              xmlns:uc="clr-namespace:Com.FirmLib.UI.Common"
+             xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
              Name="this" Title="确认提示"
             Height="350" Width="500" WindowStartupLocation="CenterOwner">
     <Grid Margin="5">
@@ -49,7 +50,7 @@
                   HorizontalScrollBarVisibility="Auto"
                   SelectionUnit="FullRow"
                   HeadersVisibility="Column" 
-                  CanUserSortColumns="True"   
+                  CanUserSortColumns="True"      dgx:DataGridFilter.IsAutoFilterEnabled="True"
                   CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2"
         >

FirmLib/Com.FirmLib.UI/Maintainer/WinManitainerProjectInfo.xaml

@@ -9,6 +9,7 @@
             
              xmlns:ui="clr-namespace:Com.FirmLib.UI"
              xmlns:maintainer="clr-namespace:Com.FirmLib.UI.Maintainer"
+             xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="500"  Name="this" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
                  Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}">
@@ -82,7 +83,7 @@
                     HorizontalScrollBarVisibility="Auto"
                     SelectionUnit="Cell"
                     HeadersVisibility="Column" 
-                    CanUserSortColumns="True"   
+                    CanUserSortColumns="True"      dgx:DataGridFilter.IsAutoFilterEnabled="True"
                     CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                       AlternationCount="2"
                     >
@@ -178,7 +179,7 @@
                 HorizontalScrollBarVisibility="Auto"
                 SelectionUnit="Cell"
                 HeadersVisibility="Column" 
-                CanUserSortColumns="True"   
+                CanUserSortColumns="True"      dgx:DataGridFilter.IsAutoFilterEnabled="True"
                 CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2"
                 >

FirmLib/Com.FirmLib.UI/Maintainer/WinUpdateProductType.xaml

@@ -6,6 +6,7 @@
              xmlns:fw="http://schemas.FWind/xaml"
              xmlns:uc="clr-namespace:Com.FirmLib.UI.Common"
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+             xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
              Name="this" Title="编辑维修商型号"
              Height="550" Width="500" WindowStartupLocation="CenterOwner">
     <fw:BaseWindow.Resources>
@@ -96,7 +97,7 @@
                   HorizontalScrollBarVisibility="Auto"
                   SelectionUnit="FullRow"
                   HeadersVisibility="Column" 
-                  CanUserSortColumns="True"   
+                  CanUserSortColumns="True"      dgx:DataGridFilter.IsAutoFilterEnabled="True"
                   CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2">
                 <DataGrid.Columns>

FirmLib/Com.FirmLib.UI/Manufacturer/WinManufactureInfo.xaml

@@ -9,6 +9,7 @@
              xmlns:behaviors="clr-namespace:FWindSoft.Wpf.Behaviors;assembly=FWindSoft.Wpf"
              xmlns:wpf="clr-namespace:FWindSoft.Wpf;assembly=FWindSoft.Wpf"
                   xmlns:bllCommon="clr-namespace:Com.FirmLib.UI.BllCommon"
+                 xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
                  mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="500" Title="生产厂家" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
                  Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}" >
     <fw:NChildWindow.Resources>
@@ -102,6 +103,7 @@
                 SelectionUnit="FullRow"
                 HeadersVisibility="Column" 
                 CanUserSortColumns="True"   
+                  dgx:DataGridFilter.IsAutoFilterEnabled="True"
                 CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2"
                 >

FirmLib/Com.FirmLib.UI/Manufacturer/WinProductList.xaml

@@ -6,6 +6,7 @@
              xmlns:local="clr-namespace:Com.FirmLib.UI.Manufacturer"
              xmlns:fw="http://schemas.FWind/xaml"
              xmlns:uc="clr-namespace:Com.FirmLib.UI.Common"
+             xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
              Title="产品名录"
                Name="this"
              Height="550" Width="500" WindowStartupLocation="CenterOwner">
@@ -45,6 +46,7 @@
                   SelectionUnit="FullRow"
                   HeadersVisibility="Column" 
                   CanUserSortColumns="False"   
+                      dgx:DataGridFilter.IsAutoFilterEnabled="True"
                   CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2">
                 <DataGrid.Columns>

FirmLib/Com.FirmLib.UI/Manufacturer/WinProductType.xaml

@@ -7,7 +7,8 @@
              xmlns:uc="clr-namespace:Com.FirmLib.UI.Common"
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
              xmlns:behaviors="clr-namespace:FWindSoft.Wpf.Behaviors;assembly=FWindSoft.Wpf"
-                 mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="500" Title="[品牌名-产品名]型号" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
+             xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
+             mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="500" Title="[品牌名-产品名]型号" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
                  Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}">
     <fw:NChildWindow.Resources>
         <fw:BindingProxy x:Key="DATA" Data="{Binding}"></fw:BindingProxy>
@@ -46,6 +47,7 @@
                 SelectionUnit="FullRow"
                 HeadersVisibility="Column" 
                 CanUserSortColumns="True"   
+                  dgx:DataGridFilter.IsAutoFilterEnabled="True"
                 CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   SelectedItem="{Binding CurrentTypeItem,Mode=OneWay}"
                   

FirmLib/Com.FirmLib.UI/Manufacturer/WinProjectAssetList.xaml

@@ -7,7 +7,8 @@
              xmlns:uc="clr-namespace:Com.FirmLib.UI.Common"
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
              xmlns:behaviors="clr-namespace:FWindSoft.Wpf.Behaviors;assembly=FWindSoft.Wpf"
-                 mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="500" Title="项目资产清单" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
+             xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
+             mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="500" Title="项目资产清单" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
                  Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}">
     <fw:NChildWindow.Resources>
         <fw:BindingProxy x:Key="DATA" Data="{Binding}"></fw:BindingProxy>
@@ -27,6 +28,7 @@
                 SelectionUnit="FullRow"
                 HeadersVisibility="Column" 
                 CanUserSortColumns="True"   
+                  dgx:DataGridFilter.IsAutoFilterEnabled="True"
                 CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2"
                 >

FirmLib/Com.FirmLib.UI/Seller/VmMultiProductTypeSelector.cs

@@ -140,7 +140,7 @@ namespace Com.FirmLib.UI.Seller
                     MessageTip.Show(this.GetWindow(), "添加成功");
                     if (window != null)
                     {
-                        window.DialogResult = true;
+                        //window.DialogResult = true;
                     }
                     
                 }

FirmLib/Com.FirmLib.UI/Seller/WinMultiProductTypeSelector.xaml

@@ -5,6 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:fw="http://schemas.FWind/xaml"
              xmlns:uc="clr-namespace:Com.FirmLib.UI.Common"
+               xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
                xmlns:behaviors="clr-namespace:FWindSoft.Wpf.Behaviors;assembly=FWindSoft.Wpf"
                Title="添加供应型号"
@@ -42,6 +43,7 @@
                   SelectionUnit="FullRow"
                   HeadersVisibility="Column" 
                   CanUserSortColumns="True"   
+                  dgx:DataGridFilter.IsAutoFilterEnabled="True"
                   CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2">
             <DataGrid.Columns>

FirmLib/Com.FirmLib.UI/Seller/WinMultiProductTypeSelector.xaml.cs

@@ -32,7 +32,14 @@ namespace Com.FirmLib.UI.Seller
             this.m_Vm = vm;
             this.m_Vm.SetRefView(this);
             this.DataContext = this.m_Vm;
+            this.Closing += WinMultiProductTypeSelector_Closing;
         }
+
+        private void WinMultiProductTypeSelector_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            this.DialogResult = true;
+        }
+
         protected override void LoadData(LoadParameter parameter)
         {
             //初始化列表数据

FirmLib/Com.FirmLib.UI/Seller/WinSellerInfo.xaml

@@ -7,6 +7,7 @@
              xmlns:wpf="clr-namespace:FWindSoft.Wpf;assembly=FWindSoft.Wpf"
              xmlns:uc="clr-namespace:Com.FirmLib.UI.Common"
                  xmlns:bllCommon="clr-namespace:Com.FirmLib.UI.BllCommon"
+                 xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
              mc:Ignorable="d" Title="供应商信息"
              d:DesignHeight="300" d:DesignWidth="500" Name="this" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
                  Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}" >
@@ -133,7 +134,7 @@
                 SelectionUnit="Cell"
                 HeadersVisibility="Column" 
                 CanUserSortColumns="True"   
-
+                              dgx:DataGridFilter.IsAutoFilterEnabled="True"
                   AlternationCount="2"
                 >
                         <DataGrid.CellStyle >

FirmLib/Com.FirmLib.UI/Seller/WinSellerProjectInfo.xaml

@@ -9,6 +9,7 @@
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
              xmlns:behaviors="clr-namespace:FWindSoft.Wpf.Behaviors;assembly=FWindSoft.Wpf"
              xmlns:ui="clr-namespace:Com.FirmLib.UI"
+             xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="500"  Name="this" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
                  Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}">
@@ -63,6 +64,7 @@
                 SelectionUnit="Cell"
                 HeadersVisibility="Column" 
                 CanUserSortColumns="True"   
+                           dgx:DataGridFilter.IsAutoFilterEnabled="True"
                 CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                   AlternationCount="2"
                 >

FirmLib/Com.FirmLib.UI/Seller/WinSupplyAssetCreater.xaml

@@ -5,6 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:fw="http://schemas.FWind/xaml"
              xmlns:uc="clr-namespace:Com.FirmLib.UI.Common"
+             xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
              Name="this" Title="创建供应的新资产"
              Height="550" Width="600"  WindowStartupLocation="CenterOwner">
     <Grid Margin="5">
@@ -98,6 +99,7 @@
                       SelectionUnit="FullRow"
                       HeadersVisibility="Column" 
                       CanUserSortColumns="True"   
+                       dgx:DataGridFilter.IsAutoFilterEnabled="True"
                       CellStyle="{StaticResource ResourceKey={x:Static uc:CommonStyles.DataGridCellKey}}"
                       AlternationCount="2">
                 <DataGrid.Columns>