feat(dataset): support url query to save random offset value

IDEA-Research · Mar 27, 2024 · 3313506 · 3313506
1 parent 54be034
commit 3313506
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/packages/app/src/models/dataset/common.tsx b/packages/app/src/models/dataset/common.tsx
@@ -135,7 +135,7 @@ export default () => {
   );
 
   const { loading: loadingImgList, run: loadImgList } = useRequest(
-    (isSlient = false) => {
+    (isSlient = false, withouOffset = false) => {
       // when to load slient
       if (!pageState.datasetId || !pageState.filterValues.categoryId) {
         throw null;
@@ -160,7 +160,7 @@ export default () => {
       };
       if (pageState.queryMode === QueryMode.random) {
         Object.assign(params, {
-          offset: -1,
+          offset: withouOffset ? -1 : pageState.offset,
           pageSize: DEFAULT_PAGE_SIZE,
         });
       }
@@ -197,6 +197,9 @@ export default () => {
           s.imgList = result.imageList;
           s.total = result.total;
         });
+        setPageState((s) => {
+          s.offset = isNumber(result.offset) ? result.offset : -1;
+        });
       },
       onError: () => {},
     },

diff --git a/packages/app/src/models/dataset/type.ts b/packages/app/src/models/dataset/type.ts
@@ -31,6 +31,7 @@ export interface PageState {
   datasetId: string;
   datasetName: string;
   queryMode: QueryMode;
+  offset: number;
   page: number;
   pageSize: number;
   // config
@@ -69,6 +70,7 @@ export const DEFAULT_PAGE_STATE = {
   datasetId: '',
   datasetName: '',
   queryMode: QueryMode.pagination,
+  offset: -1,
   page: 1,
   pageSize: DEFAULT_PAGE_SIZE,
   cloumnCount: 5,

diff --git a/packages/app/src/pages/Dataset/components/Header/index.tsx b/packages/app/src/pages/Dataset/components/Header/index.tsx
@@ -87,7 +87,7 @@ const Header: React.FC = () => {
                 type="text"
                 icon={<RandomIcon />}
                 className={styles.randomBtn}
-                onClick={() => loadImgList()}
+                onClick={() => loadImgList(false, true)}
               >
                 {localeText('dataset.detail.randomQuery')}
               </Button>

diff --git a/packages/app/src/types/api.ts b/packages/app/src/types/api.ts
@@ -23,6 +23,7 @@ export namespace NsApiDataset {
 
   export interface FetchImgListRsp {
     imageList: Array<NsDataSet.DataSetImg>;
+    offset: number;
     total: number;
   }