schangxiang@126.com
2025-05-09 a0088a63163bd3467529306f98a8cdb98b497e33
增加排序
已修改13个文件
253 ■■■■■ 文件已修改
Weben_CMS专用代码生成器/Code/File/GenerateCodeConfigParamFiles/出入库单据.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Weben_CMS专用代码生成器/Code/File/GenerateCodeConfigParamFiles/出入库单据详情.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Weben_CMS专用代码生成器/Code/File/GenerateCodeConfigParamFiles/物料容器关系.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Weben_CMS专用代码生成器/Code/File/GenerateCodeConfigParamFiles/祥子的作业计划表配置文本.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Weben_CMS专用代码生成器/Code/File/GenerateCodeConfigParamFiles/祥子的物料信息表配置文本.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Weben_CMS专用代码生成器/Code/GenerateCode_WeiBen_CMS.csproj 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Weben_CMS专用代码生成器/Code/MainForm.Designer.cs 89 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Weben_CMS专用代码生成器/Code/MainForm.cs 140 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Weben_CMS专用代码生成器/Code/Model/GenerateCodeConfigParam.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Weben_CMS专用代码生成器/Code/Model/GenerateCodeParam.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Weben_CMS专用代码生成器/Code/Templete/EntityFrameworkCore/EfCoreRepository模板.txt 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Weben_CMS专用代码生成器/Code/Utility/CommonHelper.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Weben_CMS专用代码生成器/Code/Utility/TextHelper.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/File/GenerateCodeConfigParamFiles/³öÈë¿âµ¥¾Ý.txt
@@ -11,3 +11,4 @@
[项目命名空间]:HIAWms
[枚举类型字段集合]:OrderStatus|OrderStatusEnum|OrderStatusDesc,OrderType|OrderTypeEnum|OrderTypeDesc,StockType|StockTypeEnum|StockTypeDesc
[前端根文件夹名称]:web
[排序]:CreationTime
Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/File/GenerateCodeConfigParamFiles/³öÈë¿âµ¥¾ÝÏêÇé.txt
@@ -11,3 +11,4 @@
[项目命名空间]:HIAWms
[枚举类型字段集合]:OrderType|OrderTypeEnum|OrderTypeDesc
[前端根文件夹名称]:web
[排序]:CreationTime
Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/File/GenerateCodeConfigParamFiles/ÎïÁÏÈÝÆ÷¹ØÏµ.txt
@@ -11,3 +11,4 @@
[项目命名空间]:HIAWms
[枚举类型字段集合]:
[前端根文件夹名称]:web
[排序]:CreationTime
Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/File/GenerateCodeConfigParamFiles/Ïé×ÓµÄ×÷Òµ¼Æ»®±íÅäÖÃÎı¾.txt
@@ -11,3 +11,4 @@
[项目命名空间]:PipeLineLems
[枚举类型字段集合]:
[前端根文件夹名称]:pipelinelems_web
[排序]:CreationTime
Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/File/GenerateCodeConfigParamFiles/Ïé×ÓµÄÎïÁÏÐÅÏ¢±íÅäÖÃÎı¾.txt
@@ -11,3 +11,4 @@
[项目命名空间]:HIAWms
[枚举类型字段集合]:PurchaseType|PurchaseTypeEnum|PurchaseTypeDesc,MaterialType|MaterialTypeEnum|MaterialTypeDesc,IsMainBranch|YesNoEnum|IsMainBranchDesc
[前端根文件夹名称]:templatedemo_web
[排序]:CreationTime
Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/GenerateCode_WeiBen_CMS.csproj
@@ -319,6 +319,9 @@
    </BootstrapperPackage>
  </ItemGroup>
  <ItemGroup>
    <Content Include="File\GenerateCodeConfigParamFiles\祥子的作业计划表配置文本.txt">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="Robot.ico" />
    <Content Include="Templete\Application\MapperProfiles\AutoMapperProfile模板.txt">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/MainForm.Designer.cs
