merge from 2023-03-14
This commit is contained in:
@@ -46,7 +46,8 @@ namespace JNPF.Systems;
|
||||
/// <summary>
|
||||
/// 数据接口
|
||||
/// 版 本:V3.2
|
||||
/// 版 权:拓通智联科技有限公司(http://www.tuotong-tech.com)
|
||||
/// 版 权:引迈信息技术有限公司(https://www.jnpfsoft.com)
|
||||
/// 作 者:JNPF开发平台组
|
||||
/// 日 期:2021-06-01.
|
||||
/// </summary>
|
||||
[ApiDescriptionSettings(Tag = "System", Name = "DataInterface", Order = 204)]
|
||||
@@ -345,7 +346,7 @@ public class DataInterfaceService : IDataInterfaceService, IDynamicApiController
|
||||
{
|
||||
string sheetData = Regex.Match(info.DataProcessing, @"\{(.*)\}", RegexOptions.Singleline).Groups[1].Value;
|
||||
var scriptStr = "var result = function(data){data = JSON.parse(data);" + sheetData + "}";
|
||||
return JsEngineUtil.CallFunction(scriptStr, output.ToJsonString());
|
||||
return JsEngineUtil.CallFunction(scriptStr, output.ToJsonString(CommonConst.options));//此处时间非时间戳
|
||||
}
|
||||
}
|
||||
|
||||
@@ -732,7 +733,7 @@ public class DataInterfaceService : IDataInterfaceService, IDynamicApiController
|
||||
|
||||
list = await GetDynamicDataCache(dynamic.Id);
|
||||
|
||||
if (list == null)
|
||||
if (list == null || list.Count == 0)
|
||||
{
|
||||
list = new List<StaticDataModel>();
|
||||
// 远端数据 配置参数
|
||||
|
||||
Reference in New Issue
Block a user