From 0cd95d98fdf7ed22d53398242feb2a3ca185cf09 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 13 5月 2025 15:38:35 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

---
 Weben_CMS专用代码生成器/Code/Generate/Web/Controllers/EntityModeQueryDrawer_Generate.cs |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 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/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 88017bf..a408304 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"
@@ -27,18 +27,21 @@
             str = str.Replace("$PageAddFormAttributes_Query$", attrString);
 
             attrString = "";
-            attrString += StructStrHelper.GetVueFormOptionsStrForSave_PageAddFormAttributes_Query(param.ColumnNameList,param);
+            attrString += StructStrHelper.GetVueFormOptionsStrForSave_PageAddFormAttributes_Query(newColumnNameList, param);
             str = str.Replace("$Save_PageAddFormAttributes_Query$", attrString);
+
+
+            attrString = "";
+            attrString += StructStrHelper.GetVueFormOptionsStrForPageAddFormAttributes_Query_Clear(newColumnNameList, param);
+            str = str.Replace("$Save_PageAddFormAttributes_Query_Clear$", attrString);
+
+            attrString = "";
+            attrString += StructStrHelper.GetVueFormOptionsStrForPageAddFormAttributes_Query_Clear_HighSelect(newColumnNameList, param);
+            str = str.Replace("$Save_PageAddFormAttributes_Query_Clear_HighSelect$", attrString);
 
             attrString = "";
             attrString += StructStrHelper.GetVueFormOptionsStrForCommonQueryEnumForFrom(param.ColumnNameList, param);
             str = str.Replace("$CommonQueryEnumForFrom$", attrString);
-
-            attrString = "";
-            attrString += StructStrHelper.GetVueFormOptionsStrForPageAddFormAttributes_Query_Clear(param.ColumnNameList, param);
-            str = str.Replace("$Save_PageAddFormAttributes_Query_Clear$", attrString);
-
-
 
             return str;
         }

--
Gitblit v1.9.3