From a0088a63163bd3467529306f98a8cdb98b497e33 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 09 5月 2025 14:12:29 +0800
Subject: [PATCH] 增加排序
---
Weben_CMS专用代码生成器/Code/Templete/EntityFrameworkCore/EfCoreRepository模板.txt | 4
Weben_CMS专用代码生成器/Code/File/GenerateCodeConfigParamFiles/出入库单据详情.txt | 3
Weben_CMS专用代码生成器/Code/Model/GenerateCodeConfigParam.cs | 2
Weben_CMS专用代码生成器/Code/File/GenerateCodeConfigParamFiles/祥子的作业计划表配置文本.txt | 3
Weben_CMS专用代码生成器/Code/File/GenerateCodeConfigParamFiles/物料容器关系.txt | 3
Weben_CMS专用代码生成器/Code/File/GenerateCodeConfigParamFiles/祥子的物料信息表配置文本.txt | 3
Weben_CMS专用代码生成器/Code/GenerateCode_WeiBen_CMS.csproj | 3
Weben_CMS专用代码生成器/Code/Utility/CommonHelper.cs | 1
Weben_CMS专用代码生成器/Code/MainForm.cs | 140 ++++++++++++++-------------
Weben_CMS专用代码生成器/Code/Model/GenerateCodeParam.cs | 6 +
Weben_CMS专用代码生成器/Code/Utility/TextHelper.cs | 3
Weben_CMS专用代码生成器/Code/MainForm.Designer.cs | 89 -----------------
Weben_CMS专用代码生成器/Code/File/GenerateCodeConfigParamFiles/出入库单据.txt | 3
13 files changed, 96 insertions(+), 167 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/File/GenerateCodeConfigParamFiles/\345\207\272\345\205\245\345\272\223\345\215\225\346\215\256.txt" "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/File/GenerateCodeConfigParamFiles/\345\207\272\345\205\245\345\272\223\345\215\225\346\215\256.txt"
index 2a1eefd..7c2b782 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/File/GenerateCodeConfigParamFiles/\345\207\272\345\205\245\345\272\223\345\215\225\346\215\256.txt"
+++ "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/File/GenerateCodeConfigParamFiles/\345\207\272\345\205\245\345\272\223\345\215\225\346\215\256.txt"
@@ -10,4 +10,5 @@
[妯＄硦鏌ヨ瀛楁鍚峕:璇疯緭鍏ュ崟鎹彿/鐗╂枡缂栧彿/鎵规
[椤圭洰鍛藉悕绌洪棿]:HIAWms
[鏋氫妇绫诲瀷瀛楁闆嗗悎]:OrderStatus|OrderStatusEnum|OrderStatusDesc,OrderType|OrderTypeEnum|OrderTypeDesc,StockType|StockTypeEnum|StockTypeDesc
-[鍓嶇鏍规枃浠跺す鍚嶇О]:web
\ No newline at end of file
+[鍓嶇鏍规枃浠跺す鍚嶇О]:web
+[鎺掑簭]:CreationTime
\ No newline at end of file
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/File/GenerateCodeConfigParamFiles/\345\207\272\345\205\245\345\272\223\345\215\225\346\215\256\350\257\246\346\203\205.txt" "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/File/GenerateCodeConfigParamFiles/\345\207\272\345\205\245\345\272\223\345\215\225\346\215\256\350\257\246\346\203\205.txt"
index b21976e..ad2ca63 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/File/GenerateCodeConfigParamFiles/\345\207\272\345\205\245\345\272\223\345\215\225\346\215\256\350\257\246\346\203\205.txt"
+++ "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/File/GenerateCodeConfigParamFiles/\345\207\272\345\205\245\345\272\223\345\215\225\346\215\256\350\257\246\346\203\205.txt"
@@ -10,4 +10,5 @@
[妯＄硦鏌ヨ瀛楁鍚峕:璇疯緭鍏ュ崟鎹彿/鐗╂枡缂栧彿/鐗╂枡ID
[椤圭洰鍛藉悕绌洪棿]:HIAWms
[鏋氫妇绫诲瀷瀛楁闆嗗悎]:OrderType|OrderTypeEnum|OrderTypeDesc
-[鍓嶇鏍规枃浠跺す鍚嶇О]:web
\ No newline at end of file
+[鍓嶇鏍规枃浠跺す鍚嶇О]:web
+[鎺掑簭]:CreationTime
\ No newline at end of file
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/File/GenerateCodeConfigParamFiles/\347\211\251\346\226\231\345\256\271\345\231\250\345\205\263\347\263\273.txt" "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/File/GenerateCodeConfigParamFiles/\347\211\251\346\226\231\345\256\271\345\231\250\345\205\263\347\263\273.txt"
index 1630a4d..6d84032 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/File/GenerateCodeConfigParamFiles/\347\211\251\346\226\231\345\256\271\345\231\250\345\205\263\347\263\273.txt"
+++ "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/File/GenerateCodeConfigParamFiles/\347\211\251\346\226\231\345\256\271\345\231\250\345\205\263\347\263\273.txt"
@@ -10,4 +10,5 @@
[妯＄硦鏌ヨ瀛楁鍚峕:璇疯緭鍏ョ墿鏂橧d
[椤圭洰鍛藉悕绌洪棿]:HIAWms
[鏋氫妇绫诲瀷瀛楁闆嗗悎]:
-[鍓嶇鏍规枃浠跺す鍚嶇О]:web
\ No newline at end of file
+[鍓嶇鏍规枃浠跺す鍚嶇О]:web
+[鎺掑簭]:CreationTime
\ No newline at end of file
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/File/GenerateCodeConfigParamFiles/\347\245\245\345\255\220\347\232\204\344\275\234\344\270\232\350\256\241\345\210\222\350\241\250\351\205\215\347\275\256\346\226\207\346\234\254.txt" "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/File/GenerateCodeConfigParamFiles/\347\245\245\345\255\220\347\232\204\344\275\234\344\270\232\350\256\241\345\210\222\350\241\250\351\205\215\347\275\256\346\226\207\346\234\254.txt"
index d134666..ed11518 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/File/GenerateCodeConfigParamFiles/\347\245\245\345\255\220\347\232\204\344\275\234\344\270\232\350\256\241\345\210\222\350\241\250\351\205\215\347\275\256\346\226\207\346\234\254.txt"
+++ "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/File/GenerateCodeConfigParamFiles/\347\245\245\345\255\220\347\232\204\344\275\234\344\270\232\350\256\241\345\210\222\350\241\250\351\205\215\347\275\256\346\226\207\346\234\254.txt"
@@ -10,4 +10,5 @@
[妯＄硦鏌ヨ瀛楁鍚峕:璇疯緭鍏ヤ换鍔＄紪鐮�/鍘熸枡鍨嬪彿/浜у搧浠ｇ爜
[椤圭洰鍛藉悕绌洪棿]:PipeLineLems
[鏋氫妇绫诲瀷瀛楁闆嗗悎]:
-[鍓嶇鏍规枃浠跺す鍚嶇О]:pipelinelems_web
\ No newline at end of file
+[鍓嶇鏍规枃浠跺す鍚嶇О]:pipelinelems_web
+[鎺掑簭]:CreationTime
\ No newline at end of file
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/File/GenerateCodeConfigParamFiles/\347\245\245\345\255\220\347\232\204\347\211\251\346\226\231\344\277\241\346\201\257\350\241\250\351\205\215\347\275\256\346\226\207\346\234\254.txt" "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/File/GenerateCodeConfigParamFiles/\347\245\245\345\255\220\347\232\204\347\211\251\346\226\231\344\277\241\346\201\257\350\241\250\351\205\215\347\275\256\346\226\207\346\234\254.txt"
index cfe1170..967fc02 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/File/GenerateCodeConfigParamFiles/\347\245\245\345\255\220\347\232\204\347\211\251\346\226\231\344\277\241\346\201\257\350\241\250\351\205\215\347\275\256\346\226\207\346\234\254.txt"
+++ "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/File/GenerateCodeConfigParamFiles/\347\245\245\345\255\220\347\232\204\347\211\251\346\226\231\344\277\241\346\201\257\350\241\250\351\205\215\347\275\256\346\226\207\346\234\254.txt"
@@ -10,4 +10,5 @@
[妯＄硦鏌ヨ瀛楁鍚峕:璇疯緭鍏ョ墿鏂欑紪鐮�/鐗╂枡鍚嶇О/澶囨敞
[椤圭洰鍛藉悕绌洪棿]:HIAWms
[鏋氫妇绫诲瀷瀛楁闆嗗悎]:PurchaseType|PurchaseTypeEnum|PurchaseTypeDesc,MaterialType|MaterialTypeEnum|MaterialTypeDesc,IsMainBranch|YesNoEnum|IsMainBranchDesc
-[鍓嶇鏍规枃浠跺す鍚嶇О]:templatedemo_web
\ No newline at end of file
+[鍓嶇鏍规枃浠跺す鍚嶇О]:templatedemo_web
+[鎺掑簭]:CreationTime
\ No newline at end of file
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/GenerateCode_WeiBen_CMS.csproj" "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/GenerateCode_WeiBen_CMS.csproj"
index efb04e5..cc283a0 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/GenerateCode_WeiBen_CMS.csproj"
+++ "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/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>
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.Designer.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.Designer.cs"
index ea9c18d..7f6d752 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.Designer.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.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;
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..c56be20 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,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)
{
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/Model/GenerateCodeConfigParam.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/Model/GenerateCodeConfigParam.cs"
index 445e9e2..23141d4 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/Model/GenerateCodeConfigParam.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/Model/GenerateCodeConfigParam.cs"
@@ -23,5 +23,7 @@
public string 鏋氫妇绫诲瀷瀛楁闆嗗悎 { get; set; }
public string 鍓嶇鏍规枃浠跺す鍚嶇О { get; set; }
+
+ public string 鎺掑簭 { get; set; }
}
}
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/Model/GenerateCodeParam.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/Model/GenerateCodeParam.cs"
index 6ac8c62..e855d58 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/Model/GenerateCodeParam.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/Model/GenerateCodeParam.cs"
@@ -12,6 +12,12 @@
/// </summary>
public class GenerateCodeParam
{
+
+ /// <summary>
+ /// 鎺掑簭
+ /// </summary>
+ public string OrderBy { get; set; }
+
/// <summary>
/// 鍒犻櫎鎻愮ず瀛楁
/// </summary>
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/Templete/EntityFrameworkCore/EfCoreRepository\346\250\241\346\235\277.txt" "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/Templete/EntityFrameworkCore/EfCoreRepository\346\250\241\346\235\277.txt"
index b43e762..f988f2f 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/Templete/EntityFrameworkCore/EfCoreRepository\346\250\241\346\235\277.txt"
+++ "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/Templete/EntityFrameworkCore/EfCoreRepository\346\250\241\346\235\277.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));
}
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/Utility/CommonHelper.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/Utility/CommonHelper.cs"
index 090191f..7dc7707 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/Utility/CommonHelper.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/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);
}
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/Utility/TextHelper.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/Utility/TextHelper.cs"
index d31ad4f..69ada04 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/Utility/TextHelper.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/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 + "\\";
--
Gitblit v1.9.3