From 02e4293d7baa69c961730191ec3eef22c96bee84 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 13 5月 2025 12:55:35 +0800
Subject: [PATCH] 第一版

---
 Weben_CMS专用代码生成器/Code/Utility/StructStrHelper.cs |  141 +++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 131 insertions(+), 10 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 ca814b3..28c365f 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"
@@ -681,7 +681,7 @@
                     case DataTypeEnum.dt_datetimeoffset:
                         attrStr += "        //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规�n";
                         attrStr += "        [HighSearchRangeAttribute]\n";
-                        attrStr += "        public List<string>" + emptyStr + attr + " { get; set; }\n";
+                        attrStr += "        public string" + emptyStr + attr + " { get; set; }\n";
                         attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
                         break;
                     case DataTypeEnum.dt_bigint:
@@ -2034,7 +2034,7 @@
         }
 
         /// <summary>
-        /// 鑾峰彇VUE formOptions瀛楃涓�(楂樼骇鏌ヨ涓殑)
+        /// 鏋勫缓 楂樼骇鏌ヨ涓殑form瀛楁 
         /// </summary>
         /// <param name="columnModelList"></param>
         /// <returns></returns>
@@ -2050,6 +2050,12 @@
       el: 'input',
       disabled: disabled,
       placeholder: '璇疯緭鍏ョ墿鏂欑紪鐮�',
+                 highSelectAttrs:{
+                     prop: 'materialCode_FilterMode',
+                     el: 'select', 
+                     placeholder: '璇烽�夋嫨', 
+                     options:FILTER_MODE_OPTIONS_STRING,
+                   }
     },
                  */
                 //List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
@@ -2176,18 +2182,82 @@
                                 }
                                 else
                                 {
-                                    sb.Append("                 options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}] \n");
+                                    sb.Append("                   clearable:true, \n");
+                                    sb.Append("                 options: BOOLEAN_OPTIONS, \n");
                                 }
                             }
                             else
                             {
-                                sb.Append("                 options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}] \n");
+                                sb.Append("                   clearable:true, \n");
+                                sb.Append("                 options: BOOLEAN_OPTIONS, \n");
                             }
-                            
+
                             break;
                         default:
                             break;
                     }
+
+                    //澶勭悊楂樼骇select鏌ヨ 
+                    MyDataTypeCategorizeEnum myDataTypeCategorizeEnum = CommonHelper.GetMyDataTypeCategorizeEnum(enumDT);
+                    switch (myDataTypeCategorizeEnum)
+                    {
+                        case MyDataTypeCategorizeEnum.甯冨皵绫�:
+                            sb.Append("                   highSelectAttrs:{ \n");
+                            sb.Append($"                     prop: '{low_prop_ColumnName}_FilterMode', \n");
+                            sb.Append("                     el: 'select',  \n");
+                            sb.Append("                     placeholder: '璇烽�夋嫨',  \n");
+                            sb.Append("                     options:FILTER_MODE_OPTIONS_BOOL \n");//bool鏌ヨ
+                            sb.Append("                   } \n");
+
+                            break;
+                        case MyDataTypeCategorizeEnum.鏁板瓧绫�:
+                            if (param.EnumList?.Count > 0)
+                            {
+                                var findEnumObj = param.EnumList.Where(x => x.EnumAttrName == columnModel.ColumnName).FirstOrDefault();
+                                if (findEnumObj != null)
+                                {
+                                    sb.Append("                   highSelectAttrs:{ \n");
+                                    sb.Append($"                     prop: '{low_prop_ColumnName}_FilterMode', \n");
+                                    sb.Append("                     el: 'select',  \n");
+                                    sb.Append("                     placeholder: '璇烽�夋嫨',  \n");
+                                    sb.Append("                     options:FILTER_MODE_OPTIONS_BOOL \n");//bool鏌ヨ
+                                    sb.Append("                   } \n");
+                                }
+                                else
+                                {
+                                    sb.Append("                   highSelectAttrs:{ \n");
+                                    sb.Append($"                     prop: '{low_prop_ColumnName}_FilterMode', \n");
+                                    sb.Append("                     el: 'select',  \n");
+                                    sb.Append("                     placeholder: '璇烽�夋嫨',  \n");
+                                    sb.Append("                     options:FILTER_MODE_OPTIONS_NUM \n");//鏁板瓧绫绘煡璇�
+                                    sb.Append("                   } \n");
+                                }
+                            }
+                            else
+                            {
+                                sb.Append("                   highSelectAttrs:{ \n");
+                                sb.Append($"                     prop: '{low_prop_ColumnName}_FilterMode', \n");
+                                sb.Append("                     el: 'select',  \n");
+                                sb.Append("                     placeholder: '璇烽�夋嫨',  \n");
+                                sb.Append("                     options:FILTER_MODE_OPTIONS_NUM \n");//鏁板瓧绫绘煡璇�
+                                sb.Append("                   } \n");
+                            }
+                           
+                            break;
+                        case MyDataTypeCategorizeEnum.鏃ユ湡绫�:
+                            //鏃ユ湡绫� 楂樼骇 select鏌ヨ娌℃湁
+                            sb.Append("                   isDateControl: true, // 鏄惧紡鏍囪涓烘棩鏈熸帶浠� \n");
+                            break;
+                        default://鍓╀綑鐨勪竴寰嬭涓烘槸 瀛楃涓�  
+                            sb.Append("                   highSelectAttrs:{ \n");
+                            sb.Append($"                     prop: '{low_prop_ColumnName}_FilterMode', \n");
+                            sb.Append("                     el: 'select',  \n");
+                            sb.Append("                     placeholder: '璇烽�夋嫨',  \n");
+                            sb.Append("                     options:FILTER_MODE_OPTIONS_STRING \n");//瀛楃涓茬被鏌ヨ
+                            sb.Append("                   } \n");
+                            break;
+                    }
+
                     sb.Append("                }, \n");
                 }
                 //鍘绘帀鏈�鍚庝竴涓�,
