From 5e5f4b1c36e1b7d050b8066ff1b2da993f609578 Mon Sep 17 00:00:00 2001 From: yoution Date: Wed, 26 Feb 2020 14:25:23 +0800 Subject: [PATCH] fixed issue about loadmore for models and oses fields --- src/reducers/lookup.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/reducers/lookup.js b/src/reducers/lookup.js index 5d114a4c..13e38a32 100644 --- a/src/reducers/lookup.js +++ b/src/reducers/lookup.js @@ -100,6 +100,7 @@ function onGetModelsDone(state, { payload, error }) { } let models = payload; + const hasMore = models.length === PAGE_SIZE; if (state.modelPage > 1) { models = [...state.models, ...models]; @@ -111,7 +112,7 @@ function onGetModelsDone(state, { payload, error }) { ...state, loadingModelsError: false, models, - hasMoreModels: models.length === PAGE_SIZE, + hasMoreModels: hasMore, isModelsLoading: false, }); } @@ -142,6 +143,7 @@ function onGetOsesDone(state, { payload, error }) { } let oses = payload; + const hasMore = oses.length === PAGE_SIZE; if (state.osPage > 1) { oses = [...state.oses, ...oses]; } @@ -152,7 +154,7 @@ function onGetOsesDone(state, { payload, error }) { ...state, loadingOsesError: false, oses, - hasMoreOses: oses.length === PAGE_SIZE, + hasMoreOses: hasMore, isOsesLoading: false, }); }