SVN r596
SVN-Revision: r596
This commit is contained in:
@@ -856,6 +856,13 @@ namespace Lskj.Control
|
||||
{
|
||||
// 加载网页
|
||||
string url = detailModel.DetailSql.StartsWith("http") ? detailModel.DetailSql : SystemInfo.Instance.OAUrl + detailModel.DetailSql;
|
||||
if (!string.IsNullOrWhiteSpace(this.ParentKey))
|
||||
{
|
||||
string codeSql = "select";
|
||||
codeSql += string.Format(" '{0}' as {1}", this.PrimaryValue, this.PrimaryKey);
|
||||
url=ReplaceHelper.ReplaceRowParam(BaseImpl.GetDataRowResult(codeSql), ReplaceHelper.ReplaceWhereCond(detailModel.DetailSql));
|
||||
}
|
||||
if (this.ControlObj.CurrentData != null) url = ReplaceHelper.ReplaceRowParam(this.ControlObj.CurrentData, url);
|
||||
//url= System.Web.HttpUtility.UrlEncode(url);
|
||||
if (SystemInfo.Instance.PrimitiveBrowser)
|
||||
{
|
||||
@@ -1042,7 +1049,13 @@ namespace Lskj.Control
|
||||
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);
|
||||
if (!string.IsNullOrWhiteSpace(this.ParentKey))
|
||||
{
|
||||
string codeSql = "select";
|
||||
codeSql += string.Format(" '{0}' as {1}", this.PrimaryValue, this.PrimaryKey);
|
||||
url = ReplaceHelper.ReplaceRowParam(BaseImpl.GetDataRowResult(codeSql), ReplaceHelper.ReplaceWhereCond(detailModel.DetailSql));
|
||||
}
|
||||
if (this.ControlObj.CurrentData != null) url = ReplaceHelper.ReplaceRowParam(this.ControlObj.CurrentData, url);
|
||||
webView.LoadUrl(url);
|
||||
webView.Dock = DockStyle.Fill;
|
||||
}
|
||||
@@ -1052,6 +1065,13 @@ namespace Lskj.Control
|
||||
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;
|
||||
if (!string.IsNullOrWhiteSpace(this.ParentKey))
|
||||
{
|
||||
string codeSql = "select";
|
||||
codeSql += string.Format(" '{0}' as {1}", this.PrimaryValue, this.PrimaryKey);
|
||||
url = ReplaceHelper.ReplaceRowParam(BaseImpl.GetDataRowResult(codeSql), ReplaceHelper.ReplaceWhereCond(detailModel.DetailSql));
|
||||
}
|
||||
if (this.ControlObj.CurrentData != null) url = ReplaceHelper.ReplaceRowParam(this.ControlObj.CurrentData, url);
|
||||
webView.LoadUrl(url);
|
||||
webView.Dock = DockStyle.Fill;
|
||||
|
||||
@@ -1062,6 +1082,13 @@ namespace Lskj.Control
|
||||
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;
|
||||
if (!string.IsNullOrWhiteSpace(this.ParentKey))
|
||||
{
|
||||
string codeSql = "select";
|
||||
codeSql += string.Format(" '{0}' as {1}", this.PrimaryValue, this.PrimaryKey);
|
||||
url = ReplaceHelper.ReplaceRowParam(BaseImpl.GetDataRowResult(codeSql), ReplaceHelper.ReplaceWhereCond(detailModel.DetailSql));
|
||||
}
|
||||
if (this.ControlObj.CurrentData != null) url = ReplaceHelper.ReplaceRowParam(this.ControlObj.CurrentData, url);
|
||||
webView.LoadUrl(url);
|
||||
webView.Dock = DockStyle.Fill;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user