Merge commit '43813b69' into release/1.4.0

* commit '43813b69':
  update jira-557
  events module

data-explorer/server/routes/ledgers.js

@@ -1436,6 +1436,14 @@ router.get('/:ledger/all/search', function(req, res) {
           "pubKey": "mavweXqvKGUAJzSxE9S15pV7c7qe9bgUn5R1HwpqmXVTUs"
         }
       ],
+      "event_accounts":[
+        {
+          "address": {
+            "value":"LdeNo4xBX2Xmek39xfCXqmGfDcEk7K841xAuX"
+          },
+          "pubKey": "7VeRGgAPnMxHnVosL5LZY9gfBYvWXxv8aAMWmMkjkGXTFP3p"
+        }
+      ],
     },
   });
 

data-explorer/src/stores/pages/searchStore.js

@@ -119,6 +119,7 @@ const SearchStore = types
       });
     },
     setEventTotal(result) {
+      console.log(result)
       if (result&&result.success) {
         self.dataEventTotal=result.data||0;
       }
@@ -164,7 +165,7 @@ const SearchStore = types
         self.accountsData=result.data && result.data.accounts ||[];// 数据账户
         self.contractsData=result.data && result.data.contracts || [];// 合约数据
 
-        self.eventData = [];
+        self.eventData = result.data && result.data['event_accounts'] || []; // 事件账户
 
         self.allData=[...self.blockData,...self.txsData,...self.usersData,...self.accountsData,...self.contractsData, ...self.eventData];
       } 

data-explorer/src/web/pages/event/event.t.html

@@ -3,10 +3,10 @@
     <h2 #show={!show}>
       事件账户
     </h2>
-    <!-- <div style="margin-bottom:20px;" #show={!show}>
+    <div style="margin-bottom:20px;" #show={!show}>
       <ant-Input style="width:200px;margin-right:20px" value={eventAddress} onChange={onInputChange}/>
       <ant-Button style="margin-right:20px" icon="search" type="primary" class="{styles.btn}" onClick={onSearch}>查询</ant-Button>
-    </div> -->
+    </div>
     <div class="{styles.datapanel}" #show={!show}>
       <ant-Table 
         columns={toJS(eventColumns)}

data-explorer/src/web/pages/search/search.js

@@ -86,6 +86,7 @@ export default class Search extends Component {
       search.getTransactionTotal(legder),
       search.getUserTotal(legder),
       search.getLedgerTotal(legder),
+      search.getEventTotal(legder),
       search.getContractTotal(legder),
     ]).then(() => {
       closeLoading();

data-explorer/src/web/pages/search/search.t.html

@@ -76,7 +76,7 @@
           </div>
         </router-Link>
         <!-- 事件账户总数，暂时以数据账户代替 -->
-        <!-- <router-Link to='event' class="{styles.link}">
+        <router-Link to='event' class="{styles.link}">
           <div class="{styles.tabs} {styles.ledgers}">
             <div class="{styles.span}">
               <div class="{styles.left}">
@@ -90,7 +90,7 @@
               </div>
             </div>
           </div>
-        </router-Link> -->
+        </router-Link>
         <router-Link to='contract' class="{styles.link}">
           <div class="{styles.tabs} {styles.contracts}">
             <div class="{styles.span}">
@@ -115,7 +115,7 @@
           <span>{search.txsData.length}</span>条交易内容，
           <span>{search.contractsData.length}</span>条合约数据，
           <span>{search.accountsData.length}</span>条数据账户，
-          <!-- <span>{search.eventData.length}</span>条事件账户， -->
+          <span>{search.eventData.length}</span>条事件账户，
           <span>{search.usersData.length}</span>条用户数据
         </div>
         <ant-Tabs>
@@ -171,13 +171,13 @@
               </#each>
 
               <!-- 事件账户 -->
-              <!-- <#each {{search.eventData}}>
+              <#each {{search.eventData}}>
                 <article key={@index} class="{styles.option}">
                   <p class="{styles.title}">
                     
                   </p>
                 </article>
-              </#each> -->
+              </#each>
 
               <!-- 用户数据 -->
               <#each {{search.usersData}}>
@@ -280,11 +280,17 @@
               </#else>
             </#if>
           </ant-TabPane>
-          <!-- <ant-TabPane tab="事件账户" key="5">
+          <ant-TabPane tab="事件账户" key="5">
             <#if {{search.eventData.length > 0}}>
               <#each {{search.eventData}}>
                 <article key={@index} class="{styles.option}">
                   <p class="{styles.title}">
+                    <span>事件账户地址：</span>
+                    <span :dangerouslySetInnerHTML="{__html: highLIght(address.value)}"></span>
+                    <span>事件账户公钥：</span>
+                    <span :dangerouslySetInnerHTML="{__html: highLIght(pubKey)}"></span>
+                    <span>事件账户公钥算法：</span>
+                    <span :dangerouslySetInnerHTML="{__html: tranBase58(pubKey)}"></span>
                   </p>
                 </article>
               </#each>
@@ -295,7 +301,7 @@
                 暂无数据  
               </#else>
             </#if>
-          </ant-TabPane> -->
+          </ant-TabPane>
           <ant-TabPane tab="用户" key='6'>
            <#if {{search.usersData.length > 0}}>
               <#each {{search.usersData}}>