SVN r290
SVN-Revision: r290
This commit is contained in:
@@ -10,6 +10,7 @@ using Lskj.Core;
|
||||
using Lskj.Data;
|
||||
using Lskj.Model;
|
||||
using Lskj.Util;
|
||||
using Newtonsoft.Json;
|
||||
using Qhzd.Control;
|
||||
using System;
|
||||
using System.Collections;
|
||||
@@ -4692,7 +4693,9 @@ namespace Lskj.Control.Model
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(fieldValue)) fieldValue = "0";
|
||||
calcExpr = ReplaceControlValue(calcExpr.Replace("{" + model.FieldName + "}", fieldValue));
|
||||
calcValue = EvalHelper.Eval(ReplaceHelper.ReplaceEvalCond(calcExpr)) + "";
|
||||
object evalResult = EvalHelper.Eval(ReplaceHelper.ReplaceEvalCond(calcExpr));
|
||||
calcValue = JsonConvert.SerializeObject(evalResult);
|
||||
//calcValue = EvalHelper.Eval(ReplaceHelper.ReplaceEvalCond(calcExpr)) + "";
|
||||
}
|
||||
if (isTruncate)
|
||||
{
|
||||
@@ -5234,6 +5237,32 @@ namespace Lskj.Control.Model
|
||||
/// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
|
||||
protected void OnSimpleButtonClick(object sender, EventArgs e)
|
||||
{
|
||||
try
|
||||
{
|
||||
bool allowBefore = ApiHelper.IsExecEventApi(Interface.Api.OperateEvent.BeforeSearchBtnClick, Model.ModuleCode, 0);
|
||||
//查询前调用Api接口
|
||||
if (allowBefore)
|
||||
{
|
||||
DataRow dataRow = this.GetAllControlValueRow();
|
||||
ApiHelper apiHelper = new ApiHelper(Model.ModuleCode, 0, dataRow);
|
||||
apiHelper.OnEvent(Interface.Api.OperateEvent.BeforeSearchBtnClick, Interface.Api.ActionType.None);
|
||||
if (apiHelper.apiHandlerModels.Count > 0)
|
||||
{
|
||||
Hashtable hashtable = apiHelper.apiHandlerModels[apiHelper.apiHandlerModels.Count - 1].resultPmsHashtables[0];
|
||||
if (hashtable.ContainsKey("result"))
|
||||
{
|
||||
string jsonResult = hashtable["result"] + "";
|
||||
DataTable dataTable = JsonConvert.DeserializeObject<DataTable>(jsonResult);
|
||||
this._mainGridEx.SetGridViewDataSource(dataTable);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MessageUtil.Show(ex.Message);
|
||||
}
|
||||
SearchArgs args = new SearchArgs();
|
||||
// 查询之前
|
||||
if (OnSearchBeforeCallBack != null)
|
||||
@@ -5553,30 +5582,4 @@ namespace Lskj.Control.Model
|
||||
LabelDateEdit dateEdit = controlObj as LabelDateEdit;
|
||||
value = dateEdit.TextEdit.EditValue == null ? dateEdit.EditText : dateEdit.TextEdit.DateTime.ToString("yyyy-MM-dd");
|
||||
}
|
||||
else if (controlObj is LabelCheckEdit)
|
||||
{
|
||||
LabelCheckEdit checkEdit = controlObj as LabelCheckEdit;
|
||||
value = checkEdit.EditText;
|
||||
}
|
||||
else if (controlObj is LabelComboxEdit)
|
||||
{
|
||||
LabelComboxEdit autoEdit = controlObj as LabelComboxEdit;
|
||||
value = autoEdit.EditValue;
|
||||
}
|
||||
else if (controlObj is LabelTextEdit)
|
||||
{
|
||||
LabelTextEdit textIntEdit = controlObj as LabelTextEdit;
|
||||
if (textIntEdit != null) value = string.IsNullOrEmpty(textIntEdit.EditText) ? "0" : textIntEdit.EditText;
|
||||
}
|
||||
|
||||
defaultValue = defaultValue.Replace(item, value);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
return defaultValue;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
else if
|
||||
Reference in New Issue
Block a user