github
/
jeecg-boot-vue3
mirror of https://github.com/jeecgboot/jeecgboot-vue3
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

online报表动态参数，不生效，

pull/170/head^2
zhangdaiscott 2022-09-29 17:11:27 +08:00
parent 013f6c2e81
commit d6130b685d
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/jeecg/OnLine/hooks/usePopBiz.ts
View File

@ -512,6 +512,8 @@ export function usePopBiz(props, tableRef?) {
//查询条件加载后再请求数据 //查询条件加载后再请求数据
if (data) { if (data) {
setDataSource(data); setDataSource(data);
//传递路由参数和动态参数，不生效，
loadData(1);
} else { } else {
//没有传递data时查询数据 //没有传递data时查询数据
loadData(1); loadData(1);
@ -531,6 +533,7 @@ export function usePopBiz(props, tableRef?) {
pagination.current = 1; pagination.current = 1;
} }
let params = getQueryParams(); //查询条件 let params = getQueryParams(); //查询条件
console.log('params', params);
loading.value = true; loading.value = true;
let url = `${configUrl.getData}${unref(cgRpConfigId)}`; let url = `${configUrl.getData}${unref(cgRpConfigId)}`;
//缓存key //缓存key
@ -597,6 +600,11 @@ export function usePopBiz(props, tableRef?) {
} }
queryParam.value = { ...queryTemp }; queryParam.value = { ...queryTemp };
} }
// 合并路由参数
if (props.routeQuery) {
queryParam.value = Object.assign(queryParam.value, props.routeQuery);
}
let dynamicTemp = {}; let dynamicTemp = {};
if (props.param) { if (props.param) {
Object.keys(props.param).map((key) => { Object.keys(props.param).map((key) => {