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

---
 Weben_CMS专用代码生成器/Code/MainForm.cs |   73 +++++++++++++++++++++++++++++++++++-
 1 files changed, 70 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 f5d5089..cc17f85 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"
@@ -31,6 +31,8 @@
             this.tb_WCF_NameSpacePath.Text = "HIAWms";//WCF椤圭洰鍛藉悕绌洪棿 
             this.tb_FileName.Text = "Xiangzi";//鏂囦欢鍓嶇紑鍚�
             this.tb_ChinaComment.Text = "鐗╂枡鍩虹淇℃伅琛�";//涓枃娉ㄩ噴
+            this.tb_MenuName.Text = "鐗╂枡淇℃伅";//涓枃娉ㄩ噴
+            this.tb_PageMenuInstanceName.Text = "wmsMaterial";
             this.tb_CreatePerson.Text = "shaocx";//鍒涘缓浜�
             this.tb_EntityName.Text = "WmsMaterial";//瀹炰綋绫诲悕
             //this.tb_EntityProName.Text = "wmsMaterial";//瀹炰綋绫诲璞″悕
@@ -98,6 +100,26 @@
                 string filePrefixName = this.tb_FileName.Text.Trim();//鏂囦欢鍓嶇紑鍚�
                 string modulelogo = this.tb_Modulelogo.Text.Trim();//妯″潡绠�鍐�
                 string chinaComment = this.tb_ChinaComment.Text.Trim();//涓枃娉ㄩ噴
+                if (chinaComment == "")
+                {
+                    MessageBox.Show("璇疯緭鍏� 琛ㄧ殑涓枃娉ㄨВ锛�");
+                    this.tb_ChinaComment.Focus();
+                    return;
+                }
+                string menuName = this.tb_MenuName.Text.Trim();//涓枃娉ㄩ噴
+                if (menuName == "")
+                {
+                    MessageBox.Show("璇疯緭鍏� 椤甸潰鑿滃崟鍚嶏紒");
+                    this.tb_MenuName.Focus();
+                    return;
+                }
+                string _tb_PageMenuInstanceName = this.tb_PageMenuInstanceName.Text.Trim();//涓枃娉ㄩ噴
+                if (_tb_PageMenuInstanceName == "")
+                {
+                    MessageBox.Show("璇疯緭鍏� 椤甸潰鑿滃崟瀵硅薄缂╁啓锛�");
+                    this.tb_PageMenuInstanceName.Focus();
+                    return;
+                }
                 string createPerson = this.tb_CreatePerson.Text.Trim();//鍒涘缓浜�
                 string entityName = this.tb_EntityName.Text.Trim();//瀹炰綋绫诲悕
                 string tableAlias = this.tb_EntityProName.Text.Trim();//瀹炰綋绫诲璞″悕/琛ㄥ埆鍚�
@@ -160,6 +182,8 @@
                 {
                     Modulelogo = modulelogo,
                     ChinaComment = chinaComment,
+                    PageMenuName = menuName,
+                    PageMenuInstanceName = _tb_PageMenuInstanceName,
                     NameSpacePath = wcf_NameSpacePath,
                     ColumnNameList = columnList,
                     EntityName = entityName,
@@ -191,7 +215,7 @@
                 #region 瀹炰綋绫�
                 var entityFilePath = tbPath.Text + @"\server\src\CMS.Plugin." + tb_WCF_NameSpacePath.Text.Trim() + @".Application.Contracts\Dtos\" + tb_EntityName.Text.Trim();
                 //1銆佺敓鎴� 鍒嗛〉鏌ヨ瀹炰綋 鏂囦欢
-                str_generate = InputModel_Generate.CreateQueryModelLText(param);
+                str_generate = InputQueryModel_Generate.CreateQueryModelLText(param);
                 tf = TextHelper.Export2File_V2(entityFilePath, $"Get{param.EntityName}Input.cs", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
 
                 //2銆佺敓鎴� CreateDto 鏂囦欢
@@ -238,12 +262,55 @@
                 #region Contorller
 
                 //10銆佺敓鎴� Contorller 鏂囦欢
-                var continerlllePath = tbPath.Text + @"\server\src\CMS.Plugin." + tb_WCF_NameSpacePath.Text.Trim() + @".Controller";
+                var continerlllePath = tbPath.Text + @"\server\src\CMS.Plugin." + tb_WCF_NameSpacePath.Text.Trim() + @"\Controller";
                 str_generate = Controller_Generate.CreateText(param);
                 tf = TextHelper.Export2File_V2(continerlllePath, $"{param.EntityName}Controller.cs", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
 
 
                 #endregion
+
+                #region Domain
+
+                //11銆佺敓鎴� IRepository 鏂囦欢
+                var iRepositoryPath = tbPath.Text + @"\server\src\CMS.Plugin." + tb_WCF_NameSpacePath.Text.Trim() + @".Domain\" + tb_EntityName.Text.Trim(); ;
+                str_generate = IRepository_Generate.CreateText(param);
+                tf = TextHelper.Export2File_V2(iRepositoryPath, $"I{param.EntityName}Repository.cs", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+
+
+                #endregion
+
+                #region EntityFrameworkCore
+
+                //12銆佺敓鎴� EfCoreRepository 鏂囦欢
+                var efCoreRepositoryPath = tbPath.Text + @"\server\src\CMS.Plugin." + tb_WCF_NameSpacePath.Text.Trim() + @".EntityFrameworkCore\Repositories";
+                str_generate = EfCoreRepository_Generate.CreateText(param);
+                tf = TextHelper.Export2File_V2(efCoreRepositoryPath, $"EfCore{param.EntityName}Repository.cs", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+
+
+                #endregion
+
+                #region Web
+                var webRootPath = tbPath.Text + @"\web\src\widgets\" + tb_EntityName.Text.Trim();
+
+                //13銆佺敓鎴� Index 鏂囦欢
+                str_generate = Index_Generate.CreateText(param);
+                tf = TextHelper.Export2File_V2(webRootPath, $"index.ts", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+
+                //14銆佺敓鎴� enum 鏂囦欢
+                str_generate = enum_Generate.CreateText(param);
+                tf = TextHelper.Export2File_V2(webRootPath, $"enum.ts", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+
+
+                //15銆佺敓鎴� Controllers\File 鏂囦欢
+                str_generate = File_Generate.CreateText(param);
+                tf = TextHelper.Export2File_V2(webRootPath+ @"\Controllers", $"File.ts", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+
+                //16銆佺敓鎴� Controllers\EntityMode 鏂囦欢
+                str_generate = EntityMode_Generate.CreateText(param);
+                tf = TextHelper.Export2File_V2(webRootPath + @"\Controllers", $"{tb_EntityName.Text.Trim()}.ts", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+
+                #endregion
+
 
 
                 ////鐢熸垚 OutputModel 鏂囦欢
@@ -410,7 +477,7 @@
 
         private void MainForm_Load(object sender, EventArgs e)
         {
-            tb_EntityProName.Enabled = false;
+            //tb_EntityProName.Enabled = false;
             tb_FileName.Enabled = false;
             tb_Modulelogo.Enabled = false;
             tb_WCF_NameSpacePath.Enabled = true;

--
Gitblit v1.9.3