SVN r694
SVN-Revision: r694
This commit is contained in:
@@ -37,6 +37,7 @@ using DevExpress.XtraTreeList.Nodes;
|
||||
using DevExpress.XtraTreeList;
|
||||
using System.Collections;
|
||||
using System.Threading.Tasks;
|
||||
using DevExpress.XtraRichEdit;
|
||||
|
||||
namespace Lskj.Control
|
||||
{
|
||||
@@ -45,7 +46,10 @@ namespace Lskj.Control
|
||||
/// </summary>
|
||||
public partial class ModuleEx : UserControl
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// 当前富文本框是否改变
|
||||
/// </summary>
|
||||
private bool _richTextDirty;
|
||||
/// <summary>
|
||||
/// BMP字段
|
||||
/// </summary>
|
||||
@@ -347,7 +351,7 @@ namespace Lskj.Control
|
||||
this.ModuleGridObj.OnExportCallBack += new EventHandler(SetExportGridView);
|
||||
this.InitializeTab();
|
||||
bool isLoadGridSplit = false;
|
||||
|
||||
|
||||
if (sysModel.DynamicPrompt)
|
||||
{
|
||||
this.ModuleGridObj.VisibleSearchPanel = false;
|
||||
@@ -366,7 +370,7 @@ namespace Lskj.Control
|
||||
}
|
||||
// 重点:针对 TextEdit 绑定
|
||||
this.ModuleGridObj.PromptBox.TextEdit.KeyDown += PromptBox_KeyDown;
|
||||
this.ModuleGridObj.PromptBox.TextEdit.ReadOnly = true;
|
||||
//this.ModuleGridObj.PromptBox.TextEdit.ReadOnly = true;
|
||||
if (string.IsNullOrWhiteSpace(this.ModuleGridObj.PromptBox.EditText)) this.ModuleGridObj.PromptBox.EditText = "请点击左侧查看备注信息!";
|
||||
this.ModuleGridObj.TipsobjPanel.Controls.Add(this.ModuleGridObj.PromptBox);
|
||||
}
|
||||
@@ -395,11 +399,26 @@ namespace Lskj.Control
|
||||
{
|
||||
e.Handled = true; // 阻止控件继续处理
|
||||
e.SuppressKeyPress = true; // 阻止dev功能
|
||||
|
||||
SaveRemark();
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// 保存编码
|
||||
/// </summary>
|
||||
private void SaveRemark()
|
||||
{
|
||||
RichEditControl labelRichEdit = this.ModuleGridObj.PromptBox.TextEdit;
|
||||
DataRow dataRow = ModuleGridObj.LeftGridEx.GetViewFocusedDataRow();
|
||||
|
||||
if (dataRow != null && labelRichEdit != null)
|
||||
{
|
||||
string msg;
|
||||
int ret = BaseModuleImpl.UpdateRemarkByModule(Model.ModuleCode, dataRow[this.ModuleGridObj.ParentKeyField] + "",
|
||||
labelRichEdit.Text, out msg);
|
||||
MessageUtil.Show(msg);
|
||||
this.ModuleGridObj._leftGridSearchObj.SearchLastGrid();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 获取数据源缓存
|
||||
/// </summary>
|
||||
@@ -596,7 +615,7 @@ namespace Lskj.Control
|
||||
protected void SetMainGridView(string where = "")
|
||||
{
|
||||
ModuleGridDetailEx moduleGridDetailEx = this.MainBodyTab.Visible ? (this.MainBodyTab.SelectedTabPage.Tag as ModuleGridDetailEx) : null;
|
||||
string sqlValue = ReplaceHelper.ReplaceWhereCond(moduleGridDetailEx!=null? moduleGridDetailEx.SysModel.MenuSql : this.SysModel.MenuSql);
|
||||
string sqlValue = ReplaceHelper.ReplaceWhereCond(moduleGridDetailEx != null ? moduleGridDetailEx.SysModel.MenuSql : this.SysModel.MenuSql);
|
||||
if (moduleGridDetailEx != null && moduleGridDetailEx.Tag is DataRow dataRow)
|
||||
{
|
||||
sqlValue += dataRow["unionCond"];
|
||||
@@ -634,7 +653,7 @@ namespace Lskj.Control
|
||||
}
|
||||
else
|
||||
{
|
||||
// bool isLoadGridSplit = false;
|
||||
// bool isLoadGridSplit = false;
|
||||
// 左侧gridView时,需要替换sql参数(包含查询条件、表格选中行).
|
||||
if (this.gridLeft.Visible)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user