@@ -34,8 +34,6 @@
            this.btnExit = new System.Windows.Forms.Button();
            this.btn_CreateFile = new System.Windows.Forms.Button();
            this.tb_TableName = new System.Windows.Forms.TextBox();
            this.tb_FileName = new System.Windows.Forms.TextBox();
            this.label1 = new System.Windows.Forms.Label();
            this.tb_WCF_NameSpacePath = new System.Windows.Forms.TextBox();
            this.label2 = new System.Windows.Forms.Label();
            this.tb_ChinaComment = new System.Windows.Forms.TextBox();
@@ -53,8 +51,6 @@
            this.label10 = new System.Windows.Forms.Label();
            this.tb_PrimaryDesc = new System.Windows.Forms.TextBox();
            this.label11 = new System.Windows.Forms.Label();
            this.tb_Modulelogo = new System.Windows.Forms.TextBox();
            this.label3 = new System.Windows.Forms.Label();
            this.btn_InsertSql = new System.Windows.Forms.Button();
            this.tb_VueRootFolerName = new System.Windows.Forms.TextBox();
            this.label13 = new System.Windows.Forms.Label();
@@ -79,10 +75,6 @@
            this.label19 = new System.Windows.Forms.Label();
            this.label18 = new System.Windows.Forms.Label();
            this.tb_EnumList = new System.Windows.Forms.TextBox();
            this.tb_GroupName = new System.Windows.Forms.TextBox();
            this.label16 = new System.Windows.Forms.Label();
            this.label15 = new System.Windows.Forms.Label();
            this.tb_ProjectNamePrefix = new System.Windows.Forms.TextBox();
            this.groupBox3 = new System.Windows.Forms.GroupBox();
            this.tb_importExcelCategroy = new System.Windows.Forms.TextBox();
            this.ck_IsShowImport = new System.Windows.Forms.CheckBox();
@@ -151,22 +143,6 @@
            this.tb_TableName.Size = new System.Drawing.Size(183, 21);
            this.tb_TableName.TabIndex = 15;
            this.tb_TableName.TextChanged += new System.EventHandler(this.tb_TableName_TextChanged);
            //
            // tb_FileName
            //
            this.tb_FileName.Location = new System.Drawing.Point(221, 152);
            this.tb_FileName.Name = "tb_FileName";
            this.tb_FileName.Size = new System.Drawing.Size(199, 21);
            this.tb_FileName.TabIndex = 17;
            //
            // label1
            //
            this.label1.AutoSize = true;
            this.label1.Location = new System.Drawing.Point(25, 154);
            this.label1.Name = "label1";
            this.label1.Size = new System.Drawing.Size(191, 12);
            this.label1.TabIndex = 16;
            this.label1.Text = "文件名称(用于给各个类名的前缀):";
            // 
            // tb_WCF_NameSpacePath
            // 
@@ -277,7 +253,6 @@
            // 
            // tb_OrderBy
            // 
            this.tb_OrderBy.Enabled = false;
            this.tb_OrderBy.Location = new System.Drawing.Point(552, 35);
            this.tb_OrderBy.Name = "tb_OrderBy";
            this.tb_OrderBy.Size = new System.Drawing.Size(145, 21);
@@ -308,22 +283,6 @@
            this.label11.Size = new System.Drawing.Size(59, 12);
            this.label11.TabIndex = 37;
            this.label11.Text = "主键描述:";
            //
            // tb_Modulelogo
            //
            this.tb_Modulelogo.Location = new System.Drawing.Point(221, 202);
            this.tb_Modulelogo.Name = "tb_Modulelogo";
            this.tb_Modulelogo.Size = new System.Drawing.Size(199, 21);
            this.tb_Modulelogo.TabIndex = 41;
            //
            // label3
            //
            this.label3.AutoSize = true;
            this.label3.Location = new System.Drawing.Point(25, 206);
            this.label3.Name = "label3";
            this.label3.Size = new System.Drawing.Size(167, 12);
            this.label3.TabIndex = 40;
            this.label3.Text = "模块简写(用于给各个方法名):";
            // 
            // btn_InsertSql
            // 
