SVN r928
SVN-Revision: r928
This commit is contained in:
+114
-3
@@ -98,10 +98,10 @@ namespace Lskj.PubAdd
|
||||
//this.SuspendLayout();
|
||||
this.SysModel = new ModuleModel(MainImpl.GetSystemdllTab(this.Model.ModuleCode));
|
||||
this.SysModel.ParmaryKey = BaseImpl.GetBasePrimaryKey(this.Model.ModuleCode);
|
||||
this.SysModel.maintabFocusedRow = Model.GetMaintabFocusedRow();
|
||||
this.ModuleAddControl.OnAddRecordCallBack += OnAddRecordCallBack;
|
||||
this.ModuleAddControl.OnClearCallBack += OnClearCallBack; ;
|
||||
this.details = BaseModuleImpl.GetBaseAddTabDetail(Model.ModuleCode);
|
||||
|
||||
this.CreateControlLocation();
|
||||
this.SetControlPanelSize();
|
||||
|
||||
@@ -451,7 +451,89 @@ namespace Lskj.PubAdd
|
||||
ERPInfo.Instance.UserName,
|
||||
"1",detailModel.UnionModule,"","",""
|
||||
});
|
||||
if (string.IsNullOrEmpty(detailModel.UnionModule))
|
||||
if (detailModel.IsWebView)
|
||||
{
|
||||
// 加载网页
|
||||
string url = detailModel.DetailSql.StartsWith("http") ? detailModel.DetailSql : SystemInfo.Instance.OAUrl + detailModel.DetailSql;
|
||||
if (!string.IsNullOrWhiteSpace(Model.ParentKey))
|
||||
{
|
||||
string codeSql = "select";
|
||||
codeSql += string.Format(" '{0}' as {1}", Model.ObjectId, this.SysModel.ParmaryKey);
|
||||
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)
|
||||
{
|
||||
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();
|
||||
plBottom.Dock = DockStyle.Bottom;
|
||||
@@ -637,4 +719,33 @@ namespace Lskj.PubAdd
|
||||
/// <para>修改日期:</para>
|
||||
/// <para>修改备注:</para>
|
||||
/// <para>版本:1.0</para>
|
||||
/// </
|
||||
/// </summary>
|
||||
/// <param name="sender">The source of the event.</param>
|
||||
/// <param name="e">The <see cref="FormClosingEventArgs"/> instance containing the event data.</param>
|
||||
protected void OnFormClosing(object sender, FormClosingEventArgs e)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (this.ModuleAddControl != null && this.ModuleAddControl.IsCard)
|
||||
{
|
||||
this.ModuleAddControl.CloseIDCardThread();
|
||||
}
|
||||
this.DialogResult = DialogResult.OK;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
string Message = ErrorMessage.PromptErrorMessage(ex);
|
||||
MessageUtil.Show(Message, ex.Message);
|
||||
}
|
||||
}
|
||||
protected override CreateParams CreateParams
|
||||
{
|
||||
get
|
||||
{
|
||||
CreateParams cp = base.CreateParams;
|
||||
cp.ExStyle |= 0x02000000;
|
||||
return cp;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user