[OSS101] Complete task 5: Change the method of loading new data from scrolling down and clicking to flipping pages X-lab2017#115

Author: ZhmYe

src/components/table.js

@@ -352,12 +352,6 @@ function MyTable(props) {
     });
   }, [props]);
 
-  const expandData = () => {
-    setState({
-      ...state,
-      showSize: state.showSize + 25,
-    });
-  };
   const updateDate = (newstate) => {
     console.log('table update', newstate);
     // 先获取原先的表格属性
@@ -520,39 +514,13 @@ function MyTable(props) {
             // scroll={{ x: 1500, y: 300 }}
             columns={columns}
             rowKey={(record) => record.rank}
-            dataSource={data.slice(0, Math.min(showSize, data.length))}
-            pagination={false}
+            dataSource={data}
+            pagination={{ position: ['bottomRight'], pageSize: showSize }}
             loading={loading}
             scroll={{ x: 'max-content' }}
           />
           <Row style={{ marginTop: '10px' }}>
-            <Col span={12}>
-              <Row justify="start">
-                <Col>
-                  {showSize < data.length ? (
-                    <a
-                      style={{
-                        color: '#FFCC19',
-                        fontSize: '18px',
-                      }}
-                      onClick={expandData}
-                    >
-                      {t('showMore') + '>>'}
-                    </a>
-                  ) : (
-                    <span
-                      style={{
-                        color: 'gray',
-                        fontSize: '18px',
-                      }}
-                    >
-                      {t('noMore')}
-                    </span>
-                  )}
-                </Col>
-              </Row>
-            </Col>
-            <Col span={12}>
+            <Col span={24}>
               <Row justify="end">
                 <Col>
                   <QAmiss />

src/locales/en.json

@@ -25,8 +25,6 @@
   "activity": "Activity",
   "influence": "OpenRank",
   "details": "Details",
-  "showMore": "show more",
-  "noMore": "no more",
   "issue_comments": "Issue Comments",
   "open_issues": "Open Issues",
   "open_pulls": "Open PRs",

src/locales/zh.json

@@ -25,8 +25,6 @@
   "activity": "活跃度",
   "influence": "OpenRank",
   "details": "详情",
-  "showMore": "展示更多",
-  "noMore": "没有更多啦",
   "issue_comments": "Issue 评论",
   "open_issues": "创建 Issue",
   "open_pulls": "创建 PR",