Ver código fonte

xls:更新如下内容
1、dev相关引用去掉
2、下载MD5验证失败时,增加是否重新下载本层文件
3、去除掉源码项目中不需要的dll

xulisong 6 anos atrás
pai
commit
85f7b2b8f3
100 arquivos alterados com 175 adições e 109512 exclusões
  1. 0 9
      MBI/Config/HttpSetting.xml
  2. BIN
      MBI/Dlls/DevExpress/DevExpress.Data.v16.2.dll
  3. BIN
      MBI/Dlls/DevExpress/DevExpress.Mvvm.v16.2.dll
  4. BIN
      MBI/Dlls/DevExpress/DevExpress.Printing.v16.2.Core.dll
  5. BIN
      MBI/Dlls/DevExpress/DevExpress.Xpf.Core.v16.2.dll
  6. BIN
      MBI/Dlls/DevExpress/DevExpress.Xpf.Grid.v16.2.Core.dll
  7. BIN
      MBI/Dlls/DevExpress/DevExpress.Xpf.Grid.v16.2.dll
  8. BIN
      MBI/Dlls/R2016/AdWindows.dll
  9. BIN
      MBI/Dlls/R2016/RevitAPI.dll
  10. BIN
      MBI/Dlls/R2016/RevitAPIIFC.dll
  11. BIN
      MBI/Dlls/R2016/RevitAPILink.dll
  12. BIN
      MBI/Dlls/R2016/RevitAPIUI.dll
  13. BIN
      MBI/Dlls/R2016/RevitAPIUILink.dll
  14. 36 0
      MBI/SAGA.DotNetUtils/Extend/ObservableCollectionExtension.cs
  15. 6 0
      MBI/SAGA.DotNetUtils/SAGA.DotNetUtils.csproj
  16. 36 0
      MBI/SAGA.DotNetUtils/Themes/DataGridStyle.xaml
  17. 2 0
      MBI/SAGA.DotNetUtils/Themes/Generic.xaml
  18. 29 0
      MBI/SAGA.DotNetUtils/WPF/DataGridResource.cs
  19. BIN
      MBI/SAGA.DotNetUtils/bin/x64/Debug/ICSharpCode.SharpZipLib.dll
  20. BIN
      MBI/SAGA.DotNetUtils/bin/x64/Debug/INIFileParser.dll
  21. 0 1181
      MBI/SAGA.DotNetUtils/bin/x64/Debug/INIFileParser.xml
  22. 0 60
      MBI/SAGA.DotNetUtils/bin/x64/Debug/Logger/log4net.config
  23. BIN
      MBI/SAGA.DotNetUtils/bin/x64/Debug/NPOI.OOXML.dll
  24. BIN
      MBI/SAGA.DotNetUtils/bin/x64/Debug/NPOI.OpenXml4Net.dll
  25. BIN
      MBI/SAGA.DotNetUtils/bin/x64/Debug/NPOI.OpenXmlFormats.dll
  26. BIN
      MBI/SAGA.DotNetUtils/bin/x64/Debug/NPOI.dll
  27. BIN
      MBI/SAGA.DotNetUtils/bin/x64/Debug/Newtonsoft.Json.dll
  28. 0 10760
      MBI/SAGA.DotNetUtils/bin/x64/Debug/Newtonsoft.Json.xml
  29. BIN
      MBI/SAGA.DotNetUtils/bin/x64/Debug/SAGA.DotNetUtils.dll
  30. BIN
      MBI/SAGA.DotNetUtils/bin/x64/Debug/SAGA.DotNetUtils.pdb
  31. BIN
      MBI/SAGA.DotNetUtils/bin/x64/Debug/log4net.dll
  32. 0 32464
      MBI/SAGA.DotNetUtils/bin/x64/Debug/log4net.xml
  33. BIN
      MBI/SAGA.DotNetUtils/bin/x64/R17/ICSharpCode.SharpZipLib.dll
  34. BIN
      MBI/SAGA.DotNetUtils/bin/x64/R17/INIFileParser.dll
  35. 0 1181
      MBI/SAGA.DotNetUtils/bin/x64/R17/INIFileParser.xml
  36. 0 60
      MBI/SAGA.DotNetUtils/bin/x64/R17/Logger/log4net.config
  37. BIN
      MBI/SAGA.DotNetUtils/bin/x64/R17/NPOI.OOXML.dll
  38. BIN
      MBI/SAGA.DotNetUtils/bin/x64/R17/NPOI.OpenXml4Net.dll
  39. BIN
      MBI/SAGA.DotNetUtils/bin/x64/R17/NPOI.OpenXmlFormats.dll
  40. BIN
      MBI/SAGA.DotNetUtils/bin/x64/R17/NPOI.dll
  41. BIN
      MBI/SAGA.DotNetUtils/bin/x64/R17/Newtonsoft.Json.dll
  42. 0 10760
      MBI/SAGA.DotNetUtils/bin/x64/R17/Newtonsoft.Json.xml
  43. BIN
      MBI/SAGA.DotNetUtils/bin/x64/R17/SAGA.DotNetUtils.dll
  44. BIN
      MBI/SAGA.DotNetUtils/bin/x64/R17/SAGA.DotNetUtils.pdb
  45. BIN
      MBI/SAGA.DotNetUtils/bin/x64/R17/log4net.dll
  46. 0 32464
      MBI/SAGA.DotNetUtils/bin/x64/R17/log4net.xml
  47. 0 1
      MBI/SAGA.MBI/Calc/CalcContext.cs
  48. 0 1
      MBI/SAGA.MBI/DataArrange/DalEquip.cs
  49. 0 1
      MBI/SAGA.MBI/DataArrange/DalModeFileManange.cs
  50. 0 2
      MBI/SAGA.MBI/Extend/MRevitEquipBaseExtend.cs
  51. 0 1
      MBI/SAGA.MBI/ModeInfoEdit/EquipmentCombineItem.cs
  52. 15 3
      MBI/SAGA.MBI/RequestData/UpLoadFileRequest.cs
  53. 0 1
      MBI/SAGA.MBI/RevitExport/Entity/MBIElement.cs
  54. 0 1
      MBI/SAGA.MBI/RevitExport/ExportDb.cs
  55. 0 2
      MBI/SAGA.MBI/RevitExport/ParseElement/ParseElementManager.cs
  56. 0 1
      MBI/SAGA.MBI/RevitExport/ParseElement/ParseWall.cs
  57. 2 22
      MBI/SAGA.MBI/SAGA.MBI.csproj
  58. 0 1
      MBI/SAGA.MBI/ToolCommand.cs
  59. 0 4
      MBI/SAGA.MBI/ToolsData/CheckDuplicationBIMId.cs
  60. 0 1
      MBI/SAGA.MBI/ToolsData/CheckEquipInSpace.cs
  61. 1 1
      MBI/SAGA.MBI/WinView/Login/VmSelectSaveDuty.cs
  62. 0 2
      MBI/SAGA.MBI/WinView/ModeInfoMaintenance/FirmDependance/BaseUpdateItem.cs
  63. 0 3
      MBI/SAGA.MBI/WinView/ModeInfoMaintenance/ImageMaintenance/MServiceImageAdd.cs
  64. 1 1
      MBI/SAGA.MBI/WinView/ModeInfoMaintenance/WinConfigRunParam.xaml
  65. 10 12
      MBI/SAGA.MBI/WinView/ModeInfoMaintenance/WinInsuer.xaml
  66. 3 3
      MBI/SAGA.MBI/WinView/ModeInfoMaintenance/WinInsuerContractInfo.xaml
  67. 10 12
      MBI/SAGA.MBI/WinView/ModeInfoMaintenance/WinMaintenanceDealer.xaml
  68. 11 14
      MBI/SAGA.MBI/WinView/ModeInfoMaintenance/WinManufacturer.xaml
  69. 0 1
      MBI/SAGA.MBI/WinView/ModeInfoMaintenance/WinMatchFM.xaml.cs
  70. 0 2
      MBI/SAGA.MBI/WinView/ModeInfoMaintenance/WinMissFMList.xaml.cs
  71. 9 12
      MBI/SAGA.MBI/WinView/ModeInfoMaintenance/WinSupply.xaml
  72. 3 2
      MBI/SAGA.MBI/WinView/ModeInfoMaintenance/WinSupplyContractInfo.xaml
  73. 1 2
      MBI/SAGA.MBI/WinView/Space/WinCreateSpace.xaml.cs
  74. 0 1
      MBI/SAGA.MBI/WinView/TraceView/WinTraceView.xaml.cs
  75. BIN
      MBI/SAGA.MBI/bin/R17/icudt.dll
  76. BIN
      MBI/SAGA.MBI/bin/R17/libcef.dll
  77. BIN
      MBI/SAGA.MBI/bin/x64/R17/AdWindows.dll
  78. BIN
      MBI/SAGA.MBI/bin/x64/R17/Aliyun.OSS.dll
  79. BIN
      MBI/SAGA.MBI/bin/x64/R17/CefSharp.BrowserSubprocess.Core.dll
  80. BIN
      MBI/SAGA.MBI/bin/x64/R17/CefSharp.BrowserSubprocess.Core.pdb
  81. BIN
      MBI/SAGA.MBI/bin/x64/R17/CefSharp.BrowserSubprocess.exe
  82. BIN
      MBI/SAGA.MBI/bin/x64/R17/CefSharp.BrowserSubprocess.pdb
  83. BIN
      MBI/SAGA.MBI/bin/x64/R17/CefSharp.Core.dll
  84. BIN
      MBI/SAGA.MBI/bin/x64/R17/CefSharp.Core.pdb
  85. 0 1095
      MBI/SAGA.MBI/bin/x64/R17/CefSharp.Core.xml
  86. 0 2186
      MBI/SAGA.MBI/bin/x64/R17/CefSharp.Wpf.XML
  87. BIN
      MBI/SAGA.MBI/bin/x64/R17/CefSharp.Wpf.dll
  88. BIN
      MBI/SAGA.MBI/bin/x64/R17/CefSharp.Wpf.pdb
  89. 0 8402
      MBI/SAGA.MBI/bin/x64/R17/CefSharp.XML
  90. BIN
      MBI/SAGA.MBI/bin/x64/R17/CefSharp.dll
  91. BIN
      MBI/SAGA.MBI/bin/x64/R17/CefSharp.pdb
  92. BIN
      MBI/SAGA.MBI/bin/x64/R17/DevExpress.CodeParser.v16.2.dll
  93. BIN
      MBI/SAGA.MBI/bin/x64/R17/DevExpress.Data.v16.2.dll
  94. BIN
      MBI/SAGA.MBI/bin/x64/R17/DevExpress.Mvvm.v16.2.dll
  95. BIN
      MBI/SAGA.MBI/bin/x64/R17/DevExpress.Pdf.v16.2.Core.dll
  96. 0 8780
      MBI/SAGA.MBI/bin/x64/R17/DevExpress.Pdf.v16.2.Core.xml
  97. BIN
      MBI/SAGA.MBI/bin/x64/R17/DevExpress.Printing.v16.2.Core.dll
  98. BIN
      MBI/SAGA.MBI/bin/x64/R17/DevExpress.Xpf.Core.v16.2.dll
  99. BIN
      MBI/SAGA.MBI/bin/x64/R17/DevExpress.Xpf.Grid.v16.2.Core.dll
  100. 0 0
      MBI/SAGA.MBI/bin/x64/R17/DevExpress.Xpf.Grid.v16.2.dll

