Преглед изворни кода

Merge branch 'master' of https://git.dev.tencent.com/xuhuo1234/saga

mengxiangge пре 6 година
родитељ
комит
8c988404a8

BIN
MBI/Dlls/FirmLibDll/FWindSoft.Wpf.dll


BIN
MBI/Dlls/FirmLibDll/FWindSoft.Wpf.pdb


BIN
MBI/Dlls/FirmLibDll/FWindSoft.dll


BIN
MBI/Dlls/FirmLibDll/FWindSoft.pdb


+ 1 - 1
MBI/FirmLib/Com.FirmLib.UI/Insuer/WinInsuerBaseInfo.xaml

@@ -9,7 +9,7 @@
              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="保险商名称" Name="this" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
-                 Width="{Binding Width,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}" >
+                 Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}" >
     <fw:NChildWindow.Resources>
         <wpf:BindingProxy x:Key="DATA" Data="{Binding}"></wpf:BindingProxy>
     </fw:NChildWindow.Resources>

+ 1 - 1
MBI/FirmLib/Com.FirmLib.UI/Insuer/WinInsuerInfo.xaml

@@ -9,7 +9,7 @@
              xmlns:bllCommon="clr-namespace:Com.FirmLib.UI.BllCommon"
              mc:Ignorable="d" Title="保险商信息"
              d:DesignHeight="300" d:DesignWidth="500" Name="this" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
-                 Width="{Binding Width,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}" >
+                 Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}" >
     <fw:NChildWindow.Resources>
         <wpf:BindingProxy x:Key="DATA" Data="{Binding}"></wpf:BindingProxy>
     </fw:NChildWindow.Resources>

+ 1 - 1
MBI/FirmLib/Com.FirmLib.UI/Insuer/WinInsuerProjectInfo.xaml

@@ -12,7 +12,7 @@
              xmlns:insuer="clr-namespace:Com.FirmLib.UI.Insuer"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="500"  Name="this" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
-                 Width="{Binding Width,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}">
+                 Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}">
     <fw:NChildWindow.Resources>
         <wpf:BindingProxy x:Key="DATA" Data="{Binding}"></wpf:BindingProxy>
         <insuer:CopyHandle x:Key="CopyHandle" ></insuer:CopyHandle>

+ 1 - 3
MBI/FirmLib/Com.FirmLib.UI/Insuer/WinInsurancePolicyEditor.xaml

@@ -6,12 +6,10 @@
              xmlns:fw="http://schemas.FWind/xaml"
              xmlns:wpf="clr-namespace:FWindSoft.Wpf;assembly=FWindSoft.Wpf"
              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"
              xmlns:ui="clr-namespace:Com.FirmLib.UI"
              mc:Ignorable="d" Title="添加保险"
              d:DesignHeight="300" d:DesignWidth="500" Name="this" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
-                 Width="{Binding Width,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"  >
+                 Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}"  >
     <fw:NChildWindow.Resources>
         <wpf:BindingProxy x:Key="DATA" Data="{Binding}"></wpf:BindingProxy>
     </fw:NChildWindow.Resources>

+ 1 - 1
MBI/FirmLib/Com.FirmLib.UI/Maintainer/WinMaintainerBaseInfo.xaml

@@ -10,7 +10,7 @@
              xmlns:behaviors="clr-namespace:FWindSoft.Wpf.Behaviors;assembly=FWindSoft.Wpf"
              mc:Ignorable="d" Title="维修商名称" Name="this"
              d:DesignHeight="300" d:DesignWidth="500"  Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
-                 Width="{Binding Width,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}" >
+                 Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}" >
     <fw:NChildWindow.Resources>
         <wpf:BindingProxy x:Key="DATA" Data="{Binding}"></wpf:BindingProxy>
     </fw:NChildWindow.Resources>

+ 1 - 3
MBI/FirmLib/Com.FirmLib.UI/Maintainer/WinMaintainerInfo.xaml

@@ -6,12 +6,10 @@
              xmlns:fw="http://schemas.FWind/xaml"
              xmlns:wpf="clr-namespace:FWindSoft.Wpf;assembly=FWindSoft.Wpf"
              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"
                    xmlns:bllCommon="clr-namespace:Com.FirmLib.UI.BllCommon"
              mc:Ignorable="d" Title="维修商信息"
              d:DesignHeight="300" d:DesignWidth="500" Name="this" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
-                 Width="{Binding Width,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}" >
+                 Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}" >
     <fw:NChildWindow.Resources>
         <wpf:BindingProxy x:Key="DATA" Data="{Binding}"></wpf:BindingProxy>
     </fw:NChildWindow.Resources>

+ 1 - 2
MBI/FirmLib/Com.FirmLib.UI/Maintainer/WinMaintainerProjectAsset.xaml

@@ -7,10 +7,9 @@
              xmlns:uc="clr-namespace:Com.FirmLib.UI.Common"
              xmlns:ui="clr-namespace:Com.FirmLib.UI"
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
-             xmlns:behaviors="clr-namespace:FWindSoft.Wpf.Behaviors;assembly=FWindSoft.Wpf"
              mc:Ignorable="d"  Title="添加维护资产"
                  d:DesignHeight="300" d:DesignWidth="500" Name="this" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
