From 1acfd0dc4f695165dab633b5f45acc48047eb1b6 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 14 5月 2025 11:22:01 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
Weben_CMS专用代码生成器/Code/MainForm.cs | 29 +++++++++++++++--------------
1 files changed, 15 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 c56be20..23b5274 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"
@@ -43,7 +43,7 @@
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();
@@ -135,17 +135,17 @@
string _tb_LikeQueryAttrsName = this.tb_LikeQueryAttrsName.Text.Trim();//涓枃娉ㄩ噴
if (_tb_LikeQueryAttrsName == "")
{
- MessageBox.Show("璇疯緭鍏� 妯＄硦鏌ヨ瀛楁鍚嶏紒");
- this.tb_LikeQueryAttrsName.Focus();
- return;
+ //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;
+ //MessageBox.Show("璇疯緭鍏� 妯＄硦鏌ヨ瀛楁锛�");
+ //this.tb_LikeQueryAttrs.Focus();
+ //return;
}
string chinaComment = this.tb_ChinaComment.Text.Trim();//涓枃娉ㄩ噴
@@ -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
});
}
}
--
Gitblit v1.9.3