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

12
visualdev/Tnb.VisualDev/CodeGen/DataParsing/ControlParsing.cs
View File

@@ -1,20 +1,20 @@
using JNPF.Common.Const;
using JNPF.Common.Core.Manager;
using JNPF.Common.Extension;
using JNPF.Common.Manager;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
using JNPF.RemoteRequest.Extensions;
using JNPF.Systems.Entitys.Model.DataInterFace;
using JNPF.Systems.Entitys.Permission;
using JNPF.Systems.Entitys.System;
using JNPF.Systems.Interfaces.System;
using JNPF.VisualDev.Engine;
using JNPF.VisualDev.Entitys.Dto.VisualDevModelData;
using JNPF.VisualDev.Entitys;
using JNPF.VisualDev.Entitys.Dto.VisualDevModelData;
using JNPF.VisualDev.Interfaces;
using Newtonsoft.Json.Linq;
using SqlSugar;
using JNPF.Systems.Entitys.System;
using JNPF.Systems.Interfaces.System;
using JNPF.RemoteRequest.Extensions;
using JNPF.Systems.Entitys.Model.DataInterFace;
using JNPF.Common.Core.Manager;
namespace JNPF.Common.CodeGen.DataParsing;

34
visualdev/Tnb.VisualDev/CodeGenService.cs
View File

