From a152d2dc9e4ae6fa1fdd0dcfe5db8bb455e15c4f Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 06 5月 2025 14:21:15 +0800
Subject: [PATCH] 111

---
 Weben_CMS专用代码生成器/Code/Utility/StructStrHelper.cs |   86 ++++++++++++++++++++++++-------------------
 1 files changed, 48 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 d03814a..355b5d9 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"
@@ -1736,6 +1736,8 @@
                 List<ColumnModel> newList = ListHelper.RemoveIdOperationRemarkCreateIdModifyId(columnModelList);
                 foreach (var columnModel in newList)
                 {
+                    //棣栧瓧姣嶅皬鍐�
+                    var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
                     DataTypeEnum enumDT = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType.ToString());
                     var elment = "el-input";
                     switch (enumDT)
@@ -1752,7 +1754,7 @@
                     }
                     sb.Append("                { \n");
                     sb.Append("                   label: '" + columnModel.Description + "', \n");
-                    sb.Append("                   prop: '" + columnModel.ColumnName + "', \n");
+                    sb.Append("                   prop: '" + low_prop_ColumnName + "', \n");
 
                     //娣诲姞绫诲瀷
                     switch (enumDT)
@@ -1812,6 +1814,9 @@
                 List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
                 foreach (var columnModel in newList)
                 {
+
+                    //棣栧瓧姣嶅皬鍐�
+                    var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
                     DataTypeEnum enumDT = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType.ToString());
                     var elment = "input";
                     switch (enumDT)
@@ -1828,7 +1833,7 @@
                     }
                     sb.Append("                { \n");
                     sb.Append("                   label: '" + columnModel.Description + "', \n");
-                    sb.Append("                   prop: '" + columnModel.ColumnName + "', \n");
+                    sb.Append("                   prop: '" + low_prop_ColumnName + "', \n");
 
                     //娣诲姞绫诲瀷
                     switch (enumDT)
@@ -1843,10 +1848,10 @@
                     if (enumDT == DataTypeEnum.dt_decimal)
                     {
                         sb.Append("                   el: (props: any, { attrs }: SetupContext) => { \n");
-                        sb.Append("                     return h(inputNumber, { { \n");
-                        sb.Append("                       ...props, { \n");
-                        sb.Append("                       clearable: true, { \n");
-                        sb.Append("                       ...attrs, { \n");
+                        sb.Append("                     return h(inputNumber, {  \n");
+                        sb.Append("                       ...props,  \n");
+                        sb.Append("                       clearable: true,  \n");
+                        sb.Append("                       ...attrs,  \n");
                         sb.Append("                     })  \n");
                         sb.Append("                   },\n");
 
@@ -1870,10 +1875,10 @@
                         else
                         {
                             sb.Append("                   el: (props: any, { attrs }: SetupContext) => { \n");
-                            sb.Append("                     return h(inputNumber, { { \n");
-                            sb.Append("                       ...props, { \n");
-                            sb.Append("                       clearable: true, { \n");
-                            sb.Append("                       ...attrs, { \n");
+                            sb.Append("                     return h(inputNumber, {  \n");
+                            sb.Append("                       ...props,  \n");
+                            sb.Append("                       clearable: true, \n");
+                            sb.Append("                       ...attrs,  \n");
                             sb.Append("                     })  \n");
                             sb.Append("                   },\n");
 
@@ -1887,7 +1892,7 @@
                         sb.Append("                   el: '" + elment + "', \n");
                     }
 
-                    sb.Append("                   disabled: disabled, \n");
+                    sb.Append("                   //disabled: disabled, \n");
                     sb.Append("                   placeholder: '璇疯緭鍏�" + columnModel.Description + "', \n");
                     if (columnModel.IsNullable == false)
                     {
@@ -1933,12 +1938,13 @@
       el: 'input',
       disabled: disabled,
       placeholder: '璇疯緭鍏ョ墿鏂欑紪鐮�',
-      rules: [{ required: true, message: '鐗╂枡缂栫爜涓嶈兘涓虹┖', trigger: 'blur' }],
     },
                  */
                 List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
                 foreach (var columnModel in newList)
                 {
+                    //棣栧瓧姣嶅皬鍐�
+                    var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
                     DataTypeEnum enumDT = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType.ToString());
                     var elment = "input";
                     switch (enumDT)
@@ -1955,7 +1961,7 @@
                     }
                     sb.Append("                { \n");
                     sb.Append("                   label: '" + columnModel.Description + "', \n");
-                    sb.Append("                   prop: '" + columnModel.ColumnName + "', \n");
+                    sb.Append("                   prop: '" + low_prop_ColumnName + "', \n");
 
                     //娣诲姞绫诲瀷
                     switch (enumDT)
