From b75b10418fbc2df069aeb7a4b15e6e65690d133a Mon Sep 17 00:00:00 2001 From: zs <zhousong@weben-smart.com> Date: 周二, 06 5月 2025 13:33:59 +0800 Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo --- Weben_CMS专用代码生成器/Code/MainForm.cs | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 109 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 cc17f85..b318342 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"; @@ -99,6 +103,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_LikeQueryAttrsName = this.tb_LikeQueryAttrsName.Text.Trim();//涓枃娉ㄩ噴 + if (_tb_LikeQueryAttrsName == "") + { + 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; + } + string chinaComment = this.tb_ChinaComment.Text.Trim();//涓枃娉ㄩ噴 if (chinaComment == "") { @@ -187,7 +208,9 @@ NameSpacePath = wcf_NameSpacePath, ColumnNameList = columnList, EntityName = entityName, - EntityInstanceName = tableAlias + EntityInstanceName = tableAlias, + LikeQueryAttrs = _tb_LikeQueryAttrs, + LikeQueryAttrsName = _tb_LikeQueryAttrsName }; //澶勭悊鏋氫妇绫诲瀷 List<EnumModel> enumList = new List<EnumModel>(); @@ -303,12 +326,96 @@ //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", 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); + + //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); + + //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); + + + //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); + + + //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); + + //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); + + //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); + + + //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); + + //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); + + //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); + + + //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); + + //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); + + //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); + + //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); + + + //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); + + //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); + + //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); + + + //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); + + //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); + + //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); + + #endregion -- Gitblit v1.9.3