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 |   41 +++++++++++++++++++++++++++--------------
 1 files changed, 27 insertions(+), 14 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 6311a10..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"
@@ -36,14 +36,14 @@
             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();
@@ -215,11 +215,11 @@
                     return;
                 }
                 //澧炲姞鏍￠獙
-                if (columnList.Where(x => x.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()).Count() == 0)
-                {
-                    MessageBox.Show($"琛ㄤ腑娌℃湁瀛楁{SystemCommonVar.c_creator}锛�");
-                    return;
-                }
+                //if (columnList.Where(x => x.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()).Count() == 0)
+                //{
+                //    MessageBox.Show($"琛ㄤ腑娌℃湁瀛楁{SystemCommonVar.c_creator}锛�");
+                //    return;
+                //}
 
 
 
@@ -241,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
                         });
                     }
                 }
@@ -267,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
                         });
                     }
                 }
@@ -282,6 +283,13 @@
                 //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 瀹炰綋绫�
@@ -824,5 +832,10 @@
         {
             this.tb_FilePath.Text = "";
         }
+
+        private void ck_IsDeletefile_CheckedChanged(object sender, EventArgs e)
+        {
+           
+        }
     }
 }

--
Gitblit v1.9.3