From 5a149d626ae8bc3fa4bddbb53f8caf40f51f6da6 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 04 6月 2025 17:42:13 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
Weben_CMS专用代码生成器/Code/MainForm.cs | 189 +++++++++++++++++++++++++---------------------
1 files changed, 102 insertions(+), 87 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 d77673e..05d18bf 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"
@@ -28,23 +28,22 @@
this.tb_Primary.Text = "id";//涓婚敭鍚�
this.tb_PrimaryDesc.Text = "涓婚敭";
- this.tb_OrderBy.Text = "ModifyTime";//鎺掑簭瀛楁
+ this.tb_OrderBy.Text = "CreationTime";//鎺掑簭瀛楁
- this.tb_ProjectNamePrefix.Text = "Test";
this.tb_TableName.Text = "scms_wmsmaterials";//琛ㄥ悕
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_CreatePerson.Text = "";//鍒涘缓浜�
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";
+ this.tb_EnumList.Text = "PurchaseType,PurchaseTypeEnum&MaterialType,MaterialTypeEnum&IsMainBranch,YesNoEnum";
this.cmb_DataSource.DropDownStyle = ComboBoxStyle.DropDownList;
List<ListItem> itemList = CommonHelper.GetDataSources();
@@ -88,13 +87,13 @@
var genCodeRootPath = "";
try
{
- projectNamePrefix = this.tb_ProjectNamePrefix.Text;
- if (projectNamePrefix == "")
- {
- MessageBox.Show("璇疯緭鍏ラ」鐩悕鍓嶇紑锛�");
- this.tb_ProjectNamePrefix.Focus();
- return;
- }
+ projectNamePrefix = "";
+ //if (projectNamePrefix == "")
+ //{
+ // MessageBox.Show("璇疯緭鍏ラ」鐩悕鍓嶇紑锛�");
+ // this.tb_ProjectNamePrefix.Focus();
+ // return;
+ //}
if (dataBaseName == "")
{
@@ -106,9 +105,16 @@
string primaryKeyDesc = this.tb_PrimaryDesc.Text.Trim();//涓婚敭鎻忚堪
string tableName = this.tb_TableName.Text.Trim();//琛ㄥ悕
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_OrderBy = this.tb_OrderBy.Text.Trim();//涓枃娉ㄩ噴
+ if (_tb_OrderBy == "")
+ {
+ MessageBox.Show("璇疯緭鍏� 鎺掑簭锛�");
+ this.tb_OrderBy.Focus();
+ return;
+ }
string _tb_DeleteAlertAttr = this.tb_DeleteAlertAttr.Text.Trim();//涓枃娉ㄩ噴
if (_tb_DeleteAlertAttr == "")
@@ -129,17 +135,17 @@
string _tb_LikeQueryAttrsName = this.tb_LikeQueryAttrsName.Text.Trim();//涓枃娉ㄩ噴
if (_tb_LikeQueryAttrsName == "")
{
- MessageBox.Show("璇疯緭鍏� 妯＄硦鏌ヨ瀛楁鍚嶏紒");
- this.tb_LikeQueryAttrsName.Focus();
- return;
+ //MessageBox.Show("璇疯緭鍏� 妯＄硦鏌ヨ瀛楁鍚嶏紒");
+ //this.tb_LikeQueryAttrsName.Focus();
+ //return;
}
string _tb_LikeQueryAttrs = this.tb_LikeQueryAttrs.Text.Trim();//涓枃娉ㄩ噴
if (_tb_LikeQueryAttrs == "")
{
- MessageBox.Show("璇疯緭鍏� 妯＄硦鏌ヨ瀛楁锛�");
- this.tb_LikeQueryAttrs.Focus();
- return;
+ //MessageBox.Show("璇疯緭鍏� 妯＄硦鏌ヨ瀛楁锛�");
+ //this.tb_LikeQueryAttrs.Focus();
+ //return;
}
string chinaComment = this.tb_ChinaComment.Text.Trim();//涓枃娉ㄩ噴
@@ -209,28 +215,23 @@
return;
}
//澧炲姞鏍￠獙
- if (columnList.Where(x => x.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()).Count() == 0)
- {
- MessageBox.Show($"琛ㄤ腑娌℃湁瀛楁{SystemCommonVar.c_creator}锛�");
- return;
- }
-
- string groupName = this.tb_GroupName.Text.Trim();
- //if (groupName == "")
+ //if (columnList.Where(x => x.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()).Count() == 0)
//{
- // MessageBox.Show("璇疯緭鍏ュ垎缁勫悕锛�");
- // this.tb_GroupName.Focus();
+ // MessageBox.Show($"琛ㄤ腑娌℃湁瀛楁{SystemCommonVar.c_creator}锛�");
// return;
//}
- string addEntityParam = "Add" + modulelogo + "Param";//鏂板鍙傛暟绫诲悕
+
+
+
string str_generate = "";
bool tf;
GenerateCodeParam param = new GenerateCodeParam()
{
+ OrderBy = _tb_OrderBy,
DeleteAlertAttr = CommonHelper.FirstLowercase(_tb_DeleteAlertAttr),
- Modulelogo = modulelogo,
+ Modulelogo = "",
ChinaComment = chinaComment,
PageMenuName = menuName,
PageMenuInstanceName = _tb_PageMenuInstanceName,
@@ -240,25 +241,26 @@
EntityInstanceName = tableAlias,
LikeQueryAttrs = _tb_LikeQueryAttrs,
LikeQueryAttrsName = _tb_LikeQueryAttrsName,
- ValidateRepeatName = this.tb_ValidateRepeatName.Text
+ ValidateRepeatName = this.tb_ValidateRepeatName.Text,
+ TableName = tableName
};
//澶勭悊鏋氫妇绫诲瀷
List<EnumModel> enumList = new List<EnumModel>();
var str_enumList = this.tb_EnumList.Text.Trim();
- if (str_enumList.IndexOf(',') > -1)
+ 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(',');
+ var arr_enumList = str_enumList.Split('&');
foreach (var item in arr_enumList)
{
- var arr_single = item.Split('|');
+ var arr_single = item.Split(',');
enumList.Add(new EnumModel()
{
EnumAttrName = arr_single[0],
EnumType = arr_single[1],
- EnumTypeDesc = arr_single[2]
+ EnumTypeDesc = arr_single[0] + SystemConst.enumDescName
});
}
}
@@ -266,12 +268,12 @@
{
if (!string.IsNullOrEmpty(str_enumList))
{
- var arr_single = str_enumList.Split('|');
+ var arr_single = str_enumList.Split(',');
enumList.Add(new EnumModel()
{
EnumAttrName = arr_single[0],
EnumType = arr_single[1],
- EnumTypeDesc = arr_single[2]
+ EnumTypeDesc = arr_single[0] + SystemConst.enumDescName
});
}
}
@@ -281,37 +283,44 @@
//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();
+
+ //鏄惁瑕佷簨鍏堟竻鐞嗘枃浠跺す
+ if (this.ck_IsDeletefile.Checked)
+ {
+ FileHelper.ClearFolder(genCodeRootPath); // 閫掑綊鍒犻櫎
+ }
+
//var webFolerPath = (tb_WCF_NameSpacePath.Text.Trim() + "_Web").ToLower();
var webFolerPath = _tb_VueRootFolerName;
#region 瀹炰綋绫�
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);
+ tf = TextHelper.Export2File_V2(entityFilePath, $"Get{param.EntityName}Input.cs", str_generate);
//2銆佺敓鎴� CreateDto 鏂囦欢
str_generate = CreateDto_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(entityFilePath, $"{param.EntityName}CreateDto.cs", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(entityFilePath, $"{param.EntityName}CreateDto.cs", str_generate);
//3銆佺敓鎴� UpdateDto 鏂囦欢
str_generate = UpdateDto_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(entityFilePath, $"{param.EntityName}UpdateDto.cs", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(entityFilePath, $"{param.EntityName}UpdateDto.cs", str_generate);
//4銆佺敓鎴� CreateOrUpdateDtoBase 鏂囦欢
str_generate = CreateOrUpdateDtoBase_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(entityFilePath, $"{param.EntityName}CreateOrUpdateDtoBase.cs", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(entityFilePath, $"{param.EntityName}CreateOrUpdateDtoBase.cs", str_generate);
//5銆佺敓鎴� Dto 鏂囦欢
str_generate = Dto_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(entityFilePath, $"{param.EntityName}Dto.cs", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(entityFilePath, $"{param.EntityName}Dto.cs", str_generate);
//6銆佺敓鎴� Export 鏂囦欢
str_generate = ExportModel_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(entityFilePath, $"{param.EntityName}ExportModel.cs", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(entityFilePath, $"{param.EntityName}ExportModel.cs", str_generate);
//7銆佺敓鎴� Import 鏂囦欢
str_generate = ImportModel_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(entityFilePath, $"{param.EntityName}sImportModel.cs", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(entityFilePath, $"{param.EntityName}sImportModel.cs", str_generate);
#endregion
@@ -320,12 +329,12 @@
//8銆佺敓鎴� IAppService 鏂囦欢
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);
+ tf = TextHelper.Export2File_V2(appServiceFilePath, $"I{param.EntityName}AppService.cs", str_generate);
//9銆佺敓鎴� AppService 鏂囦欢
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);
+ tf = TextHelper.Export2File_V2(appServiceFilePath, $"{param.EntityName}AppService.cs", str_generate);
#endregion
@@ -335,7 +344,7 @@
//10銆佺敓鎴� Contorller 鏂囦欢
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);
+ tf = TextHelper.Export2File_V2(continerlllePath, $"{param.EntityName}Controller.cs", str_generate);
#endregion
@@ -345,7 +354,7 @@
//11銆佺敓鎴� IRepository 鏂囦欢
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);
+ tf = TextHelper.Export2File_V2(iRepositoryPath, $"I{param.EntityName}Repository.cs", str_generate);
#endregion
@@ -355,7 +364,7 @@
//12銆佺敓鎴� EfCoreRepository 鏂囦欢
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);
+ tf = TextHelper.Export2File_V2(efCoreRepositoryPath, $"EfCore{param.EntityName}Repository.cs", str_generate);
#endregion
@@ -365,103 +374,103 @@
//13銆佺敓鎴� Index 鏂囦欢
str_generate = Index_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(webRootPath, $"index.ts", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(webRootPath, $"index.ts", str_generate);
//14銆佺敓鎴� enum 鏂囦欢
str_generate = enum_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(webRootPath, $"enum.ts", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(webRootPath, $"enum.ts", str_generate);
//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);
+ tf = TextHelper.Export2File_V2(webRootPath + @"\Controllers", $"File.ts", str_generate);
//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);
+ tf = TextHelper.Export2File_V2(webRootPath + @"\Controllers", $"{tb_EntityName.Text.Trim()}.ts", str_generate);
//17銆佺敓鎴� Controllers\EntityModeDrawer 鏂囦欢
str_generate = EntityModeDrawer_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(webRootPath + @"\Controllers", $"{tb_EntityName.Text.Trim()}Drawer.tsx", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(webRootPath + @"\Controllers", $"{tb_EntityName.Text.Trim()}Drawer.tsx", str_generate);
//18銆佺敓鎴� Controllers\EntityModeQueryDrawer 鏂囦欢
str_generate = EntityModeQueryDrawer_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(webRootPath + @"\Controllers", $"{tb_EntityName.Text.Trim()}QueryDrawer.tsx", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(webRootPath + @"\Controllers", $"{tb_EntityName.Text.Trim()}QueryDrawer.tsx", str_generate);
//19銆佺敓鎴� type\type 鏂囦欢
str_generate = type_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(webRootPath + @"\type", $"type.d.ts", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(webRootPath + @"\type", $"type.d.ts", str_generate);
//20銆佺敓鎴� Views\NameSpacePath 鏂囦欢
str_generate = NameSpacePath_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(webRootPath + @"\Views", $"{param.EntityName}.tsx", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(webRootPath + @"\Views", $"{param.EntityName}.tsx", str_generate);
//21銆佺敓鎴� Views\NameSpacePath_module 鏂囦欢
str_generate = NameSpacePath_module_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(webRootPath + @"\Views", $"{param.EntityName}.module.scss", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(webRootPath + @"\Views", $"{param.EntityName}.module.scss", str_generate);
//22銆佺敓鎴� Views\NameSpacePath_Config 鏂囦欢
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);
+ tf = TextHelper.Export2File_V2(webRootPath + @"\Views\config", $"{param.EntityName}.json", str_generate);
//23銆佺敓鎴� Views\NameSpacePath_Config 鏂囦欢
str_generate = EntityNameClass_module_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(webRootPath + @"\Views\Pages\" + param.EntityName, $"{param.EntityName}.module.scss", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(webRootPath + @"\Views\Pages\" + param.EntityName, $"{param.EntityName}.module.scss", str_generate);
//24銆佺敓鎴� Views\EntityNameClass妯℃澘 鏂囦欢
str_generate = EntityNameClass_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(webRootPath + @"\Views\Pages\" + param.EntityName, $"{param.EntityName}.tsx", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(webRootPath + @"\Views\Pages\" + param.EntityName, $"{param.EntityName}.tsx", str_generate);
//25銆佺敓鎴� Views\EntityNameClass_Config妯℃澘 鏂囦欢
str_generate = EntityNameClass_Config_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(webRootPath + @"\Views\Pages\" + param.EntityName, $"Config.ts", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(webRootPath + @"\Views\Pages\" + param.EntityName, $"Config.ts", str_generate);
//26銆佺敓鎴� Views\EntityNameClassDrawer_module_Generate 鏂囦欢
str_generate = EntityNameClassDrawer_module_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(webRootPath + @"\Views\Pages\Dialog\" + param.EntityName + "Drawer", param.EntityName + "Drawer" + $".module.scss", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(webRootPath + @"\Views\Pages\Dialog\" + param.EntityName + "Drawer", param.EntityName + "Drawer" + $".module.scss", str_generate);
//27銆佺敓鎴� Views\EntityNameClassDrawer_Generate 鏂囦欢
str_generate = EntityNameClassDrawer_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(webRootPath + @"\Views\Pages\Dialog\" + param.EntityName + "Drawer", param.EntityName + "Drawer" + $".tsx", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(webRootPath + @"\Views\Pages\Dialog\" + param.EntityName + "Drawer", param.EntityName + "Drawer" + $".tsx", str_generate);
//28銆佺敓鎴� Views\EntityNameClassDrawer_module_Generate 鏂囦欢
str_generate = EntityNameClassQueryDrawer_module_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(webRootPath + @"\Views\Pages\Dialog\" + param.EntityName + "QueryDrawer", param.EntityName + "QueryDrawer" + $".module.scss", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(webRootPath + @"\Views\Pages\Dialog\" + param.EntityName + "QueryDrawer", param.EntityName + "QueryDrawer" + $".module.scss", str_generate);
//29銆佺敓鎴� Views\EntityNameClassDrawer_Generate 鏂囦欢
str_generate = EntityNameClassQueryDrawer_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(webRootPath + @"\Views\Pages\Dialog\" + param.EntityName + "QueryDrawer", param.EntityName + "QueryDrawer" + $".tsx", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(webRootPath + @"\Views\Pages\Dialog\" + param.EntityName + "QueryDrawer", param.EntityName + "QueryDrawer" + $".tsx", str_generate);
//30銆佺敓鎴� Views\EntityNameClassDrawer_Generate 鏂囦欢
str_generate = Models_EntityNameClassQueryDrawer_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(webRootPath + @"\Models", param.EntityName + "QueryDrawer" + $".ts", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(webRootPath + @"\Models", param.EntityName + "QueryDrawer" + $".ts", str_generate);
//31銆佺敓鎴� Views\EntityNameClassDrawer_Generate 鏂囦欢
str_generate = Models_EntityNameClassDrawer_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(webRootPath + @"\Models", param.EntityName + "Drawer" + $".ts", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(webRootPath + @"\Models", param.EntityName + "Drawer" + $".ts", str_generate);
//32銆佺敓鎴� Views\EntityNameClassDrawer_Generate 鏂囦欢
str_generate = Models_EntityNameClass_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(webRootPath + @"\Models", param.EntityName + $".ts", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(webRootPath + @"\Models", param.EntityName + $".ts", str_generate);
//33銆佺敓鎴� Views\EntityNameClassDrawer_Generate 鏂囦欢
str_generate = Models_Service_EntityNameClassQueryDrawer_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(webRootPath + @"\Models\Service", param.EntityName + "QueryDrawer" + $".ts", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(webRootPath + @"\Models\Service", param.EntityName + "QueryDrawer" + $".ts", str_generate);
//34銆佺敓鎴� Views\EntityNameClassDrawer_Generate 鏂囦欢
str_generate = Models_Service_EntityNameClassDrawer_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(webRootPath + @"\Models\Service", param.EntityName + "Drawer" + $".ts", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(webRootPath + @"\Models\Service", param.EntityName + "Drawer" + $".ts", str_generate);
//35銆佺敓鎴� Views\EntityNameClassDrawer_Generate 鏂囦欢
str_generate = Models_Service_EntityNameClass_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(webRootPath + @"\Models\Service", param.EntityName + $".ts", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(webRootPath + @"\Models\Service", param.EntityName + $".ts", str_generate);
#endregion
@@ -470,7 +479,7 @@
//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);
+ tf = TextHelper.Export2File_V2(autoMapFilePath, param.EntityName + $"AutoMapperProfile.cs", str_generate);
//37銆佺敓鎴� 瀵煎嚭妯℃澘Excel鏂囦欢
List<ColumnModel> newColumnNameList = ListHelper.RemoveForPageTableListQueryAttributes(param.ColumnNameList);
@@ -585,17 +594,17 @@
if (tableName != "")
{
var str = CommonHelper.TitleToUpper(tableName);
- this.tb_FileName.Text = this.tb_EntityName.Text = str;
+
var index = tableName.IndexOf('_');
if (index > -1)
{
var moule_str = tableName.Substring(index + 1, tableName.Length - index - 1);
- this.tb_Modulelogo.Text = moule_str;
+
tb_PageMenuInstanceName.Text = this.tb_EntityProName.Text = CommonHelper.TitleToLower(moule_str);
}
else
{
- this.tb_Modulelogo.Text = tableName;
+
tb_PageMenuInstanceName.Text = this.tb_EntityProName.Text = CommonHelper.TitleToLower(tableName);
}
}
@@ -641,11 +650,7 @@
private void MainForm_Load(object sender, EventArgs e)
{
- //tb_EntityProName.Enabled = false;
- tb_FileName.Enabled = false;
- tb_Modulelogo.Enabled = false;
- tb_WCF_NameSpacePath.Enabled = true;
- tb_VueRootFolerName.Enabled = false;
+
}
private void cmb_DataSource_SelectedIndexChanged(object sender, EventArgs e)
@@ -656,19 +661,19 @@
dataBaseName = name;
if (name == "GSiemens_LES")
{
- this.tb_ProjectNamePrefix.Text = "LES";
+ // this.tb_ProjectNamePrefix.Text = "LES";
}
else if (name == "GSiemens_WIP")
{
- this.tb_ProjectNamePrefix.Text = "WIP";
+ // this.tb_ProjectNamePrefix.Text = "WIP";
}
else if (name.Contains("AoSinWms"))
{
- this.tb_ProjectNamePrefix.Text = "AoSinWms";
+ // this.tb_ProjectNamePrefix.Text = "AoSinWms";
}
else
{
- this.tb_ProjectNamePrefix.Text = "Test";
+ // this.tb_ProjectNamePrefix.Text = "Test";
}
}
@@ -771,6 +776,9 @@
case "鍓嶇鏍规枃浠跺す鍚嶇О":
entity.鍓嶇鏍规枃浠跺す鍚嶇О = propertyValue;
break;
+ case "鎺掑簭":
+ entity.鎺掑簭 = propertyValue;
+ break;
}
}
}
@@ -807,6 +815,8 @@
this.tb_DeleteAlertAttr.Text = entity.鍒犻櫎鎻愮ず瀛楁;
this.tb_VueRootFolerName.Text = entity.鍓嶇鏍规枃浠跺す鍚嶇О;
+ this.tb_OrderBy.Text = entity.鎺掑簭;
+
}
catch (FileNotFoundException)
{
@@ -822,5 +832,10 @@
{
this.tb_FilePath.Text = "";
}
+
+ private void ck_IsDeletefile_CheckedChanged(object sender, EventArgs e)
+ {
+
+ }
}
}
--
Gitblit v1.9.3