fix(browser): accept nested values in row callbacks
This commit is contained in:
@@ -7,8 +7,6 @@ using Lskj.Control.Model;
|
||||
using Lskj.Data;
|
||||
using Lskj.Model;
|
||||
using Lskj.Util;
|
||||
using Newtonsoft.Json;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
@@ -108,7 +106,7 @@ namespace Lskj.Control.BrowserSetting
|
||||
menu.Model = new DynamicModel(new string[] { MenuName, ERPInfo.Instance.UserId, ERPInfo.Instance.UserName, "1", mMenuCode });
|
||||
//DataRow[] dataRows = JsonHandler.ParseJsonArrayToDataRows(arrayItem);
|
||||
//JArray jArray = (JArray)JsonConvert.DeserializeObject(arrayItem);
|
||||
DataTable dataTable = JsonConvert.DeserializeObject<DataTable>(arrayItem);
|
||||
DataTable dataTable = JsonUtil.ToDataTablePreservingComplexValues(arrayItem);
|
||||
if (dataTable != null && dataTable.Rows.Count > 0)
|
||||
{
|
||||
menu.ExecRightMenu(menuModel, dataTable.Select());
|
||||
@@ -323,10 +321,7 @@ namespace Lskj.Control.BrowserSetting
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(rowdata) && StaticControl.RightMenuGridView != null)
|
||||
{
|
||||
JObject rowObject = JsonConvert.DeserializeObject<JObject>(rowdata);
|
||||
JArray jArray = new JArray();
|
||||
jArray.Add(rowObject);
|
||||
DataTable dataTable = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(jArray));
|
||||
DataTable dataTable = JsonUtil.ToDataTablePreservingComplexValues(rowdata);
|
||||
|
||||
|
||||
DataTable gridTable = (StaticControl.RightMenuGridView.GridControl.DataSource as DataTable).TrimDeleteRows();
|
||||
|
||||
Reference in New Issue
Block a user