+ 0 - 9
MBI/Config/HttpSetting.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-16"?>
-<InnerSetting xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <BaseAddress>http://101.200.32.13:28888/venders</BaseAddress>
-  <DependencyAddress>http://192.168.100.225:8080/venders-dp</DependencyAddress>
-  <EquipmentFamilyAddress>http://101.201.234.108:28888/data-platform-3</EquipmentFamilyAddress>
-  <FileAddress>http://service.sagacloud.cn:28888</FileAddress>
-  <SaasAddress>http://mbi.sagacloud.cn:8080</SaasAddress>
-  <H5Address>http://mbi.sagacloud.cn:8889</H5Address>
-</InnerSetting>

BIN
MBI/Dlls/DevExpress/DevExpress.Data.v16.2.dll


BIN
MBI/Dlls/DevExpress/DevExpress.Mvvm.v16.2.dll


BIN
MBI/Dlls/DevExpress/DevExpress.Printing.v16.2.Core.dll


BIN
MBI/Dlls/DevExpress/DevExpress.Xpf.Core.v16.2.dll


BIN
MBI/Dlls/DevExpress/DevExpress.Xpf.Grid.v16.2.Core.dll


BIN
MBI/Dlls/DevExpress/DevExpress.Xpf.Grid.v16.2.dll


BIN
MBI/Dlls/R2016/AdWindows.dll


BIN
MBI/Dlls/R2016/RevitAPI.dll


BIN
MBI/Dlls/R2016/RevitAPIIFC.dll


BIN
MBI/Dlls/R2016/RevitAPILink.dll


BIN
MBI/Dlls/R2016/RevitAPIUI.dll


BIN
MBI/Dlls/R2016/RevitAPIUILink.dll


+ 36 - 0
MBI/SAGA.DotNetUtils/Extend/ObservableCollectionExtension.cs

@@ -0,0 +1,36 @@
+/*-------------------------------------------------------------------------
+ * 功能描述:ObservableCollectionExtension
+ * 作者:xulisong
+ * 创建时间: 2019/4/18 10:50:02
+ * 版本号:v1.0
+ *  -------------------------------------------------------------------------*/
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SAGA.DotNetUtils.Extend
+{
+    public static class ObservableCollectionExtension
+    {
+        public static void ForEach<T>(this ObservableCollection<T> collection, Action<T> action)
+        {
+            if (action == null)
+                return;
+           collection?.ToList().ForEach(action);
+        }
+        public static void AddRange<T>(this ObservableCollection<T> collection, IEnumerable<T> items)
+        {
+            if (items == null)
+                return;
+            foreach (var addItem in items)
+            {
+                collection?.Add(addItem);
+            }
+        }
+    
+    }
+}

+ 6 - 0
MBI/SAGA.DotNetUtils/SAGA.DotNetUtils.csproj

@@ -313,6 +313,7 @@
     <Compile Include="Extend\IEnumerableExtensions.cs" />
     <Compile Include="Extend\JObjectExt.cs" />
     <Compile Include="Extend\ObjectExtend.cs" />
+    <Compile Include="Extend\ObservableCollectionExtension.cs" />
     <Compile Include="FileOperate\FileStreamOperate.cs" />
     <Compile Include="Extend\IEnumerableExtend.cs" />
     <Compile Include="Extend\IntExt.cs" />
