From e7290281eabcb88d2e430dea9782565474837ce1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 20 十月 2023 14:29:54 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs
index f39f42f..7943ef1 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs
@@ -539,10 +539,18 @@
}
else
{
- int intValue = int.Parse(editText.Text.Trim());
- if (intValue <minValue || intValue > maxValue)
+ int intValue = -1;
+ try
{
- errorId_IsNullOrEmpty = Language.StringByID(StringId.setvalue).Replace("1",minValue.ToString()).Replace("000",maxValue.ToString());
+ intValue = int.Parse(editText.Text.Trim());
+ }
+ catch
+ {
+ intValue = -1;
+ }
+ if (intValue < minValue || intValue > maxValue)
+ {
+ errorId_IsNullOrEmpty = Language.StringByID(StringId.setvalue).Replace("1", minValue.ToString()).Replace("100", maxValue.ToString());
}
}
if (errorId_IsNullOrEmpty!="")
@@ -557,7 +565,7 @@
btnTip.X = Application.GetRealWidth(53);
btnTip.Y = editBjView.Bottom + Application.GetRealHeight(12);
btnTip.Width = Application.GetRealWidth(157);//200
- btnTip.Height = Application.GetRealHeight(24);//17
+ btnTip.Height = Application.GetRealHeight(17);//17
btnTip.Text = errorId_IsNullOrEmpty;
btnTip.TextColor = CSS_Color.textRedColor;
btnTip.TextSize = TextSize.text12;
--
Gitblit v1.8.0