@@ -420,21 +379,13 @@
            this.groupBox2.Controls.Add(this.label19);
            this.groupBox2.Controls.Add(this.label18);
            this.groupBox2.Controls.Add(this.tb_EnumList);
            this.groupBox2.Controls.Add(this.tb_GroupName);
            this.groupBox2.Controls.Add(this.label16);
            this.groupBox2.Controls.Add(this.label15);
            this.groupBox2.Controls.Add(this.tb_ProjectNamePrefix);
            this.groupBox2.Controls.Add(this.groupBox3);
            this.groupBox2.Controls.Add(this.tb_FileName);
            this.groupBox2.Controls.Add(this.lblds);
            this.groupBox2.Controls.Add(this.tb_VueRootFolerName);
            this.groupBox2.Controls.Add(this.tb_TableName);
            this.groupBox2.Controls.Add(this.label13);
            this.groupBox2.Controls.Add(this.label1);
            this.groupBox2.Controls.Add(this.label2);
            this.groupBox2.Controls.Add(this.tb_Modulelogo);
            this.groupBox2.Controls.Add(this.tb_WCF_NameSpacePath);
            this.groupBox2.Controls.Add(this.label3);
            this.groupBox2.Controls.Add(this.label4);
            this.groupBox2.Controls.Add(this.tb_ChinaComment);
            this.groupBox2.Controls.Add(this.tb_PrimaryDesc);
@@ -580,38 +531,6 @@
            this.tb_EnumList.Size = new System.Drawing.Size(369, 104);
            this.tb_EnumList.TabIndex = 51;
            // 
            // tb_GroupName
            //
            this.tb_GroupName.Location = new System.Drawing.Point(973, 111);
            this.tb_GroupName.Name = "tb_GroupName";
            this.tb_GroupName.Size = new System.Drawing.Size(183, 21);
            this.tb_GroupName.TabIndex = 50;
            //
            // label16
            //
            this.label16.AutoSize = true;
            this.label16.Location = new System.Drawing.Point(920, 117);
            this.label16.Name = "label16";
            this.label16.Size = new System.Drawing.Size(47, 12);
            this.label16.TabIndex = 49;
            this.label16.Text = "分组名:";
            //
            // label15
            //
            this.label15.AutoSize = true;
            this.label15.Location = new System.Drawing.Point(26, 24);
            this.label15.Name = "label15";
            this.label15.Size = new System.Drawing.Size(71, 12);
            this.label15.TabIndex = 47;
            this.label15.Text = "项目名前缀:";
            //
            // tb_ProjectNamePrefix
            //
            this.tb_ProjectNamePrefix.Location = new System.Drawing.Point(104, 21);
            this.tb_ProjectNamePrefix.Name = "tb_ProjectNamePrefix";
            this.tb_ProjectNamePrefix.Size = new System.Drawing.Size(183, 21);
            this.tb_ProjectNamePrefix.TabIndex = 48;
            //
            // groupBox3
            // 
            this.groupBox3.Controls.Add(this.tb_importExcelCategroy);
@@ -740,8 +659,6 @@
        private System.Windows.Forms.Button btnExit;
        private System.Windows.Forms.Button btn_CreateFile;
        private System.Windows.Forms.TextBox tb_TableName;
        private System.Windows.Forms.TextBox tb_FileName;
        private System.Windows.Forms.Label label1;
        private System.Windows.Forms.TextBox tb_WCF_NameSpacePath;
        private System.Windows.Forms.Label label2;
        private System.Windows.Forms.TextBox tb_ChinaComment;
@@ -759,8 +676,6 @@
        private System.Windows.Forms.Label label10;
        private System.Windows.Forms.TextBox tb_PrimaryDesc;
        private System.Windows.Forms.Label label11;
        private System.Windows.Forms.TextBox tb_Modulelogo;
        private System.Windows.Forms.Label label3;
        private System.Windows.Forms.Button btn_InsertSql;
        private System.Windows.Forms.TextBox tb_VueRootFolerName;
        private System.Windows.Forms.Label label13;
