SVN r592
SVN-Revision: r592
This commit is contained in:
@@ -851,7 +851,83 @@ namespace Lskj.Control
|
|||||||
ERPInfo.Instance.UserName,
|
ERPInfo.Instance.UserName,
|
||||||
"1",detailModel.UnionModule,"","",""
|
"1",detailModel.UnionModule,"","",""
|
||||||
});
|
});
|
||||||
if (string.IsNullOrEmpty(detailModel.UnionModule))
|
|
||||||
|
if (detailModel.IsWebView)
|
||||||
|
{
|
||||||
|
// 加载网页
|
||||||
|
string url = detailModel.DetailSql.StartsWith("http") ? detailModel.DetailSql : SystemInfo.Instance.OAUrl + detailModel.DetailSql;
|
||||||
|
//url= System.Web.HttpUtility.UrlEncode(url);
|
||||||
|
if (SystemInfo.Instance.PrimitiveBrowser)
|
||||||
|
{
|
||||||
|
FrmMiniBlink webView = new FrmMiniBlink();
|
||||||
|
webView.IsDownVerify = true;
|
||||||
|
webView.Dock = DockStyle.Fill;
|
||||||
|
webView.Tag = detailModel;
|
||||||
|
tabPage.Tag = webView;
|
||||||
|
tabPage.Controls.Add(webView);
|
||||||
|
webView.LoadUrl(ReplaceHelper.ReplaceUserInfo(url));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
FrmWebBrowser webView = new FrmWebBrowser();
|
||||||
|
webView.Dock = DockStyle.Fill;
|
||||||
|
webView.Tag = detailModel;
|
||||||
|
tabPage.Tag = webView;
|
||||||
|
tabPage.Controls.Add(webView);
|
||||||
|
webView.FrmLoad(ReplaceHelper.ReplaceUserInfo(url));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (detailModel.IsWebView2)
|
||||||
|
{
|
||||||
|
// 加载网页
|
||||||
|
string url = detailModel.DetailSql.StartsWith("http") ? detailModel.DetailSql : SystemInfo.Instance.OAUrl + detailModel.DetailSql;
|
||||||
|
//url= System.Web.HttpUtility.UrlEncode(url);
|
||||||
|
if (SystemInfo.Instance.PrimitiveBrowser)
|
||||||
|
{
|
||||||
|
FrmMiniBlink webView = new FrmMiniBlink();
|
||||||
|
webView.Dock = DockStyle.Fill;
|
||||||
|
webView.Tag = detailModel;
|
||||||
|
tabPage.Tag = webView;
|
||||||
|
tabPage.Controls.Add(webView);
|
||||||
|
webView.LoadUrl(ReplaceHelper.ReplaceUserInfo(url));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
FrmWebBrowser2 webView =new FrmWebBrowser2();
|
||||||
|
webView.Dock = DockStyle.Fill;
|
||||||
|
webView.Tag = detailModel;
|
||||||
|
tabPage.Tag = webView;
|
||||||
|
tabPage.Controls.Add(webView);
|
||||||
|
webView.FrmLoad(ReplaceHelper.ReplaceUserInfo(url));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (detailModel.IsWebView3)
|
||||||
|
{
|
||||||
|
// 加载网页
|
||||||
|
string url = detailModel.DetailSql.StartsWith("http") ? detailModel.DetailSql : SystemInfo.Instance.OAUrl + detailModel.DetailSql;
|
||||||
|
//url= System.Web.HttpUtility.UrlEncode(url);
|
||||||
|
if (SystemInfo.Instance.PrimitiveBrowser)
|
||||||
|
{
|
||||||
|
FrmMiniBlink webView = new FrmMiniBlink();
|
||||||
|
webView.AllowDownload = false;
|
||||||
|
webView.Dock = DockStyle.Fill;
|
||||||
|
webView.Tag = detailModel;
|
||||||
|
tabPage.Tag = webView;
|
||||||
|
tabPage.Controls.Add(webView);
|
||||||
|
webView.LoadUrl(ReplaceHelper.ReplaceUserInfo(url));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
FrmWebBrowser2 webView = new FrmWebBrowser2();
|
||||||
|
webView.Dock = DockStyle.Fill;
|
||||||
|
webView.Tag = detailModel;
|
||||||
|
webView.AllowDownload = false;
|
||||||
|
tabPage.Tag = webView;
|
||||||
|
tabPage.Controls.Add(webView);
|
||||||
|
webView.FrmLoad(ReplaceHelper.ReplaceUserInfo(url));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (string.IsNullOrEmpty(detailModel.UnionModule))
|
||||||
{
|
{
|
||||||
PanelControl plBottom = new PanelControl();
|
PanelControl plBottom = new PanelControl();
|
||||||
plBottom.Dock = DockStyle.Bottom;
|
plBottom.Dock = DockStyle.Bottom;
|
||||||
@@ -960,6 +1036,35 @@ namespace Lskj.Control
|
|||||||
{
|
{
|
||||||
moduleGridEx.SearchObj.SearchGrid();
|
moduleGridEx.SearchObj.SearchGrid();
|
||||||
}
|
}
|
||||||
|
else if (tabPage.Tag is FrmWebBrowser)
|
||||||
|
{
|
||||||
|
// 加载网页
|
||||||
|
FrmWebBrowser webView = tabPage.Tag as FrmWebBrowser;
|
||||||
|
GridDetailModel detailModel = webView.Tag as GridDetailModel;
|
||||||
|
string url = detailModel.DetailSql.StartsWith("http") ? detailModel.DetailSql : SystemInfo.Instance.OAUrl + detailModel.DetailSql;
|
||||||
|
//webView.FrmLoad(url);
|
||||||
|
webView.LoadUrl(url);
|
||||||
|
webView.Dock = DockStyle.Fill;
|
||||||
|
}
|
||||||
|
else if (tabPage.Tag is FrmWebBrowser2)
|
||||||
|
{
|
||||||
|
// 加载网页
|
||||||
|
FrmWebBrowser2 webView = tabPage.Tag as FrmWebBrowser2;
|
||||||
|
GridDetailModel detailModel = webView.Tag as GridDetailModel;
|
||||||
|
string url = detailModel.DetailSql.StartsWith("http") ? detailModel.DetailSql : SystemInfo.Instance.OAUrl + detailModel.DetailSql;
|
||||||
|
webView.LoadUrl(url);
|
||||||
|
webView.Dock = DockStyle.Fill;
|
||||||
|
|
||||||
|
}
|
||||||
|
else if (tabPage.Tag is FrmMiniBlink)
|
||||||
|
{
|
||||||
|
// 加载网页
|
||||||
|
FrmMiniBlink webView = tabPage.Tag as FrmMiniBlink;
|
||||||
|
GridDetailModel detailModel = webView.Tag as GridDetailModel;
|
||||||
|
string url = detailModel.DetailSql.StartsWith("http") ? detailModel.DetailSql : SystemInfo.Instance.OAUrl + detailModel.DetailSql;
|
||||||
|
webView.LoadUrl(url);
|
||||||
|
webView.Dock = DockStyle.Fill;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
|
|||||||
Reference in New Issue
Block a user