From 0fa1534827bd21d763216550d11006fc1441c6cb Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期五, 14 五月 2021 17:08:45 +0800
Subject: [PATCH] 门锁初始上传
---
HDL_ON/UI/UI0-Stan/Controls/FrameLayoutControls/FrameRowControl.cs | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI0-Stan/Controls/FrameLayoutControls/FrameRowControl.cs b/HDL_ON/UI/UI0-Stan/Controls/FrameLayoutControls/FrameRowControl.cs
index d88f1c0..3c79f52 100644
--- a/HDL_ON/UI/UI0-Stan/Controls/FrameLayoutControls/FrameRowControl.cs
+++ b/HDL_ON/UI/UI0-Stan/Controls/FrameLayoutControls/FrameRowControl.cs
@@ -6,7 +6,7 @@
namespace HDL_ON.Stan
{
/// <summary>
- /// 鍋氭垚涓�涓猂owLayout鍨嬬殑FrameLayout
+ /// 鍋氭垚涓�涓猂owLayout鍨嬬殑FrameLayout(搴曞眰鐨勯珮搴︿负44)
/// </summary>
public class FrameRowControl : FrameLayoutStatuControl
{
@@ -42,7 +42,7 @@
#region 鈻� 鍒濆鍖朹____________________________
/// <summary>
- /// 鍋氭垚涓�涓猂owLayout鍨嬬殑FrameLayout
+ /// 鍋氭垚涓�涓猂owLayout鍨嬬殑FrameLayout(搴曞眰鐨勯珮搴︿负44)
/// </summary>
/// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(銆愬垪琛ㄦ帶浠剁殑rowSpace/2銆戝嵆鍙�,涓嶆噦榛樿涓�0鍗冲彲)</param>
public FrameRowControl(int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)
@@ -66,7 +66,7 @@
//宸茬粡娣诲姞浜嗗簳绾�
return btnBottomLine;
}
- int lineWidth = this.Width - HdlControlResourse.XXLeft * 2 - LeftOffset - RightOffset;
+ int lineWidth = this.Width - HdlControlResourse.XXLeft * 2 - LeftOffset + RightOffset;
int XX = HdlControlResourse.XXLeft + LeftOffset;
if (leftIconSize > 0)
{
@@ -80,6 +80,26 @@
base.AddChidren(btnBottomLine);
return btnBottomLine;
+ }
+
+ /// <summary>
+ /// 鎵嬪姩绉婚櫎搴曠嚎(鏈変簺鏃跺�欓渶瑕佽繖绉嶇壒娈婃晥鏋�)
+ /// </summary>
+ public void RemoveBottomLine()
+ {
+ for (int i = 0; i < this.ChildrenCount; i++)
+ {
+ var myView = this.GetChildren(i);
+ //杩欓噷鏄簳绾跨殑楂樺害鍜孻杞�
+ if (myView == null || myView.Height != HdlControlResourse.BottomLineHeight
+ || myView.Y != this.Height - HdlControlResourse.BottomLineHeight)
+ {
+ continue;
+ }
+ //绉婚櫎搴曠嚎
+ myView.RemoveFromParent();
+ break;
+ }
}
#endregion
@@ -126,7 +146,8 @@
}
var btnCaption = new NormalViewControl(i_width, i_height, real);
btnCaption.X = XX;
-
+ //2021.03.18 鏁磋嫳鏂囩増,鍔犱笂鑷姩鎹㈣
+ btnCaption.IsMoreLines = true;
btnCaption.Text = i_caption;
return btnCaption;
@@ -329,6 +350,8 @@
btnContr.TextColor = CSS_Color.PromptingColor1;
btnContr.Text = i_text;
btnContr.TextSize = CSS_FontSize.PromptFontSize_FirstLevel;
+ //2021.03.18 鏁磋嫳鏂囩増,鍔犱笂鑷姩鎹㈣
+ btnContr.IsMoreLines = true;
return btnContr;
}
--
Gitblit v1.8.0