From c7df85937f73fb347ee0b19e9c052d2d00a6df6c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 九月 2020 13:58:19 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs | 43 ++++++++++++++++++++++++++-----------------
1 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
index 000d878..1cad842 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
@@ -23,6 +23,8 @@
get { return m_CanClick; }
set
{
+ if (m_CanClick == value) { return; }
+
m_CanClick = value;
//鑳藉鐐瑰嚮,鍒欐樉绀烘病鏈夌偣鍑昏繃鐨勭姸鎬�
if (m_CanClick == true) { this.SetNotClickStatu(); }
@@ -37,6 +39,10 @@
{
set { this.Radius = (uint)Application.GetRealHeight(value); }
}
+ /// <summary>
+ /// 澹版槑姝ゅ彉閲�,鏃ㄥ湪瀛愮嚎绋嬩篃鑳藉鍘昏幏鍙栦竴涓帶浠剁殑涓婚敭
+ /// </summary>
+ public string MainKey = string.Empty;
/// <summary>
/// 鐐瑰嚮鐨勫潗鏍�
@@ -55,6 +61,23 @@
/// 鎺т欢瑙﹀彂绉诲姩鐨勪簨浠�(鑷韩鎷ユ湁绠楁硶,褰撶Щ鍔ㄥ灏戝儚绱犲悗,瑙﹀彂浜嬩欢,娉ㄦ剰,璇ヤ簨浠跺彲鑳戒細棰戠箒鐨勮Е鍙�)
/// </summary>
public Action ButtonHappenMoveEvent = null;
+
+ #endregion
+
+ #region 鈻� 閲嶅啓褰摜鐨勫睘鎬____________________
+
+ /// <summary>
+ /// 閲嶅啓Text灞炴��
+ /// </summary>
+ public new string Text
+ {
+ //鍏堣繖涔堝紕鍏堝惂
+ get { return base.Text == null ? string.Empty : base.Text; }
+ set
+ {
+ base.Text = value == null ? string.Empty : value;
+ }
+ }
#endregion
@@ -164,7 +187,8 @@
this.MouseUpEventHandler -= ButtonBase_MouseUpEventHandler;
return;
}
- if (CanClick == true)
+ //2020.05.14杩藉姞IsFormAdding:鐣岄潰杩樺湪鍔犺浇涓�,涓嶈兘鍐嶇偣鍑�
+ if (CanClick == true && ControlCommonResourse.IsFormAdding == false)
{
//Log鍑哄姏
this.WriteLog(0);
@@ -288,21 +312,6 @@
}
/// <summary>
- /// Y杞撮噸缃�(鐪熷疄鏁板��,娌℃湁鐖跺鍣ㄦ棤鏁�)
- /// </summary>
- /// <param name="alignment">涓婁笅瀵归綈鏂瑰紡</param>
- /// <param name="Space">涓婁笅涓ら儴鍒嗙殑闂磋窛</param>
- public void ReSetYaxis(UViewAlignment alignment, int Space = 0)
- {
- if (this.Parent == null)
- {
- return;
- }
- //Y杞撮噸缃�
- this.Y = HdlControlLogic.Current.GetControlChidrenYaxis(this.Parent.Height, this.Height, alignment, Space);
- }
-
- /// <summary>
/// 鏍规嵁鏂囨湰,璁＄畻瀹冨疄闄呯殑瀹藉害
/// </summary>
/// <returns></returns>
@@ -336,7 +345,7 @@
/// <summary>
/// 璇ユ帶浠舵墍灞炵殑鐣岄潰鍚嶅瓧
/// </summary>
- private string formName = null;
+ public string formName = null;
/// <summary>
/// 鎺т欢鍚嶅瓧
/// </summary>
--
Gitblit v1.8.0