From f63d5e9591f8ade8fa7ccb4523d27ff26be81feb Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 07 5月 2025 14:10:14 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
Weben_CMS专用代码生成器/Code/Utility/StructStrHelper.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 0a686b2..38bacb6 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"
@@ -1975,8 +1975,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);
@@ -1984,9 +1984,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";
@@ -2215,13 +2215,13 @@
/*
materialCode: formData.value.materialCode,
*/
- List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
+ 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");
+ sb.Append($"{low_prop_ColumnName}: formData.value.{low_prop_ColumnName} || '', \n");
}
--
Gitblit v1.9.3