wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

控制模版数据转换，将json字符串反序列化List<string>时，代码调整

Browse Source
This commit is contained in:
DEVICE8\12494
2023-03-27 16:15:35 +08:00
parent 2cbaa39611
commit eb859fe730
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
visualdev/Tnb.VisualDev.Engine/Core/FormDataParsing.cs
View File

@@ -1,4 +1,5 @@
using JNPF.Common.Const; using System.Text.RegularExpressions;
using JNPF.Common.Const;
using JNPF.Common.Core.Manager; using JNPF.Common.Core.Manager;
using JNPF.Common.Dtos; using JNPF.Common.Dtos;
using JNPF.Common.Extension; using JNPF.Common.Extension;
@@ -307,7 +308,18 @@ public class FormDataParsing : ITransient
else conversionData = data; else conversionData = data;
break; break;
default: default:
conversionData = data.ToString().ToObject<List<object>>(); //modify by ly on 20230327
var temp = data.ToString();
Regex re = new Regex("(?<=\").*?(?=\")", RegexOptions.None);
if (!re.IsMatch(temp))
{
temp = $"\"{data}\"";
}
if (!temp.StartsWith("[") && !temp.EndsWith("]"))
{
temp = $"[{temp}]";
}
conversionData = temp.ToObject<List<object>>();
break; break;
} }
} }
@@ -1443,6 +1455,7 @@ public class FormDataParsing : ITransient
if (!(dataMap[strKey[i]] is null)) if (!(dataMap[strKey[i]] is null))
{ {
FieldsModel? form = formData.Where(f => f.__vModel__ == strKey[i]).FirstOrDefault(); FieldsModel? form = formData.Where(f => f.__vModel__ == strKey[i]).FirstOrDefault();
if (form != null) if (form != null)
{ {
if (form.__vModel__.Contains(form.__config__.jnpfKey + "Field")) dataMap[strKey[i]] = TemplateControlsDataConversion(dataMap[strKey[i]], form); if (form.__vModel__.Contains(form.__config__.jnpfKey + "Field")) dataMap[strKey[i]] = TemplateControlsDataConversion(dataMap[strKey[i]], form);