@@ -2322,15 +2392,27 @@
                 /*
                   materialCode: formData.value.materialCode,
                  */
-                List<ColumnModel> newList = ListHelper.RemoveForPageTableListQueryAttributes(columnModelList);
-                foreach (var columnModel in newList)
+                foreach (var columnModel in columnModelList)
                 {
 
                     //棣栧瓧姣嶅皬鍐�
                     var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
                     sb.Append($"{low_prop_ColumnName}: formData.value.{low_prop_ColumnName} || '', \n");
 
-
+                    //娣诲姞select楂樼骇鏌ヨ
+                    DataTypeEnum enumDT = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType.ToString());
+                    MyDataTypeCategorizeEnum myDataTypeCategorizeEnum = CommonHelper.GetMyDataTypeCategorizeEnum(enumDT);
+                    switch (myDataTypeCategorizeEnum)
+                    {
+                        case MyDataTypeCategorizeEnum.甯冨皵绫�:
+                        case MyDataTypeCategorizeEnum.鏁板瓧绫�:
+                        default://鍓╀綑鐨勪竴寰嬭涓烘槸 瀛楃涓�  
+                            sb.Append($"{low_prop_ColumnName}_FilterMode: formData.value.{low_prop_ColumnName}_FilterMode || '', \n");
+                            break;
+                        case MyDataTypeCategorizeEnum.鏃ユ湡绫�:
+                            //鏃ユ湡绫� 楂樼骇 select鏌ヨ娌℃湁
+                            break;
+                    }
                 }
                 //鍘绘帀鏈�鍚庝竴涓�,
                 var res = sb.ToString();
@@ -2515,8 +2597,7 @@
                 /*
                   materialCode: res.materialCode,
                  */
-                List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
-                foreach (var columnModel in newList)
+                foreach (var columnModel in columnModelList)
                 {
                     //棣栧瓧姣嶅皬鍐�
                     var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
@@ -2533,6 +2614,46 @@
             }
         }
 
+        public static string GetVueFormOptionsStrForPageAddFormAttributes_Query_Clear_HighSelect(List<ColumnModel> columnModelList, GenerateCodeParam param)
+        {
+            StringBuilder sb = new StringBuilder();
+            try
+            {
+                /*
+                  formData.value.materialCode_FilterMode = 1
+                 */
+                foreach (var columnModel in columnModelList)
+                {
+                    //棣栧瓧姣嶅皬鍐�
+                    var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
+                    //娣诲姞select楂樼骇鏌ヨ
+                    DataTypeEnum enumDT = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType.ToString());
+                    MyDataTypeCategorizeEnum myDataTypeCategorizeEnum = CommonHelper.GetMyDataTypeCategorizeEnum(enumDT);
+                    switch (myDataTypeCategorizeEnum)
+                    {
+                        case MyDataTypeCategorizeEnum.甯冨皵绫�:
+                        case MyDataTypeCategorizeEnum.鏁板瓧绫�:
+                            sb.Append($"formData.value.{low_prop_ColumnName}_FilterMode = 2 \n");//绮惧噯鏌ヨ
+                            break;
+                        default://鍓╀綑鐨勪竴寰嬭涓烘槸 瀛楃涓�  
+                            sb.Append($"formData.value.{low_prop_ColumnName}_FilterMode = 1 \n");//妯$硦鏌ヨ
+                            break;
+                        case MyDataTypeCategorizeEnum.鏃ユ湡绫�:
+                            //鏃ユ湡绫� 楂樼骇 select鏌ヨ娌℃湁
+                            break;
+                    }
+                }
+                //鍘绘帀鏈�鍚庝竴涓�,
+                var res = sb.ToString();
+                res = res.Substring(0, res.Length - 1);
+                return res;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
         public static string GetVueFormOptionsStrForPageAdd_EntityNameClass_enumOptions(List<ColumnModel> columnModelList, GenerateCodeParam param)
         {
             StringBuilder sb = new StringBuilder();

--
Gitblit v1.9.3