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/Utility/StructStrHelper.cs | 580 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 505 insertions(+), 75 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 6b8983f..bf9af82 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"
@@ -237,6 +237,7 @@
attrStr += " /// " + columnModel.Description + "\n";
attrStr += " /// </summary>\n";
+ var findEnumObj = param.EnumList.Where(x => x.EnumAttrName == attr).FirstOrDefault();
DataTypeEnum myDataType = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType);
switch (myDataType)
{
@@ -259,12 +260,21 @@
case DataTypeEnum.dt_tinyint:
case DataTypeEnum.dt_bit:
if (columnModel.IsNullable) { str_NullFlag = "? "; }
- attrStr += " public bool" + str_NullFlag + attr + " { get; set; }\n";
- attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ if (findEnumObj != null)
+ {
+ attrStr += $" public {findEnumObj.EnumType}" + str_NullFlag + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ }
+ else
+ {
+ attrStr += " public bool" + str_NullFlag + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ }
+
break;
case DataTypeEnum.dt_int:
if (columnModel.IsNullable) { str_NullFlag = "? "; }
- var findEnumObj = param.EnumList.Where(x => x.EnumAttrName == attr).FirstOrDefault();
+
if (findEnumObj != null)
{
attrStr += $" public {findEnumObj.EnumType}" + str_NullFlag + attr + " { get; set; }\n";
@@ -454,6 +464,7 @@
attrStr += " /// " + columnModel.Description + "\n";
attrStr += " /// </summary>\n";
+ var findEnumObj = param.EnumList.Where(x => x.EnumAttrName == attr).FirstOrDefault();
DataTypeEnum myDataType = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType);
switch (myDataType)
{
@@ -476,12 +487,21 @@
case DataTypeEnum.dt_tinyint:
case DataTypeEnum.dt_bit:
if (columnModel.IsNullable) { str_NullFlag = "? "; }
- attrStr += " public bool" + str_NullFlag + attr + " { get; set; }\n";
- attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+
+ if (findEnumObj != null)
+ {
+ attrStr += $" public {findEnumObj.EnumType}" + str_NullFlag + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ }
+ else
+ {
+ attrStr += " public bool" + str_NullFlag + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ }
break;
case DataTypeEnum.dt_int:
if (columnModel.IsNullable) { str_NullFlag = "? "; }
- var findEnumObj = param.EnumList.Where(x => x.EnumAttrName == attr).FirstOrDefault();
+
if (findEnumObj != null)
{
attrStr += $" public {findEnumObj.EnumType}" + str_NullFlag + attr + " { get; set; }\n";
@@ -511,7 +531,6 @@
//澧炲姞瀵规灇涓剧被鍨嬬殑鏀寔
if (param.EnumList?.Count > 0)
{
- var findEnumObj = param.EnumList.Where(x => x.EnumAttrName == attr).FirstOrDefault();
if (findEnumObj != null)
{
attrStr += " /// <summary>\n";
@@ -558,6 +577,7 @@
attrStr += " /// </summary>\n";
attrStr += $" [ExcelColumn(Name = \"{columnModel.Description}\", Width = 25)]\n";
+ var findEnumObj = param.EnumList.Where(x => x.EnumAttrName == attr).FirstOrDefault();
DataTypeEnum myDataType = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType);
switch (myDataType)
{
@@ -580,12 +600,21 @@
case DataTypeEnum.dt_tinyint:
case DataTypeEnum.dt_bit:
if (columnModel.IsNullable) { str_NullFlag = "? "; }
- attrStr += " public bool" + str_NullFlag + attr + " { get; set; }\n";
- attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ if (findEnumObj != null)
+ {
+ attrStr += $" public {findEnumObj.EnumType}" + str_NullFlag + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ }
+ else
+ {
+ attrStr += " public bool" + str_NullFlag + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ }
+
break;
case DataTypeEnum.dt_int:
if (columnModel.IsNullable) { str_NullFlag = "? "; }
- var findEnumObj = param.EnumList.Where(x => x.EnumAttrName == attr).FirstOrDefault();
+
if (findEnumObj != null)
{
attrStr += $" public {findEnumObj.EnumType}" + str_NullFlag + attr + " { get; set; }\n";
@@ -620,7 +649,7 @@
/// </summary>
/// <param name="columnModel"></param>
/// <returns></returns>
- public static string GenerateAttributeForQueryModel(ColumnModel columnModel)
+ public static string GenerateAttributeForQueryModel(ColumnModel columnModel, GenerateCodeParam param)
{
try
{
@@ -643,6 +672,7 @@
attrStr += " /// " + columnModel.Description + "\n";
attrStr += " /// </summary>\n";
+ var findEnumObj = param.EnumList.Where(x => x.EnumAttrName == attr).FirstOrDefault();
DataTypeEnum myDataType = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType);
switch (myDataType)
{
@@ -651,7 +681,7 @@
case DataTypeEnum.dt_datetimeoffset:
attrStr += " //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规�n";
attrStr += " [HighSearchRangeAttribute]\n";
- attrStr += " public List<string>" + emptyStr + attr + " { get; set; }\n";
+ attrStr += " public string" + emptyStr + attr + " { get; set; }\n";
attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
break;
case DataTypeEnum.dt_bigint:
@@ -663,13 +693,29 @@
attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
break;
case DataTypeEnum.dt_int:
- attrStr += " public int" + str_NullFlag + emptyStr + attr + " { get; set; }\n";
- attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ if (findEnumObj != null)
+ {
+ attrStr += $" public {findEnumObj.EnumType}" + str_NullFlag + emptyStr + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ }
+ else
+ {
+ attrStr += " public int" + str_NullFlag + emptyStr + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ }
break;
case DataTypeEnum.dt_bit:
case DataTypeEnum.dt_tinyint:
- attrStr += " public bool" + str_NullFlag + emptyStr + attr + " { get; set; }\n";
- attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ if (findEnumObj != null)
+ {
+ attrStr += $" public {findEnumObj.EnumType}" + str_NullFlag + emptyStr + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ }
+ else
+ {
+ attrStr += " public bool" + str_NullFlag + emptyStr + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ }
break;
default:
attrStr += " public string" + emptyStr + attr + " { get; set; }\n";
@@ -1796,7 +1842,8 @@
{
case DataTypeEnum.dt_bit:
case DataTypeEnum.dt_tinyint:
- sb.Append(" options: [{label: '鏄�',value: 'true'}, {label: '鍚�',value: 'false'}] \n");
+ //sb.Append(" options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}] \n");
+ sb.Append(" options: BOOLEAN_OPTIONS_AddEdit \n");
break;
default:
break;
@@ -1816,11 +1863,11 @@
/// <summary>
- /// 鑾峰彇VUE formOptions瀛楃涓�(楂樼骇鏌ヨ涓殑)
+ /// 鑾峰彇VUE formOptions瀛楃涓�(娣诲姞銆佷慨鏀瑰脊鍑洪〉闈㈢殑)
/// </summary>
/// <param name="columnModelList"></param>
/// <returns></returns>
- public static string GetVueFormOptionsStrForPageAddFormAttributes(List<ColumnModel> columnModelList, GenerateCodeParam param)
+ public static string GetVueFormOptionsStrForPageAddFormAttributes_formItems(List<ColumnModel> columnModelList, GenerateCodeParam param)
{
StringBuilder sb = new StringBuilder();
try
@@ -1845,9 +1892,9 @@
var elment = "input";
switch (enumDT)
{
- case DataTypeEnum.dt_datetime:
- elment = "date-picker";
- break;
+ //case DataTypeEnum.dt_datetime:
+ // elment = "date-picker";
+ // break;
case DataTypeEnum.dt_bit:
case DataTypeEnum.dt_tinyint:
elment = "select";
@@ -1860,16 +1907,36 @@
sb.Append(" prop: '" + low_prop_ColumnName + "', \n");
//娣诲姞绫诲瀷
- switch (enumDT)
+ //switch (enumDT)
+ //{
+ // case DataTypeEnum.dt_datetime:
+ // 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;
+ //}
+ if (enumDT == DataTypeEnum.dt_datetime)
{
- case DataTypeEnum.dt_datetime:
- sb.Append(" type: 'datetimerange', \n");
- break;
- default:
- break;
+ 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");
}
- if (enumDT == DataTypeEnum.dt_decimal)
+ else if (enumDT == DataTypeEnum.dt_decimal)
{
sb.Append(" el: (props: any, { attrs }: SetupContext) => { \n");
sb.Append(" return h(inputNumber, { \n");
@@ -1879,12 +1946,14 @@
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)
@@ -1894,9 +1963,12 @@
{
elment = "select";
sb.Append(" el: '" + elment + "', \n");
+ sb.Append(" clearable:true, \n");
+ sb.Append(" options: [], \n");
+ isWriteInt = false;
}
}
- else
+ if (isWriteInt)
{
sb.Append(" el: (props: any, { attrs }: SetupContext) => { \n");
sb.Append(" return h(inputNumber, { \n");
@@ -1905,7 +1977,7 @@
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");
@@ -1923,15 +1995,34 @@
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:
+ //澧炲姞瀵规灇涓剧被鍨嬬殑鏀寔
+ if (param.EnumList?.Count > 0)
+ {
+ var findEnumObj = param.EnumList.Where(x => x.EnumAttrName == columnModel.ColumnName).FirstOrDefault();
+ if (findEnumObj != null)
+ {
+ sb.Append(" clearable:true, \n");
+ sb.Append(" option: [], \n");
+ }
+ else
+ {
+ //sb.Append(" options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}] \n");
+ sb.Append(" options: BOOLEAN_OPTIONS_AddEdit \n");
+ }
+ }
+ else
+ {
+ //sb.Append(" options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}] \n");
+ sb.Append(" options: BOOLEAN_OPTIONS_AddEdit \n");
+ }
+ break;
+ default:
+ break;
+ }
sb.Append(" }, \n");
}
//鍘绘帀鏈�鍚庝竴涓�,
@@ -1946,7 +2037,7 @@
}
/// <summary>
- /// 鑾峰彇VUE formOptions瀛楃涓�(楂樼骇鏌ヨ涓殑)
+ /// 鏋勫缓 楂樼骇鏌ヨ涓殑form瀛楁
/// </summary>
/// <param name="columnModelList"></param>
/// <returns></returns>
@@ -1962,10 +2053,16 @@
el: 'input',
disabled: disabled,
placeholder: '璇疯緭鍏ョ墿鏂欑紪鐮�',
+ highSelectAttrs:{
+ prop: 'materialCode_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_STRING,
+ }
},
*/
- List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
- foreach (var columnModel in newList)
+ //List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
+ foreach (var columnModel in columnModelList)
{
//棣栧瓧姣嶅皬鍐�
var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
@@ -1973,9 +2070,9 @@
var elment = "input";
switch (enumDT)
{
- case DataTypeEnum.dt_datetime:
- elment = "date-picker";
- break;
+ //case DataTypeEnum.dt_datetime:
+ // elment = "date-picker";
+ // break;
case DataTypeEnum.dt_bit:
case DataTypeEnum.dt_tinyint:
elment = "select";
@@ -1988,16 +2085,35 @@
sb.Append(" prop: '" + low_prop_ColumnName + "', \n");
//娣诲姞绫诲瀷
- switch (enumDT)
- {
- case DataTypeEnum.dt_datetime:
- sb.Append(" type: 'datetimerange', \n");
- break;
- default:
- break;
- }
+ //switch (enumDT)
+ //{
+ // case DataTypeEnum.dt_datetime:
+ // 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");
- if (enumDT == DataTypeEnum.dt_decimal)
+ // sb.Append(" width: '100%',\n");
+ // break;
+ // default:
+ // break;
+ //}
+ if (enumDT == DataTypeEnum.dt_datetime)
+ {
+ 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");
+ }
+ else if (enumDT == DataTypeEnum.dt_decimal)
{
sb.Append(" el: (props: any, { attrs }: SetupContext) => { \n");
sb.Append(" return h(inputNumber, { \n");
@@ -2007,12 +2123,14 @@
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)
@@ -2022,9 +2140,12 @@
{
elment = "select";
sb.Append(" el: '" + elment + "', \n");
+ sb.Append(" clearable:true, \n");
+ sb.Append(" option: [], \n");
+ isWriteInt = false;
}
}
- else
+ if (isWriteInt)
{
sb.Append(" el: (props: any, { attrs }: SetupContext) => { \n");
sb.Append(" return h(inputNumber, { \n");
@@ -2034,6 +2155,7 @@
sb.Append(" }) \n");
sb.Append(" },\n");
+ sb.Append(" width: '100%',\n");
//閰嶇疆绮惧害锛�
sb.Append(" step: 1,\n");
sb.Append(" precision: 0, \n");
@@ -2048,15 +2170,97 @@
sb.Append(" placeholder: '璇疯緭鍏�" + columnModel.Description + "', \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:
+ //澧炲姞瀵规灇涓剧被鍨嬬殑鏀寔
+ if (param.EnumList?.Count > 0)
+ {
+ var findEnumObj = param.EnumList.Where(x => x.EnumAttrName == columnModel.ColumnName).FirstOrDefault();
+ if (findEnumObj != null)
+ {
+ sb.Append(" clearable:true, \n");
+ sb.Append(" option: [], \n");
+ }
+ else
+ {
+ sb.Append(" clearable:true, \n");
+ sb.Append(" options: BOOLEAN_OPTIONS, \n");
+ }
+ }
+ else
+ {
+ sb.Append(" clearable:true, \n");
+ sb.Append(" options: BOOLEAN_OPTIONS, \n");
+ }
+
+ break;
+ default:
+ break;
+ }
+
+ //澶勭悊楂樼骇select鏌ヨ
+ MyDataTypeCategorizeEnum myDataTypeCategorizeEnum = CommonHelper.GetMyDataTypeCategorizeEnum(enumDT);
+ switch (myDataTypeCategorizeEnum)
+ {
+ case MyDataTypeCategorizeEnum.甯冨皵绫�:
+ sb.Append(" highSelectAttrs:{ \n");
+ sb.Append($" prop: '{low_prop_ColumnName}_FilterMode', \n");
+ sb.Append(" el: 'select', \n");
+ sb.Append(" placeholder: '璇烽�夋嫨', \n");
+ sb.Append(" options:FILTER_MODE_OPTIONS_BOOL \n");//bool鏌ヨ
+ sb.Append(" } \n");
+
+ break;
+ case MyDataTypeCategorizeEnum.鏁板瓧绫�:
+ if (param.EnumList?.Count > 0)
+ {
+ var findEnumObj = param.EnumList.Where(x => x.EnumAttrName == columnModel.ColumnName).FirstOrDefault();
+ if (findEnumObj != null)
+ {
+ sb.Append(" highSelectAttrs:{ \n");
+ sb.Append($" prop: '{low_prop_ColumnName}_FilterMode', \n");
+ sb.Append(" el: 'select', \n");
+ sb.Append(" placeholder: '璇烽�夋嫨', \n");
+ sb.Append(" options:FILTER_MODE_OPTIONS_BOOL \n");//bool鏌ヨ
+ sb.Append(" } \n");
+ }
+ else
+ {
+ sb.Append(" highSelectAttrs:{ \n");
+ sb.Append($" prop: '{low_prop_ColumnName}_FilterMode', \n");
+ sb.Append(" el: 'select', \n");
+ sb.Append(" placeholder: '璇烽�夋嫨', \n");
+ sb.Append(" options:FILTER_MODE_OPTIONS_NUM \n");//鏁板瓧绫绘煡璇�
+ sb.Append(" } \n");
+ }
+ }
+ else
+ {
+ sb.Append(" highSelectAttrs:{ \n");
+ sb.Append($" prop: '{low_prop_ColumnName}_FilterMode', \n");
+ sb.Append(" el: 'select', \n");
+ sb.Append(" placeholder: '璇烽�夋嫨', \n");
+ sb.Append(" options:FILTER_MODE_OPTIONS_NUM \n");//鏁板瓧绫绘煡璇�
+ sb.Append(" } \n");
+ }
+
+ break;
+ case MyDataTypeCategorizeEnum.鏃ユ湡绫�:
+ //鏃ユ湡绫� 楂樼骇 select鏌ヨ娌℃湁
+ sb.Append(" isDateControl: true, // 鏄惧紡鏍囪涓烘棩鏈熸帶浠� \n");
+ break;
+ default://鍓╀綑鐨勪竴寰嬭涓烘槸 瀛楃涓�
+ sb.Append(" highSelectAttrs:{ \n");
+ sb.Append($" prop: '{low_prop_ColumnName}_FilterMode', \n");
+ sb.Append(" el: 'select', \n");
+ sb.Append(" placeholder: '璇烽�夋嫨', \n");
+ sb.Append(" options:FILTER_MODE_OPTIONS_STRING \n");//瀛楃涓茬被鏌ヨ
+ sb.Append(" } \n");
+ break;
+ }
+
sb.Append(" }, \n");
}
//鍘绘帀鏈�鍚庝竴涓�,
@@ -2166,8 +2370,7 @@
/*
materialCode: formData.value.materialCode,
*/
- List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
- foreach (var columnModel in newList)
+ foreach (var columnModel in columnModelList)
{
//棣栧瓧姣嶅皬鍐�
var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
@@ -2192,10 +2395,27 @@
/*
materialCode: formData.value.materialCode,
*/
- List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
- foreach (var columnModel in newList)
+ foreach (var columnModel in columnModelList)
{
- 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");
+
+ //娣诲姞select楂樼骇鏌ヨ
+ DataTypeEnum enumDT = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType.ToString());
+ MyDataTypeCategorizeEnum myDataTypeCategorizeEnum = CommonHelper.GetMyDataTypeCategorizeEnum(enumDT);
+ switch (myDataTypeCategorizeEnum)
+ {
+ case MyDataTypeCategorizeEnum.甯冨皵绫�:
+ case MyDataTypeCategorizeEnum.鏁板瓧绫�:
+ default://鍓╀綑鐨勪竴寰嬭涓烘槸 瀛楃涓�
+ sb.Append($"{low_prop_ColumnName}_FilterMode: formData.value.{low_prop_ColumnName}_FilterMode || '', \n");
+ break;
+ case MyDataTypeCategorizeEnum.鏃ユ湡绫�:
+ //鏃ユ湡绫� 楂樼骇 select鏌ヨ娌℃湁
+ break;
+ }
}
//鍘绘帀鏈�鍚庝竴涓�,
var res = sb.ToString();
@@ -2209,7 +2429,86 @@
}
+ public static string Get_LikeQueryAttrs(List<ColumnModel> columnModelList, GenerateCodeParam param)
+ {
+ StringBuilder sb = new StringBuilder();
+ try
+ {
+ /*
+ [妯＄硦鏌ヨ瀛楁]:'TaskCode','MaterialMode', 'ProductCode'
+ */
+ List<ColumnModel> newList = ListHelper.RemoveForPageTableListQueryAttributes(columnModelList);
+ foreach (var columnModel in newList)
+ {
+ //鑾峰彇鏁版嵁绫诲瀷
+ DataTypeEnum enumDT = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType.ToString());
+ switch (enumDT)
+ {
+ case DataTypeEnum.dt_nvarchar:
+ case DataTypeEnum.dt_varchar:
+ case DataTypeEnum.dt_longtext:
+ sb.Append($"'{columnModel.ColumnName}',");
+ break;
+ default:
+ break;
+ }
+ }
+ //鍘绘帀鏈�鍚庝竴涓�,
+ var res = sb.ToString();
+ if (res.Length > 1)
+ {
+ res = res.Substring(0, res.Length - 1);
+ }
+ return res;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+ public static string Get_LikeQueryAttrsName(List<ColumnModel> columnModelList, GenerateCodeParam param)
+ {
+ StringBuilder sb = new StringBuilder();
+ try
+ {
+ /*
+ [妯＄硦鏌ヨ瀛楁鍚峕:璇疯緭鍏ヤ换鍔＄紪鐮�/鍘熸枡鍨嬪彿/浜у搧浠ｇ爜
+ */
+ List<ColumnModel> newList = ListHelper.RemoveForPageTableListQueryAttributes(columnModelList);
+ sb.Append("璇疯緭鍏�");
+ foreach (var columnModel in newList)
+ {
+ //鑾峰彇鏁版嵁绫诲瀷
+ DataTypeEnum enumDT = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType.ToString());
+ switch (enumDT)
+ {
+ case DataTypeEnum.dt_nvarchar:
+ case DataTypeEnum.dt_varchar:
+ case DataTypeEnum.dt_longtext:
+ sb.Append($"{columnModel.Description}/");
+ break;
+ default:
+ break;
+ }
+ }
+ //鍘绘帀鏈�鍚庝竴涓�,
+ var res = sb.ToString();
+ res = res.Substring(0, res.Length - 1);
+ return res;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 椤甸潰琛ㄦ牸鍒楁樉绀�
+ /// </summary>
+ /// <param name="columnModelList"></param>
+ /// <param name="param"></param>
+ /// <returns></returns>
public static string GetVueFormOptionsStr_EntityNameClass_Config_Attrs(List<ColumnModel> columnModelList, GenerateCodeParam param)
{
StringBuilder sb = new StringBuilder();
@@ -2239,6 +2538,22 @@
sb.Append(" field: '" + lowerCaseColumnName + "', \n");
}
sb.Append(" title: '" + columnModel.Description + "', \n");
+ //鑾峰彇鏁版嵁绫诲瀷
+ //璁剧疆瀹藉害
+ DataTypeEnum enumDT = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType.ToString());
+ switch (enumDT)
+ {
+ case DataTypeEnum.dt_datetime:
+ sb.Append(" width:180, \n");
+ break;
+ case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
+ sb.Append(" width:80, \n");
+ break;
+ default:
+ sb.Append(" width:160, \n");
+ break;
+ }
sb.Append("}, \n");
}
//鍘绘帀鏈�鍚庝竴涓�,
@@ -2260,8 +2575,7 @@
/*
materialCode: res.materialCode,
*/
- List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
- foreach (var columnModel in newList)
+ foreach (var columnModel in columnModelList)
{
//棣栧瓧姣嶅皬鍐�
var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
@@ -2286,10 +2600,51 @@
/*
materialCode: res.materialCode,
*/
- List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
- foreach (var columnModel in newList)
+ foreach (var columnModel in columnModelList)
{
- sb.Append($"formData.value.{columnModel.ColumnName} = '' \n");
+ //棣栧瓧姣嶅皬鍐�
+ var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
+ sb.Append($"formData.value.{low_prop_ColumnName} = '' \n");
+ }
+ //鍘绘帀鏈�鍚庝竴涓�,
+ var res = sb.ToString();
+ res = res.Substring(0, res.Length - 1);
+ return res;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ public static string GetVueFormOptionsStrForPageAddFormAttributes_Query_Clear_HighSelect(List<ColumnModel> columnModelList, GenerateCodeParam param)
+ {
+ StringBuilder sb = new StringBuilder();
+ try
+ {
+ /*
+ formData.value.materialCode_FilterMode = 1
+ */
+ foreach (var columnModel in columnModelList)
+ {
+ //棣栧瓧姣嶅皬鍐�
+ var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
+ //娣诲姞select楂樼骇鏌ヨ
+ DataTypeEnum enumDT = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType.ToString());
+ MyDataTypeCategorizeEnum myDataTypeCategorizeEnum = CommonHelper.GetMyDataTypeCategorizeEnum(enumDT);
+ switch (myDataTypeCategorizeEnum)
+ {
+ case MyDataTypeCategorizeEnum.甯冨皵绫�:
+ case MyDataTypeCategorizeEnum.鏁板瓧绫�:
+ sb.Append($"formData.value.{low_prop_ColumnName}_FilterMode = 2 \n");//绮惧噯鏌ヨ
+ break;
+ default://鍓╀綑鐨勪竴寰嬭涓烘槸 瀛楃涓�
+ sb.Append($"formData.value.{low_prop_ColumnName}_FilterMode = 1 \n");//妯＄硦鏌ヨ
+ break;
+ case MyDataTypeCategorizeEnum.鏃ユ湡绫�:
+ //鏃ユ湡绫� 楂樼骇 select鏌ヨ娌℃湁
+ break;
+ }
}
//鍘绘帀鏈�鍚庝竴涓�,
var res = sb.ToString();
@@ -2319,6 +2674,81 @@
var _enumAttrName = CommonHelper.FirstLowercase(item.EnumAttrName);
sb.Append(_enumAttrName + ": [] as Array<{label: string; value: any }>, \n");
}
+ //鍘绘帀鏈�鍚庝竴涓�,
+ var res = sb.ToString();
+ res = res.Substring(0, res.Length - 1);
+ return res;
+ }
+ else
+ {
+ return "";
+ }
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ public static string GetVueFormOptionsStrForPageAdd_QueryTableListForBool(List<ColumnModel> columnModelList, GenerateCodeParam param)
+ {
+ StringBuilder sb = new StringBuilder();
+ try
+ {
+ /*
+
+ isRead: ({ row }: any) => {
+ return (
+ <div>
+ {row.isRead != null ? (row.isRead ? '鏄�' : '鍚�') : '-'}
+ </div>
+ )
+ },
+
+ creationTime: ({ row }: any) => {
+ return (
+ <div>
+ {row.creationTime != null
+ ? dayjs(row.creationTime).format('YYYY-MM-DD HH:mm:ss')
+ : '-'}
+ </div>
+ )
+ },
+
+ */
+
+ foreach (var columnModel in columnModelList)
+ {
+ //灞炴�у皬鍐�
+ var instanceColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
+ //鑾峰彇鏁版嵁绫诲瀷
+ DataTypeEnum enumDT = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType.ToString());
+ switch (enumDT)
+ {
+ case DataTypeEnum.dt_datetime:
+ sb.Append(instanceColumnName + ": ({ row }: any) => { \n");
+ sb.Append(" return ( \n");
+ sb.Append(" <div> \n");
+ sb.Append(" {row." + instanceColumnName + " != null \n");
+ sb.Append(" ? dayjs(row." + instanceColumnName + ").format('YYYY-MM-DD HH:mm:ss') \n");
+ sb.Append(" : '-'} \n");
+ sb.Append(" </div> \n");
+ sb.Append(" ) \n");
+ sb.Append("},\n");
+ break;
+
+ case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
+ sb.Append(instanceColumnName + ": ({ row }: any) => { \n");
+ sb.Append(" return ( \n");
+ sb.Append(" <div> \n");
+ sb.Append(" {row." + instanceColumnName + " != null ? (row." + instanceColumnName + " ? '鏄�' : '鍚�') : '-'} \n");
+ sb.Append(" </div> \n");
+ sb.Append(" ) \n");
+ sb.Append("},\n");
+ break;
+ }
+
}
//鍘绘帀鏈�鍚庝竴涓�,
--
Gitblit v1.9.3