From ee5f2543624a0e3ae9d046062b822727a31685e1 Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期五, 14 五月 2021 17:15:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wxr4' into dev-tzy
---
HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs b/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs
old mode 100755
new mode 100644
index 926ef73..c53bfd5
--- a/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs
+++ b/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs
@@ -42,9 +42,19 @@
Width = bodyView.Width - Application.GetRealWidth(32)
};
bodyView.AddChidren(webView);
+ try
+ {
+ if (!string.IsNullOrEmpty(url))
+ {
+ //鍔犺浇缃戝潃
+ webView.LoadRequest(url);
+ }
+ }
+ catch
+ {
- //鍔犺浇缃戝潃
- webView.LoadRequest(url);
+ }
+
this.Show();
}
}
--
Gitblit v1.8.0