From 2cc966a2bb5bc2397a7188139334c8d7ccaee222 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 07 5月 2025 12:05:30 +0800
Subject: [PATCH] 测试

---
 Weben_CMS专用代码生成器/Code/Utility/StructStrHelper.cs |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 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 7b0f634..bcb9e86 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,7 +2002,15 @@
                     switch (enumDT)
                     {
                         case DataTypeEnum.dt_datetime:
-                            sb.Append("                   type: 'datetimerange', \n");
+                            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;
@@ -2210,9 +2218,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