-                 Width="{Binding Width,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>
     </fw:NChildWindow.Resources>

+ 2 - 3
MBI/FirmLib/Com.FirmLib.UI/Maintainer/WinManitainerProjectInfo.xaml

@@ -6,13 +6,12 @@
              xmlns:fw="http://schemas.FWind/xaml"
              xmlns:wpf="clr-namespace:FWindSoft.Wpf;assembly=FWindSoft.Wpf"
              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"
+            
              xmlns:ui="clr-namespace:Com.FirmLib.UI"
              xmlns:maintainer="clr-namespace:Com.FirmLib.UI.Maintainer"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="500"  Name="this" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
-                 Width="{Binding Width,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}">
+                 Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}">
     <fw:NChildWindow.Resources>
         <wpf:BindingProxy x:Key="DATA" Data="{Binding}"></wpf:BindingProxy>
     </fw:NChildWindow.Resources>

+ 1 - 1
MBI/FirmLib/Com.FirmLib.UI/Manufacturer/WinManufactureBaseInfo.xaml

@@ -9,7 +9,7 @@
              xmlns:behaviors="clr-namespace:FWindSoft.Wpf.Behaviors;assembly=FWindSoft.Wpf"
              xmlns:wpf="clr-namespace:FWindSoft.Wpf;assembly=FWindSoft.Wpf"
                  mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="500" Title="生产厂家名称" Name="this" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
-                 Width="{Binding Width,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}" >
+                 Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}" >
     <fw:NChildWindow.Resources>
         <wpf:BindingProxy x:Key="DATA" Data="{Binding}"></wpf:BindingProxy>
     </fw:NChildWindow.Resources>

+ 1 - 1
MBI/FirmLib/Com.FirmLib.UI/Manufacturer/WinManufactureInfo.xaml

@@ -10,7 +10,7 @@
              xmlns:wpf="clr-namespace:FWindSoft.Wpf;assembly=FWindSoft.Wpf"
                   xmlns:bllCommon="clr-namespace:Com.FirmLib.UI.BllCommon"
                  mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="500" Title="生产厂家" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
-                 Width="{Binding Width,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}" >
+                 Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}" >
     <fw:NChildWindow.Resources>
         <wpf:BindingProxy x:Key="DATA" Data="{Binding}"></wpf:BindingProxy>
     </fw:NChildWindow.Resources>

+ 1 - 1
MBI/FirmLib/Com.FirmLib.UI/Manufacturer/WinProductType.xaml

@@ -8,7 +8,7 @@
              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}}"
-                 Width="{Binding Width,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>
     </fw:NChildWindow.Resources>

+ 1 - 1
MBI/FirmLib/Com.FirmLib.UI/Manufacturer/WinProjectAssetList.xaml

@@ -8,7 +8,7 @@
              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}}"
-                 Width="{Binding Width,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>
     </fw:NChildWindow.Resources>

+ 1 - 1
MBI/FirmLib/Com.FirmLib.UI/Seller/WinSellerBaseInfo.xaml

@@ -10,7 +10,7 @@
              xmlns:behaviors="clr-namespace:FWindSoft.Wpf.Behaviors;assembly=FWindSoft.Wpf"
              mc:Ignorable="d" Title="供应商名称"
              d:DesignHeight="300" d:DesignWidth="500" Name="this" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
-                 Width="{Binding Width,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}" >
+                 Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}" >
     <fw:NChildWindow.Resources>
         <wpf:BindingProxy x:Key="DATA" Data="{Binding}"></wpf:BindingProxy>
     </fw:NChildWindow.Resources>

+ 1 - 1
MBI/FirmLib/Com.FirmLib.UI/Seller/WinSellerInfo.xaml

@@ -9,7 +9,7 @@
                  xmlns:bllCommon="clr-namespace:Com.FirmLib.UI.BllCommon"
              mc:Ignorable="d" Title="供应商信息"
              d:DesignHeight="300" d:DesignWidth="500" Name="this" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
-                 Width="{Binding Width,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}" >
+                 Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}" >
     <fw:NChildWindow.Resources>
         <wpf:BindingProxy x:Key="DATA" Data="{Binding}"></wpf:BindingProxy>
     </fw:NChildWindow.Resources>

+ 1 - 1
MBI/FirmLib/Com.FirmLib.UI/Seller/WinSellerProjectContract.xaml

@@ -8,7 +8,7 @@
              xmlns:ui="clr-namespace:Com.FirmLib.UI"
              mc:Ignorable="d" Title="新建项目添加合同"
              d:DesignHeight="300" d:DesignWidth="500" Name="this" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
-                 Width="{Binding Width,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>
     </fw:NChildWindow.Resources>

+ 1 - 1
MBI/FirmLib/Com.FirmLib.UI/Seller/WinSellerProjectInfo.xaml

@@ -11,7 +11,7 @@
              xmlns:ui="clr-namespace:Com.FirmLib.UI"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="500"  Name="this" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
-                 Width="{Binding Width,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}">
+                 Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}">
     <fw:NChildWindow.Resources>
         <wpf:BindingProxy x:Key="DATA" Data="{Binding}"></wpf:BindingProxy>
     </fw:NChildWindow.Resources>