diff --git a/data-explorer/src/stores/headerStore.js b/data-explorer/src/stores/headerStore.js index acf98757b8978e4a363b4a30711c7e8adc7beff8..fe01c6ef0827249d4c3bbf87805033b35af0e77e 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 5099e958ef2ce78e5587092e3d7f67805aabe5ec..9915ad89e925b2e24732b56877bee4d66f61237a 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 5fa83f8ca7454048966e2dfcbb590e63d1714b64..e1995981884acf90b18abfcfa7c9d182430de887 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 1d425c8cae064c9c3fd09cd98b57179c205cf983..6dec69bb1366f76f99d3061ab74f67781fd35013 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 c9890009d34d56af487cb7b14a323cf29ace3d01..7ec1f174d25a64e9a8433358e78c5b867474552f 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 @@
- 查询 + 查询