From b7a82bbc4b305f0323be93030842c1b82c824337 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 09 5月 2025 10:06:36 +0800
Subject: [PATCH] 优化查询列
---
Weben_CMS专用代码生成器/Code/Utility/ListHelper.cs | 120 ++++++++++++++++-----------------------
Weben_CMS专用代码生成器/Code/Generate/Web/Controllers/EntityModeQueryDrawer_Generate.cs | 2
Weben_CMS专用代码生成器/Code/Utility/StructStrHelper.cs | 2
Weben_CMS专用代码生成器/Code/Generate/Entity/ExportModel_Generate.cs | 2
4 files changed, 52 insertions(+), 74 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/Entity/ExportModel_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/Entity/ExportModel_Generate.cs"
index 130b6de..e771620 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/Entity/ExportModel_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/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);
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/Controllers/EntityModeQueryDrawer_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/Controllers/EntityModeQueryDrawer_Generate.cs"
index 74000db..88017bf 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/Controllers/EntityModeQueryDrawer_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/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);
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/ListHelper.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/ListHelper.cs"
index 6758b4b..495bde1 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/ListHelper.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/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>
/// 鑾峰彇鏈�鏂扮殑鍒桳ist闆嗗悎(鍘绘帀 creator鍜宑reateTime)
@@ -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>
/// 鑾峰彇鏈�鏂扮殑鍒桳ist闆嗗悎(鍘绘帀 ID)
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 fa5a73d..491be99 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"
@@ -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)
{
--
Gitblit v1.9.3