From a5eb9e7bd07be6bfa1f54c1043ddc6d9241ed6e9 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 06 5月 2025 12:35:23 +0800
Subject: [PATCH] 222

---
 Weben_CMS专用代码生成器/Code/Utility/StructStrHelper.cs |   47 ++++++++++++++++++++++++-----------------------
 1 files changed, 24 insertions(+), 23 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..821545e 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"
@@ -1843,10 +1843,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 +1870,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");
 
@@ -1970,10 +1970,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 +1997,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");
 
@@ -2108,13 +2108,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();
@@ -2203,11 +2203,12 @@
                     {
                         sb.Append("  field: '" + columnModel.ColumnName + "Desc', \n");
                     }
-                    else {
+                    else
+                    {
                         sb.Append("  field: '" + columnModel.ColumnName + "', \n");
                     }
-                    sb.Append("  field: '" + columnModel.Description + "', \n");
-                    sb.Append("} \n");
+                    sb.Append("  title: '" + columnModel.Description + "', \n");
+                    sb.Append("}, \n");
                 }
                 //鍘绘帀鏈�鍚庝竴涓�,
                 var res = sb.ToString();
@@ -2286,7 +2287,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