SVN r1141

SVN-Revision: r1141
This commit is contained in:
cyf
2026-03-19 09:49:05 +00:00
parent 86f3c21bca
commit 69ae33e88e
+13 -35
View File
@@ -106,6 +106,9 @@ namespace Lskj.PubAdd
this.SetControlPanelSize();
this.CreateTabDetail();
if (Business.Impl.LanguageTranslation.Translatable) xtcControl.TabPages[0].Text= Business.Impl.LanguageTranslation.GetTranslatedText(xtcControl.TabPages[0].Text);
Console.WriteLine("初始化完成:" + DateTime.Now);
}
catch (Exception ex)
@@ -223,7 +226,8 @@ namespace Lskj.PubAdd
ModuleModel moduleModel = new ModuleModel(MainImpl.GetSystemdllTab(detailModel.UnionModule));
if (string.IsNullOrWhiteSpace(moduleModel.FormKey))
{
MessageUtil.Show(detailModel.DetailName + "模块配置错误");
string text = Business.Impl.LanguageTranslation.Translatable ? Business.Impl.LanguageTranslation.GetTranslatedText("模块配置错误") : "模块配置错误";
MessageUtil.Show(detailModel.DetailName + text);
return;
}
detailModel.DetailSql = moduleModel.MenuSql;
@@ -462,8 +466,9 @@ namespace Lskj.PubAdd
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);
if (this.ModuleAddControl.ControlObj.CurrentData != null) url = ReplaceHelper.ReplaceRowParam(this.ModuleAddControl.ControlObj.CurrentData, url);
//url= System.Web.HttpUtility.UrlEncode(url);
if (SystemInfo.Instance.PrimitiveBrowser)
{
FrmMiniBlink webView = new FrmMiniBlink();
@@ -489,6 +494,7 @@ namespace Lskj.PubAdd
// 加载网页
string url = detailModel.DetailSql.StartsWith("http") ? detailModel.DetailSql : SystemInfo.Instance.OAUrl + detailModel.DetailSql;
//url= System.Web.HttpUtility.UrlEncode(url);
if (this.ModuleAddControl.ControlObj.CurrentData != null) url = ReplaceHelper.ReplaceRowParam(this.ModuleAddControl.ControlObj.CurrentData, url);
if (SystemInfo.Instance.PrimitiveBrowser)
{
FrmMiniBlink webView = new FrmMiniBlink();
@@ -513,6 +519,7 @@ namespace Lskj.PubAdd
// 加载网页
string url = detailModel.DetailSql.StartsWith("http") ? detailModel.DetailSql : SystemInfo.Instance.OAUrl + detailModel.DetailSql;
//url= System.Web.HttpUtility.UrlEncode(url);
if (this.ModuleAddControl.ControlObj.CurrentData != null) url = ReplaceHelper.ReplaceRowParam(this.ModuleAddControl.ControlObj.CurrentData, url);
if (SystemInfo.Instance.PrimitiveBrowser)
{
FrmMiniBlink webView = new FrmMiniBlink();
@@ -596,9 +603,9 @@ namespace Lskj.PubAdd
{
moduleGrid.ParentKeyValue = moduleGrid.UnionValue = this.ModuleAddControl.ControlObj.CurrentData[moduleGrid.ParentKeyField] + "";
}
//moduleGrid.ParentKeyValue = this.ModuleAddControl.ControlObj.GetControlValue(moduleGrid.ParentKeyField);
moduleGrid.DetailKeyField = detailModel.UnionValue;
//moduleGrid.ParentKeyValue = this.ModuleAddControl.ControlObj.GetControlValue(moduleGrid.ParentKeyField);
moduleGrid.DetailKeyField = detailModel.UnionValue;
moduleGrid.UnionKey = detailModel.UnionValue;
//moduleGrid.UnionValue = this.ModuleAddControl.ControlObj.GetControlValue(moduleGrid.ParentKeyField); //Model.ObjectId;
moduleGrid.SearchControlSql = Model.ControlSql;
@@ -721,33 +728,4 @@ 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;
}
}
}
}
/// </