HIA24016N_PipeLineDemo.git

			@@ -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;
			@@ -1772,7 +1796,7 @@
			{
			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");
			break;
			default:
			break;
			@@ -1796,7 +1820,7 @@
			/// </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
			@@ -1821,9 +1845,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";
			@@ -1836,16 +1860,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");
			@@ -1855,12 +1899,14 @@
			sb.Append(" }) \n");
			sb.Append(" },\n");

			sb.Append(" width: '100%',\n");
			//éç½®ç²¾åº¦ï¼è¿ééè¦è·åæ°æ®åºä¸çç²¾åº¦ï¼ï¼ï¼TODOï¼
			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)
			@@ -1870,9 +1916,11 @@
			{
			elment = "select";
			sb.Append(" el: '" + elment + "', \n");
			sb.Append(" options: [], \n");
			isWriteInt = false;
			}
			}
			else
			if (isWriteInt)
			{
			sb.Append(" el: (props: any, { attrs }: SetupContext) => { \n");
			sb.Append(" return h(inputNumber, { \n");
			@@ -1881,7 +1929,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");
			@@ -1892,22 +1940,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");
			}
			//å»ææåä¸ä¸ª,
			@@ -1940,8 +1988,8 @@
			placeholder: 'è¯·è¾å¥ç©æç¼ç ',
			},
			*/
			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);
			@@ -1949,9 +1997,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";
			@@ -1964,16 +2012,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");
			@@ -1983,12 +2050,14 @@
			sb.Append(" }) \n");
			sb.Append(" },\n");

			sb.Append(" width: '100%',\n");
			//éç½®ç²¾åº¦ï¼è¿ééè¦è·åæ°æ®åºä¸çç²¾åº¦ï¼ï¼ï¼TODOï¼
			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)
			@@ -1998,9 +2067,11 @@
			{
			elment = "select";
			sb.Append(" el: '" + elment + "', \n");
			sb.Append(" option: [], \n");
			isWriteInt = false;
			}
			}
			else
			if (isWriteInt)
			{
			sb.Append(" el: (props: any, { attrs }: SetupContext) => { \n");
			sb.Append(" return h(inputNumber, { \n");
			@@ -2010,6 +2081,7 @@
			sb.Append(" }) \n");
			sb.Append(" },\n");

			sb.Append(" width: '100%',\n");
			//éç½®ç²¾åº¦ï¼
			sb.Append(" step: 1,\n");
			sb.Append(" precision: 0, \n");
			@@ -2020,19 +2092,19 @@
			sb.Append(" el: '" + elment + "', \n");
			}

			sb.Append(" disabled: disabled, \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;
			//}
			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");
			}
			//å»ææåä¸ä¸ª,
			@@ -2145,7 +2217,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,10 +2240,15 @@
			/*
			materialCode: formData.value.materialCode,
			*/
			List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
			List<ColumnModel> newList = ListHelper.RemoveAttrForQueryMode(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();
			@@ -2213,6 +2292,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");
			}
			//å»ææåä¸ä¸ª,
			@@ -2237,7 +2332,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();
			@@ -2291,6 +2388,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;
			}

			}

			//å»ææåä¸ä¸ª,