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

去除引用common.props

Browse Source
This commit is contained in:
潘飞
2023-11-06 19:35:59 +08:00
parent 6a2154edd9
commit c6b8dfc861
810 changed files with 3910 additions and 6695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,7 +122,8 @@ public class FormDataParsing : ITransient
{
conversionData = data.ToString() + ".".PadRight((int)fieldsModel.precision + 1, '0');
conversionData = conversionData.ParseToDouble();//modifyby zhoukeda 20230605
}else conversionData = data;
}
else conversionData = data;
break;
case JnpfKeyConst.JNPFAMOUNT:
conversionData = data.ParseToDecimal(); // 金额输入
@@ -525,7 +526,7 @@ public class FormDataParsing : ITransient
{
if (isShortLink && model.__config__.jnpfKey.Equals(JnpfKeyConst.CREATETIME))
return null;
else if(model.__config__.jnpfKey.Equals(JnpfKeyConst.CREATETIME) || model.__config__.jnpfKey.Equals(JnpfKeyConst.DATE))
else if (model.__config__.jnpfKey.Equals(JnpfKeyConst.CREATETIME) || model.__config__.jnpfKey.Equals(JnpfKeyConst.DATE))
return res.ToString().ParseToDateTime();
else if (model.__config__.jnpfKey.Equals(JnpfKeyConst.NUMINPUT) || model.__config__.jnpfKey.Equals(JnpfKeyConst.SWITCH))//modify by zhoukeda 2023427 开关默认数字
return res;
@@ -1826,7 +1827,7 @@ public class FormDataParsing : ITransient
var res = _runService.GetRelationFormList(relationFormModel, listQueryInput).WaitAsync(TimeSpan.FromMinutes(2)).Result;
relationFormDataList = res.list.ToList();
_cacheManager.Set(redisName, relationFormDataList, TimeSpan.FromMinutes(10)); // 缓存10分钟
});
});
}
}
@@ -1908,7 +1909,7 @@ public class FormDataParsing : ITransient
form.__config__.templateJson.ForEach(x => x.defaultValue = (dataMap.ContainsKey(x.relationField) && dataMap[x.relationField] != null) ? dataMap[x.relationField]?.ToString() : x.defaultValue);
_databaseService.ChangeDataBase(_databaseService.GetTenantDbLink(_userManager.TenantId, _userManager.TenantDbName));
var res = _dataInterfaceService.GetResponseByType(form.__config__.propsUrl, 0, string.Empty, new Common.Dtos.VisualDev.VisualDevDataFieldDataListInput() { paramList = form.__config__.templateJson.Adapt<List<DataInterfaceReqParameterInfo>>(), pageSize = 500, currentPage = 1 }).Result;
var resList = res.ToObject<PageResult<Dictionary<string,object>>>();
var resList = res.ToObject<PageResult<Dictionary<string, object>>>();
if (resList != null && resList.list.Any())
{
foreach (object? item in mValue)

1
visualdev/Tnb.VisualDev.Engine/Model/IndexSearchFieldModel.cs
View File

@@ -1,5 +1,4 @@
using JNPF.DependencyInjection;
using JNPF.VisualDev.Engine.Model.CodeGen;
namespace JNPF.VisualDev.Engine;

55
visualdev/Tnb.VisualDev.Engine/OverideVisualDev/IOverideVisualDevService.cs
View File

@@ -1,43 +1,28 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using JNPF.Common.Dtos.VisualDev;
using JNPF.Common.Extension;
using JNPF.DependencyInjection;
using JNPF.VisualDev.Entitys;
using JNPF.VisualDev.Entitys.Dto.VisualDevModelData;
using JNPF.VisualDev.Interfaces;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using JNPF.DependencyInjection;
namespace JNPF.VisualDev
{
public interface IVisualDevOverideActionManager : ISingleton
{
void Set(string modelId, IOverideVisualDevService overideVisualDev);
public interface IVisualDevOverideActionManager : ISingleton
{
void Set(string modelId, IOverideVisualDevService overideVisualDev);
IOverideVisualDevService? GetOrDefault(string modelId);
}
IOverideVisualDevService? GetOrDefault(string modelId);
}
public interface IOverideVisualDevService
{
//string ModelId { get; set; }
OverideVisualDevFunc OverideFuncs { get; }
public interface IOverideVisualDevService
{
//string ModelId { get; set; }
OverideVisualDevFunc OverideFuncs { get; }
//Task<dynamic>? GetList(VisualDevModelListQueryInput input);
//Task<dynamic>? GetInfo(string id);
//Task<dynamic>? GetDetails(string id, string modelId);
//Task<dynamic>? Create(VisualDevModelDataCrInput visualdevModelDataCrForm);
//Task<dynamic>? Update(string id, VisualDevModelDataUpInput visualdevModelDataUpForm);
//Task? Delete(string id);
//Task? BatchDelete(VisualDevModelDataBatchDelInput input);
//Task<dynamic>? Export(VisualDevModelListQueryInput input);
//Task<dynamic>? Import(IFormFile file);
}
//Task<dynamic>? GetList(VisualDevModelListQueryInput input);
//Task<dynamic>? GetInfo(string id);
//Task<dynamic>? GetDetails(string id, string modelId);
//Task<dynamic>? Create(VisualDevModelDataCrInput visualdevModelDataCrForm);
//Task<dynamic>? Update(string id, VisualDevModelDataUpInput visualdevModelDataUpForm);
//Task? Delete(string id);
//Task? BatchDelete(VisualDevModelDataBatchDelInput input);
//Task<dynamic>? Export(VisualDevModelListQueryInput input);
//Task<dynamic>? Import(IFormFile file);
}
}

26
visualdev/Tnb.VisualDev.Engine/OverideVisualDev/OverideVisualDevAttribute.cs
View File

@@ -1,22 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using JNPF.Common.Extension;
using JNPF.VisualDev.Entitys;
using JNPF.VisualDev.Interfaces;
using Microsoft.AspNetCore.Mvc.Filters;
namespace JNPF.VisualDev
namespace JNPF.VisualDev
{
[AttributeUsage(AttributeTargets.Class, AllowMultiple = true)] //modified by ly on 20230428 允许特性在一个类上多重定义
public class OverideVisualDevAttribute : Attribute
{
public string ModelId { get; set; }
public OverideVisualDevAttribute(string modelId)
[AttributeUsage(AttributeTargets.Class, AllowMultiple = true)] //modified by ly on 20230428 允许特性在一个类上多重定义
public class OverideVisualDevAttribute : Attribute
{
ModelId = modelId;
public string ModelId { get; set; }
public OverideVisualDevAttribute(string modelId)
{
ModelId = modelId;
}
}
}
}

39
visualdev/Tnb.VisualDev.Engine/OverideVisualDev/OverideVisualDevFunc.cs
View File

@@ -1,34 +1,21 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using JNPF.Common.Dtos.VisualDev;
using JNPF.Common.Extension;
using JNPF.DependencyInjection;
using JNPF.VisualDev.Entitys;
using JNPF.Common.Dtos.VisualDev;
using JNPF.VisualDev.Entitys.Dto.VisualDev;
using JNPF.VisualDev.Entitys.Dto.VisualDevModelData;
using JNPF.VisualDev.Interfaces;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
namespace JNPF.VisualDev
{
public class OverideVisualDevFunc
{
public Func<VisualDevModelListQueryInput, Task<dynamic>>? GetListAsync { get; set; } = null;
public Func<string, Task<dynamic>>? GetAsync { get; set; } = null;
public Func<string, Task<dynamic>>? GetDetailsAsync { get; set; } = null;
public Func<VisualDevModelDataCrInput, Task<dynamic>>? CreateAsync { get; set; } = null;
public Func<string, VisualDevModelDataUpInput, Task<dynamic>>? UpdateAsync { get; set; } = null;
public Func<string, Task>? DeleteAsync { get; set; } = null;
public Func<VisualDevModelDataBatchDelInput, Task>? DeleteRangeAsync { get; set; } = null;
public Func<VisualDevModelListQueryInput, Task<dynamic>>? ExportAsync { get; set; } = null;
public Func<IFormFile, Task<dynamic>>? ImportAsync { get; set; } = null;
public Func<VisualDevImportDataInput, Task<dynamic>>? ImportDataAsync { get; set; } = null;
public class OverideVisualDevFunc
{
public Func<VisualDevModelListQueryInput, Task<dynamic>>? GetListAsync { get; set; } = null;
public Func<string, Task<dynamic>>? GetAsync { get; set; } = null;
public Func<string, Task<dynamic>>? GetDetailsAsync { get; set; } = null;
public Func<VisualDevModelDataCrInput, Task<dynamic>>? CreateAsync { get; set; } = null;
public Func<string, VisualDevModelDataUpInput, Task<dynamic>>? UpdateAsync { get; set; } = null;
public Func<string, Task>? DeleteAsync { get; set; } = null;
public Func<VisualDevModelDataBatchDelInput, Task>? DeleteRangeAsync { get; set; } = null;
public Func<VisualDevModelListQueryInput, Task<dynamic>>? ExportAsync { get; set; } = null;
public Func<IFormFile, Task<dynamic>>? ImportAsync { get; set; } = null;
public Func<VisualDevImportDataInput, Task<dynamic>>? ImportDataAsync { get; set; } = null;
}
}

48
visualdev/Tnb.VisualDev.Engine/OverideVisualDev/OverideVisualDevManager.cs
View File

@@ -1,38 +1,28 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using System.Collections.Concurrent;
using JNPF.Common.Extension;
using JNPF.DependencyInjection;
using JNPF.VisualDev.Entitys;
using JNPF.VisualDev.Interfaces;
using Microsoft.AspNetCore.Mvc.Filters;
namespace JNPF.VisualDev
{
public class OverideVisualDevManager
{
private static ConcurrentDictionary<string, Type> actions = new ConcurrentDictionary<string, Type>();
public OverideVisualDevManager()
public class OverideVisualDevManager
{
}
private static ConcurrentDictionary<string, Type> actions = new ConcurrentDictionary<string, Type>();
public OverideVisualDevManager()
{
}
public static IOverideVisualDevService? GetOrDefault(string modelId)
{
var tp = actions.GetOrDefault(modelId);
if (tp != null) { return (IOverideVisualDevService)App.GetService(tp); }
return null;
}
public static IOverideVisualDevService? GetOrDefault(string modelId)
{
var tp = actions.GetOrDefault(modelId);
if (tp != null) { return (IOverideVisualDevService)App.GetService(tp); }
return null;
}
public static void Add(string modelId, Type overideVisualDev)
{
if (!actions.ContainsKey(modelId))
{
actions.TryAdd(modelId, overideVisualDev);
}
public static void Add(string modelId, Type overideVisualDev)
{
if (!actions.ContainsKey(modelId))
{
actions.TryAdd(modelId, overideVisualDev);
}
}
}
}
}

38
visualdev/Tnb.VisualDev.Engine/OverideVisualDev/OverideVisualDevServiceCollectionExtensions.cs
View File

@@ -4,28 +4,28 @@ using Microsoft.Extensions.DependencyInjection;
namespace JNPF.VisualDev
{
[SuppressSniffer]
public static class OverideVisualDevServiceCollectionExtensions
{
/// <summary>
/// 添加重写在线开发接口的服务
/// </summary>
/// <param name="services"></param>
/// <returns></returns>
public static IServiceCollection AddOverideVisualDev(this IServiceCollection services)
[SuppressSniffer]
public static class OverideVisualDevServiceCollectionExtensions
{
var actions = App.EffectiveTypes.Where(u => u.IsClass && !u.IsInterface && !u.IsAbstract && typeof(IOverideVisualDevService).IsAssignableFrom(u)).ToList();
foreach (var item in actions)
{
var attr = item.GetAttribute<OverideVisualDevAttribute>();
if (attr != null)
/// <summary>
/// 添加重写在线开发接口的服务
/// </summary>
/// <param name="services"></param>
/// <returns></returns>
public static IServiceCollection AddOverideVisualDev(this IServiceCollection services)
{
OverideVisualDevManager.Add(attr.ModelId, item);
var actions = App.EffectiveTypes.Where(u => u.IsClass && !u.IsInterface && !u.IsAbstract && typeof(IOverideVisualDevService).IsAssignableFrom(u)).ToList();
foreach (var item in actions)
{
var attr = item.GetAttribute<OverideVisualDevAttribute>();
if (attr != null)
{
OverideVisualDevManager.Add(attr.ModelId, item);
}
}
return services;
}
}
return services;
}
}
}

3
visualdev/Tnb.VisualDev.Engine/Security/BackEnd/CodeGenControlsAttributeHelper.cs
View File

@@ -1,5 +1,4 @@
using Aop.Api.Domain;
using JNPF.Common.Const;
using JNPF.Common.Const;
using JNPF.Common.Extension;
using JNPF.Common.Models;
using JNPF.Common.Models.Authorize;

4
visualdev/Tnb.VisualDev.Engine/Security/BackEnd/GetCodeGenIndexButtonHelper.cs
View File

@@ -1,6 +1,4 @@
using Microsoft.AspNetCore.Components.Forms;
namespace JNPF.VisualDev.Engine.Security;
namespace JNPF.VisualDev.Engine.Security;
/// <summary>
/// 代码生成列表按钮帮助类.

1
visualdev/Tnb.VisualDev.Engine/Tnb.VisualDev.Engine.csproj
View File

@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)\common.props" />
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>