From 20b138393ab0d441ee6b9e9b1cedbf1d22a2c00c Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期一, 06 五月 2024 14:55:46 +0800
Subject: [PATCH] 冲突解决
---
Hydraulic/Hydro.Core/Base/LinkCalcModel.cs | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/Hydraulic/Hydro.Core/Base/LinkCalcModel.cs b/Hydraulic/Hydro.Core/Base/LinkCalcModel.cs
index 122c839..8d345ba 100644
--- a/Hydraulic/Hydro.Core/Base/LinkCalcModel.cs
+++ b/Hydraulic/Hydro.Core/Base/LinkCalcModel.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing Newtonsoft.Json;
+using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
@@ -108,14 +109,16 @@
}
}
-
+
private NodeCalcModel _StartNode;
+ [JsonIgnore]
public NodeCalcModel StartNode {
get { return _StartNode; }
set { _StartNode = value; if (_StartNode != null) this.Node1 = _StartNode.ID; }
}
-
+
private NodeCalcModel _EndNode;
+ [JsonIgnore]
public NodeCalcModel EndNode {
get { return _EndNode; }
set { _EndNode = value; if (_EndNode!=null)this.Node2 = _EndNode.ID; }
@@ -184,6 +187,12 @@
[DisplayName("閫変腑")]
[Browsable(false)]
public bool Selected { get; set; }
+
+ [Category("4銆佸叾浠栧弬鏁�")]
+ [Description("榧犳爣鎮簬涓婃柟")]
+ [DisplayName("榧犳爣鎮簬涓婃柟")]
+ [Browsable(false)]
+ public bool Hovered { get; set; }
}
--
Gitblit v1.9.3