From e7af3ec40c3b99d1cfa3ad43621423719055d523 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 07 5月 2025 11:53:36 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
Weben_CMS专用代码生成器/Code/Utility/StructStrHelper.cs | 16 +++++++---------
1 files changed, 7 insertions(+), 9 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 2424680..16426e3 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"
@@ -2002,15 +2002,7 @@
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");
+ sb.Append(" type: 'datetimerange', \n");
break;
default:
break;
@@ -2218,8 +2210,14 @@
List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
foreach (var columnModel in newList)
{
+<<<<<<< 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();
--
Gitblit v1.9.3