From 970022ca59c5c22cf572c458c01e0328be85a253 Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期六, 08 六月 2024 12:01:03 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/Yw/Hydro.V1.1
---
Hydraulic/Hydro.ConfigModel/LogicPoint.cs | 56 ++++++++++++++++++++++++++++----------------------------
1 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/Hydraulic/Hydro.ConfigModel/LogicPoint.cs b/Hydraulic/Hydro.ConfigModel/LogicPoint.cs
index fb24030..6e9c9c4 100644
--- a/Hydraulic/Hydro.ConfigModel/LogicPoint.cs
+++ b/Hydraulic/Hydro.ConfigModel/LogicPoint.cs
@@ -202,28 +202,28 @@
}
}
[DisplayName("缂栧彿")]
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
public int Id { get; set; }
[DisplayName("鍚嶇О")]
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
public string Name { get; set; }
/// <summary>
/// 閫昏緫绫诲瀷
/// </summary>
[DisplayName("绫诲瀷")]
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
public string LogicType { get; set; }
/// <summary>
/// 鏁版嵁鏉ユ簮绫诲瀷锛堟帴鍙ｅ�笺�佸熀鍑嗗�笺�佽绠楀�笺�佸彉鍖栧�笺�佸垵濮嬭绠楀�笺�佹渶灏忋�佹渶澶с�佲垐銆佲垑锛�
/// </summary>
[DisplayName("鏁版嵁鏉ユ簮")]
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
public string ExpressionType { get; set; }
/// <summary>
/// 鏁板�艰〃杈惧紡锛堟帴鍙ｅ�笺�佸熀鍑嗗�硷級
/// </summary>
[DisplayName("鍊�")]
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
public string Expression { get; set; }
private string _fullAddress;
@@ -254,16 +254,16 @@
}
}
[DisplayName("鐩戞祴绫诲瀷")]
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
public string IndicatorType { get; set; }
[DisplayName("妯″瀷缂栧彿鎴栧唴瀹�")]
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
public string ModelObjectID { get; set; }
[DisplayName("鎺掑簭")]
- [Category("4銆佸叾浠�")]
+ [Category("鍏朵粬")]
public int Sort { get; set; }
[DisplayName("鐖惰妭鐐圭紪鍙�")]
- [Category("4銆佸叾浠�")]
+ [Category("鍏朵粬")]
public int ParentId { get; set; }
[Browsable(false)]
@@ -298,7 +298,7 @@
[Browsable(false)]
public byte[] VPN { get; set; } = null;
[DisplayName("缁撴灉")]
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
public string Result
{
get
@@ -396,56 +396,56 @@
public string Text_change = null;
[DisplayName("瀵硅薄鍚嶇О")]
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
public string ObjectType
{
get { return this.Ext.ObjectType; }
set { this.Ext.ObjectType = value; }
}
[DisplayName("绮惧害")]
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
public string accurary
{
get { return this.Ext.accurary; }
set { this.Ext.accurary = value; }
}
[DisplayName("瀛愭柟妗堝悕绉�")]
- [Category("3銆佸瓙鏂规")]
+ [Category("瀛愭柟妗�")]
public string childSolution
{
get { return this.Ext.childSolution; }
set { this.Ext.childSolution = value; }
}
[DisplayName("瀛愭柟妗堥敭")]
- [Category("3銆佸瓙鏂规")]
+ [Category("瀛愭柟妗�")]
public string childTag
{
get { return this.Ext.childTag; }
set { this.Ext.childTag = value; }
}
[DisplayName("瀛愭柟妗堜紶杈�")]
- [Category("3銆佸瓙鏂规")]
+ [Category("瀛愭柟妗�")]
public string childType
{
get { return this.Ext.childType; }
set { this.Ext.childType = value; }
}
[DisplayName("瀛愭悳绱㈢簿搴�")]
- [Category("3銆佸瓙鏂规")]
+ [Category("瀛愭柟妗�")]
public string SaveAcc
{
get { return this.Ext.SaveAcc; }
set { this.Ext.SaveAcc = value; }
}
[DisplayName("鏄惁瀛樺偍")]
- [Category("3銆佸瓙鏂规")]
+ [Category("瀛愭柟妗�")]
public string isSave
{
get { return this.Ext.isSave; }
set { this.Ext.isSave = value; }
}
[DisplayName("瀛樺偍閿��")]
- [Category("3銆佸瓙鏂规")]
+ [Category("瀛愭柟妗�")]
public string SaveRange
{
get { return this.Ext.SaveRange; }
@@ -453,35 +453,35 @@
}
[DisplayName("鏄惁鍐呭瓨瀛樺偍")]
- [Category("3銆佸瓙鏂规")]
+ [Category("瀛愭柟妗�")]
public string isMemSave
{
get { return this.Ext.isMemSave; }
set { this.Ext.isMemSave = value; }
}
[DisplayName("鍐呭瓨瀛樺偍鑼冨洿")]
- [Category("3銆佸瓙鏂规")]
+ [Category("瀛愭柟妗�")]
public string MemSaveRange
{
get { return this.Ext.MemSaveRange; }
set { this.Ext.MemSaveRange = value; }
}
[DisplayName("鍐呭瓨瀛樺偍绮惧害")]
- [Category("3銆佸瓙鏂规")]
+ [Category("瀛愭柟妗�")]
public string MemSaveAcc
{
get { return this.Ext.MemSaveAcc; }
set { this.Ext.MemSaveAcc = value; }
}
[DisplayName("鍐呭瓨瀛樺偍娆″簭")]
- [Category("3銆佸瓙鏂规")]
+ [Category("瀛愭柟妗�")]
public string MemSaveIndex
{
get { return this.Ext.MemSaveIndex; }
set { this.Ext.MemSaveIndex = value; }
}
[DisplayName("鍚敤")]
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
public bool Enable
{
get { return this.Ext.Enable; }
@@ -489,14 +489,14 @@
}
[DisplayName("鍙鎬�")]
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
public bool Visible
{
get { return this.Ext.Visible; }
set { this.Ext.Visible = value; }
}
[DisplayName("鏍囩")]
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
public string Tag
{
get { return this.Ext.Tag; }
@@ -504,14 +504,14 @@
}
[DisplayName("鏀惰棌")]
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
public bool Prefer
{
get { return this.Ext.Prefer; }
set { this.Ext.Prefer = value; }
}
[DisplayName("浣跨敤鑷畾涔夎壊")]
- [Category("4銆佽嚜瀹氫箟")]
+ [Category("鑷畾涔�")]
public bool isUseCustomColor
{
get { return this.Ext.isUseCustomColor; }
@@ -519,7 +519,7 @@
}
[DisplayName("鍐呭鑹�")]
- [Category("4銆佽嚜瀹氫箟")]
+ [Category("鑷畾涔�")]
public MetroColorStyle_Inner ContentColor
{
get { return this.Ext.ContentColor; }
--
Gitblit v1.9.3