From 42589cd1dcb90e1a960b7838da6347ca460ca2b7 Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Wed, 5 Apr 2023 11:44:51 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90issues/425=E3=80=91=E4=BD=BF=E7=94=A8o?= =?UTF-8?q?nline=E8=A1=A8=E5=8D=95=E5=BC=80=E5=8F=91=EF=BC=8C=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E9=80=89=E6=8B=A9vue3=E5=8E=9F?= =?UTF-8?q?=E7=94=9F=E4=BB=A5=E5=90=8E=EF=BC=8C=E7=95=8C=E9=9D=A2=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E7=9A=84=E5=8A=9F=E8=83=BD=E4=B8=8D=E8=83=BD=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BA=86--?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/form/native/vue3NativeSearch.ftl | 3 ++- .../vue3Native/${entityName}List.vuei | 16 +++++++++------- .../vue3Native/${entityName}List.vuei | 16 +++++++++------- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl index b4157894..41515bf8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl @@ -1,3 +1,4 @@ +<#include "/common/utils.ftl"> <#if po.isQuery=='Y'> <#assign query_flag=true> <#if query_field_no==2> @@ -13,7 +14,7 @@ <#if po.queryMode=='single'> <#if query_field_no gt 1> - <#if query_field_no gt 1> + <#if query_field_no gt 1> <#if po.classType=='sel_search'> <#if query_field_no gt 1> <#elseif po.classType=='sel_user'> diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei index 126cc2a5..68c11615 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei @@ -21,7 +21,7 @@ <#assign query_flag = false>
- + <#-- 开始循环 --> <#list columns as po> @@ -145,7 +145,8 @@ import { startProcess } from '/@/api/common/api'; - const queryParam = ref({}); + const formRef = ref(); + const queryParam = reactive({}); const toggleSearchStatus = ref(false); const registerModal = ref(); //注册table数据 @@ -161,12 +162,13 @@ fixed: 'right', }, beforeFetch: (params) => { - return Object.assign(params, queryParam.value); + return Object.assign(params, queryParam); }, }, exportConfig: { name: "${tableVo.ftlDescription}", url: getExportUrl, + params: queryParam, }, importConfig: { url: getImportUrl, @@ -294,7 +296,7 @@ * 重置 */ function searchReset() { - queryParam.value = {}; + formRef.value.resetFields(); selectedRowKeys.value = []; //刷新数据 reload(); @@ -306,7 +308,7 @@ */ function setFieldsValue(map) { Object.keys(map).map((key) => { - queryParam.value[key] = map[key]; + queryParam[key] = map[key]; }); } @@ -318,7 +320,7 @@ * @param value */ function handleAreaChange(key, value) { - queryParam.value[key] = value.join(','); + queryParam[key] = value.join(','); } @@ -344,7 +346,7 @@ * @param value */ function handleFormChange(key, value) { - queryParam.value[key] = value; + queryParam[key] = value; } /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei index f7621642..f7cd84e8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei @@ -22,7 +22,7 @@ <#assign query_flag = false>
- + <#-- 开始循环 --> <#list columns as po> @@ -150,6 +150,8 @@ import { startProcess } from '/@/api/common/api'; + const formRef = ref(); + const queryParam = reactive({}); const checkedKeys = ref>([]); //注册model const [registerModal, {openModal}] = useModal(); @@ -166,12 +168,13 @@ fixed:'right' }, beforeFetch: (params) => { - return Object.assign(params, queryParam.value); + return Object.assign(params, queryParam); }, }, exportConfig: { name:"${tableVo.ftlDescription}", url: getExportUrl, + params: queryParam, }, importConfig: { url: getImportUrl, @@ -304,7 +307,7 @@ * @param value */ function handleFormChange(key, value) { - queryParam.value[key] = value; + queryParam[key] = value; } /** * 初始化字典配置 @@ -330,7 +333,6 @@ /* ----------------------以下为原生查询需要添加的-------------------------- */ - const queryParam = ref({}); const toggleSearchStatus = ref(false); const labelCol = reactive({ xs: { span: 24 }, @@ -344,7 +346,7 @@ * 重置 */ function searchReset() { - queryParam.value = {}; + formRef.value.resetFields(); selectedRowKeys.value = []; //刷新数据 reload(); @@ -355,7 +357,7 @@ */ function setFieldsValue(map) { Object.keys(map).map((key) => { - queryParam.value[key] = map[key]; + queryParam[key] = map[key]; }); } @@ -367,7 +369,7 @@ * @param value */ function handleAreaChange(key, value) { - queryParam.value[key] = value.join(','); + queryParam[key] = value.join(','); }