@@ -1,4 +1,6 @@
using JNPF.Common.Configuration;
using System.IO.Compression;
using System.Text;
using JNPF.Common.Configuration;
using JNPF.Common.Const;
using JNPF.Common.Core.Manager;
using JNPF.Common.Enums;
@@ -21,10 +23,7 @@ using JNPF.VisualDev.Entitys;
using JNPF.VisualDev.Entitys.Dto.CodeGen;
using JNPF.VisualDev.Entitys.Enum;
using Microsoft.AspNetCore.Mvc;
using NPOI.Util;
using SqlSugar;
using System.IO.Compression;
using System.Text;
namespace JNPF.CodeGen;
@@ -393,7 +392,8 @@ public class CodeGenService : IDynamicApiController, ITransient
for (int i = 0; i < templatePathList.Count; i++)
{
var tContent = File.ReadAllText(templatePathList[i]);
var tResult = _viewEngine.RunCompileFromCached(tContent, new {
var tResult = _viewEngine.RunCompileFromCached(tContent, new
{
BusName = codeGenConfigModel.BusName,
ClassName = codeGenConfigModel.ClassName,
NameSpace = formDataModel.areasName,
@@ -528,7 +528,8 @@ public class CodeGenService : IDynamicApiController, ITransient
for (int i = 0; i < templatePathList.Count; i++)
{
string tContent = File.ReadAllText(templatePathList[i]);
string tResult = _viewEngine.RunCompileFromCached(tContent, new {
string tResult = _viewEngine.RunCompileFromCached(tContent, new
{
NameSpace = codeGenConfigModel.NameSpace,
BusName = codeGenConfigModel.BusName,
ClassName = codeGenConfigModel.ClassName,
@@ -648,7 +649,8 @@ public class CodeGenService : IDynamicApiController, ITransient
for (int i = 0; i < templatePathList.Count; i++)
{
var tContent = File.ReadAllText(templatePathList[i]);
var tResult = _viewEngine.RunCompileFromCached(tContent, new {
var tResult = _viewEngine.RunCompileFromCached(tContent, new
{
BusName = codeGenConfigModel.BusName,
ClassName = codeGenConfigModel.ClassName,
NameSpace = formDataModel.areasName,
@@ -773,7 +775,8 @@ public class CodeGenService : IDynamicApiController, ITransient
for (var i = 0; i < templatePathList.Count; i++)
{
var tContent = File.ReadAllText(templatePathList[i]);
var tResult = _viewEngine.RunCompileFromCached(tContent, new {
var tResult = _viewEngine.RunCompileFromCached(tContent, new
{
NameSpace = codeGenConfigModel.NameSpace,
BusName = codeGenConfigModel.BusName,
ClassName = codeGenConfigModel.ClassName,
@@ -904,7 +907,8 @@ public class CodeGenService : IDynamicApiController, ITransient
for (int i = 0; i < templatePathList.Count; i++)
{
var tContent = File.ReadAllText(templatePathList[i]);
var tResult = _viewEngine.RunCompileFromCached(tContent, new {
var tResult = _viewEngine.RunCompileFromCached(tContent, new
{
BusName = codeGenConfigModel.BusName,
ClassName = codeGenConfigModel.ClassName,
NameSpace = formDataModel.areasName,
@@ -984,7 +988,8 @@ public class CodeGenService : IDynamicApiController, ITransient
for (int i = 0; i < templatePathList.Count; i++)
{
var tContent = File.ReadAllText(templatePathList[i]);
var tResult = _viewEngine.RunCompileFromCached(tContent, new {
var tResult = _viewEngine.RunCompileFromCached(tContent, new
{
BusName = codeGenConfigModel.BusName,
ClassName = codeGenConfigModel.ClassName,
NameSpace = formDataModel.areasName,
@@ -1117,7 +1122,8 @@ public class CodeGenService : IDynamicApiController, ITransient
for (int i = 0; i < templatePathList.Count; i++)
{
string tContent = File.ReadAllText(templatePathList[i]);
string tResult = _viewEngine.RunCompileFromCached(tContent, new {
string tResult = _viewEngine.RunCompileFromCached(tContent, new
{
NameSpace = codeGenConfigModel.NameSpace,
BusName = codeGenConfigModel.BusName,
ClassName = codeGenConfigModel.ClassName,
@@ -1272,7 +1278,8 @@ public class CodeGenService : IDynamicApiController, ITransient
for (var i = 0; i < templatePathList.Count; i++)
{
var tContent = File.ReadAllText(templatePathList[i]);
var tResult = _viewEngine.RunCompileFromCached(tContent, new {
var tResult = _viewEngine.RunCompileFromCached(tContent, new
{
NameSpace = codeGenConfigModel.NameSpace,
BusName = codeGenConfigModel.BusName,
ClassName = codeGenConfigModel.ClassName,
@@ -1558,7 +1565,8 @@ public class CodeGenService : IDynamicApiController, ITransient
for (int i = 0; i < templatePathList.Count; i++)
{
string tContent = File.ReadAllText(templatePathList[i]);
var tResult = _viewEngine.RunCompileFromCached(tContent, new {
var tResult = _viewEngine.RunCompileFromCached(tContent, new
{
NameSpace = frondEndGenConfig.NameSpace,
ClassName = frondEndGenConfig.ClassName,
FormRef = frondEndGenConfig.FormRef,

3
visualdev/Tnb.VisualDev/DashboardService.cs
View File

@@ -1,10 +1,9 @@
using JNPF.Common.Core.Manager;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.Extend.Entitys;
using JNPF.Extend.Entitys.Dto.Email;
using JNPF.Message.Entitys;
using JNPF.Message.Interfaces.Message;
using JNPF.VisualDev.Entitys;
using JNPF.VisualDev.Entitys.Dto.Dashboard;
using JNPF.WorkFlow.Entitys.Entity;
using JNPF.WorkFlow.Interfaces.Repository;

8
visualdev/Tnb.VisualDev/HmiService.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Aspose.Cells;
using JNPF.DependencyInjection;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using Microsoft.AspNetCore.Mvc;

4
visualdev/Tnb.VisualDev/PortalService.cs
View File

@@ -3,14 +3,12 @@ using JNPF.Common.Core.Manager.Files;
using JNPF.Common.Enums;
using JNPF.Common.Extension;
using JNPF.Common.Filter;
using JNPF.Common.Models.User;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.FriendlyException;
using JNPF.Systems.Entitys.Permission;
using JNPF.Systems.Entitys.System;
using JNPF.Systems.Interfaces.Common;
using JNPF.VisualDev.Entitys;
using JNPF.VisualDev.Entitys.Dto.Portal;
using JNPF.VisualDev.Entitys.Dto.VisualDev;
@@ -169,7 +167,7 @@ public class PortalService : IDynamicApiController, ITransient
{
if (_userManager.Roles != null && !_userManager.IsAdministrator)
{
List<string>? roleId = await _portalRepository.AsSugarClient().Queryable<RoleEntity>().Where(r =>_userManager.Roles.Contains(r.Id)).Where(r => r.EnabledMark == 1 && r.DeleteMark == null).Select(r => r.Id).ToListAsync();
List<string>? roleId = await _portalRepository.AsSugarClient().Queryable<RoleEntity>().Where(r => _userManager.Roles.Contains(r.Id)).Where(r => r.EnabledMark == 1 && r.DeleteMark == null).Select(r => r.Id).ToListAsync();
var items = await _portalRepository.AsSugarClient().Queryable<AuthorizeEntity>().Where(a => roleId.Contains(a.ObjectId)).Where(a => a.ItemType == "portal").GroupBy(it => new { it.ItemId }).Select(it => new { it.ItemId }).ToListAsync();
if (items.Count == 0) return null;
PortalEntity? entity = await _portalRepository.AsQueryable().Where(p => items.Select(it => it.ItemId).Contains(p.Id)).SingleAsync(p => p.Id == id && p.EnabledMark == 1 && p.DeleteMark == null);

4
visualdev/Tnb.VisualDev/RunService.cs
View File

@@ -1,5 +1,4 @@
using System.Data;
using System.Text;
using System.Text.RegularExpressions;
using JNPF.Common.Const;
using JNPF.Common.Core.Manager;
@@ -14,7 +13,6 @@ using JNPF.DependencyInjection;
using JNPF.FriendlyException;
using JNPF.JsonSerialization;
using JNPF.RemoteRequest.Extensions;
using JNPF.Systems.Entitys.Dto.Authorize;
using JNPF.Systems.Entitys.Model.DataBase;
using JNPF.Systems.Entitys.Permission;
using JNPF.Systems.Entitys.System;
@@ -824,7 +822,7 @@ public class RunService : IRunService, ITransient
if (child.Key.Equals("id") && child.Value.IsNotEmptyOrNull())
{
//modify by ly on 20230720 判断如果子表主键为空的把原主键值赋值给子表主键，直接复制会导致主键重复
if(tableField[childPrimary.field].IsNull() || tableField[childPrimary.field].ToString().IsNullOrEmpty())
if (tableField[childPrimary.field].IsNull() || tableField[childPrimary.field].ToString().IsNullOrEmpty())
{
tableField[childPrimary.field] = child.Value;
}

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

@@ -12,7 +12,6 @@
<ItemGroup>
<ProjectReference Include="..\..\common\Tnb.Common.Core\Tnb.Common.Core.csproj" />
<ProjectReference Include="..\..\extend\Tnb.Extend.Interfaces\Tnb.Extend.Interfaces.csproj" />
<ProjectReference Include="..\..\message\Tnb.Message.Interfaces\Tnb.Message.Interfaces.csproj" />
<ProjectReference Include="..\..\ProductionMgr\Tnb.ProductionMgr.Interfaces\Tnb.ProductionMgr.Interfaces.csproj" />
<ProjectReference Include="..\Tnb.VisualDev.Engine\Tnb.VisualDev.Engine.csproj" />

10
visualdev/Tnb.VisualDev/VisualDevService.cs
View File

@@ -723,9 +723,9 @@ public class VisualDevService : IVisualDevService, IDynamicApiController, ITrans
moduleModel.ModuleId = input.id;
moduleModel.ParentId = oldWebModule != null ? oldWebModule.ParentId : (input.pcModuleParentId.Equals(input.pcSystemId) ? "-1" : input.pcModuleParentId); // 父级菜单节点
moduleModel.Category = "Web";
moduleModel.FullName = oldWebModule!=null ? oldWebModule.FullName : entity.FullName; //modifyby zhoukeda 发布功能不更新名称排序图标
moduleModel.FullName = oldWebModule != null ? oldWebModule.FullName : entity.FullName; //modifyby zhoukeda 发布功能不更新名称排序图标
moduleModel.EnCode = entity.EnCode;
moduleModel.Icon = oldWebModule!=null ? oldWebModule.Icon : "icon-ym icon-ym-webForm"; //modifyby zhoukeda 发布功能不更新名称排序图标
moduleModel.Icon = oldWebModule != null ? oldWebModule.Icon : "icon-ym icon-ym-webForm"; //modifyby zhoukeda 发布功能不更新名称排序图标
moduleModel.UrlAddress = oldWebModule != null ? oldWebModule.UrlAddress : "model/" + entity.EnCode;
moduleModel.Type = 3;
moduleModel.EnabledMark = 1;
@@ -789,7 +789,8 @@ public class VisualDevService : IVisualDevService, IDynamicApiController, ITrans
SortCode = 0
});
});
ctList.ForEach(item => {
ctList.ForEach(item =>
{
formAuth.Add(new ModuleFormEntity()
{
@@ -993,7 +994,8 @@ public class VisualDevService : IVisualDevService, IDynamicApiController, ITrans
SortCode = 0
});
});
ctList.ForEach(item => {
ctList.ForEach(item =>
{
formAuth.Add(new ModuleFormEntity()
{