From d04043960122cf87b43af6b081eaea2a71834ee9 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 07 5月 2025 11:16:42 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
Weben_CMS专用代码生成器/Code/MainForm.cs | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/MainForm.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/MainForm.cs"
index efc2ee6..4742b52 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/MainForm.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/MainForm.cs"
@@ -105,6 +105,14 @@
string modulelogo = this.tb_Modulelogo.Text.Trim();//妯″潡绠�鍐�
+ string _tb_DeleteAlertAttr = this.tb_DeleteAlertAttr.Text.Trim();//涓枃娉ㄩ噴
+ if (_tb_DeleteAlertAttr == "")
+ {
+ MessageBox.Show("璇疯緭鍏� 鍒犻櫎鎻愮ず瀛楁锛�");
+ this.tb_DeleteAlertAttr.Focus();
+ return;
+ }
+
string _tb_ValidateRepeatName = this.tb_ValidateRepeatName.Text.Trim();//涓枃娉ㄩ噴
if (_tb_ValidateRepeatName == "")
{
@@ -210,6 +218,7 @@
GenerateCodeParam param = new GenerateCodeParam()
{
+ DeleteAlertAttr = CommonHelper.FirstLowercase(_tb_DeleteAlertAttr),
Modulelogo = modulelogo,
ChinaComment = chinaComment,
PageMenuName = menuName,
@@ -227,6 +236,9 @@
var str_enumList = this.tb_EnumList.Text.Trim();
if (str_enumList.IndexOf(',') > -1)
{
+ str_enumList = str_enumList.Replace("\n","");
+ str_enumList = str_enumList.Replace("\t", "");
+ str_enumList = str_enumList.Replace("\r", "");
var arr_enumList = str_enumList.Split(',');
foreach (var item in arr_enumList)
{
@@ -379,8 +391,8 @@
tf = TextHelper.Export2File_V2(webRootPath + @"\Views", $"{param.EntityName}.module.scss", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
//22銆佺敓鎴� Views\NameSpacePath_Config 鏂囦欢
- str_generate = NameSpacePath_Config_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(webRootPath + @"\Views\config", $"{param.EntityName}.module.scss", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ str_generate = EntityNameClass_json_Generate.CreateText(param);
+ tf = TextHelper.Export2File_V2(webRootPath + @"\Views\config", $"{param.EntityName}.json", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
//23銆佺敓鎴� Views\NameSpacePath_Config 鏂囦欢
@@ -442,6 +454,12 @@
#endregion
+ //36銆佺敓鎴� AutoMapperProfile 鏂囦欢
+ var autoMapFilePath = tbPath.Text + @"\server\src\CMS.Plugin." + tb_WCF_NameSpacePath.Text.Trim() + @".Application\MapperProfiles";
+ str_generate = AutoMapperProfile_Generate.CreateText(param);
+ tf = TextHelper.Export2File_V2(autoMapFilePath, param.EntityName + $"AutoMapperProfile.cs", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+
+
////鐢熸垚 OutputModel 鏂囦欢
//str_generate = OutputModel_Generate.CreateQueryModelLText(modulelogo, chinaComment, columnList, entityName);
--
Gitblit v1.9.3