SVN r1047

SVN-Revision: r1047
This commit is contained in:
cyf
2025-11-20 09:01:11 +00:00
parent 6c0f72cb62
commit 2616d5dbad
23 changed files with 741 additions and 202 deletions
+12 -10
View File
@@ -410,7 +410,7 @@ namespace Lskj.Control
{
RichEditControl labelRichEdit = this.ModuleGridObj.PromptBox.TextEdit;
DataRow dataRow = ModuleGridObj.LeftGridEx.GetViewFocusedDataRow();
if (dataRow != null && labelRichEdit != null)
{
string msg;
@@ -955,7 +955,7 @@ namespace Lskj.Control
//父级字段名称
this.treeGridLeft.TreeListObj.ParentFieldName = "Pid";
}
@@ -1048,12 +1048,12 @@ namespace Lskj.Control
{
this._leftGridSearchObj.SearchGrid();
if (this.SysModel.DefaultClickLeft)
if (this.SysModel.DefaultClickLeft)
{
this.OnGridViewRowClick(null, null);
}
}
catch (Exception ex)
@@ -1366,7 +1366,7 @@ namespace Lskj.Control
// {
// if (!string.IsNullOrEmpty(SysModel.DragprocessFile))//若配置存储
// {
// }
// records[i] = ReplaceHelper.ReplaceRowParamCond(item, DragCond)
// ? BaseModuleImpl.UpdateRecord(this.SysModel.MenuTable, fieldName, e.SelectGridRow[fieldName] + "", this.ModuleGridObj.ParmaryKey, item[this.ModuleGridObj.ParmaryKey] + "")
@@ -1421,14 +1421,14 @@ namespace Lskj.Control
if (MessageUtil.Show(ResourceKeys.DragSelectRow, MessageBoxButtons.YesNo) != DialogResult.Yes)
return;
string fieldName = string.IsNullOrEmpty(SysModel.leftprimFile)? this.LeftRowObj["fieldName"] + "": SysModel.leftprimFile;
string fieldName = string.IsNullOrEmpty(SysModel.leftprimFile) ? this.LeftRowObj["fieldName"] + "" : SysModel.leftprimFile;
/* ───── ① 有配置存储过程:只执行存储过程 ───── */
if (!string.IsNullOrWhiteSpace(SysModel.DragprocessFile))
{
try
{
string moduleCode = this.Model.ModuleCode;
string leftValue = e.SelectGridRow[fieldName] + "";
string rightKeys = string.Join(",", e.GridViewSelectRows
@@ -1471,7 +1471,7 @@ namespace Lskj.Control
{
string dragCond = ReplaceHelper.ReplaceRowParam(e.SelectGridRow, this.SysModel.DragCond);
int successCount = 0, faultCount = 0;
string ErrorMessage = string.Empty;
foreach (DataRow item in e.GridViewSelectRows)
{
try
@@ -1500,6 +1500,7 @@ namespace Lskj.Control
{
faultCount++;
LogHelper.Instance.WriteError(ex1);
ErrorMessage += ex1.InnerException.Message + "\r\n";
}
}
@@ -1507,6 +1508,7 @@ namespace Lskj.Control
if (successCount > 0) tip = string.Format(ResourceKeys.DragSuccessCount, successCount);
if (faultCount > 0) tip += (tip == "" ? "" : "\r\n") +
string.Format(ResourceKeys.DragFaultCount, faultCount);
if (!string.IsNullOrWhiteSpace(ErrorMessage)) tip = tip + "\r\n" + ErrorMessage.TrimEnd('\r', '\n');
MessageUtil.Show(tip);
SearchObj.SearchLastGrid();
@@ -1857,7 +1859,7 @@ namespace Lskj.Control
{
GridDragGrid.GridAddCheckBox(modegridEx.ModuleGridObj.GridControlObj.GridView);
}
string association = item["unionvalue"]+"";
string association = item["unionvalue"] + "";
if (!string.IsNullOrWhiteSpace(association))
{
//配置了树节点关联的页签,就绑定主表的左侧控件
@@ -1881,7 +1883,7 @@ namespace Lskj.Control
break;
}
}
page.Controls.Add(modegridEx);
modegridEx.Tag = item;