From b7a82bbc4b305f0323be93030842c1b82c824337 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 09 5月 2025 10:06:36 +0800
Subject: [PATCH] 优化查询列

---
 Weben_CMS专用代码生成器/Code/Utility/StructStrHelper.cs |  125 +++++++++++++++++++++++++++++------------
 1 files changed, 87 insertions(+), 38 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 4bc6468..491be99 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"
@@ -1820,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
@@ -1860,24 +1860,36 @@
                     sb.Append("                   prop: '" + low_prop_ColumnName + "', \n");
 
                     //娣诲姞绫诲瀷
-                    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");
+                    //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;
+                    //        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(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");
@@ -1904,6 +1916,7 @@
                             {
                                 elment = "select";
                                 sb.Append("                   el: '" + elment + "', \n");
+                                sb.Append("                   options: [], \n");
                                 isWriteInt = false;
                             }
                         }
@@ -1999,24 +2012,35 @@
                     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(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;
+                    //}
+                    if (enumDT == DataTypeEnum.dt_datetime)
                     {
-                        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("                   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;
+                        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");
@@ -2043,6 +2067,7 @@
                             {
                                 elment = "select";
                                 sb.Append("                   el: '" + elment + "', \n");
+                                sb.Append("                   option: [], \n");
                                 isWriteInt = false;
                             }
                         }
@@ -2215,7 +2240,7 @@
                 /*
                   materialCode: formData.value.materialCode,
                  */
-                List<ColumnModel> newList = ListHelper.RemoveAttrForQueryMode(columnModelList);
+                List<ColumnModel> newList = ListHelper.RemoveForPageTableListQueryAttributes(columnModelList);
                 foreach (var columnModel in newList)
                 {
 
@@ -2237,7 +2262,12 @@
         }
 
 
-
+        /// <summary>
+        /// 椤甸潰琛ㄦ牸鍒楁樉绀�
+        /// </summary>
+        /// <param name="columnModelList"></param>
+        /// <param name="param"></param>
+        /// <returns></returns>
         public static string GetVueFormOptionsStr_EntityNameClass_Config_Attrs(List<ColumnModel> columnModelList, GenerateCodeParam param)
         {
             StringBuilder sb = new StringBuilder();
@@ -2267,6 +2297,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");
                 }
                 //鍘绘帀鏈�鍚庝竴涓�,
@@ -2347,12 +2393,15 @@
                         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;
                 }
-
-                //鍘绘帀鏈�鍚庝竴涓�,
-                var res = sb.ToString();
-                res = res.Substring(0, res.Length - 1);
-                return res;
+                else
+                {
+                    return "";
+                }
             }
             catch (Exception ex)
             {

--
Gitblit v1.9.3