From 5ff67318e1b4f754f96102a35556e3f30d1c57e8 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 06 5月 2025 15:46:19 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

---
 Weben_CMS专用代码生成器/Code/MainForm.cs |   31 ++++++++++++++++++++++++++++---
 1 files changed, 28 insertions(+), 3 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 5fd6b7f..8821053 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"
@@ -104,6 +104,23 @@
                 string filePrefixName = this.tb_FileName.Text.Trim();//鏂囦欢鍓嶇紑鍚�
                 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 == "")
+                {
+                    MessageBox.Show("璇疯緭鍏� 閲嶅鎬ф牎楠屽瓧娈碉紒");
+                    this.tb_ValidateRepeatName.Focus();
+                    return;
+                }
+
                 string _tb_LikeQueryAttrsName = this.tb_LikeQueryAttrsName.Text.Trim();//涓枃娉ㄩ噴
                 if (_tb_LikeQueryAttrsName == "")
                 {
@@ -201,6 +218,7 @@
 
                 GenerateCodeParam param = new GenerateCodeParam()
                 {
+                    DeleteAlertAttr = CommonHelper.FirstLowercase(_tb_DeleteAlertAttr),
                     Modulelogo = modulelogo,
                     ChinaComment = chinaComment,
                     PageMenuName = menuName,
@@ -210,7 +228,8 @@
                     EntityName = entityName,
                     EntityInstanceName = tableAlias,
                     LikeQueryAttrs = _tb_LikeQueryAttrs,
-                    LikeQueryAttrsName = _tb_LikeQueryAttrsName
+                    LikeQueryAttrsName = _tb_LikeQueryAttrsName,
+                    ValidateRepeatName = this.tb_ValidateRepeatName.Text
                 };
                 //澶勭悊鏋氫妇绫诲瀷
                 List<EnumModel> enumList = new List<EnumModel>();
@@ -369,8 +388,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 鏂囦欢
@@ -432,6 +451,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