@@ -1970,10 +1976,10 @@
                     if (enumDT == DataTypeEnum.dt_decimal)
                     {
                         sb.Append("                   el: (props: any, { attrs }: SetupContext) => { \n");
-                        sb.Append("                     return h(inputNumber, { { \n");
-                        sb.Append("                       ...props, { \n");
-                        sb.Append("                       clearable: true, { \n");
-                        sb.Append("                       ...attrs, { \n");
+                        sb.Append("                     return h(inputNumber, {  \n");
+                        sb.Append("                       ...props,\n");
+                        sb.Append("                       clearable: true, \n");
+                        sb.Append("                       ...attrs,  \n");
                         sb.Append("                     })  \n");
                         sb.Append("                   },\n");
 
@@ -1997,10 +2003,10 @@
                         else
                         {
                             sb.Append("                   el: (props: any, { attrs }: SetupContext) => { \n");
-                            sb.Append("                     return h(inputNumber, { { \n");
-                            sb.Append("                       ...props, { \n");
-                            sb.Append("                       clearable: true, { \n");
-                            sb.Append("                       ...attrs, { \n");
+                            sb.Append("                     return h(inputNumber, {  \n");
+                            sb.Append("                       ...props,  \n");
+                            sb.Append("                       clearable: true,  \n");
+                            sb.Append("                       ...attrs,  \n");
                             sb.Append("                     })  \n");
                             sb.Append("                   },\n");
 
@@ -2014,12 +2020,9 @@
                         sb.Append("                   el: '" + elment + "', \n");
                     }
 
-                    sb.Append("                   disabled: disabled, \n");
+                    sb.Append("                   //disabled: disabled, \n");
                     sb.Append("                   placeholder: '璇疯緭鍏�" + columnModel.Description + "', \n");
-                    if (columnModel.IsNullable == false)
-                    {
-                        sb.Append("              rules: [{required: true, message: '" + columnModel.Description + "涓嶈兘涓虹┖', trigger: 'blur' }], \n");
-                    }
+                  
                     //娣诲姞绫诲瀷
                     //switch (enumDT)
                     //{
@@ -2108,13 +2111,13 @@
                         //灞炴�у皬鍐�
                         var instanceName = CommonHelper.FirstLowercase(item.EnumType);
                         var _enumAttrName = CommonHelper.FirstLowercase(item.EnumAttrName);
-                        sb.Append("const "+ instanceName + "Data = await getWmsEnumData({ \n");
+                        sb.Append("const " + instanceName + "Data = await getWmsEnumData({ \n");
                         sb.Append(" EnumName: '" + item.EnumType + "', \n");
                         sb.Append("}) \n");
-                        sb.Append("enumOptions."+ instanceName + " = "+ instanceName + "Data.map((item) => ({ \n");
+                        sb.Append("enumOptions." + _enumAttrName + " = " + instanceName + "Data.map((item) => ({ \n");
                         sb.Append("  label: item.description, \n");
                         sb.Append("  value: item.value, \n");
-                        sb.Append("}) \n");
+                        sb.Append("})) \n");
                     }
                 }
                 var res = sb.ToString();
@@ -2142,7 +2145,9 @@
                 List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
                 foreach (var columnModel in newList)
                 {
-                    sb.Append($"{columnModel.ColumnName}: formData.value.{columnModel.ColumnName}, \n");
+                    //棣栧瓧姣嶅皬鍐�
+                    var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
+                    sb.Append($"{low_prop_ColumnName}: formData.value.{low_prop_ColumnName}, \n");
                 }
                 //鍘绘帀鏈�鍚庝竴涓�,
                 var res = sb.ToString();
@@ -2198,16 +2203,19 @@
                 foreach (var columnModel in newList)
                 {
                     sb.Append("{ \n");
+                    //棣栧瓧姣嶅皬鍐�
+                    var lowerCaseColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
                     var findEnumObj = param.EnumList.Where(x => x.EnumAttrName == columnModel.ColumnName).FirstOrDefault();
                     if (findEnumObj != null)
                     {
-                        sb.Append("  field: '" + columnModel.ColumnName + "Desc', \n");
+                        sb.Append("  field: '" + lowerCaseColumnName + "Desc', \n");
                     }
-                    else {
-                        sb.Append("  field: '" + columnModel.ColumnName + "', \n");
+                    else
+                    {
+                        sb.Append("  field: '" + lowerCaseColumnName + "', \n");
                     }
-                    sb.Append("  field: '" + columnModel.Description + "', \n");
-                    sb.Append("} \n");
+                    sb.Append("  title: '" + columnModel.Description + "', \n");
+                    sb.Append("}, \n");
                 }
                 //鍘绘帀鏈�鍚庝竴涓�,
                 var res = sb.ToString();
@@ -2231,7 +2239,9 @@
                 List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
                 foreach (var columnModel in newList)
                 {
-                    sb.Append($"{columnModel.ColumnName}: res.{columnModel.ColumnName}, \n");
+                    //棣栧瓧姣嶅皬鍐�
+                    var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
+                    sb.Append($"{low_prop_ColumnName}: res.{low_prop_ColumnName}, \n");
                 }
                 //鍘绘帀鏈�鍚庝竴涓�,
                 var res = sb.ToString();
@@ -2276,7 +2286,7 @@
                 /*
                   isMainBranch: [] as Array<{ label: string; value: any }>,
                  */
-                if (param.EnumList?.Count > 0)
+                    if (param.EnumList?.Count > 0)
                 {
                     foreach (var item in param.EnumList)
                     {
@@ -2286,7 +2296,7 @@
                         sb.Append(_enumAttrName + ": [] as Array<{label: string; value: any }>, \n");
                     }
                 }
-              
+
                 //鍘绘帀鏈�鍚庝竴涓�,
                 var res = sb.ToString();
                 res = res.Substring(0, res.Length - 1);

--
Gitblit v1.9.3