From d41eac403ece679e9ea740a6ff8247235ed18aba Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周二, 20 5月 2025 17:00:34 +0800 Subject: [PATCH] 22 --- Weben_CMS专用代码生成器/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass模板.txt | 94 +++++++++++++++------------------------------- 1 files changed, 31 insertions(+), 63 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 86306c2..644cb22 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" @@ -27,6 +27,8 @@ import { FILTER_MODE_OPTIONS_STRING } from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions'; +// 引入公共高级查询工具文件 +import { commonSaveCurHighQueryData,setValueForCurHighQueryData,commonGetHighQueryForm,initQueryForm,GetFilteredData } from '@/utils/myHighQueryUtils'; interface RenderTableType { url?: string @@ -97,69 +99,35 @@ fetchEnumData() resetQuery(); }) - /*******************************************************[高级查询]开始********************************************************************************* */ - // 新增的查询条件 - const queryForm = ref({ - searchVal: '', - str_searchFormInputAttrs:[], - searchVal_FilterMode:'' - }) - // 定义响应式查询数据 - const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[],searchVal_FilterMode:'' }); - // 新版的查询方法(主页面中的按钮【查询】) - const handleQueryForMain = async () => { - setValueForCurHighQueryData(); - tableRef.value.getList(_curHighQueryData.value) - } - // 新版的查询方法(高级查询中的按钮【查询】) - const handleQuery = async (extraParams = {}) => { - let filteredData = commonGetHighQueryForm(extraParams); - commonSaveCurHighQueryData(filteredData); - tableRef.value.getList(filteredData) - } - // 新版的查询重置 - const resetQuery = () => { - 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=()=>{ - onExport(_curHighQueryData.value); - } - // 新版的查询弹出框关闭方法 - const closeQuery = (extraParams={}) => { - let filteredData = commonGetHighQueryForm(extraParams); - commonSaveCurHighQueryData(filteredData); - } - //保存查询值 - const commonSaveCurHighQueryData=(filteredData={})=>{ - _curHighQueryData.value = { ..._curHighQueryData.value, ...filteredData }; - setValueForCurHighQueryData(); - } - //获取高级查询弹出框的查询值 - const commonGetHighQueryForm=(extraParams={})=>{ - // 过滤掉 undefined 的值 - let filteredData = Object.assign( - {}, - ...Object.entries(extraParams).map(([key, value]) => - value !== undefined ? { [key]: value } : {} - ) - ) - //组合模糊查询 - filteredData.searchVal = queryForm.value.searchVal - filteredData.searchVal_FilterMode = queryForm.value.searchVal_FilterMode - filteredData.str_searchFormInputAttrs =_searchFormInputAttrs.value; - return filteredData; - } - /*******************************************************[高级查询]结束********************************************************************************* */ + /*******************************************************[高级查询]开始********************************************************************************* */ + // 新增的查询条件 + const queryForm = ref({ searchVal: '',str_searchFormInputAttrs:[],searchVal_FilterMode:'' }); + // 定义响应式查询数据 + const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[],searchVal_FilterMode:'' }); + // 新版的查询方法(主页面中的按钮【查询】) + const handleQueryForMain = async () => { + setValueForCurHighQueryData(_curHighQueryData,queryForm,_searchFormInputAttrs); + tableRef.value.getList(_curHighQueryData.value) + } + // 新版的查询方法(高级查询中的按钮【查询】) + const handleQuery = async (extraParams = {}) => { + let filteredData = GetFilteredData(extraParams,queryForm,_searchFormInputAttrs,_curHighQueryData); + tableRef.value.getList(filteredData) + } + // 新版的查询重置 + const resetQuery = () => { + initQueryForm(queryForm,_searchFormInputAttrs,FILTER_MODE_OPTIONS_STRING); + setValueForCurHighQueryData(_curHighQueryData,queryForm,_searchFormInputAttrs); + } + //新版的导出方法 + const handleExport=()=>{ + onExport(_curHighQueryData.value); + } + // 新版的查询弹出框关闭方法 + const closeQuery = (extraParams={}) => { + GetFilteredData(extraParams,queryForm,_searchFormInputAttrs,_curHighQueryData); + } + /*******************************************************[高级查询]结束********************************************************************************* */ /** * @returns 表格 -- Gitblit v1.9.3