@@ -774,10 +689,6 @@
        private System.Windows.Forms.Label label12;
        private System.Windows.Forms.TextBox tb_templeteFileDownName;
        private System.Windows.Forms.Label label14;
        private System.Windows.Forms.Label label15;
        private System.Windows.Forms.TextBox tb_ProjectNamePrefix;
        private System.Windows.Forms.Label label16;
        private System.Windows.Forms.TextBox tb_GroupName;
        private System.Windows.Forms.ComboBox cmb_DataBase;
        private System.Windows.Forms.Label label17;
        private System.Windows.Forms.Label label18;
Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/MainForm.cs
@@ -28,12 +28,11 @@
            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";
@@ -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 == "")
@@ -215,22 +221,17 @@
                    return;
                }
                string groupName = this.tb_GroupName.Text.Trim();
                //if (groupName == "")
                //{
                //    MessageBox.Show("请输入分组名!");
                //    this.tb_GroupName.Focus();
                //    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,
@@ -287,31 +288,31 @@
                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 +321,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 +336,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 +346,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 +356,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 +366,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 +471,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 +586,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 +642,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 +653,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 +768,9 @@
                            case "前端根文件夹名称":
                                entity.前端根文件夹名称 = propertyValue;
                                break;
                            case "排序":
                                entity.排序 = propertyValue;
                                break;
                        }
                    }
                }
@@ -807,6 +807,8 @@
                this.tb_DeleteAlertAttr.Text = entity.删除提示字段;
                this.tb_VueRootFolerName.Text = entity.前端根文件夹名称;
                this.tb_OrderBy.Text = entity.排序;
            }
            catch (FileNotFoundException)
            {
Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Model/GenerateCodeConfigParam.cs
@@ -23,5 +23,7 @@
        public string æžšä¸¾ç±»åž‹å­—段集合 { get; set; }
        public string å‰ç«¯æ ¹æ–‡ä»¶å¤¹åç§° { get; set; }
        public string æŽ’序 { get; set; }
    }
}
Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Model/GenerateCodeParam.cs
@@ -12,6 +12,12 @@
    /// </summary>
    public class GenerateCodeParam
    {
        /// <summary>
        /// æŽ’序
        /// </summary>
        public string OrderBy { get; set; }
        /// <summary>
        /// åˆ é™¤æç¤ºå­—段
        /// </summary>
Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Templete/EntityFrameworkCore/EfCoreRepositoryÄ£°å.txt
@@ -35,7 +35,7 @@
        return await (await GetDbSetAsync())
            .IncludeDetails()
            .Where(x => !x.IsDeleted)
            .OrderByDescending(x=>x.CreationTime)
            .OrderByDescending(x=>x.$OrderBy$)
            .FirstOrDefaultAsync(t => t.$ValidateRepeatName$ == name, GetCancellationToken(cancellationToken));
    }
@@ -84,7 +84,7 @@
            .IncludeDetails(includeDetails)
            .WhereIf(whereConditions != null, whereConditions.data)
            .Where(x => !x.IsDeleted)
            .OrderByDescending(x=>x.CreationTime)
            .OrderByDescending(x=>x.$OrderBy$)
            .PageBy(skipCount, maxResultCount)
            .ToListAsync(GetCancellationToken(cancellationToken));
    }
Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Utility/CommonHelper.cs
@@ -51,6 +51,7 @@
            str = str.Replace("$LikeQueryAttrsName$", param.LikeQueryAttrsName);
            str = str.Replace("$ValidateRepeatName$", param.ValidateRepeatName);
            str = str.Replace("$DeleteAlertAttr$", param.DeleteAlertAttr);
            str = str.Replace("$OrderBy$", param.OrderBy);
        }
Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Utility/TextHelper.cs
@@ -180,8 +180,7 @@
        /// <param name="entityName">实体类名</param>
        /// <param name="modulelogo">模块名字</param>
        /// <returns></returns>
        public static bool Export2File_V2(string _strPath, string fileName, string _tableName, string _code, FileType fileType,
            string filePrefixName, string entityName, string modulelogo)
        public static bool Export2File_V2(string _strPath, string fileName,string _code)
        {
            string fileFolderPath = _strPath + "\\";