fix(console): use pod name query can't find next page resource (#982)

* fix(console): change name * fix(console): can't find next page pod when use podName * fix(console): rm no use file
tkestack · Dec 7, 2020 · a35f015 · a35f015
1 parent 2e45a9e
commit a35f015
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/web/console/src/modules/cluster/actions/resourcePodActions.ts b/web/console/src/modules/cluster/actions/resourcePodActions.ts
@@ -81,7 +81,7 @@ const fetchPodActions = generateFetcherActionCreator({
     }
 
     k8sQueryObj = JSON.parse(JSON.stringify(k8sQueryObj));
-    let { records, continueToken } = await WebAPI.fetchResourceList(podQuery, {
+    const { records, continueToken } = await WebAPI.fetchResourceList(podQuery, {
       resourceInfo: podResourceInfo,
       isClearData,
       k8sQueryObj,
@@ -223,8 +223,13 @@ const restActions = {
         payload: podFilter
       });
 
-      // 清除分页信息
-      dispatch(resourceDetailActions.pod.resetPaging());
+      if (podFilter.podName) {
+        // 清除分页信息
+        dispatch(resourceDetailActions.pod.changePaging({ pageIndex: 1, pageSize: 2048 }));
+      } else {
+        // 清除分页信息
+        dispatch(resourceDetailActions.pod.resetPaging());
+      }
 
       // 根据筛选项，进行pod列表的查询，namespace、metadata.name等过滤条件
       dispatch(resourceDetailActions.pod.poll(podQuery.filter));

diff --git a/...console/src/modules/cluster/components/resource/resourceDetail/ResourcePodActionPanel.tsx b/...console/src/modules/cluster/components/resource/resourceDetail/ResourcePodActionPanel.tsx
@@ -196,7 +196,7 @@ export class ResourcePodActionPanel extends React.Component<RootProps, ResourceP
       {
         type: 'input',
         key: 'ip',
-        name: t('ip地址')
+        name: t('实例IP')
       }
     ].concat(
       isInNodeManage

diff --git a/web/console/src/modules/cluster/components/resource/resourceDetail/ResourcePodTable.tsx b/web/console/src/modules/cluster/components/resource/resourceDetail/ResourcePodTable.tsx
@@ -50,6 +50,7 @@ export function PodTabel({
       <Card.Body>
         <Table columns={columns} records={podList?.data?.records || []} recordKey="id" addons={addons} />
         <Pagination
+          pageSizeOptions={[10, 20, 30, 50, 100, 200, 2048]}
           pageIndex={paging.pageIndex}
           pageSize={paging.pageSize}
           recordCount={recordCount}