HIA24016N管子线DEMO开发
上一版本: f892002a | 补丁 | 提交 | 忽略空白
schangxiang@126.com
2025-05-09 b7a82bbc4b305f0323be93030842c1b82c824337 
优化查询列
已修改4个文件
126 ■■■■■ 文件已修改
Weben_CMS专用代码生成器/Code/Generate/Entity/ExportModel_Generate.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Weben_CMS专用代码生成器/Code/Generate/Web/Controllers/EntityModeQueryDrawer_Generate.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Weben_CMS专用代码生成器/Code/Utility/ListHelper.cs 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Weben_CMS专用代码生成器/Code/Utility/StructStrHelper.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Generate/Entity/ExportModel_Generate.cs


@@ -22,7 +22,7 @@




            string attrString = "";




            List<ColumnModel> newColumnNameList = ListHelper.RemoveAttrForExport(param.ColumnNameList);


            List<ColumnModel> newColumnNameList = ListHelper.RemoveForPageTableListQueryAttributes(param.ColumnNameList);


            for (int i = 0; i < newColumnNameList.Count; ++i)


            {


                attrString += StructStrHelper.GenerateAttributeForExport(newColumnNameList[i], param);




 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Generate/Web/Controllers/EntityModeQueryDrawer_Generate.cs


@@ -22,7 +22,7 @@




            //替换新增form列表属性


            string attrString = "";


            List<ColumnModel> newColumnNameList = ListHelper.RemoveAttrForQueryMode(param.ColumnNameList);


            List<ColumnModel> newColumnNameList = ListHelper.RemoveForPageTableListQueryAttributes(param.ColumnNameList);


            attrString += StructStrHelper.GetVueFormOptionsStrForPageAddFormAttributes_Query(newColumnNameList, param);


            str = str.Replace("$PageAddFormAttributes_Query$", attrString);






 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Utility/ListHelper.cs


@@ -58,7 +58,9 @@


        #region ã€é¡µé¢ã€‘列表界面




        /// <summary>


        /// é¡µé¢è¡¨æ ¼å±•ç¤ºçš„ å­—段列表


        /// 1、页面表格展示的 å­—段列表


        /// 2、页面导出列表


        /// 3、高级查询列


        /// </summary>


        /// <param name="columnNameList"></param>


        /// <returns></returns>


@@ -70,6 +72,7 @@


            {


                columnModel = columnNameList[i];


                if (




                    columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()


                    //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()


                    //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_createTime.ToUpper()


@@ -102,51 +105,53 @@




        #endregion




        #region ã€é¡µé¢ã€‘高级查询显示的列




        /// <summary>


        /// ã€é¡µé¢ã€‘高级查询显示的列


        /// </summary>


        /// <param name="columnNameList"></param>


        /// <returns></returns>


        public static List<ColumnModel> RemoveAttrForQueryMode(List<ColumnModel> columnNameList)


        {


            List<ColumnModel> newList = new List<ColumnModel>();


            ColumnModel columnModel = null;


            for (int i = 0; i < columnNameList.Count; i++)


            {


                columnModel = columnNameList[i];


                if (


                     columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()


                    //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()


                    //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_createTime.ToUpper()




                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()


                    //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()


                    //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()




                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()




                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()


                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()




                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeleterId.ToUpper()


                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_delFlag.ToUpper()


                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeletionTime.ToUpper()






                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Sort.ToUpper()


                    || SystemCommonVar.c_Extend.Contains(columnModel.ColumnName.ToUpper())


                    )


                {


                    continue;


                }


                newList.Add(columnModel);


            }


            return newList;


        }


        //#region ã€é¡µé¢ã€‘高级查询显示的列




        #endregion


        ///// <summary>


        ///// ã€é¡µé¢ã€‘高级查询显示的列


        ///// </summary>


        ///// <param name="columnNameList"></param>


        ///// <returns></returns>


        //public static List<ColumnModel> RemoveAttrForQueryMode(List<ColumnModel> columnNameList)


        //{


        //    List<ColumnModel> newList = new List<ColumnModel>();


        //    ColumnModel columnModel = null;


        //    for (int i = 0; i < columnNameList.Count; i++)


        //    {


        //        columnModel = columnNameList[i];


        //        if (


        //             columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()


        //            //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()


        //            //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_createTime.ToUpper()




        //            || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()


        //            //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()


        //            //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()




        //            || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()




        //            || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()


        //            || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()




        //            || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeleterId.ToUpper()


        //            || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_delFlag.ToUpper()


        //            || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeletionTime.ToUpper()






        //            || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Sort.ToUpper()


        //            || SystemCommonVar.c_Extend.Contains(columnModel.ColumnName.ToUpper())


        //            )


        //        {


        //            continue;


        //        }


        //        newList.Add(columnModel);


        //    }


        //    return newList;


        //}




        //#endregion




        /// <summary>


        /// èŽ·å–最新的列List集合(去掉 creator和createTime)


@@ -426,36 +431,9 @@


            return newList;


        }




        public static List<ColumnModel> RemoveAttrForExport(List<ColumnModel> columnNameList)


        {


            List<ColumnModel> newList = new List<ColumnModel>();


            ColumnModel columnModel = null;


            for (int i = 0; i < columnNameList.Count; i++)


            {


                columnModel = columnNameList[i];


                if (columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()


                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_createTime.ToUpper()


                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()


                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()


                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()


                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()


                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()


                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeleterId.ToUpper()


                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_delFlag.ToUpper()


                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()


                    || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()




                    )


                {


                    continue;


                }


                newList.Add(columnModel);


            }


            return newList;


        }






       






        /// <summary>


        /// èŽ·å–最新的列List集合(去掉 ID)




 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Utility/StructStrHelper.cs


@@ -2240,7 +2240,7 @@


                /*


                  materialCode: formData.value.materialCode,


                 */


                List<ColumnModel> newList = ListHelper.RemoveAttrForQueryMode(columnModelList);


                List<ColumnModel> newList = ListHelper.RemoveForPageTableListQueryAttributes(columnModelList);


                foreach (var columnModel in newList)


                {