From 0e429a92d486fb5a2e0418eadd16ee44b7fa660e Mon Sep 17 00:00:00 2001 From: cyf Date: Mon, 1 Jun 2026 02:15:03 +0000 Subject: [PATCH] SVN r1201 SVN-Revision: r1201 --- 插件库/Lskj.PubProductSmart/FrmMain.cs | 53 ++++++++++++------- .../Lskj.PubProductSmart/Model/SysSetModel.cs | 24 ++++++++- 2 files changed, 58 insertions(+), 19 deletions(-) diff --git a/插件库/Lskj.PubProductSmart/FrmMain.cs b/插件库/Lskj.PubProductSmart/FrmMain.cs index 5d648e9..6372f7b 100644 --- a/插件库/Lskj.PubProductSmart/FrmMain.cs +++ b/插件库/Lskj.PubProductSmart/FrmMain.cs @@ -173,6 +173,8 @@ namespace Lskj.PubProductSmart this.splitMainContainer.PanelVisibility = SplitPanelVisibility.Panel2; break; } + //隐藏中间下方浏览器 + this.splitDynamicContainer.PanelVisibility = SplitPanelVisibility.Panel1; } catch (Exception) { @@ -326,28 +328,40 @@ namespace Lskj.PubProductSmart /// private void SetRowControlValues() { - //this.CloseReverseWriting = true; - //根据主表选中行给左侧控件赋值 - DataRow dr = this.gcMain.GetViewFocusedDataRow(); - if (dr != null) + try { - List modelControls = this.pl_Top.Controls.Cast().Where(n => !string.IsNullOrEmpty((n.Tag as SysSetModel).DbName)).OrderBy(n => (n.Tag as SysSetModel).OrderId).ToList(); - foreach (BaseUserControl item in modelControls) + //根据主表选中行给左侧控件赋值 + DataRow dr = this.gcMain.GetViewFocusedDataRow(); + if (dr != null) { - SysSetModel sysSetModel = item.Tag as SysSetModel; - string controlName = !string.IsNullOrWhiteSpace(sysSetModel.DbName) ? sysSetModel.DbName : sysSetModel.SysName; - if (dr.Table.Columns.Contains(controlName)) + //this.CloseReverseWriting = true; + List modelControls = this.pl_Top.Controls.Cast().Where(n => !string.IsNullOrEmpty((n.Tag as SysSetModel).DbName)).OrderBy(n => (n.Tag as SysSetModel).OrderId).ToList(); + foreach (BaseUserControl item in modelControls) { - this.SetControlValue(controlName, dr[sysSetModel.DbName]); - } - else - { - this.SetControlValue(controlName, ""); - } + SysSetModel sysSetModel = item.Tag as SysSetModel; + string controlName = !string.IsNullOrWhiteSpace(sysSetModel.DbName) ? sysSetModel.DbName : sysSetModel.SysName; + if (dr.Table.Columns.Contains(controlName)) + { + this.SetControlValue(controlName, dr[sysSetModel.DbName]); + } + else + { + this.SetControlValue(controlName, ""); + } + } } } - //this.CloseReverseWriting = false; + catch (Exception ex) + { + + } + finally + { + //this.CloseReverseWriting = false; + } + + } /// @@ -926,7 +940,9 @@ namespace Lskj.PubProductSmart bool ClickMain = true;//点击主表 try { - foreach (SysSetModel setModel in this.ControlList) + List< SysSetModel > sysSetModels= this.ControlList.Where(p => p.Item.Equals("1")|| p.Item.Equals("3")|| p.Item.Equals("5")).ToList(); + + foreach (SysSetModel setModel in sysSetModels) { string controlName = !string.IsNullOrWhiteSpace(setModel.DbName) ? "txt_" + setModel.DbName : "txt_" + setModel.SysName; System.Windows.Forms.Control ctr = this.pl_Top.Controls.Find(controlName, false).FirstOrDefault(); @@ -1263,7 +1279,7 @@ namespace Lskj.PubProductSmart /// private void OnTextEditTextChanged(object sender, EventArgs e) { - //if (!CloseReverseWriting) return; + //if (CloseReverseWriting) return; DataTable dataTable = this.gcMain.GridControl.DataSourceTable(); BaseUserControl baseControl = (sender as System.Windows.Forms.Control).ToBaseUserControl(); @@ -1540,6 +1556,7 @@ namespace Lskj.PubProductSmart string url = dataRow.Table.Columns.Contains("url") ? dataRow["url"] + "" : ""; if (!string.IsNullOrEmpty(url)) { + this.splitDynamicContainer.PanelVisibility = SplitPanelVisibility.Both; this.tipsLabel.Visible = false; this.frmWebBrowser.Visible = true; this.frmWebBrowser.LoadUrl(url); diff --git a/插件库/Lskj.PubProductSmart/Model/SysSetModel.cs b/插件库/Lskj.PubProductSmart/Model/SysSetModel.cs index 21ddc50..491fd55 100644 --- a/插件库/Lskj.PubProductSmart/Model/SysSetModel.cs +++ b/插件库/Lskj.PubProductSmart/Model/SysSetModel.cs @@ -215,6 +215,23 @@ namespace Lskj.PubProductSmart.Model /// 只查询名称 /// public bool OnlyQueryName; + /// + /// 系统表 + /// + public string xtModeCode { get; set; } + /// + /// 行业表 + /// + public string hyModeCode { get; set; } + // + /// 是否映射 + /// + public bool IsYsZD { get; set; } + // + /// 具体对应的表 + /// + public string SaveModeCode { get; set; } + public SysSetModel(DataRow rowItem) { @@ -273,4 +290,9 @@ namespace Lskj.PubProductSmart.Model this.EndConnectorStrGg = rowItem.Table.Columns.Contains("EndConnectorStrGg") && !string.IsNullOrEmpty(rowItem["EndConnectorStrGg"] + "") ? rowItem["EndConnectorStrGg"] + "" : ""; this.ConnectorStrXh = rowItem.Table.Columns.Contains("ConnectorStrXh") && !string.IsNullOrEmpty(rowItem["ConnectorStrXh"] + "") ? rowItem["ConnectorStrXh"] + "" : ""; - this.EndConnectorStrXh = rowItem.Table.Columns.Contains("EndConnectorStrXh") && !string.Is \ No newline at end of file + this.EndConnectorStrXh = rowItem.Table.Columns.Contains("EndConnectorStrXh") && !string.IsNullOrEmpty(rowItem["EndConnectorStrXh"] + "") ? rowItem["EndConnectorStrXh"] + "" : ""; + + this.ConnectorStrZhsx = rowItem.Table.Columns.Contains("ConnectorStrZhsx") && !string.IsNullOrEmpty(rowItem["ConnectorStrZhsx"] + "") ? rowItem["ConnectorStrZhsx"] + "" : ""; + this.EndConnectorStrZhsx = rowItem.Table.Columns.Contains("EndConnectorStrZhsx") && !string.IsNullOrEmpty(rowItem["EndConnectorStrZhsx"] + "") ? rowItem["EndConnectorStrZhsx"] + "" : ""; + + this.ConnectorStrCz = rowItem.Table.Co \ No newline at end of file