From 55f646920b4e394f4aa18cb98f2260c82d0ecff9 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 20 5月 2025 16:41:13 +0800
Subject: [PATCH] 優化高級拆綫呢

---
 Weben_CMS专用代码生成器/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass模板.txt |   43 ++++++++++++++++++++++---------------------
 1 files changed, 22 insertions(+), 21 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 4e53d26..86306c2 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"
@@ -69,12 +69,7 @@
 
     //定义高级查询引用
    const $PageMenuInstanceName$QueryDrawerRef=ref(null);
-    // 新增的查询条件
-    const queryForm = ref({
-      searchVal: '',
-      str_searchFormInputAttrs:[],
-      searchVal_FilterMode:''
-    })
+    
     //定义整体模糊查询的列数组(注意:必须大小写跟后端的实体类属性名一致,否则会导致匹配不对的问题)
     const _searchFormInputAttrs = ref([
      $LikeQueryAttrs$
@@ -96,21 +91,24 @@
       }
     }
 
-    // 定义响应式查询数据 
-    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; 
+      resetQuery();
     }) 
-
+    /*******************************************************[高级查询]开始********************************************************************************* */
+    // 新增的查询条件
+    const queryForm = ref({
+      searchVal: '',
+      str_searchFormInputAttrs:[],
+      searchVal_FilterMode:''
+    })
+    // 定义响应式查询数据 
+    const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[],searchVal_FilterMode:'' });  
     // 新版的查询方法(主页面中的按钮【查询】)
     const handleQueryForMain = async () => {
-      _curHighQueryData.value.searchVal = queryForm.value.searchVal;
-      _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode; 
-      _curHighQueryData.value.str_searchFormInputAttrs = _searchFormInputAttrs.value;
+      setValueForCurHighQueryData();
       tableRef.value.getList(_curHighQueryData.value)
     }
     // 新版的查询方法(高级查询中的按钮【查询】)
@@ -124,6 +122,13 @@
       queryForm.value.searchVal = ''
       queryForm.value.searchVal_FilterMode = FILTER_MODE_OPTIONS_STRING[0]?.value || '';
       queryForm.value.str_searchFormInputAttrs=_searchFormInputAttrs.value;
+      setValueForCurHighQueryData();
+    }
+    //给响应式查询数据赋值
+    const setValueForCurHighQueryData=()=>{
+      _curHighQueryData.value.searchVal = queryForm.value.searchVal; 
+      _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode;  
+      _curHighQueryData.value.str_searchFormInputAttrs = _searchFormInputAttrs.value; 
     }
      //新版的导出方法
      const handleExport=()=>{
@@ -132,16 +137,12 @@
     // 新版的查询弹出框关闭方法
     const closeQuery = (extraParams={}) => {
       let filteredData = commonGetHighQueryForm(extraParams);
-      console.log("closeQuery方法");
-      console.log(filteredData);
       commonSaveCurHighQueryData(filteredData);
     }
     //保存查询值
     const commonSaveCurHighQueryData=(filteredData={})=>{
       _curHighQueryData.value = { ..._curHighQueryData.value, ...filteredData };
-      _curHighQueryData.value.searchVal = queryForm.value.searchVal
-      _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode 
-      _curHighQueryData.value.str_searchFormInputAttrs =_searchFormInputAttrs.value;
+      setValueForCurHighQueryData();
     }
      //获取高级查询弹出框的查询值
      const commonGetHighQueryForm=(extraParams={})=>{
@@ -158,7 +159,7 @@
       filteredData.str_searchFormInputAttrs =_searchFormInputAttrs.value;
       return filteredData;
     }
-   
+    /*******************************************************[高级查询]结束********************************************************************************* */
 
     /**
      * @returns 表格

--
Gitblit v1.9.3