SVN r1089
SVN-Revision: r1089
This commit is contained in:
@@ -80,6 +80,30 @@ namespace Lskj.Control.Model
|
||||
|
||||
GridRightMenuModel model = new GridRightMenuModel(rowItem);
|
||||
|
||||
//if (!string.IsNullOrWhiteSpace(model.MenuCond))
|
||||
//{
|
||||
// try
|
||||
// {
|
||||
// string cond = ReplaceHelper.ReplaceUserInfo(model.MenuCond);
|
||||
// if (this._controlObj != null)
|
||||
// {
|
||||
// cond = _controlObj.ReplaceControlValue(model.MenuCond);
|
||||
// }
|
||||
// if (BaseGridView != null && BaseGridView.GetFocusedDataRow() != null)
|
||||
// {
|
||||
// DataRow parentitem = BaseGridView.GetFocusedDataRow();
|
||||
// cond = ReplaceHelper.ReplaceRowParam(parentitem, cond) + "";
|
||||
// }
|
||||
// bool result = ReplaceHelper.EvalCond(cond);
|
||||
// if (!result) return false;
|
||||
// }
|
||||
// catch (Exception)
|
||||
// {
|
||||
// MessageUtil.Show(ResourceKeys.SetRightMenuCondFault);
|
||||
// }
|
||||
//}
|
||||
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(model.BeforeMsg))
|
||||
{
|
||||
string prompt = this._controlObj.ReplaceControlValue(model.BeforeMsg);
|
||||
@@ -108,6 +132,12 @@ namespace Lskj.Control.Model
|
||||
if (applyArgs.CancelFlag) return false;
|
||||
|
||||
List<string> paramList = HandleRightMenuParams(model.ParamList);
|
||||
string maintabFocusedRowJson = "";
|
||||
if (BaseGridView != null && BaseGridView.GetFocusedDataRow() != null)
|
||||
{
|
||||
maintabFocusedRowJson = BaseGridView.GetFocusedDataRow().ToJsonObject(); // 假设 ToJsonObject() 是将对象转换为 JSON 字符串的方法
|
||||
}
|
||||
paramList.Add(maintabFocusedRowJson);
|
||||
string dllName = this._controlObj.ReplaceControlValue(model.DllName).Trim();
|
||||
if (BaseGridView != null && BaseGridView.GetFocusedDataRow() != null)
|
||||
{
|
||||
@@ -310,9 +340,9 @@ namespace Lskj.Control.Model
|
||||
}
|
||||
break;
|
||||
default:
|
||||
if (ReturnStoredProcedureValue != null)
|
||||
if (ReturnStoredProcedureValue != null)
|
||||
{
|
||||
ReturnStoredProcedureValue(pMsg.Value+"");
|
||||
ReturnStoredProcedureValue(pMsg.Value + "");
|
||||
}
|
||||
MessageUtil.Show(ResourceKeys.OperSuccess);
|
||||
break;
|
||||
@@ -355,7 +385,7 @@ namespace Lskj.Control.Model
|
||||
/// <para>版本:1.0</para>
|
||||
/// </summary>
|
||||
/// <returns><c>true</c> if XXXX, <c>false</c> otherwise.</returns>
|
||||
private bool ExecDynamicLinkLibary(GridRightMenuModel model, List<string> paramList, DataRow rowItem,string dllname)
|
||||
private bool ExecDynamicLinkLibary(GridRightMenuModel model, List<string> paramList, DataRow rowItem, string dllname)
|
||||
{
|
||||
issuccess = true;
|
||||
if (string.IsNullOrWhiteSpace(dllname))
|
||||
@@ -388,30 +418,33 @@ namespace Lskj.Control.Model
|
||||
break;
|
||||
default:
|
||||
List<string> str = new List<string>
|
||||
{
|
||||
_model.FormText,
|
||||
ERPInfo.Instance.UserId,
|
||||
ERPInfo.Instance.UserName,
|
||||
"3",
|
||||
_model.ModuleCode,
|
||||
paramList[0],
|
||||
paramList[1],
|
||||
paramList[2],
|
||||
paramList[3],
|
||||
paramList[4],
|
||||
paramList[5],
|
||||
paramList[6],
|
||||
paramList[7],
|
||||
paramList[8],
|
||||
paramList[9]
|
||||
};
|
||||
string maintabFocusedRowJson = "";
|
||||
if (BaseGridView != null && BaseGridView.GetFocusedDataRow() != null)
|
||||
{
|
||||
maintabFocusedRowJson = BaseGridView.GetFocusedDataRow().ToJsonObject(); // 假设 ToJsonObject() 是将对象转换为 JSON 字符串的方法
|
||||
}
|
||||
str.Add(maintabFocusedRowJson); // 现在可以添加元素了,因为 str 是 List<string>
|
||||
// 假设你需要将 List<string> 转回字符串数组,可以这样操作
|
||||
{
|
||||
_model.FormText,
|
||||
ERPInfo.Instance.UserId,
|
||||
ERPInfo.Instance.UserName,
|
||||
"3",
|
||||
_model.ModuleCode,
|
||||
paramList[0],
|
||||
paramList[1],
|
||||
paramList[2],
|
||||
paramList[3],
|
||||
paramList[4],
|
||||
paramList[5],
|
||||
paramList[6],
|
||||
paramList[7],
|
||||
paramList[8],
|
||||
paramList[9],
|
||||
paramList[10],
|
||||
paramList[11],
|
||||
paramList[12]//固定添加行数据json字符串
|
||||
};
|
||||
//string maintabFocusedRowJson = "";
|
||||
//if (BaseGridView != null && BaseGridView.GetFocusedDataRow() != null)
|
||||
//{
|
||||
// maintabFocusedRowJson = BaseGridView.GetFocusedDataRow().ToJsonObject(); // 假设 ToJsonObject() 是将对象转换为 JSON 字符串的方法
|
||||
//}
|
||||
//str.Add(maintabFocusedRowJson); // 现在可以添加元素了,因为 str 是 List<string>
|
||||
// // 假设你需要将 List<string> 转回字符串数组,可以这样操作
|
||||
string[] strArray = str.ToArray();
|
||||
IForm form = FormHelper.LoadDllForm(dllname, strArray);
|
||||
if (form == null)
|
||||
|
||||
Reference in New Issue
Block a user