222
schangxiang@126.com
2025-05-13 6e831531ac5277ee1a6215eab1249e788320c440
222
已修改8个文件
149 ■■■■■ 文件已修改
Weben_CMS专用代码生成器/Code/Generate/VUE/VUE_Generate.cs 84 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Weben_CMS专用代码生成器/Code/Templete/Web/Controllers/EntityModeDrawer模板.txt 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Weben_CMS专用代码生成器/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass模板.txt 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Weben_CMS专用代码生成器/Code/Utility/StructStrHelper.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial导出模板.xlsx 补丁 | 查看 | 原始文档 | blame | 历史
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/utils/commonOptionConstants.js 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/WmsMaterial.tsx 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Weben_CMSרÓôúÂëÉú³ÉÆ÷/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;
//        }
//    }
//}
Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Templete/Web/Controllers/EntityModeDrawerÄ£°å.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')
Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClassÄ£°å.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;
Weben_CMSרÓôúÂëÉú³ÉÆ÷/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查询没有
Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterialµ¼³öÄ£°å.xlsx
Binary files differ
Weben_CMSרÓôúÂëÉú³ÉÆ÷/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 },
  ];
Weben_CMSרÓôúÂëÉú³ÉÆ÷/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: '数量', 
Weben_CMSרÓôúÂëÉú³ÉÆ÷/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;