@@ -441,6 +442,7 @@
     <Compile Include="WPF\Converter\BoolToInverserConverter.cs" />
     <Compile Include="WPF\Converter\BoolToVisibilityConverter.cs" />
     <Compile Include="WPF\Converter\StringToImageConverter.cs" />
+    <Compile Include="WPF\DataGridResource.cs" />
     <Compile Include="WPF\Extend\UIElementExtensions.cs" />
     <Compile Include="WPF\MVVM\BaseCommand.cs" />
     <Compile Include="WPF\MVVM\BasePropertyChanged.cs" />
@@ -511,6 +513,10 @@
     <None Include="Utilities\packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <Page Include="Themes\DataGridStyle.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Themes\Generic.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

+ 36 - 0
MBI/SAGA.DotNetUtils/Themes/DataGridStyle.xaml

@@ -0,0 +1,36 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:common="clr-namespace:SAGA.DotNetUtils.WPF">
+   
+    <Style x:Key="{x:Static common:DataGridResource.RowStyle}" TargetType="DataGridRow" BasedOn="{StaticResource ResourceKey={x:Type DataGridRow}}">
+        <Setter Property="Height" Value="30"></Setter>
+        <Style.Triggers>
+            <Trigger Property="ItemsControl.AlternationIndex"
+                         Value="0">
+                <Setter Property="Background" Value="White" />
+            </Trigger>
+            <Trigger Property="ItemsControl.AlternationIndex"
+                         Value="1">
+                <Setter Property="Background" Value="#FFE6E3DD" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    <Style x:Key="{x:Static common:DataGridResource.ElementStyle}" TargetType="TextBlock">
+        <!--<Setter Property="TextAlignment" Value="Left"/>-->
+        <Setter Property="VerticalAlignment" Value="Center"/>
+    </Style>
+
+    <Style x:Key="{x:Static common:DataGridResource.DataGridStyle}" TargetType="DataGrid" BasedOn="{StaticResource ResourceKey={x:Type DataGrid}}">
+        <Setter Property="AlternationCount" Value="2"></Setter>
+        <Setter Property="CanUserSortColumns" Value="True"></Setter>
+        <Setter Property="SelectionUnit" Value="FullRow"></Setter>
+        <Setter Property="CanUserAddRows" Value="False"></Setter>
+        <Setter Property="CanUserDeleteRows" Value="False"></Setter>
+        <Setter Property="AutoGenerateColumns" Value="False"></Setter>
+        <Setter Property="SelectionMode" Value="Single"></Setter>
+        <Setter Property="VerticalScrollBarVisibility" Value="Auto"></Setter>
+        <Setter Property="HorizontalScrollBarVisibility" Value="Auto"></Setter>
+        <Setter Property="RowStyle" Value="{StaticResource ResourceKey={x:Static common:DataGridResource.RowStyle}}"></Setter>
+    </Style>
+</ResourceDictionary>

+ 2 - 0
MBI/SAGA.DotNetUtils/Themes/Generic.xaml

@@ -5,6 +5,8 @@
     xmlns:comboboxTreeView="clr-namespace:SAGA.DotNetUtils.WPF.UserControl.ComboboxTreeView">
     <ResourceDictionary.MergedDictionaries >
         <ResourceDictionary Source="/SAGA.DotNetUtils;component/Themes/SearchInputEditor.xaml"/>
+        <ResourceDictionary Source="/SAGA.DotNetUtils;component/Themes/DataGridStyle.xaml"/>
+        
     </ResourceDictionary.MergedDictionaries>
     <!-- TreeViewItem styles -->
     <SolidColorBrush x:Key="TreeViewItem.TreeArrow.Static.Checked.Fill" Color="#FF595959"/>

+ 29 - 0
MBI/SAGA.DotNetUtils/WPF/DataGridResource.cs

