From 5a149d626ae8bc3fa4bddbb53f8caf40f51f6da6 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 04 6月 2025 17:42:13 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

---
 Weben_CMS专用代码生成器/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass模板.txt |    9 ++++-----
 1 files changed, 4 insertions(+), 5 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/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 644cb22..83af498 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"
@@ -25,7 +25,7 @@
 import { injectModel } from '@/libs/Provider/Provider'
 // 引入公共选项配置 
 import {  
-  FILTER_MODE_OPTIONS_STRING
+  FILTER_MODE_OPTIONS_STRING_KEY
 } from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions'; 
 // 引入公共高级查询工具文件  
 import { commonSaveCurHighQueryData,setValueForCurHighQueryData,commonGetHighQueryForm,initQueryForm,GetFilteredData } from '@/utils/myHighQueryUtils'; 
@@ -93,13 +93,12 @@
       }
     }
 
-   
+    /*******************************************************[高级查询]开始********************************************************************************* */
     // 组件挂载时获取枚举数据 
     onMounted(() => { 
       fetchEnumData() 
       resetQuery();
     }) 
-    /*******************************************************[高级查询]开始********************************************************************************* */ 
     // 新增的查询条件 
     const queryForm = ref({ searchVal: '',str_searchFormInputAttrs:[],searchVal_FilterMode:'' });   
     // 定义响应式查询数据  
@@ -116,7 +115,7 @@
     } 
     // 新版的查询重置 
     const resetQuery = () => { 
-      initQueryForm(queryForm,_searchFormInputAttrs,FILTER_MODE_OPTIONS_STRING);
+      initQueryForm(queryForm,_searchFormInputAttrs,FILTER_MODE_OPTIONS_STRING_KEY);
       setValueForCurHighQueryData(_curHighQueryData,queryForm,_searchFormInputAttrs); 
     } 
      //新版的导出方法 
@@ -266,7 +265,7 @@
                                 placeholder="请选择"
                                 class={styles.formItem}
                               >
-                                {FILTER_MODE_OPTIONS_STRING.map((option) => (
+                                {FILTER_MODE_OPTIONS_STRING_KEY.map((option) => (
                                   <ElOption
                                     key={option.value}
                                     label={option.label}

--
Gitblit v1.9.3