From fbd434b2aaf5e1f7035f3843508c62ea930d2549 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 07 5月 2025 10:47:56 +0800
Subject: [PATCH] 高级查询

---
 Weben_CMS专用代码生成器/Code/Utility/StructStrHelper.cs |   59 +++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 37 insertions(+), 22 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 6b8983f..3b61775 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"
@@ -1863,7 +1863,15 @@
                     switch (enumDT)
                     {
                         case DataTypeEnum.dt_datetime:
-                            sb.Append("                   type: 'datetimerange', \n");
+                            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;
@@ -1879,12 +1887,14 @@
                         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)
@@ -1894,9 +1904,10 @@
                             {
                                 elment = "select";
                                 sb.Append("                   el: '" + elment + "', \n");
+                                isWriteInt = false;
                             }
                         }
-                        else
+                        if(isWriteInt)
                         {
                             sb.Append("                   el: (props: any, { attrs }: SetupContext) => { \n");
                             sb.Append("                     return h(inputNumber, {  \n");
@@ -1905,7 +1916,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");
@@ -1923,15 +1934,15 @@
                         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");
                 }
                 //鍘绘帀鏈�鍚庝竴涓�,
@@ -2007,12 +2018,14 @@
                         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)
@@ -2022,9 +2035,10 @@
                             {
                                 elment = "select";
                                 sb.Append("                   el: '" + elment + "', \n");
+                                isWriteInt = false;
                             }
                         }
-                        else
+                        if (isWriteInt)
                         {
                             sb.Append("                   el: (props: any, { attrs }: SetupContext) => { \n");
                             sb.Append("                     return h(inputNumber, {  \n");
@@ -2034,6 +2048,7 @@
                             sb.Append("                     })  \n");
                             sb.Append("                   },\n");
 
+                            sb.Append("                   width: '100%',\n");
                             //閰嶇疆绮惧害锛�
                             sb.Append("                   step: 1,\n");
                             sb.Append("                   precision: 0, \n");
@@ -2048,15 +2063,15 @@
                     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");
                 }
                 //鍘绘帀鏈�鍚庝竴涓�,

--
Gitblit v1.9.3