소스 검색

xls:序列化设置

xulisong 6 년 전
부모
커밋
72200dbd80

+ 1 - 1
MBI/SAGA.GplotRelationComputerManage/DataServer/DataServer.cs

@@ -83,7 +83,7 @@ namespace SAGA.GplotRelationComputerManage
             {
                 JsonSerializerSettings jsetting = new JsonSerializerSettings();
                 //jsetting.Converters.Add(new Point3DConverter());
-                jsetting.Converters.Add(GElementConverter.CreateConverter());
+                //jsetting.Converters.Add(GElementConverter.CreateConverter());
                 return JsonConvert.DeserializeObject<T>(content, jsetting);
             }
             return default(T);

+ 0 - 7
MBI/SAGA.MBI/SAGA.MBI.csproj

@@ -712,9 +712,6 @@
     <Compile Include="WinView\TraceView\WinTraceView.xaml.cs">
       <DependentUpon>WinTraceView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="WinView\WinTestUserControl.xaml.cs">
-      <DependentUpon>WinTestUserControl.xaml</DependentUpon>
-    </Compile>
     <Compile Include="WinView\Upload\MTopologyGriph.cs" />
     <Compile Include="WinView\Upload\UploadFilesSelectConverter.cs" />
     <Compile Include="WinView\Upload\UploadFloor.cs" />
@@ -958,10 +955,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="WinView\WinTestUserControl.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="WinView\Upload\WinUnlockedFloorList.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

+ 2 - 0
MBI/SAGA.Models/Graphs/GElement.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Media;
+using Newtonsoft.Json;
 
 namespace SAGA.Models.Graphs
 {
@@ -21,6 +22,7 @@ namespace SAGA.Models.Graphs
         /// <summary>
         /// 关联Id
         /// </summary>
+        [JsonProperty]
         public string Id { get; internal set; }
         public string Name { get; set; } = string.Empty;
         /// <summary>

+ 2 - 3
MBI/SAGA.Models/Graphs/GElementConverter.cs

@@ -53,8 +53,8 @@ namespace SAGA.Models.Graphs
         }
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {        
-            //JObject jObject = (JObject)serializer.Deserialize(reader, typeof(JObject));
-            var jObject = JsonSerializer.Create().Deserialize<JObject>(reader);
+            JObject jObject = (JObject)serializer.Deserialize(reader, typeof(JObject));
+            //var jObject = JsonSerializer.Create().Deserialize<JObject>(reader);
             //jObject.CreateReader()//下面直接直接使用reader会出问题,
             try
             {
@@ -88,7 +88,6 @@ namespace SAGA.Models.Graphs
 
         public override bool CanConvert(Type objectType)
         {
-            return false;
             return typeof(GElement).IsAssignableFrom(objectType);
         }
 

+ 1 - 2
MBI/SAGA.Models/Graphs/GraphDB.cs

@@ -23,7 +23,7 @@ namespace SAGA.Models.Graphs
         {
             JsonSerializerSettings jsetting = new JsonSerializerSettings();
             jsetting.Converters.Add(new Point3DConverter());
-            jsetting.Converters.Add(new GElementConverter());
+           // jsetting.Converters.Add(new GElementConverter());
             return jsetting;
         }
         public List<GElement> Elements { get;private set; }
@@ -91,7 +91,6 @@ namespace SAGA.Models.Graphs
         {
             this.Elements.Clear();
             JsonSerializerSettings jsetting = CreateJsonSetting();
-            var serializer = JsonSerializer.Create(jsetting);
             var elements=JsonConvert.DeserializeObject<List<GElement>>(jsonStr, jsetting);
             this.Elements.AddRange(elements);
         }