From 6e831531ac5277ee1a6215eab1249e788320c440 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 13 5月 2025 13:54:31 +0800
Subject: [PATCH] 222
---
Weben_CMS专用代码生成器/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass模板.txt | 16 +++--
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx | 8 ++
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial导出模板.xlsx | 0
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/WmsMaterial.tsx | 16 +++--
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/utils/commonOptionConstants.js | 8 ++
Weben_CMS专用代码生成器/Code/Generate/VUE/VUE_Generate.cs | 84 ++++++++++++++--------------
Weben_CMS专用代码生成器/Code/Templete/Web/Controllers/EntityModeDrawer模板.txt | 4 +
Weben_CMS专用代码生成器/Code/Utility/StructStrHelper.cs | 13 ++-
8 files changed, 85 insertions(+), 64 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/VUE/VUE_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/VUE/VUE_Generate.cs"
index 48b0dd8..0b01ad9 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/VUE/VUE_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/VUE/VUE_Generate.cs"
@@ -1,58 +1,58 @@
锘�
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
-namespace GenerateCode_GEBrilliantFactory
-{
- /// <summary>
- /// VUE鏂囦欢
- /// </summary>
- public class VUE_Generate : BaseGenerate
- {
- public static string CreateText(string TableAlias, string modulelogo, string primaryKey,
- List<ColumnModel> columnNameList, string ChinaComment
- , string emport_templeteFileDownName, string emport_excelCategroy)
- {
- var str = TextHelper.ReadText(@"Templete\VUE\VUE鏂囦欢妯℃澘.txt");
+//namespace GenerateCode_GEBrilliantFactory
+//{
+// /// <summary>
+// /// VUE鏂囦欢
+// /// </summary>
+// public class VUE_Generate : BaseGenerate
+// {
+// public static string CreateText(string TableAlias, string modulelogo, string primaryKey,
+// List<ColumnModel> columnNameList, string ChinaComment
+// , string emport_templeteFileDownName, string emport_excelCategroy)
+// {
+// var str = TextHelper.ReadText(@"Templete\VUE\VUE鏂囦欢妯℃澘.txt");
- CommonReplace(ref str);
- str = str.Replace("$el-table-column$", StructStrHelper.GetElTableColumnStr(columnNameList));//鍒楄〃椤�
+// CommonReplace(ref str);
+// str = str.Replace("$el-table-column$", StructStrHelper.GetElTableColumnStr(columnNameList));//鍒楄〃椤�
- //鏂板/缂栬緫鐣岄潰
- str = str.Replace("$el-item$", StructStrHelper.GetElFormItemStrForAddEditForm(columnNameList));
+// //鏂板/缂栬緫鐣岄潰
+// str = str.Replace("$el-item$", StructStrHelper.GetElFormItemStrForAddEditForm(columnNameList));
- //鏌ョ湅鐣岄潰
- str = str.Replace("$el-item-view$", StructStrHelper.GetElFormItemStrForViewForm(columnNameList));
+// //鏌ョ湅鐣岄潰
+// str = str.Replace("$el-item-view$", StructStrHelper.GetElFormItemStrForViewForm(columnNameList));
- str = str.Replace("$el-form-itemForSearch$", StructStrHelper.GetElFormItemForSearchStr(columnNameList));
+// str = str.Replace("$el-form-itemForSearch$", StructStrHelper.GetElFormItemForSearchStr(columnNameList));
- //瀵煎嚭瀛楃涓�
- str = str.Replace("$VueExportColumnHeaderStr$", StructStrHelper.GetVueExportTHeaderArrayStr(columnNameList));
+// //瀵煎嚭瀛楃涓�
+// str = str.Replace("$VueExportColumnHeaderStr$", StructStrHelper.GetVueExportTHeaderArrayStr(columnNameList));
- //鍏叡鏌ヨ鐨勫垪
- var SearchFormInputPlaceholderNameStr = "";
- str = str.Replace("$SearchFormInputPlaceholderStr$", StructStrHelper.GetVueSearchFormInputPlaceholderStr(columnNameList, ref SearchFormInputPlaceholderNameStr));
- str = str.Replace("$SearchFormInputPlaceholderNameStr$", SearchFormInputPlaceholderNameStr);
+// //鍏叡鏌ヨ鐨勫垪
+// var SearchFormInputPlaceholderNameStr = "";
+// str = str.Replace("$SearchFormInputPlaceholderStr$", StructStrHelper.GetVueSearchFormInputPlaceholderStr(columnNameList, ref SearchFormInputPlaceholderNameStr));
+// str = str.Replace("$SearchFormInputPlaceholderNameStr$", SearchFormInputPlaceholderNameStr);
- //楂樼骇鏌ヨ
- str = str.Replace("$FormOptionsStr$", StructStrHelper.GetVueFormOptionsStr(columnNameList));
+// //楂樼骇鏌ヨ
+// str = str.Replace("$FormOptionsStr$", StructStrHelper.GetVueFormOptionsStr(columnNameList));
- str = str.Replace("$ChinaComment$", ChinaComment);//涓枃娉ㄩ噴
+// str = str.Replace("$ChinaComment$", ChinaComment);//涓枃娉ㄩ噴
- str = str.Replace("$Modulelogo$", modulelogo);//琛ㄥ埆鍚�(浠栦竴瀹氳鍦ㄦ渶鍚庢浛鎹�)
- str = str.Replace("$TableAlias$", TableAlias);//琛ㄥ埆鍚�(浠栦竴瀹氳鍦ㄦ渶鍚庢浛鎹�)
- str = str.Replace("$PrimaryKey$", primaryKey);//涓婚敭
+// str = str.Replace("$Modulelogo$", modulelogo);//琛ㄥ埆鍚�(浠栦竴瀹氳鍦ㄦ渶鍚庢浛鎹�)
+// str = str.Replace("$TableAlias$", TableAlias);//琛ㄥ埆鍚�(浠栦竴瀹氳鍦ㄦ渶鍚庢浛鎹�)
+// str = str.Replace("$PrimaryKey$", primaryKey);//涓婚敭
- //鏇挎崲瀵煎叆鍔熻兘
- str = str.Replace("$emport_templeteFileDownName$", emport_templeteFileDownName);
- str = str.Replace("$emport_excelCategroy$", emport_excelCategroy);
+// //鏇挎崲瀵煎叆鍔熻兘
+// str = str.Replace("$emport_templeteFileDownName$", emport_templeteFileDownName);
+// str = str.Replace("$emport_excelCategroy$", emport_excelCategroy);
- return str;
- }
- }
-}
+// return 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/Templete/Web/Controllers/EntityModeDrawer\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/Controllers/EntityModeDrawer\346\250\241\346\235\277.txt"
index cbcf880..bc66791 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/Controllers/EntityModeDrawer\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/Controllers/EntityModeDrawer\346\250\241\346\235\277.txt"
@@ -14,6 +14,10 @@
import isEqual from 'lodash/isEqual'
import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox'
import { cloneDeep } from 'lodash'
+// 引入公共选项配置
+import {
+ BOOLEAN_OPTIONS_AddEdit
+} from '@/utils/commonOptionConstants';
export const use$EntityName$Drawer = (props: any, ctx?: any) => {
const $PageMenuInstanceName$Drawer = injectModel<$EntityName$Drawer>('$PageMenuInstanceName$Drawer')
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 cd5479b..4e53d26 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"
@@ -96,14 +96,16 @@
}
}
- // 组件挂载时获取枚举数据
- onMounted(() => {
- fetchEnumData()
- queryForm.value.searchVal_FilterMode = FILTER_MODE_OPTIONS_STRING[0]?.value || '';
- })
+ // 定义响应式查询数据
+ const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[],searchVal_FilterMode:'' });
+ // 组件挂载时获取枚举数据
+ onMounted(() => {
+ fetchEnumData()
+ queryForm.value.searchVal_FilterMode = FILTER_MODE_OPTIONS_STRING[0]?.value || '';
+ _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode;
+ _curHighQueryData.value.str_searchFormInputAttrs = _searchFormInputAttrs.value;
+ })
- // 定义响应式查询数据
- const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[],searchVal_FilterMode:'' });
// 新版的查询方法（主页面中的按钮【查询】）
const handleQueryForMain = async () => {
_curHighQueryData.value.searchVal = queryForm.value.searchVal;
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 28c365f..bf9af82 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"
@@ -1842,7 +1842,8 @@
{
case DataTypeEnum.dt_bit:
case DataTypeEnum.dt_tinyint:
- sb.Append(" options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}] \n");
+ //sb.Append(" options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}] \n");
+ sb.Append(" options: BOOLEAN_OPTIONS_AddEdit \n");
break;
default:
break;
@@ -1862,7 +1863,7 @@
/// <summary>
- /// 鑾峰彇VUE formOptions瀛楃涓�(楂樼骇鏌ヨ涓殑)
+ /// 鑾峰彇VUE formOptions瀛楃涓�(娣诲姞銆佷慨鏀瑰脊鍑洪〉闈㈢殑)
/// </summary>
/// <param name="columnModelList"></param>
/// <returns></returns>
@@ -2009,12 +2010,14 @@
}
else
{
- sb.Append(" options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}] \n");
+ //sb.Append(" options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}] \n");
+ sb.Append(" options: BOOLEAN_OPTIONS_AddEdit \n");
}
}
else
{
- sb.Append(" options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}] \n");
+ //sb.Append(" options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}] \n");
+ sb.Append(" options: BOOLEAN_OPTIONS_AddEdit \n");
}
break;
default:
@@ -2242,7 +2245,7 @@
sb.Append(" options:FILTER_MODE_OPTIONS_NUM \n");//鏁板瓧绫绘煡璇�
sb.Append(" } \n");
}
-
+
break;
case MyDataTypeCategorizeEnum.鏃ユ湡绫�:
//鏃ユ湡绫� 楂樼骇 select鏌ヨ娌℃湁
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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
index 65df394..2cc7419 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/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
Binary files differ
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/Weben_CMS_TemplateDemo/templatedemo_web/src/utils/commonOptionConstants.js" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/utils/commonOptionConstants.js"
index 7bd0146..d09c6d6 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/Weben_CMS_TemplateDemo/templatedemo_web/src/utils/commonOptionConstants.js"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/utils/commonOptionConstants.js"
@@ -1,5 +1,11 @@
-// 鏄� 鍚�
+// 鏄� 鍚�(楂樼骇鏌ヨ鐢�)
export const BOOLEAN_OPTIONS = [
{ label: '鏄�', value: 'true'},
{ label: '鍚�', value: 'false' },
];
+
+ // 鏄� 鍚�(鏂板銆佷慨鏀圭晫闈笓鐢�)
+ export const BOOLEAN_OPTIONS_AddEdit = [
+ { label: '鏄�', value: true},
+ { label: '鍚�', value: false },
+ ];
\ No newline at end of file
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/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx"
index fd62e4b..5b14d1f 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/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx"
@@ -14,6 +14,10 @@
import isEqual from 'lodash/isEqual'
import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox'
import { cloneDeep } from 'lodash'
+// 寮曞叆鍏叡閫夐」閰嶇疆
+import {
+ BOOLEAN_OPTIONS_AddEdit
+} from '@/utils/commonOptionConstants';
export const useWmsMaterialDrawer = (props: any, ctx?: any) => {
const wmsMaterialDrawer = injectModel<WmsMaterialDrawer>('wmsMaterialDrawer')
@@ -91,7 +95,7 @@
//disabled: disabled,
placeholder: '璇疯緭鍏ユ槸鍚︽湁鏁堢墿鏂�',
rules: [{required: true, message: '鏄惁鏈夋晥鐗╂枡涓嶈兘涓虹┖', trigger: 'blur' }],
- options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}]
+ options: BOOLEAN_OPTIONS_AddEdit
},
{
label: '鏄惁鑷骇',
@@ -99,7 +103,7 @@
el: 'select',
//disabled: disabled,
placeholder: '璇疯緭鍏ユ槸鍚﹁嚜浜�',
- options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}]
+ options: BOOLEAN_OPTIONS_AddEdit
},
{
label: '鏁伴噺',
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/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/WmsMaterial.tsx" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/WmsMaterial.tsx"
index c3411d3..c03f2aa 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/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/WmsMaterial.tsx"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/WmsMaterial.tsx"
@@ -119,14 +119,16 @@
}
}
- // 缁勪欢鎸傝浇鏃惰幏鍙栨灇涓炬暟鎹�
- onMounted(() => {
- fetchEnumData()
- queryForm.value.searchVal_FilterMode = FILTER_MODE_OPTIONS_STRING[0]?.value || '';
- })
+ // 瀹氫箟鍝嶅簲寮忔煡璇㈡暟鎹�
+ const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[],searchVal_FilterMode:'' });
+ // 缁勪欢鎸傝浇鏃惰幏鍙栨灇涓炬暟鎹�
+ onMounted(() => {
+ fetchEnumData()
+ queryForm.value.searchVal_FilterMode = FILTER_MODE_OPTIONS_STRING[0]?.value || '';
+ _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode;
+ _curHighQueryData.value.str_searchFormInputAttrs = _searchFormInputAttrs.value;
+ })
- // 瀹氫箟鍝嶅簲寮忔煡璇㈡暟鎹�
- const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[],searchVal_FilterMode:'' });
// 鏂扮増鐨勬煡璇㈡柟娉曪紙涓婚〉闈腑鐨勬寜閽�愭煡璇€�戯級
const handleQueryForMain = async () => {
_curHighQueryData.value.searchVal = queryForm.value.searchVal;
--
Gitblit v1.9.3