自动检测/手动检测页面
This commit is contained in:
@@ -25,14 +25,14 @@ export const useTable = (
|
||||
// 每页显示条数
|
||||
pageSize: 10,
|
||||
// 总条数
|
||||
total: 0
|
||||
total: 0,
|
||||
},
|
||||
// 查询参数(只包括查询)
|
||||
searchParam: {},
|
||||
// 初始化默认的查询参数
|
||||
searchInitParam: {},
|
||||
// 总参数(包含分页和查询参数)
|
||||
totalParam: {}
|
||||
totalParam: {},
|
||||
});
|
||||
|
||||
/**
|
||||
@@ -42,12 +42,12 @@ export const useTable = (
|
||||
get: () => {
|
||||
return {
|
||||
pageNum: state.pageable.pageNum,
|
||||
pageSize: state.pageable.pageSize
|
||||
pageSize: state.pageable.pageSize,
|
||||
};
|
||||
},
|
||||
set: (newVal: any) => {
|
||||
console.log("我是分页更新之后的值", newVal);
|
||||
}
|
||||
},
|
||||
});
|
||||
|
||||
/**
|
||||
@@ -58,8 +58,15 @@ export const useTable = (
|
||||
if (!api) return;
|
||||
try {
|
||||
// 先把初始化参数和分页参数放到总参数里面
|
||||
Object.assign(state.totalParam, initParam, isPageable ? pageParam.value : {});
|
||||
let { data } = await api({ ...state.searchInitParam, ...state.totalParam });
|
||||
Object.assign(
|
||||
state.totalParam,
|
||||
initParam,
|
||||
isPageable ? pageParam.value : {}
|
||||
);
|
||||
let { data } = await api({
|
||||
...state.searchInitParam,
|
||||
...state.totalParam,
|
||||
});
|
||||
dataCallBack && (data = dataCallBack(data));
|
||||
state.tableData = isPageable ? data.list : data;
|
||||
// 解构后台返回的分页数据 (如果有分页更新分页信息)
|
||||
@@ -82,7 +89,11 @@ export const useTable = (
|
||||
// 防止手动清空输入框携带参数(这里可以自定义查询参数前缀)
|
||||
for (let key in state.searchParam) {
|
||||
// 某些情况下参数为 false/0 也应该携带参数
|
||||
if (state.searchParam[key] || state.searchParam[key] === false || state.searchParam[key] === 0) {
|
||||
if (
|
||||
state.searchParam[key] ||
|
||||
state.searchParam[key] === false ||
|
||||
state.searchParam[key] === 0
|
||||
) {
|
||||
nowSearchParam[key] = state.searchParam[key];
|
||||
}
|
||||
}
|
||||
@@ -139,6 +150,6 @@ export const useTable = (
|
||||
reset,
|
||||
handleSizeChange,
|
||||
handleCurrentChange,
|
||||
updatedTotalParam
|
||||
updatedTotalParam,
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user