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 |   27 ++++++++++++++++++++-------
 1 files changed, 20 insertions(+), 7 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 6e9bc75..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,7 +36,7 @@
             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'";
@@ -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,7 +241,8 @@
                     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>();
@@ -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