From 72cfeb5d6d747a10cb492ebec6e09934e46b04b1 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 07 5月 2025 09:06:58 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
Weben_CMS专用代码生成器/Code/Utility/StructStrHelper.cs | 73 ++++++++++++++++++++++++++----------
1 files changed, 53 insertions(+), 20 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/Utility/StructStrHelper.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/StructStrHelper.cs"
index 821545e..6b8983f 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/StructStrHelper.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/StructStrHelper.cs"
@@ -85,7 +85,7 @@
model = new ColumnModel();
if (dt.Rows[n]["Precision"].ToString() != "")
{
- model.Precision = int.Parse(dt.Rows[n]["Precision"].ToString());
+ model.MyPrecision = int.Parse(dt.Rows[n]["Precision"].ToString());
}
if (dt.Rows[n]["Scale"].ToString() != "")
{
@@ -243,7 +243,7 @@
case DataTypeEnum.dt_datetime:
case DataTypeEnum.dt_datetime2:
case DataTypeEnum.dt_datetimeoffset:
- attrStr += " public datetime" + str_NullFlag + attr + " { get; set; }\n";
+ attrStr += " public DateTime" + str_NullFlag + attr + " { get; set; }\n";
attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
break;
case DataTypeEnum.dt_bigint:
@@ -304,6 +304,30 @@
string attrStr = "";
attrStr += $" updateObj.{attr} = input.{attr};\n";
+
+
+ return attrStr;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+
+ }
+
+ public static string GenerateAttribute_AppService_ImportAsync(ColumnModel columnModel, GenerateCodeParam param)
+ {
+ try
+ {
+ /*
+
+ MaterialCode = impItem.MaterialCode,
+
+ */
+ string attr = columnModel.ColumnName;
+
+ string attrStr = "";
+ attrStr += $"{attr} = impItem.{attr},\n";
return attrStr;
@@ -540,7 +564,7 @@
case DataTypeEnum.dt_datetime:
case DataTypeEnum.dt_datetime2:
case DataTypeEnum.dt_datetimeoffset:
- attrStr += " public datetime" + str_NullFlag + attr + " { get; set; }\n";
+ attrStr += " public DateTime" + str_NullFlag + attr + " { get; set; }\n";
attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
break;
case DataTypeEnum.dt_bigint:
@@ -863,7 +887,7 @@
case DataTypeEnum.dt_decimal:
case DataTypeEnum.dt_float:
sql.Append("@" + attrColumnName + " " + columnModel.DataType
- + "(" + columnModel.Precision.ToString() + "," + columnModel.Scale.ToString() + ") " + fuhao + "\n");
+ + "(" + columnModel.MyPrecision.ToString() + "," + columnModel.Scale.ToString() + ") " + fuhao + "\n");
break;
default:
break;
@@ -925,7 +949,7 @@
case DataTypeEnum.dt_decimal:
case DataTypeEnum.dt_float:
sql.Append("@" + attrColumnName + " " + columnModel.DataType
- + "(" + columnModel.Precision.ToString() + "," + columnModel.Scale.ToString() + ") " + fuhao + "\n");
+ + "(" + columnModel.MyPrecision.ToString() + "," + columnModel.Scale.ToString() + ") " + fuhao + "\n");
break;
default:
break;
@@ -986,7 +1010,7 @@
case DataTypeEnum.dt_decimal:
case DataTypeEnum.dt_float:
sql.Append("@" + attrColumnName + " " + columnModel.DataType
- + "(" + columnModel.Precision.ToString() + "," + columnModel.Scale.ToString() + ") " + fuhao);
+ + "(" + columnModel.MyPrecision.ToString() + "," + columnModel.Scale.ToString() + ") " + fuhao);
break;
default:
break;
@@ -1736,6 +1760,8 @@
List<ColumnModel> newList = ListHelper.RemoveIdOperationRemarkCreateIdModifyId(columnModelList);
foreach (var columnModel in newList)
{
+ //棣栧瓧姣嶅皬鍐�
+ var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
DataTypeEnum enumDT = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType.ToString());
var elment = "el-input";
switch (enumDT)
@@ -1752,7 +1778,7 @@
}
sb.Append(" { \n");
sb.Append(" label: '" + columnModel.Description + "', \n");
- sb.Append(" prop: '" + columnModel.ColumnName + "', \n");
+ sb.Append(" prop: '" + low_prop_ColumnName + "', \n");
//娣诲姞绫诲瀷
switch (enumDT)
@@ -1812,6 +1838,9 @@
List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
foreach (var columnModel in newList)
{
+
+ //棣栧瓧姣嶅皬鍐�
+ var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
DataTypeEnum enumDT = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType.ToString());
var elment = "input";
switch (enumDT)
@@ -1828,7 +1857,7 @@
}
sb.Append(" { \n");
sb.Append(" label: '" + columnModel.Description + "', \n");
- sb.Append(" prop: '" + columnModel.ColumnName + "', \n");
+ sb.Append(" prop: '" + low_prop_ColumnName + "', \n");
//娣诲姞绫诲瀷
switch (enumDT)
@@ -1887,7 +1916,7 @@
sb.Append(" el: '" + elment + "', \n");
}
- sb.Append(" disabled: disabled, \n");
+ sb.Append(" //disabled: disabled, \n");
sb.Append(" placeholder: '璇疯緭鍏�" + columnModel.Description + "', \n");
if (columnModel.IsNullable == false)
{
@@ -1933,12 +1962,13 @@
el: 'input',
disabled: disabled,
placeholder: '璇疯緭鍏ョ墿鏂欑紪鐮�',
- rules: [{ required: true, message: '鐗╂枡缂栫爜涓嶈兘涓虹┖', trigger: 'blur' }],
},
*/
List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
foreach (var columnModel in newList)
{
+ //棣栧瓧姣嶅皬鍐�
+ var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
DataTypeEnum enumDT = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType.ToString());
var elment = "input";
switch (enumDT)
@@ -1955,7 +1985,7 @@
}
sb.Append(" { \n");
sb.Append(" label: '" + columnModel.Description + "', \n");
- sb.Append(" prop: '" + columnModel.ColumnName + "', \n");
+ sb.Append(" prop: '" + low_prop_ColumnName + "', \n");
//娣诲姞绫诲瀷
switch (enumDT)
@@ -2014,12 +2044,9 @@
sb.Append(" el: '" + elment + "', \n");
}
- sb.Append(" disabled: disabled, \n");
+ sb.Append(" //disabled: disabled, \n");
sb.Append(" placeholder: '璇疯緭鍏�" + columnModel.Description + "', \n");
- if (columnModel.IsNullable == false)
- {
- sb.Append(" rules: [{required: true, message: '" + columnModel.Description + "涓嶈兘涓虹┖', trigger: 'blur' }], \n");
- }
+
//娣诲姞绫诲瀷
//switch (enumDT)
//{
@@ -2142,7 +2169,9 @@
List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
foreach (var columnModel in newList)
{
- sb.Append($"{columnModel.ColumnName}: formData.value.{columnModel.ColumnName}, \n");
+ //棣栧瓧姣嶅皬鍐�
+ var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
+ sb.Append($"{low_prop_ColumnName}: formData.value.{low_prop_ColumnName}, \n");
}
//鍘绘帀鏈�鍚庝竴涓�,
var res = sb.ToString();
@@ -2198,14 +2227,16 @@
foreach (var columnModel in newList)
{
sb.Append("{ \n");
+ //棣栧瓧姣嶅皬鍐�
+ var lowerCaseColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
var findEnumObj = param.EnumList.Where(x => x.EnumAttrName == columnModel.ColumnName).FirstOrDefault();
if (findEnumObj != null)
{
- sb.Append(" field: '" + columnModel.ColumnName + "Desc', \n");
+ sb.Append(" field: '" + lowerCaseColumnName + "Desc', \n");
}
else
{
- sb.Append(" field: '" + columnModel.ColumnName + "', \n");
+ sb.Append(" field: '" + lowerCaseColumnName + "', \n");
}
sb.Append(" title: '" + columnModel.Description + "', \n");
sb.Append("}, \n");
@@ -2232,7 +2263,9 @@
List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
foreach (var columnModel in newList)
{
- sb.Append($"{columnModel.ColumnName}: res.{columnModel.ColumnName}, \n");
+ //棣栧瓧姣嶅皬鍐�
+ var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
+ sb.Append($"{low_prop_ColumnName}: res.{low_prop_ColumnName}, \n");
}
//鍘绘帀鏈�鍚庝竴涓�,
var res = sb.ToString();
--
Gitblit v1.9.3