From 2cc966a2bb5bc2397a7188139334c8d7ccaee222 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 07 5月 2025 12:05:30 +0800
Subject: [PATCH] 测试
---
Weben_CMS专用代码生成器/Code/Utility/StructStrHelper.cs | 198 ++++++++++++++++++++++++++++++++----------------
1 files changed, 131 insertions(+), 67 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 d03814a..bcb9e86 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,13 +1857,21 @@
}
sb.Append(" { \n");
sb.Append(" label: '" + columnModel.Description + "', \n");
- sb.Append(" prop: '" + columnModel.ColumnName + "', \n");
+ sb.Append(" prop: '" + low_prop_ColumnName + "', \n");
//娣诲姞绫诲瀷
switch (enumDT)
{
case DataTypeEnum.dt_datetime:
- sb.Append(" type: 'datetimerange', \n");
+ sb.Append(" el: (props: any, { attrs }: SetupContext) => { \n");
+ sb.Append(" return h(datePicker, { \n");
+ sb.Append(" ...props, \n");
+ sb.Append(" clearable: true, \n");
+ sb.Append(" ...attrs, \n");
+ sb.Append(" }) \n");
+ sb.Append(" },\n");
+
+ sb.Append(" width: '100%',\n");
break;
default:
break;
@@ -1843,19 +1880,21 @@
if (enumDT == DataTypeEnum.dt_decimal)
{
sb.Append(" el: (props: any, { attrs }: SetupContext) => { \n");
- sb.Append(" return h(inputNumber, { { \n");
- sb.Append(" ...props, { \n");
- sb.Append(" clearable: true, { \n");
- sb.Append(" ...attrs, { \n");
+ sb.Append(" return h(inputNumber, { \n");
+ sb.Append(" ...props, \n");
+ sb.Append(" clearable: true, \n");
+ sb.Append(" ...attrs, \n");
sb.Append(" }) \n");
sb.Append(" },\n");
+ sb.Append(" width: '100%',\n");
//閰嶇疆绮惧害锛熻繖閲岄渶瑕佽幏鍙栨暟鎹簱涓殑绮惧害锛侊紒锛乀ODO锛�
sb.Append(" step: 0.01,\n");
sb.Append(" precision: 2, \n");
}
else if (enumDT == DataTypeEnum.dt_int)
{
+ bool isWriteInt = true;
//鍒ゆ柇鏄惁鏄笅鎷夌被鍨�
//澧炲姞瀵规灇涓剧被鍨嬬殑鏀寔
if (param.EnumList?.Count > 0)
@@ -1865,18 +1904,19 @@
{
elment = "select";
sb.Append(" el: '" + elment + "', \n");
+ isWriteInt = false;
}
}
- else
+ if(isWriteInt)
{
sb.Append(" el: (props: any, { attrs }: SetupContext) => { \n");
- sb.Append(" return h(inputNumber, { { \n");
- sb.Append(" ...props, { \n");
- sb.Append(" clearable: true, { \n");
- sb.Append(" ...attrs, { \n");
+ sb.Append(" return h(inputNumber, { \n");
+ sb.Append(" ...props, \n");
+ sb.Append(" clearable: true, \n");
+ sb.Append(" ...attrs, \n");
sb.Append(" }) \n");
sb.Append(" },\n");
-
+ sb.Append(" width: '100%',\n");
//閰嶇疆绮惧害锛�
sb.Append(" step: 1,\n");
sb.Append(" precision: 0, \n");
@@ -1887,22 +1927,22 @@
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)
- //{
- // case DataTypeEnum.dt_bit:
- // case DataTypeEnum.dt_tinyint:
- // sb.Append(" options: [{label: '鏄�',value: 'true'}, {label: '鍚�',value: 'false'}] \n");
- // break;
- // default:
- // break;
- //}
+ switch (enumDT)
+ {
+ case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
+ sb.Append(" options: [{label: '鏄�',value: 'true'}, {label: '鍚�',value: 'false'}] \n");
+ break;
+ default:
+ break;
+ }
sb.Append(" }, \n");
}
//鍘绘帀鏈�鍚庝竴涓�,
@@ -1933,12 +1973,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,13 +1996,21 @@
}
sb.Append(" { \n");
sb.Append(" label: '" + columnModel.Description + "', \n");
- sb.Append(" prop: '" + columnModel.ColumnName + "', \n");
+ sb.Append(" prop: '" + low_prop_ColumnName + "', \n");
//娣诲姞绫诲瀷
switch (enumDT)
{
case DataTypeEnum.dt_datetime:
- sb.Append(" type: 'datetimerange', \n");
+ sb.Append(" el: (props: any, { attrs }: SetupContext) => { \n");
+ sb.Append(" return h(dateTimePickerRange, { \n");
+ sb.Append(" ...props,\n");
+ sb.Append(" clearable: true, \n");
+ sb.Append(" ...attrs, \n");
+ sb.Append(" }) \n");
+ sb.Append(" },\n");
+
+ sb.Append(" width: '100%',\n");
break;
default:
break;
@@ -1970,19 +2019,21 @@
if (enumDT == DataTypeEnum.dt_decimal)
{
sb.Append(" el: (props: any, { attrs }: SetupContext) => { \n");
- sb.Append(" return h(inputNumber, { { \n");
- sb.Append(" ...props, { \n");
- sb.Append(" clearable: true, { \n");
- sb.Append(" ...attrs, { \n");
+ sb.Append(" return h(inputNumber, { \n");
+ sb.Append(" ...props,\n");
+ sb.Append(" clearable: true, \n");
+ sb.Append(" ...attrs, \n");
sb.Append(" }) \n");
sb.Append(" },\n");
+ sb.Append(" width: '100%',\n");
//閰嶇疆绮惧害锛熻繖閲岄渶瑕佽幏鍙栨暟鎹簱涓殑绮惧害锛侊紒锛乀ODO锛�
sb.Append(" step: 0.01,\n");
sb.Append(" precision: 2, \n");
}
else if (enumDT == DataTypeEnum.dt_int)
{
+ bool isWriteInt = true;
//鍒ゆ柇鏄惁鏄笅鎷夌被鍨�
//澧炲姞瀵规灇涓剧被鍨嬬殑鏀寔
if (param.EnumList?.Count > 0)
@@ -1992,18 +2043,20 @@
{
elment = "select";
sb.Append(" el: '" + elment + "', \n");
+ isWriteInt = false;
}
}
- else
+ if (isWriteInt)
{
sb.Append(" el: (props: any, { attrs }: SetupContext) => { \n");
- sb.Append(" return h(inputNumber, { { \n");
- sb.Append(" ...props, { \n");
- sb.Append(" clearable: true, { \n");
- sb.Append(" ...attrs, { \n");
+ sb.Append(" return h(inputNumber, { \n");
+ sb.Append(" ...props, \n");
+ sb.Append(" clearable: true, \n");
+ sb.Append(" ...attrs, \n");
sb.Append(" }) \n");
sb.Append(" },\n");
+ sb.Append(" width: '100%',\n");
//閰嶇疆绮惧害锛�
sb.Append(" step: 1,\n");
sb.Append(" precision: 0, \n");
@@ -2014,22 +2067,19 @@
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)
- //{
- // case DataTypeEnum.dt_bit:
- // case DataTypeEnum.dt_tinyint:
- // sb.Append(" options: [{label: '鏄�',value: 'true'}, {label: '鍚�',value: 'false'}] \n");
- // break;
- // default:
- // break;
- //}
+ switch (enumDT)
+ {
+ case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
+ sb.Append(" options: [{label: '鏄�',value: 'true'}, {label: '鍚�',value: 'false'}] \n");
+ break;
+ default:
+ break;
+ }
sb.Append(" }, \n");
}
//鍘绘帀鏈�鍚庝竴涓�,
@@ -2108,13 +2158,13 @@
//灞炴�у皬鍐�
var instanceName = CommonHelper.FirstLowercase(item.EnumType);
var _enumAttrName = CommonHelper.FirstLowercase(item.EnumAttrName);
- sb.Append("const "+ instanceName + "Data = await getWmsEnumData({ \n");
+ sb.Append("const " + instanceName + "Data = await getWmsEnumData({ \n");
sb.Append(" EnumName: '" + item.EnumType + "', \n");
sb.Append("}) \n");
- sb.Append("enumOptions."+ instanceName + " = "+ instanceName + "Data.map((item) => ({ \n");
+ sb.Append("enumOptions." + _enumAttrName + " = " + instanceName + "Data.map((item) => ({ \n");
sb.Append(" label: item.description, \n");
sb.Append(" value: item.value, \n");
- sb.Append("}) \n");
+ sb.Append("})) \n");
}
}
var res = sb.ToString();
@@ -2142,7 +2192,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();
@@ -2166,7 +2218,14 @@
List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
foreach (var columnModel in newList)
{
- sb.Append($"{columnModel.ColumnName}: formData.value.{columnModel.ColumnName}, \n");
+<<<<<<< HEAD
+ //棣栧瓧姣嶅皬鍐�
+ var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
+ sb.Append($"{low_prop_ColumnName}: formData.value.{low_prop_ColumnName}, \n");
+=======
+ var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
+ sb.Append($"{low_prop_ColumnName}: formData.value.{low_prop_ColumnName}, || ''\n");
+>>>>>>> a1cdc5e71aa827651a6c3e313fd7acc95b09c097
}
//鍘绘帀鏈�鍚庝竴涓�,
var res = sb.ToString();
@@ -2198,16 +2257,19 @@
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");
+ else
+ {
+ sb.Append(" field: '" + lowerCaseColumnName + "', \n");
}
- sb.Append(" field: '" + columnModel.Description + "', \n");
- sb.Append("} \n");
+ sb.Append(" title: '" + columnModel.Description + "', \n");
+ sb.Append("}, \n");
}
//鍘绘帀鏈�鍚庝竴涓�,
var res = sb.ToString();
@@ -2231,7 +2293,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();
@@ -2286,7 +2350,7 @@
sb.Append(_enumAttrName + ": [] as Array<{label: string; value: any }>, \n");
}
}
-
+
//鍘绘帀鏈�鍚庝竴涓�,
var res = sb.ToString();
res = res.Substring(0, res.Length - 1);
--
Gitblit v1.9.3