mirror of
https://gitee.com/langsisi_admin/serein-flow
synced 2026-03-03 00:00:49 +08:00
1. 重新设计了 JSON门户类的实现
2. Script脚本添加了原始字符串的实现 3. 修复了Script中无法对 \" 双引号转义的问题 4. 新增了对于集合嵌套取值的支持(目前仅是集合取值) 5. 重新设计了FlowWorkManagement任务启动的逻辑,修复了触发器无法正常运行的问题 6. 在ScriptBaseFunc中新增了 json() 本地函数,支持将字符串转为IJsonToken进行取值。 7. EmitHelper对于集合取值时,反射获取“get_item”委托时存在看你多个MethodInfo,现在可以传入子项类型,帮助匹配目标重载方法
This commit is contained in:
121
Serein.Extend.NewtonsoftJson/NewtonsoftJsonArrayToken.cs
Normal file
121
Serein.Extend.NewtonsoftJson/NewtonsoftJsonArrayToken.cs
Normal file
@@ -0,0 +1,121 @@
|
||||
using Newtonsoft.Json.Linq;
|
||||
using Serein.Library.Api;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Serein.Extend.NewtonsoftJson
|
||||
{
|
||||
public sealed class NewtonsoftJsonArrayToken : IJsonToken, IList<IJsonToken>
|
||||
{
|
||||
private readonly JArray _array;
|
||||
public NewtonsoftJsonArrayToken(JArray array) => _array = array;
|
||||
|
||||
public bool IsNull => false;
|
||||
public bool IsObject => false;
|
||||
public bool IsArray => true;
|
||||
|
||||
public int Count => _array.Count;
|
||||
|
||||
public bool IsReadOnly => _array.IsReadOnly;
|
||||
|
||||
|
||||
public string GetString() => _array.ToString();
|
||||
public int GetInt32() => throw new InvalidOperationException("不是值类型");
|
||||
public bool GetBoolean() => throw new InvalidOperationException("不是值类型");
|
||||
|
||||
public IJsonToken this[object key] => key is int index ? this[index] : throw new InvalidOperationException("不是对象类型");
|
||||
|
||||
public IJsonToken this[int index]
|
||||
{
|
||||
get => NewtonsoftJsonTokenFactory.FromJToken(_array[index]);
|
||||
set => _array[index] = JToken.FromObject(value.ToObject<object>());
|
||||
}
|
||||
|
||||
|
||||
public IEnumerable<IJsonToken> EnumerateArray()
|
||||
{
|
||||
foreach (var t in _array)
|
||||
yield return NewtonsoftJsonTokenFactory.FromJToken(t);
|
||||
}
|
||||
|
||||
public T ToObject<T>() => throw new InvalidOperationException("不是对象类型");
|
||||
public object ToObject(Type type) => throw new InvalidOperationException("不是对象类型");
|
||||
public override string ToString() => _array.ToString();
|
||||
|
||||
public bool TryGetValue(string name, out IJsonToken token) => throw new InvalidOperationException("不是对象类型");
|
||||
public IJsonToken? GetValue(string name) => throw new InvalidOperationException("不是对象类型");
|
||||
|
||||
public int IndexOf(IJsonToken item)
|
||||
{
|
||||
var jt = JToken.FromObject(item.ToObject<object>());
|
||||
for (int i = 0; i < _array.Count; i++)
|
||||
{
|
||||
if (JToken.DeepEquals(_array[i], jt))
|
||||
return i;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
public void Insert(int index, IJsonToken item)
|
||||
{
|
||||
_array.Insert(index, JToken.FromObject(item.ToObject<object>()));
|
||||
}
|
||||
|
||||
public void RemoveAt(int index)
|
||||
{
|
||||
_array.RemoveAt(index);
|
||||
}
|
||||
|
||||
public void Add(IJsonToken item)
|
||||
{
|
||||
_array.Add(JToken.FromObject(item.ToObject<object>()));
|
||||
}
|
||||
|
||||
public void Clear()
|
||||
{
|
||||
_array.Clear();
|
||||
}
|
||||
|
||||
public bool Contains(IJsonToken item)
|
||||
{
|
||||
var jt = JToken.FromObject(item.ToObject<object>());
|
||||
return _array.Any(x => JToken.DeepEquals(x, jt));
|
||||
}
|
||||
|
||||
public void CopyTo(IJsonToken[] array, int arrayIndex)
|
||||
{
|
||||
foreach (var item in _array)
|
||||
{
|
||||
array[arrayIndex++] = NewtonsoftJsonTokenFactory.FromJToken(item);
|
||||
}
|
||||
}
|
||||
|
||||
public bool Remove(IJsonToken item)
|
||||
{
|
||||
int index = IndexOf(item);
|
||||
if (index >= 0)
|
||||
{
|
||||
_array.RemoveAt(index);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public IEnumerator<IJsonToken> GetEnumerator()
|
||||
{
|
||||
foreach (var item in _array)
|
||||
yield return NewtonsoftJsonTokenFactory.FromJToken(item);
|
||||
}
|
||||
|
||||
IEnumerator IEnumerable.GetEnumerator()
|
||||
{
|
||||
return GetEnumerator();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
134
Serein.Extend.NewtonsoftJson/NewtonsoftJsonObjectToken.cs
Normal file
134
Serein.Extend.NewtonsoftJson/NewtonsoftJsonObjectToken.cs
Normal file
@@ -0,0 +1,134 @@
|
||||
using Newtonsoft.Json;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using Serein.Library.Api;
|
||||
using Serein.Library.Utils;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
|
||||
namespace Serein.Extend.NewtonsoftJson
|
||||
{
|
||||
/// <summary>
|
||||
/// 基于Newtonsoft.Json的IJsonToken实现
|
||||
/// </summary>
|
||||
public sealed class NewtonsoftJsonObjectToken : IJsonToken, IDictionary<string, IJsonToken>
|
||||
{
|
||||
private readonly JObject _object;
|
||||
public NewtonsoftJsonObjectToken(JObject obj) => _object = obj;
|
||||
|
||||
public bool IsNull => false;
|
||||
public bool IsObject => true;
|
||||
public bool IsArray => false;
|
||||
|
||||
public string GetString() => _object.ToString();
|
||||
public int GetInt32() => throw new InvalidOperationException("不是值类型");
|
||||
public bool GetBoolean() => throw new InvalidOperationException("不是值类型");
|
||||
|
||||
public IJsonToken this[object key] => key is string name ? this[name] : throw new InvalidOperationException("不是数组类型");
|
||||
|
||||
public IJsonToken this[string key]
|
||||
{
|
||||
get => _object.TryGetValue(key, out var value) ? NewtonsoftJsonTokenFactory.FromJToken(value) : throw new KeyNotFoundException(key);
|
||||
set => _object[key] = JToken.FromObject(value.ToObject<object>());
|
||||
}
|
||||
|
||||
public IEnumerable<IJsonToken> EnumerateArray() => throw new InvalidOperationException("不是数组类型");
|
||||
|
||||
public T ToObject<T>() => _object.ToObject<T>();
|
||||
public object ToObject(Type type) => _object.ToObject(type);
|
||||
public override string ToString() => _object.ToString();
|
||||
public bool TryGetValue(string name, [NotNullWhen(true)] out IJsonToken? token)
|
||||
{
|
||||
if (_object.TryGetValue(name, out JToken? value))
|
||||
{
|
||||
token = NewtonsoftJsonTokenFactory.FromJToken(value);
|
||||
return true;
|
||||
}
|
||||
token = null;
|
||||
return false;
|
||||
}
|
||||
public IJsonToken? GetValue(string name)
|
||||
{
|
||||
if (_object.TryGetValue(name, out JToken? value))
|
||||
{
|
||||
var token = NewtonsoftJsonTokenFactory.FromJToken(value);
|
||||
return token;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
#region IDictionary<string, IJsonToken> 接口实现
|
||||
|
||||
public ICollection<string> Keys => _object.Properties().Select(p => p.Name).ToList();
|
||||
|
||||
public ICollection<IJsonToken> Values => _object.Properties().Select(p => new NewtonsoftJsonObjectToken(JObject.FromObject(p.Value)) as IJsonToken).ToList();
|
||||
|
||||
public int Count => _object.Count;
|
||||
|
||||
public bool IsReadOnly => false;
|
||||
|
||||
public void Add(string key, IJsonToken value)
|
||||
{
|
||||
var token = JToken.FromObject(value.ToObject<object>());
|
||||
_object[key] = token;
|
||||
}
|
||||
|
||||
|
||||
public void Add(KeyValuePair<string, IJsonToken> item) => Add(item.Key, item.Value);
|
||||
|
||||
public void Clear() => _object.RemoveAll();
|
||||
|
||||
public bool ContainsKey(string key) => _object.ContainsKey(key);
|
||||
|
||||
|
||||
public void CopyTo(KeyValuePair<string, IJsonToken>[] array, int arrayIndex)
|
||||
{
|
||||
foreach (var prop in _object.Properties())
|
||||
{
|
||||
array[arrayIndex++] = new KeyValuePair<string, IJsonToken>(prop.Name, new NewtonsoftJsonObjectToken(JObject.FromObject(prop.Value)));
|
||||
}
|
||||
}
|
||||
public IEnumerator<KeyValuePair<string, IJsonToken>> GetEnumerator()
|
||||
{
|
||||
foreach (var prop in _object.Properties())
|
||||
{
|
||||
yield return new KeyValuePair<string, IJsonToken>(prop.Name, new NewtonsoftJsonObjectToken(JObject.FromObject(prop.Value)));
|
||||
}
|
||||
}
|
||||
|
||||
public bool Remove(string key) => _object.Remove(key);
|
||||
|
||||
|
||||
public bool Remove(KeyValuePair<string, IJsonToken> item)
|
||||
{
|
||||
if (_object.TryGetValue(item.Key, out var token))
|
||||
{
|
||||
var existing = new NewtonsoftJsonObjectToken(JObject.FromObject(token));
|
||||
if (existing.Equals(item.Value))
|
||||
{
|
||||
return _object.Remove(item.Key);
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
IEnumerator IEnumerable.GetEnumerator()
|
||||
{
|
||||
return GetEnumerator();
|
||||
}
|
||||
|
||||
public bool Contains(KeyValuePair<string, IJsonToken> item)
|
||||
{
|
||||
if (_object.TryGetValue(item.Key, out var token))
|
||||
{
|
||||
var value = new NewtonsoftJsonObjectToken(JObject.FromObject(token));
|
||||
return value.Equals(item.Value);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
#endregion
|
||||
|
||||
}
|
||||
}
|
||||
@@ -95,19 +95,18 @@ namespace Serein.Extend.NewtonsoftJson
|
||||
|
||||
public IJsonToken Parse(string json)
|
||||
{
|
||||
var token = JToken.Parse(json);
|
||||
return new NewtonsoftJsonToken(token);
|
||||
return NewtonsoftJsonTokenFactory.Parse(json);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 创建一个新的JSON对象。
|
||||
/// 创建一个新的JSON数组对象。
|
||||
/// </summary>
|
||||
/// <param name="values"></param>
|
||||
/// <returns></returns>
|
||||
public IJsonToken CreateObject(IDictionary<string, object>? values = null)
|
||||
{
|
||||
var jobj = values != null ? JObject.FromObject(values) : new JObject();
|
||||
return new NewtonsoftJsonToken(jobj);
|
||||
return new NewtonsoftJsonObjectToken(jobj);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -119,7 +118,7 @@ namespace Serein.Extend.NewtonsoftJson
|
||||
public IJsonToken CreateArray(IEnumerable<object>? values = null)
|
||||
{
|
||||
var jarr = values != null ? JArray.FromObject(values) : new JArray();
|
||||
return new NewtonsoftJsonToken(jarr);
|
||||
return new NewtonsoftJsonArrayToken(jarr);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -129,8 +128,8 @@ namespace Serein.Extend.NewtonsoftJson
|
||||
/// <returns></returns>
|
||||
public IJsonToken FromObject(object obj)
|
||||
{
|
||||
var token = JToken.FromObject(obj);
|
||||
return new NewtonsoftJsonToken(token);
|
||||
var token = JObject.FromObject(obj);
|
||||
return new NewtonsoftJsonObjectToken(token);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,89 +0,0 @@
|
||||
using Newtonsoft.Json.Linq;
|
||||
using Serein.Library.Api;
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
|
||||
namespace Serein.Extend.NewtonsoftJson
|
||||
{
|
||||
/// <summary>
|
||||
/// 基于Newtonsoft.Json的IJsonToken实现
|
||||
/// </summary>
|
||||
public sealed class NewtonsoftJsonToken : IJsonToken
|
||||
{
|
||||
private readonly JToken _token;
|
||||
|
||||
/// <summary>
|
||||
/// 使用JToken初始化一个新的NewtonsoftJsonToken实例。
|
||||
/// </summary>
|
||||
/// <param name="token"></param>
|
||||
/// <exception cref="ArgumentNullException"></exception>
|
||||
public NewtonsoftJsonToken(JToken token)
|
||||
{
|
||||
_token = token ?? throw new ArgumentNullException(nameof(token));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 尝试获取指定名称的属性值。
|
||||
/// </summary>
|
||||
/// <param name="name"></param>
|
||||
/// <param name="token"></param>
|
||||
/// <returns></returns>
|
||||
public bool TryGetValue(string name, [NotNullWhen(true)] out IJsonToken? token)
|
||||
{
|
||||
if (_token is JObject obj && obj.TryGetValue(name, out JToken? value))
|
||||
{
|
||||
token = new NewtonsoftJsonToken(value);
|
||||
return true;
|
||||
}
|
||||
token = null;
|
||||
return false;
|
||||
}
|
||||
|
||||
public IJsonToken? GetValue(string name)
|
||||
{
|
||||
if (_token is JObject obj && obj.TryGetValue(name, out JToken? value))
|
||||
{
|
||||
return new NewtonsoftJsonToken(value);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public string GetString() => (_token.Type == JTokenType.Null ? null : _token.ToString()) ?? string.Empty;
|
||||
|
||||
public int GetInt32() => _token.Value<int>();
|
||||
|
||||
public bool GetBoolean() => _token.Value<bool>();
|
||||
|
||||
public bool IsNull => _token.Type == JTokenType.Null || _token.Type == JTokenType.Undefined;
|
||||
|
||||
public IEnumerable<IJsonToken> EnumerateArray()
|
||||
{
|
||||
if (_token is JArray arr)
|
||||
return arr.Select(x => new NewtonsoftJsonToken(x));
|
||||
throw new InvalidOperationException("当前Token不是数组类型。");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 将当前JSON Token转换为指定类型的对象。
|
||||
/// </summary>
|
||||
/// <typeparam name="T"></typeparam>
|
||||
/// <returns></returns>
|
||||
#pragma warning disable CS8603 // 可能返回 null 引用。
|
||||
public T ToObject<T>() => _token.ToObject<T>();
|
||||
#pragma warning restore CS8603 // 可能返回 null 引用。
|
||||
|
||||
/// <summary>
|
||||
/// 将当前JSON Token转换为指定类型的对象。
|
||||
/// </summary>
|
||||
/// <param name="type"></param>
|
||||
/// <returns></returns>
|
||||
#pragma warning disable CS8603 // 可能返回 null 引用。
|
||||
public object ToObject(Type type) => _token.ToObject(type);
|
||||
#pragma warning restore CS8603 // 可能返回 null 引用。
|
||||
|
||||
/// <summary>
|
||||
/// 返回当前JSON Token的字符串表示形式。
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public override string ToString() => _token.ToString();
|
||||
}
|
||||
}
|
||||
30
Serein.Extend.NewtonsoftJson/NewtonsoftJsonTokenFactory.cs
Normal file
30
Serein.Extend.NewtonsoftJson/NewtonsoftJsonTokenFactory.cs
Normal file
@@ -0,0 +1,30 @@
|
||||
using Newtonsoft.Json.Linq;
|
||||
using Serein.Library.Api;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Serein.Extend.NewtonsoftJson
|
||||
{
|
||||
public static class NewtonsoftJsonTokenFactory
|
||||
{
|
||||
public static IJsonToken Parse(string json)
|
||||
{
|
||||
var jt = JToken.Parse(json);
|
||||
return FromJToken(jt);
|
||||
}
|
||||
|
||||
public static IJsonToken FromJToken(JToken token)
|
||||
{
|
||||
return token.Type switch
|
||||
{
|
||||
JTokenType.Object => new NewtonsoftJsonObjectToken((JObject)token),
|
||||
JTokenType.Array => new NewtonsoftJsonArrayToken((JArray)token),
|
||||
_ => new NewtonsoftJsonValueToken(token)
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
46
Serein.Extend.NewtonsoftJson/NewtonsoftJsonValueToken.cs
Normal file
46
Serein.Extend.NewtonsoftJson/NewtonsoftJsonValueToken.cs
Normal file
@@ -0,0 +1,46 @@
|
||||
using Newtonsoft.Json.Linq;
|
||||
using Serein.Library.Api;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Serein.Extend.NewtonsoftJson
|
||||
{
|
||||
public sealed class NewtonsoftJsonValueToken : IJsonToken
|
||||
{
|
||||
private readonly JToken _token;
|
||||
|
||||
public NewtonsoftJsonValueToken(JToken token)
|
||||
{
|
||||
_token = token ?? throw new ArgumentNullException(nameof(token));
|
||||
}
|
||||
|
||||
public bool IsNull => _token.Type == JTokenType.Null || _token.Type == JTokenType.Undefined;
|
||||
public bool IsObject => false;
|
||||
public bool IsArray => false;
|
||||
|
||||
|
||||
|
||||
public string GetString() => _token.Type == JTokenType.Null ? string.Empty : _token.ToString();
|
||||
public int GetInt32() => _token.Value<int>();
|
||||
public bool GetBoolean() => _token.Value<bool>();
|
||||
|
||||
public IJsonToken this[object key] => throw new InvalidOperationException("不是对象/数组类型");
|
||||
public IEnumerable<IJsonToken> EnumerateArray() => throw new InvalidOperationException("不是数组类型");
|
||||
|
||||
public T ToObject<T>() => _token.ToObject<T>();
|
||||
public object ToObject(Type type) => _token.ToObject(type);
|
||||
public override string ToString() => _token.ToString();
|
||||
|
||||
public bool TryGetValue(string name, out IJsonToken token) => throw new InvalidOperationException("不是对象类型");
|
||||
|
||||
public IJsonToken? GetValue(string name) => throw new InvalidOperationException("不是对象类型");
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user