From dfa6733793434bdcfd394f978ae72f1628b2260f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 22 四月 2020 16:50:03 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/BottomItemSelectForm.cs | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/BottomItemSelectForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/BottomItemSelectForm.cs
index 09af164..fbc6aeb 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/BottomItemSelectForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/BottomItemSelectForm.cs
@@ -19,6 +19,14 @@
/// 鍓嶅洖閫夋嫨鐨勬帶浠�
/// </summary>
private NormalSelectControl oldSelectContr = null;
+ /// <summary>
+ /// 閫夋嫨鍙栨秷(涓嶆槸宸︿笂瑙�),骞朵笖鎸変笅纭畾閿椂,鏄惁璋冪敤鍥炶皟鍑芥暟(璋冪敤鏃朵紶閫掔殑鍙傛暟鏄� -1,榛樿涓嶅洖璋�)
+ /// </summary>
+ public bool CancelCallEvent = false;
+ /// <summary>
+ /// 閫夋嫨鐨勮鑳藉惁鍙栨秷
+ /// </summary>
+ public bool SelectRowCanCancel = true;
#endregion
@@ -111,6 +119,11 @@
//鍥炶皟鍑芥暟
FinishSelectEvent.Invoke(Convert.ToInt32(oldSelectContr.MainKeys));
}
+ else if (FinishSelectEvent != null && this.CancelCallEvent == true)
+ {
+ //鍥炶皟鍑芥暟
+ FinishSelectEvent.Invoke(-1);
+ }
this.CloseForm();
};
@@ -138,8 +151,12 @@
//鍙栨秷閫夋嫨
if (btnRow.IsSelected == true)
{
- btnRow.IsSelected = false;
- oldSelectContr = null;
+ //鍏佽鍙栨秷鐨勬椂鍊�,鎵嶈兘鍙栨秷
+ if (this.SelectRowCanCancel == true)
+ {
+ btnRow.IsSelected = false;
+ oldSelectContr = null;
+ }
return;
}
if (oldSelectContr != null)
--
Gitblit v1.8.0