From 20d9817a627d68c19f456f9733fa98cc635a45f5 Mon Sep 17 00:00:00 2001 From: cyf Date: Fri, 20 Mar 2026 01:39:49 +0000 Subject: [PATCH] SVN r1144 SVN-Revision: r1144 --- 插件库/Lskj.PubProductSysMge/FrmMain.cs | 42 +++++++++---------- .../Model/SysSetModel.cs | 36 ++++++++++------ 2 files changed, 45 insertions(+), 33 deletions(-) diff --git a/插件库/Lskj.PubProductSysMge/FrmMain.cs b/插件库/Lskj.PubProductSysMge/FrmMain.cs index 0e55931..615d815 100644 --- a/插件库/Lskj.PubProductSysMge/FrmMain.cs +++ b/插件库/Lskj.PubProductSysMge/FrmMain.cs @@ -745,13 +745,13 @@ namespace Lskj.PubProductSysMge LabelAutoTextEdit labelAutoTextEdit = ctr as LabelAutoTextEdit; if (dataSource.Columns.Count >= 2) { - string keyField = dataSource.Columns[0].ColumnName; - string valueField = dataSource.Columns[1].ColumnName; - setModel.ValueMember = keyField; - setModel.TextMember = valueField; - labelAutoTextEdit.ValueField = keyField; - labelAutoTextEdit.TextField = valueField; - labelAutoTextEdit.ValueMember = keyField; + string ValueMember = dataSource.Columns[0].ColumnName; + string TextMember = dataSource.Columns[1].ColumnName; + setModel.ValueMember = ValueMember; + setModel.TextMember = TextMember; + labelAutoTextEdit.ValueField = ValueMember; + labelAutoTextEdit.TextField = TextMember; + labelAutoTextEdit.ValueMember = ValueMember; } labelAutoTextEdit.SetDataSource(dataSource); } @@ -778,13 +778,13 @@ namespace Lskj.PubProductSysMge LabelMultiAutoTextEdit labelMultiAutoTextEdit = ctr as LabelMultiAutoTextEdit; if (dataSource.Columns.Count >= 2) { - string keyField = dataSource.Columns[0].ColumnName; - string valueField = dataSource.Columns[1].ColumnName; - setModel.ValueMember = keyField; - setModel.TextMember = valueField; - labelMultiAutoTextEdit.ValueField = keyField; - labelMultiAutoTextEdit.TextField = valueField; - labelMultiAutoTextEdit.ValueMember = keyField; + string ValueMember = dataSource.Columns[0].ColumnName; + string TextMember = dataSource.Columns[1].ColumnName; + setModel.ValueMember = ValueMember; + setModel.TextMember = TextMember; + labelMultiAutoTextEdit.ValueField = ValueMember; + labelMultiAutoTextEdit.TextField = TextMember; + labelMultiAutoTextEdit.ValueMember = ValueMember; } labelMultiAutoTextEdit.SetDataSource(dataSource); } @@ -811,13 +811,13 @@ namespace Lskj.PubProductSysMge LabelAutoMemoEdit labelAutoMemoEdit = ctr as LabelAutoMemoEdit; if (dataSource.Columns.Count >= 2) { - string keyField = dataSource.Columns[0].ColumnName; - string valueField = dataSource.Columns[1].ColumnName; - setModel.ValueMember = keyField; - setModel.TextMember = valueField; - labelAutoMemoEdit.ValueField = keyField; - labelAutoMemoEdit.TextField = valueField; - labelAutoMemoEdit.ValueMember = keyField; + string ValueMember = dataSource.Columns[0].ColumnName; + string TextMember = dataSource.Columns[1].ColumnName; + setModel.ValueMember = ValueMember; + setModel.TextMember = TextMember; + labelAutoMemoEdit.ValueField = ValueMember; + labelAutoMemoEdit.TextField = TextMember; + labelAutoMemoEdit.ValueMember = ValueMember; } labelAutoMemoEdit.SetDataSource(dataSource); } diff --git a/插件库/Lskj.PubProductSysMge/Model/SysSetModel.cs b/插件库/Lskj.PubProductSysMge/Model/SysSetModel.cs index f179962..503f322 100644 --- a/插件库/Lskj.PubProductSysMge/Model/SysSetModel.cs +++ b/插件库/Lskj.PubProductSysMge/Model/SysSetModel.cs @@ -15,7 +15,7 @@ namespace Lskj.PubProductSysMge.Model public int Id { get; set; } public int GroupId { get; set; } /// - /// 方案名称 + /// 方案名称(没有使用) /// public string GroupName { get; set; } /// @@ -39,34 +39,46 @@ namespace Lskj.PubProductSysMge.Model /// public int GradeSort { get; set; } /// - /// 节点 + /// 节点（没有使用） /// public string SpeciesId { get; set; } /// - /// 节点名 + /// 节点名（没有使用） /// public string SpeciesName { get; set; } /// /// 参数名 /// public string SysName { get; set; } + //(没有使用) public int SysCount { get; set; } + //(没有使用) public int SysInt { get; set; } /// - /// 备注 + /// 备注(没有使用) /// public string SysInfo { get; set; } - //禁用标识 + //禁用标识 (没有使用) public int Ban { get; set; } /// /// 类型 ，1仅限选择，2仅限输入 + /// 1,下拉框控件 + ///2,文本框 + ///3,多选框控件 + ///4,备注框 + ///5,下拉备注框(把下拉框中的值添加到备注框中) + ///6,文本（标签） + ///7,复选框 + ///9,日期框 /// public string Item { get; set; } + //(没有使用) public string XZ1 { get; set; } /// /// 反写字段 /// public string DbName { get; set; } + //(没有使用) public int? DbNameCount { get; set; } /// /// 是否反写规格 @@ -101,7 +113,7 @@ namespace Lskj.PubProductSysMge.Model /// public string DataSourceSql { get; set; } /// - /// 生成BOM标识 + /// 生成BOM标识 (没有使用) /// public int? BomTig { get; set; } /// @@ -109,11 +121,11 @@ namespace Lskj.PubProductSysMge.Model /// public string ConnectorStr { get; set; } /// - /// 默认编码 + /// 默认编码（默认值，直接赋配置值） /// public string DefaultID { get; set; } /// - /// 默认名称 + /// 默认名称（默认值，可以配置sql，先在上方控件中替换参数，把最后执行的值赋值） /// public string DefaultName { get; set; } /// @@ -135,7 +147,7 @@ namespace Lskj.PubProductSysMge.Model /// The union values. public bool ProhibitEdited { get; set; } /// - /// 排序字段 + /// 排序字段（如果是默认的数据源sql，就拼接到最后select b.midno as id,b.sysnamelist as sysnamelist,b.bak as bak from p_productsyssettab a join p_productsyslisttab b on a.id = b.mid where mid = '{控件id}' order by b.{排序字段}） /// /// The union values. public string OrderField { get; set; } @@ -144,12 +156,12 @@ namespace Lskj.PubProductSysMge.Model /// public string DataFormat { get; set; } /// - /// 必填条件 + /// 必填条件（根据条件设置控件是否为必填，如a改变后，判断所有条件中有{a}的控件，然后改变必填状态） /// - public string RequiredCond{ get; set; } + public string RequiredCond { get; set; } /// - /// 连接符（后方） + /// 连接符（后方）（没用） /// public string EndConnectorStr { get; set; }