update table

src/TransactionList/TransactionList.jsx

@@ -1,7 +1,7 @@
 /* eslint no-mixed-operators:0 */
 import React, { Component } from 'react';
-import { Table, Feedback, Dialog, Button } from '@icedesign/base';
-import { Tag, Balloon } from '@alifd/next';
+import { Feedback, Dialog } from '@icedesign/base';
+import { Table, Tag, Balloon, Button } from '@alifd/next';
 import IceContainer from '@icedesign/container';
 import copy from 'copy-to-clipboard';
 import * as oexchain from 'oex-web3';
@@ -140,7 +140,7 @@ export default class TransactionList extends Component {
           transactions = transactions.slice(0, this.state.maxTxNum);
         }
 
-        _this.setState({ transactions });
+        this.state.transactions = transactions;
       //});
     }
   }
@@ -353,13 +353,13 @@ export default class TransactionList extends Component {
   }
 
   render() {
-    console.log('displayed tx num = ' + this.state.transactions.length);
     return (
       <div className="progress-table">
         {
           this.state.homePage ? 
             <IceContainer  title={T("交易")}>
               <Table primaryKey="txHash" isZebra={false}  hasBorder={false} 
+                //rowProps={{style: {height:'50px'}}} 
                 language={T('zh-cn')} hasHeader={false} 
                 dataSource={this.state.transactions}
               >
@@ -368,6 +368,14 @@ export default class TransactionList extends Component {
                 <Table.Column title={T("交易详情")} dataIndex="parsedActions" width={180} cell={this.renderDetailInfo2.bind(this)}/>
                 <Table.Column title={T("结果")} dataIndex="parsedActions" width={80} cell={this.renderResult2.bind(this)} />
               </Table>
+
+              <Button type='primary' 
+                      style={{width: '100%', height: '40px', background: 'rgb(239,240,255)', color: '#5c67f2'}}
+                      onClick={() => {
+                        history.push('/Transaction');
+                      }}>
+                {T('查询交易')}
+              </Button>
             </IceContainer>
               :
             <IceContainer className="tab-card" title={T("交易")}>

src/pages/Dashboard/components/BlocksTable/BlocksTable.jsx

@@ -21,6 +21,7 @@ export default class BlocksTable extends Component {
     super(props);
 
     this.state = {
+      maxBlockNum: 17,
       blockList: [],
       intervalId: 0,
       blockListVisible: false,
@@ -53,7 +54,7 @@ export default class BlocksTable extends Component {
       let nextBlockNum = block.number - 1;
       let count = 1;
       const len = this.state.blockList.length;
-      for (let i = 0; count < 18; i++, nextBlockNum--, count++) {
+      for (let i = 0; count < this.state.maxBlockNum; i++, nextBlockNum--, count++) {
         if (i < len && this.state.blockList[i].number == nextBlockNum) {
           blockList.push(this.state.blockList[i]);
           continue;
@@ -101,10 +102,13 @@ export default class BlocksTable extends Component {
     const localTime = utils.getValidTime(record.timestamp);
     return (<div>
         <div>
-          {T('矿工') + ' '}<font style={{color: '#5c67f2'}}>{record.miner}</font>
+          {T('出块时间 ')}{localTime}
         </div>
         <div>
-          <font style={{color: '#5c67f2'}}>{record.txn}{T('条交易')}</font>{T('发生于')}{localTime}
+          {T('矿工 ') + ' '}<font style={{color: '#5c67f2'}}>{record.miner}</font>
+        </div>
+        <div>
+        {T('交易量 ') + ' '}<font style={{color: '#5c67f2'}}>{record.txn}{T('条')}</font>
         </div>
       </div>);
   }
@@ -137,8 +141,9 @@ export default class BlocksTable extends Component {
             <Table.Column title={T("区块大小(B)")} dataIndex="size" width={100}/>
             <Table.Column title={T("生产者")} dataIndex="miner" width={100} /> */}
           </Table>
+
           <Button type='primary' 
-                  style={{width: '100%', height: '40px', background: 'rgb(239,240,255)', color: '#5c67f2'}}
+                  style={{width: '100%', height: '40px', marginTop: '5px', background: 'rgb(239,240,255)', color: '#5c67f2'}}
                   onClick={() => {
                     this.setState({blockListVisible: true});
                   }}>

src/pages/Dashboard/components/TransactionsTable/TransactionsTable.jsx

@@ -1,6 +1,5 @@
 /* eslint no-mixed-operators:0 */
 import React, { Component } from 'react';
-import * as oexchain from 'oex-web3';
 
 import TransactionList from '../../../../TransactionList';
 import eventProxy from '../../../../utils/eventProxy';
@@ -12,26 +11,32 @@ export default class TransactionsTable extends Component {
     super(props);
 
     this.state = {
+      blockHashSet: {},
+      txHashSet: {},
+      maxTxNum: 13,
       txHashArr: [],
       current: 1,
       assetInfos: {},
       txFrom: { txHashArr: [], maxTxNum: 0, fromHomePage: true },
       intervalId: 0,
+      transactions: [],
     };
   }
 
   componentDidMount() {
     eventProxy.on('updateBlocks', (blocks) => {
-      const maxTxNum = 13;
       let txHashArr = [];
       for (let i = 0; i < blocks.length; i++) {
-        txHashArr.push(...blocks[i].transactions);
-        if (txHashArr.length > maxTxNum) {
-          txHashArr = txHashArr.slice(0, maxTxNum);
-          break;
+        if (this.state.blockHashSet[blocks[i].number] == null) {
+          txHashArr.push(...blocks[i].transactions);
+          this.state.blockHashSet[blocks[i].number] = 1;
+          if (txHashArr.length > this.state.maxTxNum) {
+            txHashArr = txHashArr.slice(0, this.state.maxTxNum);
+            break;
+          }
         }
       }
-      this.setState({txFrom: { txHashArr, maxTxNum, fromHomePage: true }});
+      this.setState({txFrom: { txHashArr, maxTxNum: this.state.maxTxNum, fromHomePage: true }});
     });
   }