diff --git a/插件库/Lskj.Control/ModuleEx.cs b/插件库/Lskj.Control/ModuleEx.cs index 36a4a22..a463075 100644 --- a/插件库/Lskj.Control/ModuleEx.cs +++ b/插件库/Lskj.Control/ModuleEx.cs @@ -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 /// public partial class ModuleEx : UserControl { - + /// + /// 当前富文本框是否改变 + /// + private bool _richTextDirty; /// /// BMP字段 /// @@ -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(); + } + } + /// + /// 保存编码 + /// + 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(); } } - - /// /// 获取数据源缓存 /// @@ -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) { diff --git a/插件库/Lskj.Control/ModuleGridDetailEx.cs b/插件库/Lskj.Control/ModuleGridDetailEx.cs index 258dd15..c188dab 100644 --- a/插件库/Lskj.Control/ModuleGridDetailEx.cs +++ b/插件库/Lskj.Control/ModuleGridDetailEx.cs @@ -619,6 +619,29 @@ namespace Lskj.Control } GridDetailModel model = this.tcButtom.GetGridDetailModel(tabPage); DataRow rowItem = this.ModuleGridObj.GridControlObj.GetViewFocusedDataRow(); + if (!string.IsNullOrEmpty(SysModel.PageVisbleCond) ) + { + string condSql= ReplaceHelper.ReplaceRowParam(rowItem, ReplaceHelper.ReplaceUserInfo(SysModel.PageVisbleCond)).Replace("''", "'"); + // 形如 "1,2,3" 的返回值 + string numberList = MainImpl.GetResult(condSql) + ""; + + // ---------- 判断当前 orderid 是否在列表中 ---------- + string orderIdStr = model.Orderid.ToString(); // 统一转成字符串 + string[] idArr = numberList.Split(new[] { ',' }, + StringSplitOptions.RemoveEmptyEntries); + + if (!idArr.Contains(orderIdStr)) + { + tabPage.PageVisible = false; + return; // 不包含当前 orderid,直接退出 + } + else + { + tabPage.PageVisible = true; + } + } + + if (IsDynamicDetailType) { //string mainModuleCode = model.ParentModuleCode; diff --git a/插件库/Lskj.Control/ModuleGridEx.cs b/插件库/Lskj.Control/ModuleGridEx.cs index 2420f2b..18e9587 100644 --- a/插件库/Lskj.Control/ModuleGridEx.cs +++ b/插件库/Lskj.Control/ModuleGridEx.cs @@ -83,6 +83,10 @@ namespace Lskj.Control /// private bool _isExcPrint; /// + /// 最新的名字 + /// + public string lastrichtext; + /// /// 主打印Sql /// private string _mainPrintSql; @@ -5380,6 +5384,7 @@ namespace Lskj.Control { if (!this.SysModel.SearchEnable) { + lastrichtext = text; PromptBox.EditText = text; // 获取文档对象 Document document = this.PromptBox.TextEdit.Document;