From 3b6f6123a7f7e80dfca43e85edd614a925d684a2 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 09 5月 2025 09:12:54 +0800
Subject: [PATCH] 222
---
Weben_CMS专用代码生成器/Code/Utility/StructStrHelper.cs | 1057 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 1,044 insertions(+), 13 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 dea907b..c1a638d 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"
@@ -1,8 +1,11 @@
-锘縰sing System;
+锘縰sing GenerateCode_WeiBen_WMS.Const;
+using GenerateCode_WeiBen_WMS.Model;
+using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Data.SqlClient;
+using System.Linq;
using System.Text;
namespace GenerateCode_GEBrilliantFactory
@@ -82,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() != "")
{
@@ -197,6 +200,7 @@
attrStr += " public float" + str_NullFlag + attr + " { get; set; }\n";
break;
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
if (columnModel.IsNullable) { str_NullFlag = "? "; }
attrStr += " public bool" + str_NullFlag + attr + " { get; set; }\n";
break;
@@ -216,7 +220,328 @@
/// </summary>
/// <param name="columnModel"></param>
/// <returns></returns>
- public static string GenerateAttributeForAddModel(ColumnModel columnModel)
+ public static string GenerateAttributeForAddModel(ColumnModel columnModel, GenerateCodeParam param)
+ {
+ try
+ {
+ string attr = columnModel.ColumnName;
+ //if (attr.ToUpper() == "DBId".ToUpper())
+ //{
+ // var bb = "";
+ //}
+ string str_NullFlag = " ";
+ if (columnModel.IsNullable) { str_NullFlag = "? "; }
+
+ string attrStr = "";
+ attrStr += " /// <summary>\n";
+ attrStr += " /// " + columnModel.Description + "\n";
+ attrStr += " /// </summary>\n";
+
+ DataTypeEnum myDataType = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType);
+ switch (myDataType)
+ {
+ case DataTypeEnum.dt_datetime:
+ case DataTypeEnum.dt_datetime2:
+ case DataTypeEnum.dt_datetimeoffset:
+ attrStr += " public DateTime" + str_NullFlag + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ break;
+ case DataTypeEnum.dt_bigint:
+ if (columnModel.IsNullable) { str_NullFlag = "? "; }
+ attrStr += " public long" + str_NullFlag + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ break;
+ case DataTypeEnum.dt_decimal:
+ if (columnModel.IsNullable) { str_NullFlag = "? "; }
+ attrStr += " public decimal" + str_NullFlag + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ break;
+ case DataTypeEnum.dt_tinyint:
+ case DataTypeEnum.dt_bit:
+ if (columnModel.IsNullable) { str_NullFlag = "? "; }
+ 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";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ }
+ else
+ {
+ attrStr += " public int" + str_NullFlag + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ }
+ break;
+ default:
+ attrStr += " public string" + str_NullFlag + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ break;
+ }
+
+ return attrStr;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+
+ }
+
+ /// <summary>
+ /// 鐢熸垚灞炴�у瓧绗︿覆ForAddModel-鏇存柊瀹炰綋涓撶敤
+ /// </summary>
+ /// <param name="columnModel"></param>
+ /// <returns></returns>
+ public static string GenerateAttributeForUpdateModel(ColumnModel columnModel, GenerateCodeParam param)
+ {
+ try
+ {
+ string attr = columnModel.ColumnName;
+
+ 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;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+
+ }
+
+ /// <summary>
+ /// 鐢熸垚灞炴�у瓧绗︿覆ForAddModel-鏇存柊瀹炰綋涓撶敤(瀵煎叆鏃�)
+ /// </summary>
+ /// <param name="columnModel"></param>
+ /// <returns></returns>
+ public static string GenerateAttributeForUpdateModelByImport(ColumnModel columnModel, GenerateCodeParam param)
+ {
+ try
+ {
+ string attr = columnModel.ColumnName;
+
+ string attrStr = "";
+ attrStr += $" {attr} = {param.EntityInstanceName}.{attr},\n";
+
+
+ return attrStr;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+
+ }
+
+ /// <summary>
+ /// 鐢熸垚灞炴�у瓧绗︿覆ForAddModel-CheckCreateOrUpdateDtoAsync涓撶敤
+ /// </summary>
+ /// <param name="columnModel"></param>
+ /// <returns></returns>
+ public static string GenerateAttributeForCheckCreateOrUpdateDtoAsync(ColumnModel columnModel, GenerateCodeParam param)
+ {
+ try
+ {
+ string attr = columnModel.ColumnName;
+
+ string attrStr = "";
+ bool isHaveMaxLength = false;
+ if (!string.IsNullOrEmpty(columnModel.DataLength))
+ {
+ isHaveMaxLength = true;
+ }
+ if (columnModel.IsNullable == false)
+ {//蹇呭～
+ DataTypeEnum myDataType = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType);
+ switch (myDataType)
+ {
+ case DataTypeEnum.dt_datetime:
+ case DataTypeEnum.dt_datetime2:
+ case DataTypeEnum.dt_datetimeoffset:
+ if (isHaveMaxLength)
+ {
+ attrStr += $" Check.NotNull(input.{attr}, \"{columnModel.Description}\", {columnModel.DataLength});\n";
+ }
+ else
+ {
+ attrStr += $" Check.NotNull(input.{attr}, \"{columnModel.Description}\");\n";
+ }
+ break;
+ case DataTypeEnum.dt_bigint:
+ case DataTypeEnum.dt_decimal:
+ case DataTypeEnum.dt_tinyint:
+ case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_int:
+ if (isHaveMaxLength)
+ {
+ attrStr += $" Check.NotNull(input.{attr}, \"{columnModel.Description}\", {columnModel.DataLength});\n";
+ }
+ else
+ {
+ attrStr += $" Check.NotNull(input.{attr}, \"{columnModel.Description}\");\n";
+ }
+ break;
+ default:
+ if (isHaveMaxLength)
+ {
+ attrStr += $" Check.NotNullOrWhiteSpace(input.{attr}, \"{columnModel.Description}\", {columnModel.DataLength});\n";
+ }
+ else
+ {
+ attrStr += $" Check.NotNullOrWhiteSpace(input.{attr}, \"{columnModel.Description}\");\n";
+ }
+ break;
+ }
+ }
+ return attrStr;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+
+ }
+
+ /// <summary>
+ /// 鐢熸垚灞炴�у瓧绗︿覆ForAddModel-Dto瀹炰綋涓撶敤
+ /// </summary>
+ /// <param name="columnModel"></param>
+ /// <returns></returns>
+ public static string GenerateAttributeForDto(ColumnModel columnModel, GenerateCodeParam param)
+ {
+ try
+ {
+ string attr = columnModel.ColumnName;
+ //if (attr.ToUpper() == "DBId".ToUpper())
+ //{
+ // var bb = "";
+ //}
+ string str_NullFlag = " ";
+ if (columnModel.IsNullable) { str_NullFlag = "? "; }
+
+ string attrStr = "";
+ attrStr += " /// <summary>\n";
+ attrStr += " /// " + columnModel.Description + "\n";
+ attrStr += " /// </summary>\n";
+
+ DataTypeEnum myDataType = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType);
+ switch (myDataType)
+ {
+ case DataTypeEnum.dt_datetime:
+ case DataTypeEnum.dt_datetime2:
+ case DataTypeEnum.dt_datetimeoffset:
+ attrStr += " public DateTime" + str_NullFlag + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ break;
+ case DataTypeEnum.dt_bigint:
+ if (columnModel.IsNullable) { str_NullFlag = "? "; }
+ attrStr += " public long" + str_NullFlag + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ break;
+ case DataTypeEnum.dt_decimal:
+ if (columnModel.IsNullable) { str_NullFlag = "? "; }
+ attrStr += " public decimal" + str_NullFlag + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ break;
+ case DataTypeEnum.dt_tinyint:
+ case DataTypeEnum.dt_bit:
+ if (columnModel.IsNullable) { str_NullFlag = "? "; }
+ 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";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ }
+ else
+ {
+ attrStr += " public int" + str_NullFlag + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ }
+
+ break;
+ default:
+ //鐗规畩澶勭悊 瀛楁 ExtraProperties
+ if (columnModel.ColumnName.ToUpper() == SystemConst.pro_ExtraProperties.ToUpper())
+ {
+ attrStr += " public ExtraPropertyDictionary" + str_NullFlag + attr + " { get; set; }\n";
+ }
+ else
+ {
+ attrStr += " public string" + str_NullFlag + attr + " { get; set; }\n";
+ }
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ break;
+ }
+
+ //澧炲姞瀵规灇涓剧被鍨嬬殑鏀寔
+ if (param.EnumList?.Count > 0)
+ {
+ var findEnumObj = param.EnumList.Where(x => x.EnumAttrName == attr).FirstOrDefault();
+ if (findEnumObj != null)
+ {
+ attrStr += " /// <summary>\n";
+ attrStr += " /// " + columnModel.Description + "\n";
+ attrStr += " /// </summary>\n";
+ attrStr += " public string" + str_NullFlag + findEnumObj.EnumTypeDesc + "\n";
+ attrStr += " { \n";
+ attrStr += " get \n";
+ attrStr += " { \n";
+ attrStr += $" return GetEnumDescriptionUtil.GetEnumDescription({findEnumObj.EnumAttrName}); \n";
+ attrStr += " } \n";
+ attrStr += " } \n";
+ }
+ }
+
+ return attrStr;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+
+ }
+
+ /// <summary>
+ /// 鐢熸垚灞炴�у瓧绗︿覆ForAddModel-Export瀹炰綋涓撶敤
+ /// </summary>
+ /// <param name="columnModel"></param>
+ /// <returns></returns>
+ public static string GenerateAttributeForExport(ColumnModel columnModel, GenerateCodeParam param)
{
try
{
@@ -231,6 +556,7 @@
attrStr += " /// <summary>\n";
attrStr += " /// " + columnModel.Description + "\n";
attrStr += " /// </summary>\n";
+ attrStr += $" [ExcelColumn(Name = \"{columnModel.Description}\", Width = 25)]\n";
DataTypeEnum myDataType = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType);
switch (myDataType)
@@ -238,9 +564,7 @@
case DataTypeEnum.dt_datetime:
case DataTypeEnum.dt_datetime2:
case DataTypeEnum.dt_datetimeoffset:
- attrStr += " //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规�n";
- attrStr += " [HighSearchRangeAttribute]\n";
- attrStr += " public List<string>" + str_NullFlag + attr + " { get; set; }\n";
+ attrStr += " public DateTime" + str_NullFlag + attr + " { get; set; }\n";
attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
break;
case DataTypeEnum.dt_bigint:
@@ -248,16 +572,39 @@
attrStr += " public long" + str_NullFlag + attr + " { get; set; }\n";
attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
break;
+ case DataTypeEnum.dt_decimal:
+ if (columnModel.IsNullable) { str_NullFlag = "? "; }
+ attrStr += " public decimal" + str_NullFlag + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ break;
+ case DataTypeEnum.dt_tinyint:
+ case DataTypeEnum.dt_bit:
+ if (columnModel.IsNullable) { str_NullFlag = "? "; }
+ attrStr += " public bool" + str_NullFlag + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ break;
case DataTypeEnum.dt_int:
if (columnModel.IsNullable) { str_NullFlag = "? "; }
- attrStr += " public int" + str_NullFlag + attr + " { get; set; }\n";
- attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ var findEnumObj = param.EnumList.Where(x => x.EnumAttrName == attr).FirstOrDefault();
+ if (findEnumObj != null)
+ {
+ attrStr += $" public {findEnumObj.EnumType}" + str_NullFlag + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ }
+ else
+ {
+ attrStr += " public int" + str_NullFlag + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ }
+
break;
default:
attrStr += " public string" + str_NullFlag + attr + " { get; set; }\n";
attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
break;
}
+
+
return attrStr;
}
@@ -311,10 +658,15 @@
attrStr += " public long" + str_NullFlag + emptyStr + attr + " { get; set; }\n";
attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
break;
+ case DataTypeEnum.dt_decimal:
+ attrStr += " public decimal" + str_NullFlag + emptyStr + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ break;
case DataTypeEnum.dt_int:
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";//鏈�鍚庢槸鍔犱竴涓┖鏍�
@@ -364,6 +716,7 @@
case DataTypeEnum.dt_datetimeoffset:
return "\n";
case DataTypeEnum.dt_bigint:
+ case DataTypeEnum.dt_decimal:
case DataTypeEnum.dt_int:
case DataTypeEnum.dt_tinyint:
attrStr += " public SearchFilterModeEnum " + attr + highSearchModeSuffix + " { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;\n";
@@ -469,6 +822,7 @@
defaultValue = "getdate()";
break;
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
defaultValue = "0";
break;
default:
@@ -527,12 +881,13 @@
case DataTypeEnum.dt_datetime2:
case DataTypeEnum.dt_datetimeoffset:
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
sql.Append("@" + attrColumnName + " " + columnModel.DataType + " " + fuhao + "\n");
break;
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;
@@ -588,12 +943,13 @@
case DataTypeEnum.dt_datetime2:
case DataTypeEnum.dt_datetimeoffset:
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
sql.Append("@" + attrColumnName + " " + columnModel.DataType + " " + fuhao + "\n");
break;
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;
@@ -648,12 +1004,13 @@
case DataTypeEnum.dt_datetime2:
case DataTypeEnum.dt_datetimeoffset:
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
sql.Append("@" + attrColumnName + " " + columnModel.DataType + " " + fuhao);
break;
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;
@@ -773,6 +1130,7 @@
case DataTypeEnum.dt_datetime2:
case DataTypeEnum.dt_datetimeoffset:
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
updateSql = " " + attrColumnName + "= case @" + attrColumnName + " when NULL then " + attrColumnName + " else @" + attrColumnName + " end ";
break;
default:
@@ -934,6 +1292,7 @@
str += "SqlDbType.Float," + columnModel.DataLength.ToString();
break;
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
str += "SqlDbType.Bit," + columnModel.DataLength.ToString();
break;
}
@@ -1004,6 +1363,7 @@
sb.Append("} \n");
break;
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
sb.Append("if (dataRow[\"" + columnModel.ColumnName.ToString() + "\"].ToString() != \"\") \n");
sb.Append("{ \n");
@@ -1254,6 +1614,7 @@
sb.Append(" </el-table-column> \n");
break;
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
sb.Append(" <el-table-column prop=\"" + columnModel.ColumnName + "\" label=\"" + columnModel.Description + "\" align=\"center\" > \n");
sb.Append("<template slot-scope=\"scope\">");
sb.Append("<el-tag :type=\"scope.row." + columnModel.ColumnName + " ? 'danger' : 'success'\"");
@@ -1301,6 +1662,7 @@
switch (enumDT)
{
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
sb.Append(" <el-switch v-model=\"addForm." + columnModel.ColumnName + "\"></el-switch> \n");
break;
case DataTypeEnum.dt_datetime:
@@ -1348,6 +1710,7 @@
switch (enumDT)
{
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
sb.Append(" <el-switch v-model=\"viewDetailForm." + columnModel.ColumnName + "\"></el-switch> \n");
break;
case DataTypeEnum.dt_datetime:
@@ -1397,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)
@@ -1405,6 +1770,7 @@
elment = "el-date-picker";
break;
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
elment = "el-select";
break;
default:
@@ -1412,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)
@@ -1429,7 +1795,8 @@
switch (enumDT)
{
case DataTypeEnum.dt_bit:
- sb.Append(" options: [{label: '鏄�',value: 'true'}, {label: '鍚�',value: 'false'}] \n");
+ case DataTypeEnum.dt_tinyint:
+ sb.Append(" options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}] \n");
break;
default:
break;
@@ -1447,6 +1814,667 @@
}
}
+
+ /// <summary>
+ /// 鑾峰彇VUE formOptions瀛楃涓�(楂樼骇鏌ヨ涓殑)
+ /// </summary>
+ /// <param name="columnModelList"></param>
+ /// <returns></returns>
+ public static string GetVueFormOptionsStrForPageAddFormAttributes_formItems(List<ColumnModel> columnModelList, GenerateCodeParam param)
+ {
+ StringBuilder sb = new StringBuilder();
+ try
+ {
+ /*
+ {
+ label: '鐗╂枡缂栫爜',
+ prop: 'materialCode',
+ 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)
+ {
+ //case DataTypeEnum.dt_datetime:
+ // elment = "date-picker";
+ // break;
+ case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
+ elment = "select";
+ break;
+ default:
+ break;
+ }
+ sb.Append(" { \n");
+ sb.Append(" label: '" + columnModel.Description + "', \n");
+ sb.Append(" prop: '" + low_prop_ColumnName + "', \n");
+
+ //娣诲姞绫诲瀷
+ //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)
+ {
+ 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");
+ }
+
+ else 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(" }) \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)
+ {
+ var findEnumObj = param.EnumList.Where(x => x.EnumAttrName == columnModel.ColumnName).FirstOrDefault();
+ if (findEnumObj != null)
+ {
+ elment = "select";
+ sb.Append(" el: '" + elment + "', \n");
+ sb.Append(" options: [], \n");
+ isWriteInt = false;
+ }
+ }
+ 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(" }) \n");
+ sb.Append(" },\n");
+ sb.Append(" width: '100%',\n");
+ //閰嶇疆绮惧害锛�
+ sb.Append(" step: 1,\n");
+ sb.Append(" precision: 0, \n");
+ }
+ }
+ else
+ {
+ sb.Append(" el: '" + elment + "', \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;
+ }
+ sb.Append(" }, \n");
+ }
+ //鍘绘帀鏈�鍚庝竴涓�,
+ var res = sb.ToString();
+ res = res.Substring(0, res.Length - 1);
+ return res;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇VUE formOptions瀛楃涓�(楂樼骇鏌ヨ涓殑)
+ /// </summary>
+ /// <param name="columnModelList"></param>
+ /// <returns></returns>
+ public static string GetVueFormOptionsStrForPageAddFormAttributes_Query(List<ColumnModel> columnModelList, GenerateCodeParam param)
+ {
+ StringBuilder sb = new StringBuilder();
+ try
+ {
+ /*
+ {
+ label: '鐗╂枡缂栫爜',
+ prop: 'materialCode',
+ el: 'input',
+ disabled: disabled,
+ placeholder: '璇疯緭鍏ョ墿鏂欑紪鐮�',
+ },
+ */
+ //List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
+ foreach (var columnModel in columnModelList)
+ {
+ //棣栧瓧姣嶅皬鍐�
+ var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
+ DataTypeEnum enumDT = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType.ToString());
+ var elment = "input";
+ switch (enumDT)
+ {
+ //case DataTypeEnum.dt_datetime:
+ // elment = "date-picker";
+ // break;
+ case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
+ elment = "select";
+ break;
+ default:
+ break;
+ }
+ sb.Append(" { \n");
+ sb.Append(" label: '" + columnModel.Description + "', \n");
+ sb.Append(" prop: '" + low_prop_ColumnName + "', \n");
+
+ //娣诲姞绫诲瀷
+ //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");
+
+ // 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");
+ 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)
+ {
+ var findEnumObj = param.EnumList.Where(x => x.EnumAttrName == columnModel.ColumnName).FirstOrDefault();
+ if (findEnumObj != null)
+ {
+ elment = "select";
+ sb.Append(" el: '" + elment + "', \n");
+ sb.Append(" option: [], \n");
+ isWriteInt = false;
+ }
+ }
+ 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(" }) \n");
+ sb.Append(" },\n");
+
+ sb.Append(" width: '100%',\n");
+ //閰嶇疆绮惧害锛�
+ sb.Append(" step: 1,\n");
+ sb.Append(" precision: 0, \n");
+ }
+ }
+ else
+ {
+ sb.Append(" el: '" + elment + "', \n");
+ }
+
+ sb.Append(" //disabled: disabled, \n");
+ 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;
+ }
+ sb.Append(" }, \n");
+ }
+ //鍘绘帀鏈�鍚庝竴涓�,
+ var res = sb.ToString();
+ res = res.Substring(0, res.Length - 1);
+ return res;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇VUE formOptions瀛楃涓�(楂樼骇鏌ヨ涓殑)
+ /// </summary>
+ /// <param name="columnModelList"></param>
+ /// <returns></returns>
+ public static string GetVueFormOptionsStrForCommonQueryEnumForFrom(List<ColumnModel> columnModelList, GenerateCodeParam param)
+ {
+ StringBuilder sb = new StringBuilder();
+ try
+ {
+ /*
+ const yesOrNoTypeEnum = await wmsMaterialDrawer.getWmsEnumData({
+ EnumName: 'YesNoEnum',
+ })
+ updateFormItemOptions('isMainBranch', yesOrNoTypeEnum)
+
+ */
+ if (param.EnumList?.Count > 0)
+ {
+ foreach (var item in param.EnumList)
+ {
+ //灞炴�у皬鍐�
+ var instanceName = CommonHelper.FirstLowercase(item.EnumType);
+ var _enumAttrName = CommonHelper.FirstLowercase(item.EnumAttrName);
+ sb.Append("const " + instanceName + "Enum = await " + param.PageMenuInstanceName + "Drawer.getWmsEnumData({ \n");
+ sb.Append(" EnumName: '" + item.EnumType + "', \n");
+ sb.Append("}) \n");
+ sb.Append("updateFormItemOptions('" + _enumAttrName + "', " + instanceName + "Enum) \n");
+ }
+ }
+ var res = sb.ToString();
+ return res;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+
+ public static string GetVueFormOptionsStr_EntityNameClass_fetchEnumData(List<ColumnModel> columnModelList, GenerateCodeParam param)
+ {
+ StringBuilder sb = new StringBuilder();
+ try
+ {
+ /*
+
+ // 鑾峰彇鐗╂枡绫诲瀷鏋氫妇
+ const materialTypeData = await getWmsEnumData({
+ EnumName: 'MaterialTypeEnum',
+ })
+ enumOptions.materialType = materialTypeData.map((item) => ({
+ label: item.description,
+ value: item.value,
+ }))
+
+ */
+ if (param.EnumList?.Count > 0)
+ {
+ foreach (var item in param.EnumList)
+ {
+ //灞炴�у皬鍐�
+ var instanceName = CommonHelper.FirstLowercase(item.EnumType);
+ var _enumAttrName = CommonHelper.FirstLowercase(item.EnumAttrName);
+ sb.Append("const " + instanceName + "Data = await getWmsEnumData({ \n");
+ sb.Append(" EnumName: '" + item.EnumType + "', \n");
+ sb.Append("}) \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");
+ }
+ }
+ var res = sb.ToString();
+ return res;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇VUE formOptions瀛楃涓�(楂樼骇鏌ヨ涓殑)
+ /// </summary>
+ /// <param name="columnModelList"></param>
+ /// <returns></returns>
+ public static string GetVueFormOptionsStrForSave_PageAddFormAttributes(List<ColumnModel> columnModelList, GenerateCodeParam param)
+ {
+ StringBuilder sb = new StringBuilder();
+ try
+ {
+ /*
+ materialCode: formData.value.materialCode,
+ */
+ List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
+ foreach (var columnModel in newList)
+ {
+ //棣栧瓧姣嶅皬鍐�
+ var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
+ sb.Append($"{low_prop_ColumnName}: 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 GetVueFormOptionsStrForSave_PageAddFormAttributes_Query(List<ColumnModel> columnModelList, GenerateCodeParam param)
+ {
+ StringBuilder sb = new StringBuilder();
+ try
+ {
+ /*
+ materialCode: formData.value.materialCode,
+ */
+ List<ColumnModel> newList = ListHelper.RemoveAttrForQueryMode(columnModelList);
+ foreach (var columnModel in newList)
+ {
+
+ //棣栧瓧姣嶅皬鍐�
+ var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
+ sb.Append($"{low_prop_ColumnName}: 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 GetVueFormOptionsStr_EntityNameClass_Config_Attrs(List<ColumnModel> columnModelList, GenerateCodeParam param)
+ {
+ StringBuilder sb = new StringBuilder();
+ try
+ {
+ /*
+
+ {
+ field: 'materialCode',
+ title: '鐗╂枡缂栫爜',
+ },
+
+ */
+ List<ColumnModel> newList = ListHelper.RemoveForPageTableListQueryAttributes(columnModelList);
+ 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: '" + lowerCaseColumnName + "Desc', \n");
+ }
+ else
+ {
+ 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");
+ }
+ //鍘绘帀鏈�鍚庝竴涓�,
+ var res = sb.ToString();
+ res = res.Substring(0, res.Length - 1);
+ return res;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ public static string GetVueFormOptionsStrForPageAddFormAttributesByOpen(List<ColumnModel> columnModelList, GenerateCodeParam param)
+ {
+ StringBuilder sb = new StringBuilder();
+ try
+ {
+ /*
+ materialCode: res.materialCode,
+ */
+ List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
+ foreach (var columnModel in newList)
+ {
+ //棣栧瓧姣嶅皬鍐�
+ var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
+ sb.Append($"{low_prop_ColumnName}: res.{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(List<ColumnModel> columnModelList, GenerateCodeParam param)
+ {
+ StringBuilder sb = new StringBuilder();
+ try
+ {
+ /*
+ materialCode: res.materialCode,
+ */
+ List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
+ foreach (var columnModel in newList)
+ {
+ sb.Append($"formData.value.{columnModel.ColumnName} = '' \n");
+ }
+ //鍘绘帀鏈�鍚庝竴涓�,
+ var res = sb.ToString();
+ res = res.Substring(0, res.Length - 1);
+ return res;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ public static string GetVueFormOptionsStrForPageAdd_EntityNameClass_enumOptions(List<ColumnModel> columnModelList, GenerateCodeParam param)
+ {
+ StringBuilder sb = new StringBuilder();
+ try
+ {
+ /*
+ isMainBranch: [] as Array<{ label: string; value: any }>,
+ */
+ if (param.EnumList?.Count > 0)
+ {
+ foreach (var item in param.EnumList)
+ {
+ //灞炴�у皬鍐�
+ var instanceName = CommonHelper.FirstLowercase(item.EnumType);
+ 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;
+ }
+
+ }
+
+ //鍘绘帀鏈�鍚庝竴涓�,
+ var res = sb.ToString();
+ res = res.Substring(0, res.Length - 1);
+ return res;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
/// <summary>
/// 鑾峰彇VUE 瀵煎嚭鏁扮粍瀛楃涓�-姹夊瓧+灞炴��
@@ -1541,6 +2569,7 @@
sb.Append("<el-input v-model=\"serachObj." + columnModel.ColumnName + "\" placeholder=\"璇疯緭鍏�" + columnModel.Description + "\"></el-input> \n");
break;
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
sb.Append("<el-checkbox-group v-model=\"ck_delflag\" @change=\"ckDelFlag\">\n");
sb.Append(" <el-checkbox-button label=\"鍚敤\" name=\"ck_delflag\"></el-checkbox-button>\n");
sb.Append(" <el-checkbox-button label=\"绂佺敤\" name=\"ck_delflag\"></el-checkbox-button>\n");
@@ -1586,6 +2615,7 @@
switch (enumDT)
{
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
case DataTypeEnum.dt_datetime:
case DataTypeEnum.dt_datetime2:
case DataTypeEnum.dt_datetimeoffset:
@@ -1651,6 +2681,7 @@
sb.Append(" } \n");
break;
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
sb.Append(" if (!string.IsNullOrEmpty(queryModel." + columnModel.ColumnName + ")) \n");
sb.Append(" { \n");
sb.Append(" strWhere += \" AND $TableAlias$." + columnModel.ColumnName + " = '\" + queryModel." + columnModel.ColumnName + " + \"'\"; \n");
--
Gitblit v1.9.3