merge from 2023-03-14

2023-03-24 09:37:07 +08:00
parent f95ef4cf73
commit 3de92dab06
57 changed files with 1538 additions and 528 deletions
--- a/visualdev/Tnb.VisualDev/CodeGenService.cs
+++ b/visualdev/Tnb.VisualDev/CodeGenService.cs
@@ -21,8 +21,6 @@ using JNPF.VisualDev.Entitys;
 using JNPF.VisualDev.Entitys.Dto.CodeGen;
 using JNPF.VisualDev.Entitys.Enum;
 using Microsoft.AspNetCore.Mvc;
-using Org.BouncyCastle.Asn1.Crmf;
-using Spire.Presentation;
 using SqlSugar;
 using System.IO.Compression;
 using System.Text;
@@ -300,6 +298,7 @@ public class CodeGenService : IDynamicApiController, ITransient

                        // 统一处理下表单内控件
                        controls = CodeGenUnifiedHandlerHelper.UnifiedHandlerFormDataModel(controls, pcColumnDesignModel, appColumnDesignModel);
+                        controls = CodeGenUnifiedHandlerHelper.UnifiedHandlerControlRelationship(controls);
                        break;
                }