@@ -0,0 +1,29 @@
+/*-------------------------------------------------------------------------
+ * 功能描述:DataGridResource
+ * 作者:xulisong
+ * 创建时间: 2019/4/18 11:28:11
+ * 版本号:v1.0
+ *  -------------------------------------------------------------------------*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace SAGA.DotNetUtils.WPF
+{
+    public static class DataGridResource
+    {
+        static DataGridResource()
+        {
+            DataGridStyle = new ComponentResourceKey(typeof(DataGridResource), nameof(DataGridStyle));
+            RowStyle = new ComponentResourceKey(typeof(DataGridResource), nameof(RowStyle));
+            ElementStyle = new ComponentResourceKey(typeof(DataGridResource), nameof(ElementStyle));
+        }
+        public static ResourceKey DataGridStyle { get; private set; }
+        public static ResourceKey RowStyle { get; private set; }
+        public static ResourceKey ElementStyle { get; private set; }
+    }
+}

BIN
MBI/SAGA.DotNetUtils/bin/x64/Debug/ICSharpCode.SharpZipLib.dll


BIN
MBI/SAGA.DotNetUtils/bin/x64/Debug/INIFileParser.dll


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 1181
MBI/SAGA.DotNetUtils/bin/x64/Debug/INIFileParser.xml


+ 0 - 60
MBI/SAGA.DotNetUtils/bin/x64/Debug/Logger/log4net.config

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net"/>
-  </configSections>
-
-  <log4net>
-    <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
-      <!--日志路径-->
-      <param name= "File" value= "D:\App_Log\"/>
-      <!--是否是向文件中追加日志-->
-      <param name= "AppendToFile" value= "true"/>
-      <!--log保留天数-->
-      <param name= "MaxSizeRollBackups" value= "10"/>
-      <!--日志文件名是否是固定不变的-->
-      <param name= "StaticLogFileName" value= "false"/>
-      <!--日志文件名格式为:2008-08-31.log-->
-      <param name= "DatePattern" value= "yyyy-MM-dd&quot;.log&quot;"/>
-      <!--日志根据日期滚动-->
-      <param name= "RollingStyle" value= "Date"/>
-      <layout type="log4net.Layout.PatternLayout">
-        <param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n %loggername" />
-      </layout>
-    </appender>
-
-    <!-- 控制台前台显示日志 -->
-    <appender name="ColoredConsoleAppender" type="log4net.Appender.ColoredConsoleAppender">
-      <mapping>
-        <level value="ERROR" />
-        <foreColor value="Red, HighIntensity" />
-        <!--<backColor value="Red,HighIntensity"/>-->
-      </mapping>
-      <mapping>
-        <level value="Info" />
-        <foreColor value="Green" />
-      </mapping>
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%n%date{HH:mm:ss,fff} [%-5level] %m" />
-      </layout>
-
-      <filter type="log4net.Filter.LevelRangeFilter">
-        <param name="LevelMin" value="ALL" />
-        <param name="LevelMax" value="Fatal" />
-      </filter>
-    </appender>
-
-    <root>
-      <!--(高) OFF > FATAL > ERROR > WARN > INFO > DEBUG > ALL (低) -->
-      <level value="ALL" />
-      <appender-ref ref="ColoredConsoleAppender"/>
-      <appender-ref ref="RollingLogFileAppender"/>
-    </root>
-    <logger name="Debug">
-      <!--(高) OFF > FATAL > ERROR > WARN > INFO > DEBUG > ALL (低) -->
-      <level value="ALL" />
-      <appender-ref ref="ColoredConsoleAppender"/>
-      <appender-ref ref="RollingLogFileAppender"/>
-    </logger>
-  </log4net>
-</configuration>

BIN
MBI/SAGA.DotNetUtils/bin/x64/Debug/NPOI.OOXML.dll


BIN
MBI/SAGA.DotNetUtils/bin/x64/Debug/NPOI.OpenXml4Net.dll


BIN
MBI/SAGA.DotNetUtils/bin/x64/Debug/NPOI.OpenXmlFormats.dll


BIN
MBI/SAGA.DotNetUtils/bin/x64/Debug/NPOI.dll


BIN
MBI/SAGA.DotNetUtils/bin/x64/Debug/Newtonsoft.Json.dll


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 10760
MBI/SAGA.DotNetUtils/bin/x64/Debug/Newtonsoft.Json.xml


BIN
MBI/SAGA.DotNetUtils/bin/x64/Debug/SAGA.DotNetUtils.dll


BIN
MBI/SAGA.DotNetUtils/bin/x64/Debug/SAGA.DotNetUtils.pdb


BIN
MBI/SAGA.DotNetUtils/bin/x64/Debug/log4net.dll


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 32464
MBI/SAGA.DotNetUtils/bin/x64/Debug/log4net.xml


BIN
MBI/SAGA.DotNetUtils/bin/x64/R17/ICSharpCode.SharpZipLib.dll


BIN
MBI/SAGA.DotNetUtils/bin/x64/R17/INIFileParser.dll


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 1181
MBI/SAGA.DotNetUtils/bin/x64/R17/INIFileParser.xml


+ 0 - 60
MBI/SAGA.DotNetUtils/bin/x64/R17/Logger/log4net.config

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net"/>
-  </configSections>
-
-  <log4net>
-    <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
-      <!--日志路径-->
-      <param name= "File" value= "D:\App_Log\"/>
-      <!--是否是向文件中追加日志-->
-      <param name= "AppendToFile" value= "true"/>
-      <!--log保留天数-->
-      <param name= "MaxSizeRollBackups" value= "10"/>
-      <!--日志文件名是否是固定不变的-->
-      <param name= "StaticLogFileName" value= "false"/>
-      <!--日志文件名格式为:2008-08-31.log-->
-      <param name= "DatePattern" value= "yyyy-MM-dd&quot;.log&quot;"/>
-      <!--日志根据日期滚动-->
-      <param name= "RollingStyle" value= "Date"/>
-      <layout type="log4net.Layout.PatternLayout">
-        <param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n %loggername" />
-      </layout>
-    </appender>
-
-    <!-- 控制台前台显示日志 -->
-    <appender name="ColoredConsoleAppender" type="log4net.Appender.ColoredConsoleAppender">
-      <mapping>
-        <level value="ERROR" />
-        <foreColor value="Red, HighIntensity" />
-        <!--<backColor value="Red,HighIntensity"/>-->
-      </mapping>
-      <mapping>
-        <level value="Info" />
-        <foreColor value="Green" />
-      </mapping>
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%n%date{HH:mm:ss,fff} [%-5level] %m" />
-      </layout>
-
-      <filter type="log4net.Filter.LevelRangeFilter">
-        <param name="LevelMin" value="ALL" />
-        <param name="LevelMax" value="Fatal" />
-      </filter>
-    </appender>
-
-    <root>
-      <!--(高) OFF > FATAL > ERROR > WARN > INFO > DEBUG > ALL (低) -->
-      <level value="ALL" />
-      <appender-ref ref="ColoredConsoleAppender"/>
-      <appender-ref ref="RollingLogFileAppender"/>
-    </root>
-    <logger name="Debug">
-      <!--(高) OFF > FATAL > ERROR > WARN > INFO > DEBUG > ALL (低) -->
-      <level value="ALL" />
-      <appender-ref ref="ColoredConsoleAppender"/>
-      <appender-ref ref="RollingLogFileAppender"/>
-    </logger>
-  </log4net>
-</configuration>

BIN
MBI/SAGA.DotNetUtils/bin/x64/R17/NPOI.OOXML.dll


BIN
MBI/SAGA.DotNetUtils/bin/x64/R17/NPOI.OpenXml4Net.dll


BIN
MBI/SAGA.DotNetUtils/bin/x64/R17/NPOI.OpenXmlFormats.dll


BIN
MBI/SAGA.DotNetUtils/bin/x64/R17/NPOI.dll


BIN
MBI/SAGA.DotNetUtils/bin/x64/R17/Newtonsoft.Json.dll


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 10760
MBI/SAGA.DotNetUtils/bin/x64/R17/Newtonsoft.Json.xml


BIN
MBI/SAGA.DotNetUtils/bin/x64/R17/SAGA.DotNetUtils.dll


BIN
MBI/SAGA.DotNetUtils/bin/x64/R17/SAGA.DotNetUtils.pdb


BIN
MBI/SAGA.DotNetUtils/bin/x64/R17/log4net.dll


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 32464
MBI/SAGA.DotNetUtils/bin/x64/R17/log4net.xml


+ 0 - 1
MBI/SAGA.MBI/Calc/CalcContext.cs

@@ -12,7 +12,6 @@ using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using Autodesk.Revit.DB;
-using DevExpress.Mvvm.Native;
 using SAGA.DotNetUtils;
 using SAGA.DotNetUtils.Data;
 using SAGA.DotNetUtils.Extend;

+ 0 - 1
MBI/SAGA.MBI/DataArrange/DalEquip.cs

@@ -9,7 +9,6 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Autodesk.Revit.DB;
-using DevExpress.Xpf.Bars;
 using Newtonsoft.Json.Linq;
 using SAGA.DotNetUtils;
 using SAGA.DotNetUtils.Extend;

+ 0 - 1
MBI/SAGA.MBI/DataArrange/DalModeFileManange.cs

@@ -13,7 +13,6 @@ using System.Windows.Markup;
 using Autodesk.Revit.DB;
 using Autodesk.Revit.DB.Events;
 using Autodesk.Revit.UI;
-using DevExpress.Xpf.CodeView;
 using SAGA.DotNetUtils;
 using SAGA.DotNetUtils.Extend;
 using SAGA.DotNetUtils.Logger;

+ 0 - 2
MBI/SAGA.MBI/Extend/MRevitEquipBaseExtend.cs

@@ -8,8 +8,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Autodesk.Revit.DB;
-using DevExpress.Xpf.Bars;
 using SAGA.DotNetUtils;
 using SAGA.DotNetUtils.DB;
 using SAGA.MBI.Common;

+ 0 - 1
MBI/SAGA.MBI/ModeInfoEdit/EquipmentCombineItem.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using DevExpress.Data.Helpers;
 using Newtonsoft.Json.Linq;
 using SAGA.DotNetUtils;
 using SAGA.DotNetUtils.Extend;

+ 15 - 3
MBI/SAGA.MBI/RequestData/UpLoadFileRequest.cs

@@ -114,6 +114,7 @@ namespace SAGA.MBI.RequestData
             if (state == 2)
                 FloorFileOperate.BakFile(fullPath);
             string key = $"{MBIConst.OssClientFileKey}{cloudName}";
+            DownLoadNew:
             OssClient client = new OssClient(MBIConst.Endpoint, MBIConst.AccessKeyId, MBIConst.AccessKeySecret);
             int timeoutNum = 20;
             long totalLength = 0;
@@ -135,7 +136,8 @@ namespace SAGA.MBI.RequestData
                     Debug.WriteLine("ProgressCallback - TotalBytes:{0}M, TransferredBytes:{1}M,上传百分比:{2}%",
                         Math.Round(tempTotal / 1024d / 1024,3), Math.Round(tempTrans / 1024d / 1024,3), currentData);
                     windown?.Update(currentData);
-                    if (currentData >= 100d && windown.Count == windown.Cur)
+                    //currentData >= 100d
+                    if (tempTrans >= tempTotal && windown!=null&&windown.Count == windown.Cur)
                     {
                         //MessageBox.Show("数据上传完毕!");
                         CloseDownloadWin(true, false);
@@ -188,10 +190,20 @@ namespace SAGA.MBI.RequestData
                     //下载后的文件md5校验
                     if (client.GetObjectMetadata(bucketName, key).ContentMd5 != md5)
                     {
-                        string per =Math.Round((fs.Length / (double)totalLength) * 100,3) + "%";
+                        string per = Math.Round((fs.Length / (double)totalLength) * 100, 3) + "%";
                         string errorMessage = ($"楼层 {floorName} MD5校验失败,本地与服务器不一致!下载进度{per}");
+                        if (fs.Length== totalLength)
+                        {
+                            if (MessageShowBase.Question(errorMessage + "\r\n是否重新下载该层文件"))
+                            {
+                                goto DownLoadNew;
+                            }                          
+                        }
+                        else
+                        {                         
+                            MessageShowBase.Infomation(errorMessage);
+                        }
                         MailLog.Log("下载MD5异常", errorMessage);
-                        MessageShowBase.Infomation(errorMessage);
                         result = false;
                     }
                     #endregion

+ 0 - 1
MBI/SAGA.MBI/RevitExport/Entity/MBIElement.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Autodesk.Revit.DB;
-using DevExpress.Data.Helpers;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 using SAGA.MBI.JsonConvert;

+ 0 - 1
MBI/SAGA.MBI/RevitExport/ExportDb.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using DevExpress.Data.Helpers;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using SAGA.MBI.JsonConvert;

+ 0 - 2
MBI/SAGA.MBI/RevitExport/ParseElement/ParseElementManager.cs

@@ -3,8 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using System.Threading.Tasks;
-using DevExpress.Data.Helpers;
 
 namespace SAGA.MBI.RevitExport
 {

+ 0 - 1
MBI/SAGA.MBI/RevitExport/ParseElement/ParseWall.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Autodesk.Revit.DB;
-using DevExpress.Data.Helpers;
 using SAGA.RevitUtils.Extends;
 
 namespace SAGA.MBI.RevitExport.ParseElement

+ 2 - 22
MBI/SAGA.MBI/SAGA.MBI.csproj

@@ -202,29 +202,9 @@
     <Reference Include="Aliyun.OSS">
       <HintPath>..\Dlls\Aliyun.OSS.dll</HintPath>
     </Reference>
-    <Reference Include="DevExpress.Data.v16.2, Version=16.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DataGridExtensions, Version=1.0.39.0, Culture=neutral, PublicKeyToken=43de855f87de903a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Dlls\DevExpress\DevExpress.Data.v16.2.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.Mvvm.v16.2, Version=16.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Dlls\DevExpress\DevExpress.Mvvm.v16.2.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.Printing.v16.2.Core, Version=16.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Dlls\DevExpress\DevExpress.Printing.v16.2.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.Xpf.Core.v16.2, Version=16.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Dlls\DevExpress\DevExpress.Xpf.Core.v16.2.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.Xpf.Grid.v16.2, Version=16.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Dlls\DevExpress\DevExpress.Xpf.Grid.v16.2.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.Xpf.Grid.v16.2.Core, Version=16.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Dlls\DevExpress\DevExpress.Xpf.Grid.v16.2.Core.dll</HintPath>
+      <HintPath>..\Dlls\FirmLibDll\DataGridExtensions.dll</HintPath>
     </Reference>
     <Reference Include="FWindSoft, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

+ 0 - 1
MBI/SAGA.MBI/ToolCommand.cs

@@ -14,7 +14,6 @@ using Autodesk.Revit.Attributes;
 using Autodesk.Revit.DB;
 using Autodesk.Revit.DB.Plumbing;
 using Autodesk.Revit.UI;
-using DevExpress.Xpf.Core;
 using FWindSoft.DataFramework;
 using SAGA.DotNetUtils;
 using SAGA.DotNetUtils.Logger;

+ 0 - 4
MBI/SAGA.MBI/ToolsData/CheckDuplicationBIMId.cs

@@ -14,13 +14,9 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
-using DevExpress.Data.Helpers;
 using Microsoft.Win32;
 using NPOI.SS.UserModel;
 using NPOI.XSSF.UserModel;
-using SAGA.DotNetUtils.Extend;
-using SAGA.DotNetUtils.Logger;
 using SAGA.DotNetUtils.Others;
 using SAGA.MBI.Common;
 using SAGA.MBI.Tools;

+ 0 - 1
MBI/SAGA.MBI/ToolsData/CheckEquipInSpace.cs

@@ -13,7 +13,6 @@ using SAGA.MBI.Calc;
 using SAGA.MBI.Model;
 using SAGA.MBI.WinView.Upload;
 using Autodesk.Revit.DB;
-using DevExpress.SpreadsheetSource;
 using Microsoft.Win32;
 using SAGA.DotNetUtils.Logger;
 using SAGA.MBI.DataArrange;

+ 1 - 1
MBI/SAGA.MBI/WinView/Login/VmSelectSaveDuty.cs

@@ -9,8 +9,8 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
-using DevExpress.Mvvm.Native;
 using SAGA.DotNetUtils;
+using SAGA.DotNetUtils.Extend;
 using SAGA.DotNetUtils.Logger;
 using SAGA.DotNetUtils.Others;
 using SAGA.DotNetUtils.WPF;

+ 0 - 2
MBI/SAGA.MBI/WinView/ModeInfoMaintenance/FirmDependance/BaseUpdateItem.cs

@@ -4,8 +4,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
-using DevExpress.Data.Helpers;
 using SAGA.MBI.Common;
 
 namespace SAGA.MBI.WinView

+ 0 - 3
MBI/SAGA.MBI/WinView/ModeInfoMaintenance/ImageMaintenance/MServiceImageAdd.cs

@@ -8,9 +8,6 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
-using Autodesk.Revit.DB;
-using DevExpress.Xpf.CodeView;
 using SAGA.DotNetUtils.WPF;
 using SAGA.MBI.Model;
 using SAGA.MBI.Tools;

+ 1 - 1
MBI/SAGA.MBI/WinView/ModeInfoMaintenance/WinConfigRunParam.xaml

@@ -1,4 +1,4 @@
-<Window xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"  x:Class="SAGA.MBI.WinView.ModeInfoMaintenance.WinConfigRunParam"
+<Window  x:Class="SAGA.MBI.WinView.ModeInfoMaintenance.WinConfigRunParam"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

+ 10 - 12
MBI/SAGA.MBI/WinView/ModeInfoMaintenance/WinInsuer.xaml

@@ -3,10 +3,9 @@
              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:local="clr-namespace:SAGA.MBI.WinView.ModeInfoMaintenance"
-             xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
         xmlns:wpf="clr-namespace:SAGA.DotNetUtils.WPF;assembly=SAGA.DotNetUtils"
         xmlns:windows="clr-namespace:SAGA.RevitUtils.Windows;assembly=SAGA.RevitUtils"
+        xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
         mc:Ignorable="d" Title="选择保险公司" WindowStartupLocation="CenterScreen"
              Height="310" Width="557">
     <Grid Margin="5">
@@ -20,16 +19,15 @@
             <wpf:SearchInputEditor WaterText="输入厂商名称关键字快速搜索(支持模糊搜索,首字符缩写)" Margin="0,5,0,5" VerticalAlignment="Center" HorizontalAlignment="Stretch" ButtonBase.Click="SearchInputEditor_Click"></wpf:SearchInputEditor>
         </Grid>
         <Grid Grid.Row="1">
-            <dxg:GridControl  x:Name="pivotGridControl1"
-                              ItemsSource="{Binding Path=Venders}"
-                              SelectedItem="{Binding Path=CurrentVender}">
-                <dxg:GridControl.View>
-                    <dxg:TableView ShowSearchPanelMode="Never"  AllowGrouping="False" ShowGroupPanel="False"/>
-                </dxg:GridControl.View>
-                <dxg:GridColumn Width="*" FieldName="厂商名称"  Binding="{Binding Path=Name}" AutoFilterCondition="Contains" FilterPopupMode="CheckedList"></dxg:GridColumn>
-                <dxg:GridColumn Width="150" FieldName="联系人" Binding="{Binding Path=Negotiator}" AutoFilterCondition="Contains" FilterPopupMode="CheckedList"></dxg:GridColumn>
-                <dxg:GridColumn Width="120" FieldName="联系电话" Binding="{Binding Path=PhoneNumber}" AutoFilterCondition="Contains" FilterPopupMode="CheckedList"></dxg:GridColumn>
-            </dxg:GridControl>
+            <DataGrid  x:Name="pivotGridControl1" ItemsSource="{Binding Path=Venders}" SelectedItem="{Binding Path=CurrentVender}"
+                       dgx:DataGridFilter.IsAutoFilterEnabled="True" Style="{StaticResource ResourceKey={x:Static wpf:DataGridResource.DataGridStyle}}">
+                <DataGrid.Columns>
+                <DataGridTextColumn Width="*" Header="厂商名称"  Binding="{Binding Path=Name}"  ElementStyle="{StaticResource ResourceKey={x:Static wpf:DataGridResource.ElementStyle}}"></DataGridTextColumn>
+                <DataGridTextColumn Width="150" Header="联系人" Binding="{Binding Path=Negotiator }"   ElementStyle="{StaticResource ResourceKey={x:Static wpf:DataGridResource.ElementStyle}}"></DataGridTextColumn>
+                <DataGridTextColumn Width="120" Header="联系电话" Binding="{Binding Path=PhoneNumber}"  ElementStyle="{StaticResource ResourceKey={x:Static wpf:DataGridResource.ElementStyle}}"></DataGridTextColumn>
+                </DataGrid.Columns>
+
+            </DataGrid>
         </Grid>
         <Canvas Grid.Row="2">
             <TextBlock Canvas.Top="10" Canvas.Left="10">

+ 3 - 3
MBI/SAGA.MBI/WinView/ModeInfoMaintenance/WinInsuerContractInfo.xaml

@@ -1,13 +1,13 @@
-<windows:WinBase xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" 
+<windows:WinBase  
         x:Class="SAGA.MBI.WinView.ModeInfoMaintenance.WinInsuerContractInfo"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              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:local="clr-namespace:SAGA.MBI.WinView.ModeInfoMaintenance"
              xmlns:userControl="clr-namespace:SAGA.DotNetUtils.WPF.UserControl;assembly=SAGA.DotNetUtils"
              xmlns:converter="clr-namespace:SAGA.DotNetUtils.WPF.Converter;assembly=SAGA.DotNetUtils"
              xmlns:windows="clr-namespace:SAGA.RevitUtils.Windows;assembly=SAGA.RevitUtils"
+             xmlns:controls="http://schemas.FWind/xaml"
              WindowStartupLocation="CenterScreen"
              mc:Ignorable="d" Title="维护保险公司保单相关信息" 
         Height="460" Width="350">
@@ -37,7 +37,7 @@
             </Grid.RowDefinitions>
             <StackPanel Grid.Row="0" HorizontalAlignment="Left" Margin="20,0,20,10" VerticalAlignment="Bottom">
                 <Label Content="保单号:"></Label>
-                <dxe:TextEdit  Width="290" ShowNullText="True" NullText="输入保单号" NullTextForeground="LightGray"  Height="24" VerticalContentAlignment="Center"
+                <TextBox  Width="290"  Height="24" VerticalContentAlignment="Center" controls:TextWatermark.UseWatermark="True" controls:TextWatermark.ShowInfo="输入保单号"
                                Text="{Binding Path=ContractNO,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
             </StackPanel>
             <GroupBox Grid.Row="1" Header="从已有保单号中选择" Margin="20,0">

+ 10 - 12
MBI/SAGA.MBI/WinView/ModeInfoMaintenance/WinMaintenanceDealer.xaml

@@ -3,10 +3,9 @@
              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:local="clr-namespace:SAGA.MBI.WinView.ModeInfoMaintenance"
-             xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
         xmlns:wpf="clr-namespace:SAGA.DotNetUtils.WPF;assembly=SAGA.DotNetUtils"
         xmlns:windows="clr-namespace:SAGA.RevitUtils.Windows;assembly=SAGA.RevitUtils"
+        xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
         mc:Ignorable="d" Title="选择维修商" WindowStartupLocation="CenterScreen"
              Height="310" Width="557">
     <Grid Margin="5">
@@ -20,16 +19,15 @@
             <wpf:SearchInputEditor WaterText="输入厂商名称关键字快速搜索(支持模糊搜索,首字符缩写)" Margin="0,5,0,5" VerticalAlignment="Center" HorizontalAlignment="Stretch" ButtonBase.Click="SearchInputEditor_Click"></wpf:SearchInputEditor>
         </Grid>
         <Grid Grid.Row="1">
-            <dxg:GridControl  x:Name="pivotGridControl1"
-                              ItemsSource="{Binding Path=Venders}"
-                              SelectedItem="{Binding Path=CurrentVender}">
-                <dxg:GridControl.View>
-                    <dxg:TableView ShowSearchPanelMode="Never"  AllowGrouping="False" ShowGroupPanel="False"/>
-                </dxg:GridControl.View>
-                <dxg:GridColumn Width="*" FieldName="厂商名称"  Binding="{Binding Path=Name}" AutoFilterCondition="Contains" FilterPopupMode="CheckedList"></dxg:GridColumn>
-                <dxg:GridColumn Width="150" FieldName="联系人" Binding="{Binding Path=Negotiator}" AutoFilterCondition="Contains" FilterPopupMode="CheckedList"></dxg:GridColumn>
-                <dxg:GridColumn Width="120" FieldName="联系电话" Binding="{Binding Path=PhoneNumber}" AutoFilterCondition="Contains" FilterPopupMode="CheckedList"></dxg:GridColumn>
-            </dxg:GridControl>
+            <DataGrid  x:Name="pivotGridControl1" ItemsSource="{Binding Path=Venders}" SelectedItem="{Binding Path=CurrentVender}"
+                       dgx:DataGridFilter.IsAutoFilterEnabled="True" Style="{StaticResource ResourceKey={x:Static wpf:DataGridResource.DataGridStyle}}" >
+                <DataGrid.Columns>
+                    <DataGridTextColumn Width="*" Header="厂商名称"  Binding="{Binding Path=Name}"  ElementStyle="{StaticResource ResourceKey={x:Static wpf:DataGridResource.ElementStyle}}"></DataGridTextColumn>
+                    <DataGridTextColumn Width="150" Header="联系人" Binding="{Binding Path=Negotiator}"  ElementStyle="{StaticResource ResourceKey={x:Static wpf:DataGridResource.ElementStyle}}"></DataGridTextColumn>
+                    <DataGridTextColumn Width="120" Header="联系电话" Binding="{Binding Path=PhoneNumber}"  ElementStyle="{StaticResource ResourceKey={x:Static wpf:DataGridResource.ElementStyle}}"></DataGridTextColumn>
+                </DataGrid.Columns>
+             
+            </DataGrid>
         </Grid>
         <Canvas Grid.Row="2">
             <TextBlock Canvas.Top="10" Canvas.Left="10">

+ 11 - 14
MBI/SAGA.MBI/WinView/ModeInfoMaintenance/WinManufacturer.xaml

@@ -3,10 +3,9 @@
              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:local="clr-namespace:SAGA.MBI.WinView.ModeInfoMaintenance"
-             xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
         xmlns:wpf="clr-namespace:SAGA.DotNetUtils.WPF;assembly=SAGA.DotNetUtils"
         xmlns:windows="clr-namespace:SAGA.RevitUtils.Windows;assembly=SAGA.RevitUtils"
+        xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
         mc:Ignorable="d" Title="选择型号" WindowStartupLocation="CenterScreen"
              Height="310" Width="557">
     <Grid Margin="5">
@@ -20,18 +19,16 @@
             <wpf:SearchInputEditor WaterText="输入生产厂家名称,品牌名,型号键字快速搜索(支持模糊搜索)" Margin="0,5,0,5" VerticalAlignment="Center" HorizontalAlignment="Stretch" ButtonBase.Click="SearchInputEditor_Click"></wpf:SearchInputEditor>
         </Grid>
         <Grid Grid.Row="1">
-            <dxg:GridControl  x:Name="pivotGridControl1"
-                              ItemsSource="{Binding Path=Venders}"
-                              SelectedItem="{Binding Path=CurrentVender}">
-                <dxg:GridControl.View>
-                    <dxg:TableView ShowSearchPanelMode="Never"  AllowGrouping="False" ShowGroupPanel="False"/>
-                </dxg:GridControl.View>
-                <dxg:GridColumn Width="150" FieldName="生产厂家"  Binding="{Binding Path=Name}" AutoFilterCondition="Contains" FilterPopupMode="CheckedList"></dxg:GridColumn>
-                <dxg:GridColumn Width="120" FieldName="品牌" Binding="{Binding Path=Brand}" AutoFilterCondition="Contains" FilterPopupMode="CheckedList"></dxg:GridColumn>
-                <dxg:GridColumn Width="130" FieldName="型号" Binding="{Binding Path=ModeNumber}" AutoFilterCondition="Contains" FilterPopupMode="CheckedList"></dxg:GridColumn>
-                <dxg:GridColumn Width="100" FieldName="保养周期(天)" Binding="{Binding Path=MaintainPeriod}" AutoFilterCondition="Contains" FilterPopupMode="CheckedList"></dxg:GridColumn>
-                <dxg:GridColumn Width="100" FieldName="使用寿命(年)" Binding="{Binding Path=ServiceLife}" AutoFilterCondition="Contains" FilterPopupMode="CheckedList"></dxg:GridColumn>
-            </dxg:GridControl>
+            <DataGrid  x:Name="pivotGridControl1" ItemsSource="{Binding Path=Venders}"  SelectedItem="{Binding Path=CurrentVender}"
+                       dgx:DataGridFilter.IsAutoFilterEnabled="True" Style="{StaticResource ResourceKey={x:Static wpf:DataGridResource.DataGridStyle}}">
+                <DataGrid.Columns>
+                <DataGridTextColumn Width="*" MinWidth="150" Header="生产厂家"  Binding="{Binding Path=Name}"  ElementStyle="{StaticResource ResourceKey={x:Static wpf:DataGridResource.ElementStyle}}"></DataGridTextColumn>
+                <DataGridTextColumn Width="120" Header="品牌" Binding="{Binding Path=Brand}"  ElementStyle="{StaticResource ResourceKey={x:Static wpf:DataGridResource.ElementStyle}}"></DataGridTextColumn>
+                <DataGridTextColumn Width="130" Header="型号" Binding="{Binding Path=ModeNumber}"  ElementStyle="{StaticResource ResourceKey={x:Static wpf:DataGridResource.ElementStyle}}"></DataGridTextColumn>
+                <DataGridTextColumn Width="100" Header="保养周期(天)" Binding="{Binding Path=MaintainPeriod}"  ElementStyle="{StaticResource ResourceKey={x:Static wpf:DataGridResource.ElementStyle}}"></DataGridTextColumn>
+                <DataGridTextColumn Width="100" Header="使用寿命(年)" Binding="{Binding Path=ServiceLife}"  ElementStyle="{StaticResource ResourceKey={x:Static wpf:DataGridResource.ElementStyle}}"></DataGridTextColumn>
+                </DataGrid.Columns>
+            </DataGrid>
         </Grid>
         <Canvas Grid.Row="2">
             <TextBlock Canvas.Top="10" Canvas.Left="10">

+ 0 - 1
MBI/SAGA.MBI/WinView/ModeInfoMaintenance/WinMatchFM.xaml.cs

@@ -13,7 +13,6 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
-using DevExpress.Mvvm.Native;
 using SAGA.DotNetUtils;
 using SAGA.MBI.JsonConvert;
 using SAGA.MBI.Model;

+ 0 - 2
MBI/SAGA.MBI/WinView/ModeInfoMaintenance/WinMissFMList.xaml.cs

@@ -15,8 +15,6 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
-using DevExpress.Xpf.Core;
-using DevExpress.Xpf.Core.Native;
 using SAGA.DotNetUtils.Others;
 using SAGA.DotNetUtils.WPF.Extend;
 using SAGA.MBI.DataArrange;

+ 9 - 12
MBI/SAGA.MBI/WinView/ModeInfoMaintenance/WinSupply.xaml

@@ -3,9 +3,8 @@
              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:local="clr-namespace:SAGA.MBI.WinView.ModeInfoMaintenance"
-             xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
         xmlns:wpf="clr-namespace:SAGA.DotNetUtils.WPF;assembly=SAGA.DotNetUtils"
+        xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
         mc:Ignorable="d" Title="选择供应商" WindowStartupLocation="CenterScreen"
              Height="310" Width="557">
     <Grid Margin="5">
@@ -20,16 +19,14 @@
             <!--<TextBox Text="输入生产厂家。。。" VerticalContentAlignment="Center"></TextBox>-->
         </Grid>
         <Grid Grid.Row="1">
-            <dxg:GridControl  x:Name="pivotGridControl1" 
-                              ItemsSource="{Binding Path=Venders}"
-                              SelectedItem="{Binding Path=CurrentVender}">
-                <dxg:GridControl.View>
-                    <dxg:TableView ShowSearchPanelMode="Never"  AllowGrouping="False" ShowGroupPanel="False"/>
-                </dxg:GridControl.View>
-                <dxg:GridColumn Width="*" FieldName="供应商名称"  Binding="{Binding Path=Name}" AutoFilterCondition="Contains" FilterPopupMode="CheckedList"></dxg:GridColumn>
-                <dxg:GridColumn Width="150" FieldName="联系人" Binding="{Binding Path=Negotiator}" AutoFilterCondition="Contains" FilterPopupMode="CheckedList"></dxg:GridColumn>
-                <dxg:GridColumn Width="120" FieldName="联系电话" Binding="{Binding Path=PhoneNumber}" AutoFilterCondition="Contains" FilterPopupMode="CheckedList"></dxg:GridColumn>
-            </dxg:GridControl>
+            <DataGrid  x:Name="pivotGridControl1"  ItemsSource="{Binding Path=Venders}" SelectedItem="{Binding Path=CurrentVender}" 
+                       dgx:DataGridFilter.IsAutoFilterEnabled="True" Style="{StaticResource ResourceKey={x:Static wpf:DataGridResource.DataGridStyle}}">
+                <DataGrid.Columns>
+                <DataGridTextColumn Width="*" Header="供应商名称"  Binding="{Binding Path=Name}"  ElementStyle="{StaticResource ResourceKey={x:Static wpf:DataGridResource.ElementStyle}}"></DataGridTextColumn>
+                <DataGridTextColumn Width="150" Header="联系人" Binding="{Binding Path=Negotiator}"  ElementStyle="{StaticResource ResourceKey={x:Static wpf:DataGridResource.ElementStyle}}"></DataGridTextColumn>
+                <DataGridTextColumn Width="120" Header="联系电话" Binding="{Binding Path=PhoneNumber}"  ElementStyle="{StaticResource ResourceKey={x:Static wpf:DataGridResource.ElementStyle}}"></DataGridTextColumn>
+                </DataGrid.Columns>
+            </DataGrid>
         </Grid>
         <Canvas Grid.Row="2">
             <TextBlock Canvas.Top="10" Canvas.Left="10">

+ 3 - 2
MBI/SAGA.MBI/WinView/ModeInfoMaintenance/WinSupplyContractInfo.xaml

@@ -1,10 +1,11 @@
-<Window xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"  x:Class="SAGA.MBI.WinView.ModeInfoMaintenance.WinSupplyContractInfo"
+<Window  x:Class="SAGA.MBI.WinView.ModeInfoMaintenance.WinSupplyContractInfo"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              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:local="clr-namespace:SAGA.MBI.WinView.ModeInfoMaintenance"
              xmlns:userControl="clr-namespace:SAGA.DotNetUtils.WPF.UserControl;assembly=SAGA.DotNetUtils"
+             xmlns:controls="http://schemas.FWind/xaml"
              WindowStartupLocation="CenterScreen"
              mc:Ignorable="d" Title="维护供应商合同相关信息" 
         Height="460" Width="350">
@@ -31,7 +32,7 @@
             </Grid.RowDefinitions>
             <StackPanel Grid.Row="0" HorizontalAlignment="Left" Margin="20,0,20,10" VerticalAlignment="Bottom">
                 <Label Content="供应商合同编号:"></Label>
-                <dxe:TextEdit  Width="290" ShowNullText="True" NullText="输入供应商合同编号" NullTextForeground="LightGray"  Height="24" VerticalContentAlignment="Center"
+                <TextBox Width="290"   Height="24" VerticalContentAlignment="Center"  controls:TextWatermark.UseWatermark="True" controls:TextWatermark.ShowInfo="输入供应商合同编号"
                                Text="{Binding Path=ContractNO,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
             </StackPanel>
             <GroupBox Grid.Row="1" Header="从已有的供应商合同编号中选择" Margin="20,0">

+ 1 - 2
MBI/SAGA.MBI/WinView/Space/WinCreateSpace.xaml.cs

@@ -9,7 +9,6 @@ using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Shapes;
 using Autodesk.Revit.DB;
-using DevExpress.Mvvm.Native;
 using SAGA.DotNetUtils.Extend;
 using SAGA.RevitUtils.Extends;
 using WPolyline = System.Windows.Shapes.Polyline;
@@ -106,7 +105,7 @@ namespace SAGA.MBI.WinView.Space
                 pline.Tag = line.ElementId;
             });
             //墙
-            m_wallsData.Select(row => row.Select(xyz => xyz.ToW2DPoint()).ToList()).ForEach(line =>
+            m_wallsData.Select(wall => wall.Select(xyz => xyz.ToW2DPoint()).ToList()).ToList().ForEach(line =>
             {
                 CreateDefaultPolyLine(line, Brushes.Black, 4);
             });

+ 0 - 1
MBI/SAGA.MBI/WinView/TraceView/WinTraceView.xaml.cs

@@ -15,7 +15,6 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using System.Windows.Threading;
-using DevExpress.Xpf.Editors.Helpers;
 
 namespace SAGA.MBI.WinView.TraceView
 {

BIN
MBI/SAGA.MBI/bin/R17/icudt.dll


BIN
MBI/SAGA.MBI/bin/R17/libcef.dll


BIN
MBI/SAGA.MBI/bin/x64/R17/AdWindows.dll


BIN
MBI/SAGA.MBI/bin/x64/R17/Aliyun.OSS.dll


BIN
MBI/SAGA.MBI/bin/x64/R17/CefSharp.BrowserSubprocess.Core.dll


BIN
MBI/SAGA.MBI/bin/x64/R17/CefSharp.BrowserSubprocess.Core.pdb


BIN
MBI/SAGA.MBI/bin/x64/R17/CefSharp.BrowserSubprocess.exe


BIN
MBI/SAGA.MBI/bin/x64/R17/CefSharp.BrowserSubprocess.pdb


BIN
MBI/SAGA.MBI/bin/x64/R17/CefSharp.Core.dll


BIN
MBI/SAGA.MBI/bin/x64/R17/CefSharp.Core.pdb


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 1095
MBI/SAGA.MBI/bin/x64/R17/CefSharp.Core.xml


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 2186
MBI/SAGA.MBI/bin/x64/R17/CefSharp.Wpf.XML


BIN
MBI/SAGA.MBI/bin/x64/R17/CefSharp.Wpf.dll


BIN
MBI/SAGA.MBI/bin/x64/R17/CefSharp.Wpf.pdb


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 8402
MBI/SAGA.MBI/bin/x64/R17/CefSharp.XML


BIN
MBI/SAGA.MBI/bin/x64/R17/CefSharp.dll


BIN
MBI/SAGA.MBI/bin/x64/R17/CefSharp.pdb


BIN
MBI/SAGA.MBI/bin/x64/R17/DevExpress.CodeParser.v16.2.dll


BIN
MBI/SAGA.MBI/bin/x64/R17/DevExpress.Data.v16.2.dll


BIN
MBI/SAGA.MBI/bin/x64/R17/DevExpress.Mvvm.v16.2.dll


BIN
MBI/SAGA.MBI/bin/x64/R17/DevExpress.Pdf.v16.2.Core.dll


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 8780
MBI/SAGA.MBI/bin/x64/R17/DevExpress.Pdf.v16.2.Core.xml


BIN
MBI/SAGA.MBI/bin/x64/R17/DevExpress.Printing.v16.2.Core.dll


BIN
MBI/SAGA.MBI/bin/x64/R17/DevExpress.Xpf.Core.v16.2.dll


BIN
MBI/SAGA.MBI/bin/x64/R17/DevExpress.Xpf.Grid.v16.2.Core.dll


+ 0 - 0
MBI/SAGA.MBI/bin/x64/R17/DevExpress.Xpf.Grid.v16.2.dll


Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff