|
|
@@ -61,10 +61,12 @@ export const useTable = (
|
|
|
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;
|
|
|
- // 解构后台返回的分页数据 (如果有分页更新分页信息)
|
|
|
+ // 无分页时 requestApi 仍常返回 { list, total },不能直接赋给表格(el-table 需要数组,否则会 data.reduce 报错)
|
|
|
if (isPageable) {
|
|
|
- state.pageable.total = data.total;
|
|
|
+ state.tableData = Array.isArray(data?.list) ? data.list : [];
|
|
|
+ state.pageable.total = data?.total ?? 0;
|
|
|
+ } else {
|
|
|
+ state.tableData = Array.isArray(data) ? data : Array.isArray(data?.list) ? data.list : [];
|
|
|
}
|
|
|
} catch (error) {
|
|
|
requestError && requestError(error);
|