From 85f3241f369a1f899a39d86b2bbb4b0c5e4caf3f Mon Sep 17 00:00:00 2001
From: wcy <ext.wangchuangye@jd.com>
Date: Mon, 7 Jun 2021 15:13:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B6=E9=83=A8tab?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E6=B7=BB=E5=8A=A0=E4=BA=8B=E4=BB=B6=E8=B4=A6?=
 =?UTF-8?q?=E6=88=B7=E6=90=9C=E7=B4=A2=E4=B8=A4=E4=B8=AA=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=8F=82=E4=B8=8E=E6=96=B9=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-explorer/src/stores/headerStore.js       |  8 ++--
 data-explorer/src/stores/pages/eventStore.js  | 29 ++++++++++++++
 .../src/web/components/header/header.js       | 13 +++++--
 data-explorer/src/web/pages/event/event.js    | 38 ++++++++++++++++++-
 .../src/web/pages/event/event.t.html          |  2 +-
 5 files changed, 80 insertions(+), 10 deletions(-)

diff --git a/data-explorer/src/stores/headerStore.js b/data-explorer/src/stores/headerStore.js
index acf98757..fe01c6ef 100644
--- a/data-explorer/src/stores/headerStore.js
+++ b/data-explorer/src/stores/headerStore.js
@@ -14,6 +14,10 @@ const HeaderStore = types
       path:'block',
       name:'区块',
       icon:'block',
+    },{
+      path:'user',
+      name:'用户',
+      icon:'user',
     },{
       path:'account',
       name:'数据账户',
@@ -26,10 +30,6 @@ const HeaderStore = types
       path:'contract',
       name:'合约',
       icon:'profile',
-    },{
-      path:'user',
-      name:'用户',
-      icon:'user',
     }],
     selectMenu:[''],
   }))
diff --git a/data-explorer/src/stores/pages/eventStore.js b/data-explorer/src/stores/pages/eventStore.js
index 5099e958..9915ad89 100644
--- a/data-explorer/src/stores/pages/eventStore.js
+++ b/data-explorer/src/stores/pages/eventStore.js
@@ -135,6 +135,35 @@ const EventStore = types
       ).catch(error => {
       });
     },
+
+    searchEvent(ledger,param){
+      return fetchData(`${__HOST}/ledgers/${ledger}/events/accounts/search`,
+        self.setEventCount,
+        param,{ 
+          method: 'get',
+          headers: {
+            // accept: 'application/json',
+            cookie: document.cookie,
+          } 
+        }
+      ).catch(error => {
+      });
+    },
+
+    eventCountSearch(ledger,keyword){
+      return fetchData(`${__HOST}/ledgers/${ledger}/events/accounts/count/search`,
+        self.setEventCount,
+        {keyword:keyword},{ 
+          method: 'get',
+          headers: {
+            // accept: 'application/json',
+            cookie: document.cookie,
+          } 
+        }
+      ).catch(error => {
+      });
+    },
+
     setEventCount(result) {
       if (result && result.success) {
         self.eventTotal = result.data || 0;
diff --git a/data-explorer/src/web/components/header/header.js b/data-explorer/src/web/components/header/header.js
index 5fa83f8c..e1995981 100644
--- a/data-explorer/src/web/components/header/header.js
+++ b/data-explorer/src/web/components/header/header.js
@@ -87,22 +87,22 @@ export default class Header extends Component {
   // 交易列表
   @computed get tableColumns() {
     return [{
-      title: '参与方ID',
+      title: 'ID',
       dataIndex: 'id',
       key:'id'
     },
     {
-      title: '参与方名字',
+      title: '名字',
       dataIndex: 'name',
       key:'name'
     },
     {
-      title: '参与方地址',
+      title: '地址',
       dataIndex: 'address.value',
       key:'address'
     },
     {
-      title: '参与方公钥',
+      title: '公钥',
       dataIndex: 'pubKey',
       key:'pubKey'
     },
@@ -113,6 +113,11 @@ export default class Header extends Component {
       render: (text, record, index) => nj `
        ${tranBase58(text)}
       `()
+    },
+    {
+      title: '状态',
+      dataIndex: 'participantNodeState',
+      key:'participantNodeState'
     }];
   }
  // 交易列表
diff --git a/data-explorer/src/web/pages/event/event.js b/data-explorer/src/web/pages/event/event.js
index 1d425c8c..6dec69bb 100644
--- a/data-explorer/src/web/pages/event/event.js
+++ b/data-explorer/src/web/pages/event/event.js
@@ -38,6 +38,7 @@ export default class Event extends Component {
 
   onInputChange = e => {
     this.eventAddress = e.target.value;
+    console.log(this.eventAddress);
   }
 
   componentDidMount() {
@@ -76,13 +77,48 @@ export default class Event extends Component {
     })
   }
 
+  onSearchEvent = () => {
+    const { store: { common, event } } = this.props;
+    const closeLoading = Message.loading('正在获取数据...', 0);
+    let leaders = common.getDefaultLedger(),
+      keyword = this.eventAddress,
+      param = {
+        fromIndex: (event.accountcurrent - 1) * this.pageSize,
+        count: this.pageSize,
+      };
+    Promise.all([
+      event.eventCountSearch(leaders, keyword)
+    ]).then(() => {
+      if (event.accountcount > 0) {
+        Promise.all([event.searchEvent(leaders,
+          param
+        ),
+        ]).then(() => {
+          closeLoading();
+        });
+      }
+      else {
+        closeLoading();
+      }
+    });
+  }
+
   @autobind
   onPageChange(page, pageSize) {
     const { store: { event } } = this.props;
     event.setCurrent(page);
     this.onSearch();
   }
-
+  @autobind
+  SerchInfo() {
+    console.log(this.eventAddress);
+    if (this.eventAddress.trim() != '') {
+      this.onSearchEvent();
+    }
+    else {
+      this.onSearch()
+    }
+  }
   showEvent = (record, index) => {
     const { store: { common, event } } = this.props;
 
diff --git a/data-explorer/src/web/pages/event/event.t.html b/data-explorer/src/web/pages/event/event.t.html
index c9890009..7ec1f174 100644
--- a/data-explorer/src/web/pages/event/event.t.html
+++ b/data-explorer/src/web/pages/event/event.t.html
@@ -5,7 +5,7 @@
     </h2>
     <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>
+      <ant-Button style="margin-right:20px" icon="search" type="primary" class="{styles.btn}" onClick={SerchInfo}>查询</ant-Button>
     </div>
     <div class="{styles.datapanel}" #show={!show}>
       <ant-Table 
-- 
Gitee