From 086e8d457fb6480f126aedbd2677c7e97bdac193 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 07 5月 2025 15:49:09 +0800
Subject: [PATCH] 任务管理修改
---
Weben_CMS专用代码生成器/Code/MainForm.cs | 79 +++++++++++++++++++++++++++++++--------
1 files changed, 63 insertions(+), 16 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 ff60dcd..e0fe64c 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"
@@ -35,6 +35,10 @@
this.tb_PageMenuInstanceName.Text = "wmsMaterial";
this.tb_CreatePerson.Text = "shaocx";//鍒涘缓浜�
this.tb_EntityName.Text = "WmsMaterial";//瀹炰綋绫诲悕
+
+ this.tb_LikeQueryAttrs.Text = "'MaterialCode', 'MaterialName', 'Remark'";
+ this.tb_LikeQueryAttrsName.Text = "璇疯緭鍏ョ墿鏂欑紪鐮�/鐗╂枡鍚嶇О/澶囨敞";
+
//this.tb_EntityProName.Text = "wmsMaterial";//瀹炰綋绫诲璞″悕
this.tb_EnumList.Text = "PurchaseType|PurchaseTypeEnum|PurchaseTypeDesc,MaterialType|MaterialTypeEnum|MaterialTypeDesc,IsMainBranch|YesNoEnum|IsMainBranchDesc";
@@ -77,6 +81,7 @@
//涓�閿敓鎴愭墍鏈夋枃浠�
private void btn_CreateFile_Click(object sender, EventArgs e)
{
+ var genCodeRootPath = "";
try
{
projectNamePrefix = this.tb_ProjectNamePrefix.Text;
@@ -99,6 +104,23 @@
string wcf_NameSpacePath = this.tb_WCF_NameSpacePath.Text.Trim();//WCF椤圭洰鍛藉悕绌洪棿
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 == "")
@@ -197,6 +219,7 @@
GenerateCodeParam param = new GenerateCodeParam()
{
+ DeleteAlertAttr = CommonHelper.FirstLowercase(_tb_DeleteAlertAttr),
Modulelogo = modulelogo,
ChinaComment = chinaComment,
PageMenuName = menuName,
@@ -206,17 +229,34 @@
EntityName = entityName,
EntityInstanceName = tableAlias,
LikeQueryAttrs = _tb_LikeQueryAttrs,
- LikeQueryAttrsName = _tb_LikeQueryAttrsName
+ LikeQueryAttrsName = _tb_LikeQueryAttrsName,
+ ValidateRepeatName = this.tb_ValidateRepeatName.Text
};
//澶勭悊鏋氫妇绫诲瀷
List<EnumModel> enumList = new List<EnumModel>();
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)
{
var arr_single = item.Split('|');
+ enumList.Add(new EnumModel()
+ {
+ EnumAttrName = arr_single[0],
+ EnumType = arr_single[1],
+ EnumTypeDesc = arr_single[2]
+ });
+ }
+ }
+ else
+ {
+ if (!string.IsNullOrEmpty(str_enumList))
+ {
+ var arr_single = str_enumList.Split('|');
enumList.Add(new EnumModel()
{
EnumAttrName = arr_single[0],
@@ -230,9 +270,10 @@
//鐢熸垚Model
//CreateModelFile(columnList, tableName, filePrefixName, wcf_NameSpacePath, createPerson, chinaComment, entityName, modulelogo);
//CreateModelParamFile(columnList, tableName, filePrefixName, wcf_NameSpacePath, createPerson, chinaComment, entityName, modulelogo);
-
+ genCodeRootPath = tbPath.Text + @"\" + tb_WCF_NameSpacePath.Text.Trim();
+ var webFolerPath = (tb_WCF_NameSpacePath.Text.Trim() + "_Web").ToLower();
#region 瀹炰綋绫�
- var entityFilePath = tbPath.Text + @"\server\src\CMS.Plugin." + tb_WCF_NameSpacePath.Text.Trim() + @".Application.Contracts\Dtos\" + tb_EntityName.Text.Trim();
+ var entityFilePath = genCodeRootPath + @"\server\src\CMS.Plugin." + tb_WCF_NameSpacePath.Text.Trim() + @".Application.Contracts\Dtos\" + tb_EntityName.Text.Trim();
//1銆佺敓鎴� 鍒嗛〉鏌ヨ瀹炰綋 鏂囦欢
str_generate = InputQueryModel_Generate.CreateQueryModelLText(param);
tf = TextHelper.Export2File_V2(entityFilePath, $"Get{param.EntityName}Input.cs", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
@@ -266,12 +307,12 @@
#region AppSerivice
//8銆佺敓鎴� IAppService 鏂囦欢
- var appServiceFilePath = tbPath.Text + @"\server\src\CMS.Plugin." + tb_WCF_NameSpacePath.Text.Trim() + @".Application.Contracts\Services";
+ var appServiceFilePath = genCodeRootPath + @"\server\src\CMS.Plugin." + tb_WCF_NameSpacePath.Text.Trim() + @".Application.Contracts\Services";
str_generate = IAppService_Generate.CreateText(param);
tf = TextHelper.Export2File_V2(appServiceFilePath, $"I{param.EntityName}AppService.cs", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
//9銆佺敓鎴� AppService 鏂囦欢
- appServiceFilePath = tbPath.Text + @"\server\src\CMS.Plugin." + tb_WCF_NameSpacePath.Text.Trim() + @".Application\Implements";
+ appServiceFilePath = genCodeRootPath + @"\server\src\CMS.Plugin." + tb_WCF_NameSpacePath.Text.Trim() + @".Application\Implements";
str_generate = AppService_Generate.CreateText(param);
tf = TextHelper.Export2File_V2(appServiceFilePath, $"{param.EntityName}AppService.cs", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
@@ -281,7 +322,7 @@
#region Contorller
//10銆佺敓鎴� Contorller 鏂囦欢
- var continerlllePath = tbPath.Text + @"\server\src\CMS.Plugin." + tb_WCF_NameSpacePath.Text.Trim() + @"\Controller";
+ var continerlllePath = genCodeRootPath + @"\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);
@@ -291,7 +332,7 @@
#region Domain
//11銆佺敓鎴� IRepository 鏂囦欢
- var iRepositoryPath = tbPath.Text + @"\server\src\CMS.Plugin." + tb_WCF_NameSpacePath.Text.Trim() + @".Domain\" + tb_EntityName.Text.Trim(); ;
+ var iRepositoryPath = genCodeRootPath + @"\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);
@@ -301,7 +342,7 @@
#region EntityFrameworkCore
//12銆佺敓鎴� EfCoreRepository 鏂囦欢
- var efCoreRepositoryPath = tbPath.Text + @"\server\src\CMS.Plugin." + tb_WCF_NameSpacePath.Text.Trim() + @".EntityFrameworkCore\Repositories";
+ var efCoreRepositoryPath = genCodeRootPath + @"\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);
@@ -309,7 +350,7 @@
#endregion
#region Web
- var webRootPath = tbPath.Text + @"\web\src\widgets\" + tb_EntityName.Text.Trim();
+ var webRootPath = genCodeRootPath + @"\" + webFolerPath + @"\src\widgets\" + tb_EntityName.Text.Trim();
//13銆佺敓鎴� Index 鏂囦欢
str_generate = Index_Generate.CreateText(param);
@@ -345,15 +386,15 @@
//20銆佺敓鎴� Views\NameSpacePath 鏂囦欢
str_generate = NameSpacePath_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(webRootPath + @"\Views", $"{param.NameSpacePath}.tsx", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(webRootPath + @"\Views", $"{param.EntityName}.tsx", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
//21銆佺敓鎴� Views\NameSpacePath_module 鏂囦欢
str_generate = NameSpacePath_module_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(webRootPath + @"\Views", $"{param.NameSpacePath}.module.scss", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ 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.NameSpacePath}.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 鏂囦欢
@@ -413,6 +454,12 @@
#endregion
+
+
+ //36銆佺敓鎴� AutoMapperProfile 鏂囦欢
+ var autoMapFilePath = genCodeRootPath + @"\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);
@@ -479,7 +526,7 @@
}
//MessageBox.Show("鐢熸垚鏂囦欢鎴愬姛锛�");
//鎴愬姛涔嬪悗鎵撳紑鏂囦欢澶�
- using (System.Diagnostics.Process.Start(this.tbPath.Text))
+ using (System.Diagnostics.Process.Start(genCodeRootPath))
{
}
@@ -530,12 +577,12 @@
{
var moule_str = tableName.Substring(index + 1, tableName.Length - index - 1);
this.tb_Modulelogo.Text = moule_str;
- this.tb_EntityProName.Text = CommonHelper.TitleToLower(moule_str);
+ tb_PageMenuInstanceName.Text = this.tb_EntityProName.Text = CommonHelper.TitleToLower(moule_str);
}
else
{
this.tb_Modulelogo.Text = tableName;
- this.tb_EntityProName.Text = CommonHelper.TitleToLower(tableName);
+ tb_PageMenuInstanceName.Text = this.tb_EntityProName.Text = CommonHelper.TitleToLower(tableName);
}
}
}
--
Gitblit v1.9.3