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/MainForm.cs | 4 ++
Weben_CMS专用代码生成器/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass模板.txt | 17 --------
Weben_CMS专用代码生成器/Code/Generate/Web/Views/Pages/EntityNameClass/EntityNameClass_Config_Generate.cs | 2
Weben_CMS专用代码生成器/Code/Utility/StructStrHelper.cs | 47 ++++++++++++-----------
4 files changed, 29 insertions(+), 41 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/Generate/Web/Views/Pages/EntityNameClass/EntityNameClass_Config_Generate.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/Generate/Web/Views/Pages/EntityNameClass/EntityNameClass_Config_Generate.cs"
index ca1e946..5ca8f46 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/Generate/Web/Views/Pages/EntityNameClass/EntityNameClass_Config_Generate.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/Generate/Web/Views/Pages/EntityNameClass/EntityNameClass_Config_Generate.cs"
@@ -15,7 +15,7 @@
{
public static string CreateText(GenerateCodeParam param)
{
- var str = TextHelper.ReadText(@"Templete\Web\Views\Pages\EntityNameClass\EntityNameClass妯℃澘.txt");
+ var str = TextHelper.ReadText(@"Templete\Web\Views\Pages\EntityNameClass\EntityNameClass_Config妯℃澘.txt");
CommonReplace(ref str);
CommonHelper.CommonReplaceStr(param, ref str);
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/MainForm.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/MainForm.cs"
index ff60dcd..b318342 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/MainForm.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/MainForm.cs"
@@ -35,6 +35,10 @@
this.tb_PageMenuInstanceName.Text = "wmsMaterial";
this.tb_CreatePerson.Text = "shaocx";//鍒涘缓浜�
this.tb_EntityName.Text = "WmsMaterial";//瀹炰綋绫诲悕
+
+ this.tb_LikeQueryAttrs.Text = "'MaterialCode', 'MaterialName', 'Remark'";
+ this.tb_LikeQueryAttrsName.Text = "璇疯緭鍏ョ墿鏂欑紪鐮�/鐗╂枡鍚嶇О/澶囨敞";
+
//this.tb_EntityProName.Text = "wmsMaterial";//瀹炰綋绫诲璞″悕
this.tb_EnumList.Text = "PurchaseType|PurchaseTypeEnum|PurchaseTypeDesc,MaterialType|MaterialTypeEnum|MaterialTypeDesc,IsMainBranch|YesNoEnum|IsMainBranchDesc";
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/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass\346\250\241\346\235\277.txt" "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/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass\346\250\241\346\235\277.txt"
index 0b6abb3..86f92e8 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/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass\346\250\241\346\235\277.txt"
+++ "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/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass\346\250\241\346\235\277.txt"
@@ -85,23 +85,6 @@
const fetchEnumData = async () => {
try {
$EntityNameClass_fetchEnumData$
- // 获取物料类型枚举
- const materialTypeData = await getWmsEnumData({
- EnumName: 'MaterialTypeEnum',
- })
- enumOptions.materialType = materialTypeData.map((item) => ({
- label: item.description,
- value: item.value,
- }))
-
- // 获取采购类型枚举
- const purchaseTypeData = await getWmsEnumData({
- EnumName: 'PurchaseTypeEnum',
- })
- enumOptions.purchaseType = purchaseTypeData.map((item) => ({
- label: item.description,
- value: item.value,
- }))
} catch (error) {
console.error('获取枚举数据失败:', error)
}
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