From e0f3ef553c8cfb185b68fae245bfdf37c1496834 Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周二, 13 5月 2025 13:09:42 +0800 Subject: [PATCH] 优化 --- Weben_CMS专用代码生成器/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass模板.txt | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 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 6bb0efc..cd5479b 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" @@ -23,6 +23,10 @@ ElFormItem, } from 'element-plus' import { injectModel } from '@/libs/Provider/Provider' +// 引入公共选项配置 +import { + FILTER_MODE_OPTIONS_STRING +} from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions'; interface RenderTableType { url?: string @@ -68,7 +72,8 @@ // 新增的查询条件 const queryForm = ref({ searchVal: '', - str_searchFormInputAttrs:[] + str_searchFormInputAttrs:[], + searchVal_FilterMode:'' }) //定义整体模糊查询的列数组(注意:必须大小写跟后端的实体类属性名一致,否则会导致匹配不对的问题) const _searchFormInputAttrs = ref([ @@ -94,13 +99,15 @@ // 组件挂载时获取枚举数据 onMounted(() => { fetchEnumData() + queryForm.value.searchVal_FilterMode = FILTER_MODE_OPTIONS_STRING[0]?.value || ''; }) // 定义响应式查询数据 - const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[] }); + 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; tableRef.value.getList(_curHighQueryData.value) } @@ -113,6 +120,7 @@ // 新版的查询重置 const resetQuery = () => { queryForm.value.searchVal = '' + queryForm.value.searchVal_FilterMode = FILTER_MODE_OPTIONS_STRING[0]?.value || ''; queryForm.value.str_searchFormInputAttrs=_searchFormInputAttrs.value; } //新版的导出方法 @@ -130,6 +138,7 @@ 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; } //获取高级查询弹出框的查询值 @@ -143,6 +152,7 @@ ) //组合模糊查询 filteredData.searchVal = queryForm.value.searchVal + filteredData.searchVal_FilterMode = queryForm.value.searchVal_FilterMode filteredData.str_searchFormInputAttrs =_searchFormInputAttrs.value; return filteredData; } @@ -279,6 +289,21 @@ /> </el-tooltip> </ElFormItem> + <ElFormItem label="" style="width:100px;"> + <ElSelect + v-model={queryForm.value.searchVal_FilterMode} + placeholder="请选择" + class={styles.formItem} + > + {FILTER_MODE_OPTIONS_STRING.map((option) => ( + <ElOption + key={option.value} + label={option.label} + value={option.value} + /> + ))} + </ElSelect> + </ElFormItem> <IconButton type="primary" icon="search" onClick={handleQueryForMain}> 查询 </IconButton> -- Gitblit v1.9.3