提交 95d7f119 编写于 作者: H huanghaiquan

Merge branch 'feature/jira-465-transaction-status' into 'release/1.4.0'

Feature/jira 465 transaction status

See merge request jd-blockchain/explorer!1
......@@ -27,15 +27,15 @@ class Bundle extends Component {
ledgers=common.ledgers;
if (ledgerDafault) {
for (let i = 0; i < ledgers.length; i++) {
if(ledgers[i].value==ledgerDafault){
if(ledgers[i]==ledgerDafault){
common.setDefaultLedger(ledgerDafault);
this.load(this.props);
return false;
}
}
if (ledgers.length>0) {
common.setDefaultLedger(ledgers[0].value);
localStorage.setItem('defaultledger',ledgers[0].value);
common.setDefaultLedger(ledgers[0]);
localStorage.setItem('defaultledger',ledgers[0]);
}
else{
// 没有账本时的操作
......@@ -45,8 +45,8 @@ class Bundle extends Component {
}
else{
if (ledgers.length>0) {
common.setDefaultLedger(ledgers[0].value);
localStorage.setItem('defaultledger',ledgers[0].value);
common.setDefaultLedger(ledgers[0]);
localStorage.setItem('defaultledger',ledgers[0]);
}
else{
// 没有账本时的操作
......
因为 它太大了无法显示 source diff 。你可以改为 查看blob
......@@ -5,8 +5,8 @@
<fj-Col l=1 s=4 xs=12>数据账户根哈希
</fj-Col>
<fj-Col l=5 s=8 xs=12>
<#if {{accountData && accountData.rootHash && accountData.rootHash.value}}>
{accountData.rootHash.value}
<#if {{accountData && accountData.rootHash && accountData.rootHash}}>
{accountData.rootHash}
<#elseif {{accountData && accountData.address && accountData.address.value}}>
<AccountRootHash address={accountData.address.value}/>
</#elseif>
......@@ -23,7 +23,7 @@
<fj-Row class="{styles.gl}">
<fj-Col l=1 s=4 xs=12>数据账户公钥
</fj-Col>
<fj-Col l=5 s=8 xs=12>{accountData && accountData.pubKey && accountData.pubKey.value || ''}
<fj-Col l=5 s=8 xs=12>{accountData && accountData.pubKey && accountData.pubKey || ''}
</fj-Col>
<fj-Col l=1 s=4 xs=12>KV数量
</fj-Col>
......
......@@ -49,7 +49,7 @@ export default class BlockInfo extends Component {
let legder=this.props.store.common.getDefaultLedger();
this.transactioninfoData={};
Promise.all([
block.getTransactionMore({"ledger":legder,'tx_hash':record.transactionHash.value}),
block.getTransactionMore({"ledger":legder,'tx_hash':record.transactionHash}),
]).then((success) => {
this.show=true;
this.transactioninfoData=block.transactionInfo;
......@@ -60,7 +60,7 @@ export default class BlockInfo extends Component {
@computed get tableColumns() {
return [{
title: '交易哈希',
dataIndex: 'transactionHash.value',
dataIndex: 'transactionHash',
width:'80%',
key:'name'
}, {
......
......@@ -8,13 +8,13 @@
</fj-Col>
<fj-Col l=1 s=4 xs=12>区块哈希
</fj-Col>
<fj-Col l=3 s=8 xs=12>{blockdata && blockdata.hash && blockdata.hash.value || ''}
<fj-Col l=3 s=8 xs=12>{blockdata && blockdata.hash && blockdata.hash || ''}
</fj-Col>
<fj-Col l=1 s=4 xs=12>前置区块哈希
</fj-Col>
<fj-Col l=3 s=8 xs=12>
<span style="cursor: pointer;" onClick={goBlock}>
{blockdata && blockdata.previousHash && blockdata.previousHash.value || ''}
{blockdata && blockdata.previousHash && blockdata.previousHash || ''}
</span>
</fj-Col>
</fj-Row>
......@@ -25,36 +25,36 @@
</fj-Col>
<fj-Col l=1 s=4 xs=12>交易集哈希
</fj-Col>
<fj-Col l=3 s=8 xs=12>{blockdata && blockdata.transactionSetHash && blockdata.transactionSetHash.value || ''}
<fj-Col l=3 s=8 xs=12>{blockdata && blockdata.transactionSetHash && blockdata.transactionSetHash || ''}
</fj-Col>
<fj-Col l=1 s=4 xs=12>账本哈希
</fj-Col>
<fj-Col l=3 s=8 xs=12>{blockdata && blockdata.ledgerHash && blockdata.ledgerHash.value || ''}
<fj-Col l=3 s=8 xs=12>{blockdata && blockdata.ledgerHash && blockdata.ledgerHash || ''}
</fj-Col>
</fj-Row>
<fj-Row class="{styles.gl}">
<fj-Col l=1 s=4 xs=12>用户集哈希
</fj-Col>
<fj-Col l=3 s=8 xs=12>{blockdata && blockdata.userAccountSetHash && blockdata.userAccountSetHash.value || ''}
<fj-Col l=3 s=8 xs=12>{blockdata && blockdata.userAccountSetHash && blockdata.userAccountSetHash || ''}
</fj-Col>
<fj-Col l=1 s=4 xs=12>合约集哈希
</fj-Col>
<fj-Col l=3 s=8 xs=12>{blockdata && blockdata.contractAccountSetHash && blockdata.contractAccountSetHash.value || ''}
<fj-Col l=3 s=8 xs=12>{blockdata && blockdata.contractAccountSetHash && blockdata.contractAccountSetHash || ''}
</fj-Col>
<fj-Col l=1 s=4 xs=12>配置集哈希
</fj-Col>
<fj-Col l=3 s=8 xs=12>{blockdata && blockdata.adminAccountHash && blockdata.adminAccountHash.value || ''}
<fj-Col l=3 s=8 xs=12>{blockdata && blockdata.adminAccountHash && blockdata.adminAccountHash || ''}
</fj-Col>
</fj-Row>
<fj-Row class="{styles.gl}">
<fj-Col l=1 s=4 xs=12>数据账户集哈希
</fj-Col>
<fj-Col l=3 s=8 xs=12>{blockdata && blockdata.dataAccountSetHash && blockdata.dataAccountSetHash.value || ''}
<fj-Col l=3 s=8 xs=12>{blockdata && blockdata.dataAccountSetHash && blockdata.dataAccountSetHash || ''}
</fj-Col>
<!-- 用户事件集哈希 --》 暂且用数据账户占位 -->
<fj-Col l=1 s=4 xs=12>用户事件集哈希
</fj-Col>
<fj-Col l=3 s=8 xs=12>{blockdata && blockdata.userEventSetHash && blockdata.userEventSetHash.value || ''}
<fj-Col l=3 s=8 xs=12>{blockdata && blockdata.userEventSetHash && blockdata.userEventSetHash || ''}
</fj-Col>
<fj-Col l=1 s=4 xs=12>区块创建时间
......
......@@ -295,7 +295,7 @@ export default class EventInfo extends Component {
<Col span = {10} xs = {24} sm = {16} lg = {10}>{data.address && data.address.value && data.address.value || ''}</Col>
<Col span = {2} xs = {24} sm = {8} lg = {2}>事件账户公钥:</Col>
<Col span = {10} xs = {24} sm = {16} lg = {10}>{data.pubKey && data.pubKey.value && data.pubKey.value || ''}</Col>
<Col span = {10} xs = {24} sm = {16} lg = {10}>{data.pubKey && data.pubKey && data.pubKey || ''}</Col>
</Row>
<h3>事件列表</h3>
......
......@@ -98,17 +98,17 @@ export default class Header extends Component {
},
{
title: '参与方地址',
dataIndex: 'address.value',
dataIndex: 'address',
key:'address'
},
{
title: '参与方公钥',
dataIndex: 'pubKey.value',
dataIndex: 'pubKey',
key:'pubKey'
},
{
title: '公钥算法',
dataIndex: 'pubKey.value',
dataIndex: 'pubKey',
key:'algorithm',
render: (text, record, index) => nj `
${tranBase58(text)}
......
......@@ -21,7 +21,7 @@
</ant-Select> -->
<ant-Select value="{common.defaultledger}" onChange={handleSelectChange} class="ledgers">
<#each {{common.ledgers}}>
<ant-Option key="{@index}" value="{{value}}">{{value}}</ant-Option>
<ant-Option key="{@index}" value="{@item}">{{@item}}</ant-Option>
</#each>
</ant-Select>
<ant-Tooltip title="复制账本" placement="bottomLeft" onClick={onClickCopy}>
......
......@@ -128,7 +128,7 @@ export default class TransactionInfo extends Component {
</div>,
data.transactionHash && (
<div className = {styles.option}>
交易哈希: {data.transactionHash.value && data.transactionHash.value || ''}
交易哈希: {data.transactionHash && data.transactionHash || ''}
</div>
) || null,
<Tabs
......@@ -162,8 +162,8 @@ export default class TransactionInfo extends Component {
<BlockCollapse title = "终端签名列表">
{
data.endpointSignatures.map((item, key) => (
<BlockCollapseSmall title = {`公钥: ${item.pubKey && item.pubKey.value && item.pubKey.value || ''}`}>
签名: {item.digest && item.digest.value && item.digest.value || ''}
<BlockCollapseSmall title = {`公钥: ${item.pubKey && item.pubKey && item.pubKey || ''}`}>
签名: {item.digest && item.digest && item.digest || ''}
</BlockCollapseSmall>
))
}
......@@ -175,8 +175,8 @@ export default class TransactionInfo extends Component {
<BlockCollapse title = "节点签名列表">
{
data.nodeSignatures.map((item, key) => (
<BlockCollapseSmall title = {`公钥: ${item.pubKey && item.pubKey.value && item.pubKey.value || ''}`}>
签名: {item.digest && item.digest.value && item.digest.value || ''}
<BlockCollapseSmall title = {`公钥: ${item.pubKey && item.pubKey && item.pubKey || ''}`}>
签名: {item.digest && item.digest && item.digest || ''}
</BlockCollapseSmall>
))
}
......@@ -273,11 +273,11 @@ export default class TransactionInfo extends Component {
</tr>
<tr>
<td>参与方公钥算法:</td>
<td>{tranBase58(item.pubKey && item.pubKey.value && item.pubKey.value || '')}</td>
<td>{tranBase58(item.pubKey && item.pubKey && item.pubKey || '')}</td>
</tr>
<tr>
<td>参与方公钥数据:</td>
<td>{item.pubKey && item.pubKey.value && item.pubKey.value || ''}</td>
<td>{item.pubKey && item.pubKey && item.pubKey || ''}</td>
</tr>
<tr>
<td>节点状态:</td>
......@@ -358,11 +358,11 @@ export default class TransactionInfo extends Component {
</tr>
<tr>
<td>合约公钥算法:</td>
<td>{tranBase58(contractID.pubKey && contractID.pubKey.value && contractID.pubKey.value || '')}</td>
<td>{tranBase58(contractID.pubKey && contractID.pubKey && contractID.pubKey || '')}</td>
</tr>
<tr>
<td>合约公钥:</td>
<td>{contractID.pubKey && contractID.pubKey.value && contractID.pubKey.value || ''}</td>
<td>{contractID.pubKey && contractID.pubKey && contractID.pubKey || ''}</td>
</tr>
{chainCode && (<tr>
<td>合约内容:</td>
......@@ -398,11 +398,11 @@ export default class TransactionInfo extends Component {
</tr>
<tr>
<td>账户公钥算法:</td>
<td>{tranBase58(accountID.pubKey && accountID.pubKey.value && accountID.pubKey.value || '')}</td>
<td>{tranBase58(accountID.pubKey && accountID.pubKey && accountID.pubKey || '')}</td>
</tr>
<tr>
<td>账户公钥:</td>
<td>{accountID.pubKey && accountID.pubKey.value && accountID.pubKey.value || ''}</td>
<td>{accountID.pubKey && accountID.pubKey && accountID.pubKey || ''}</td>
</tr>
</table>
</BlockCollapsePanel>
......@@ -416,11 +416,11 @@ export default class TransactionInfo extends Component {
</tr>
<tr>
<td>用户公钥算法:</td>
<td>{tranBase58(userID.pubKey && userID.pubKey.value && userID.pubKey.value || '')}</td>
<td>{tranBase58(userID.pubKey && userID.pubKey && userID.pubKey || '')}</td>
</tr>
<tr>
<td>用户公钥数据:</td>
<td>{userID.pubKey && userID.pubKey.value && userID.pubKey.value || ''}</td>
<td>{userID.pubKey && userID.pubKey && userID.pubKey || ''}</td>
</tr>
</table>
</BlockCollapsePanel>
......@@ -460,11 +460,11 @@ export default class TransactionInfo extends Component {
</tr>
<tr>
<td>参与方公钥算法:</td>
<td>{tranBase58(participantRegisterIdentity.pubKey && participantRegisterIdentity.pubKey.value && participantRegisterIdentity.pubKey.value || '')}</td>
<td>{tranBase58(participantRegisterIdentity.pubKey && participantRegisterIdentity.pubKey && participantRegisterIdentity.pubKey || '')}</td>
</tr>
<tr>
<td>参与方公钥数据:</td>
<td>{participantRegisterIdentity.pubKey && participantRegisterIdentity.pubKey.value && participantRegisterIdentity.pubKey.value || ''}</td>
<td>{participantRegisterIdentity.pubKey && participantRegisterIdentity.pubKey && participantRegisterIdentity.pubKey || ''}</td>
</tr>
</table>
</BlockCollapsePanel>
......@@ -486,11 +486,11 @@ export default class TransactionInfo extends Component {
</tr>
<tr>
<td>参与方公钥算法:</td>
<td>{tranBase58(participantID.pubKey && participantID.pubKey.value && participantID.pubKey.value || '')}</td>
<td>{tranBase58(participantID.pubKey && participantID.pubKey && participantID.pubKey || '')}</td>
</tr>
<tr>
<td>参与方公钥数据:</td>
<td>{participantID.pubKey && participantID.pubKey.value && participantID.pubKey.value || ''}</td>
<td>{participantID.pubKey && participantID.pubKey && participantID.pubKey || ''}</td>
</tr>
{
state && (
......@@ -520,11 +520,11 @@ export default class TransactionInfo extends Component {
</tr>
<tr>
<td>参与方公钥算法:</td>
<td>{tranBase58(stateUpdateIdentity.pubKey && stateUpdateIdentity.pubKey.value && stateUpdateIdentity.pubKey.value || '')}</td>
<td>{tranBase58(stateUpdateIdentity.pubKey && stateUpdateIdentity.pubKey && stateUpdateIdentity.pubKey || '')}</td>
</tr>
<tr>
<td>参与方公钥数据:</td>
<td>{stateUpdateIdentity.pubKey && stateUpdateIdentity.pubKey.value && stateUpdateIdentity.pubKey.value || ''}</td>
<td>{stateUpdateIdentity.pubKey && stateUpdateIdentity.pubKey && stateUpdateIdentity.pubKey || ''}</td>
</tr>
</table>
</BlockCollapsePanel>
......@@ -538,7 +538,7 @@ export default class TransactionInfo extends Component {
</tr>
<tr>
<td>事件账户公钥算法:</td>
<td>{eventAccountID.pubKey && eventAccountID.pubKey.value && tranBase58(eventAccountID.pubKey.value) || ''}</td>
<td>{eventAccountID.pubKey && eventAccountID.pubKey && tranBase58(eventAccountID.pubKey) || ''}</td>
</tr>
</table>
</BlockCollapsePanel>
......@@ -660,7 +660,7 @@ export default class TransactionInfo extends Component {
dataSnapshot.adminAccountHash && (
<tr>
<td>管理账户根哈希:</td>
<td>{dataSnapshot.adminAccountHash.value || ''}</td>
<td>{dataSnapshot.adminAccountHash || ''}</td>
</tr>
) || null
}
......@@ -668,7 +668,7 @@ export default class TransactionInfo extends Component {
dataSnapshot.userAccountSetHash && (
<tr>
<td>用户账户集根哈希:</td>
<td>{dataSnapshot.userAccountSetHash.value || ''}</td>
<td>{dataSnapshot.userAccountSetHash || ''}</td>
</tr>
) || null
}
......@@ -676,7 +676,7 @@ export default class TransactionInfo extends Component {
dataSnapshot.dataAccountSetHash && (
<tr>
<td>数据账户集根哈希:</td>
<td>{dataSnapshot.dataAccountSetHash.value || ''}</td>
<td>{dataSnapshot.dataAccountSetHash || ''}</td>
</tr>
) || null
}
......@@ -684,7 +684,7 @@ export default class TransactionInfo extends Component {
dataSnapshot.contractAccountSetHash && (
<tr>
<td>合约账户集根哈希:</td>
<td>{dataSnapshot.contractAccountSetHash.value || ''}</td>
<td>{dataSnapshot.contractAccountSetHash || ''}</td>
</tr>
) || null
}
......@@ -692,7 +692,7 @@ export default class TransactionInfo extends Component {
dataSnapshot.systemEventSetHash && (
<tr>
<td>系统事件集根哈希:</td>
<td>{dataSnapshot.systemEventSetHash.value || ''}</td>
<td>{dataSnapshot.systemEventSetHash || ''}</td>
</tr>
) || null
}
......@@ -700,7 +700,7 @@ export default class TransactionInfo extends Component {
dataSnapshot.userEventSetHash && (
<tr>
<td>用户事件集根哈希:</td>
<td>{dataSnapshot.userEventSetHash.value || ''}</td>
<td>{dataSnapshot.userEventSetHash || ''}</td>
</tr>
) || null
}
......
......@@ -10,311 +10,5 @@
class="{styles.transaction}"
>
{modelItem(data)}
<!-- <div class="{styles.option}">
交易哈希:{data.transactionContent.hash.value}
</div>
<div class="{styles.option}">
交易时间:{data.transactionContent.timestamp && moment(+data.transactionContent.timestamp).format('YYYY-MM-DD HH:mm:ss')}
</div>
<div class="{styles.option}">
执行状态: {data.executionState}
</div>
<#if {{data.endpointSignatures}}>
<BlockCollapse title="终端签名列表">
<#each {{data.endpointSignatures}}>
<BlockCollapseSmall title=" 公钥:{{this.pubKey.value}}" sign="公钥算法:{{tranBase58(this.pubKey.value)}}">
签名:{{this.digest.value}}
</BlockCollapseSmall>
</#each>
</BlockCollapse>
</#if>
<#if {{data.nodeSignatures}}>
<BlockCollapse title="节点签名列表">
<#each {{data.nodeSignatures}}>
<BlockCollapseSmall title=" 公钥:{{this.pubKey.value}}" sign="公钥算法:{{tranBase58(this.pubKey.value)}}">
签名:{{this.digest.value}}
</BlockCollapseSmall>
</#each>
</BlockCollapse>
</#if>
<#if {{data.transactionContent.operations}}>
<BlockCollapse title="交易内容">
<#each {{data.transactionContent.operations}}>
<#if {{this.writeSet}}>
<BlockCollapsePanel title="数据写入">
<h4 style="font-size: 14px;color: #333333;line-height: 14px; font-weight: bold;margin:16px 0;">写入
</h4>
<fj-Row style="margin:16px 0;">
<fj-Col l=2>账户地址:</fj-Col>
<fj-Col l=10>{{this.accountAddress.value}} </fj-Col>
</fj-Row>
<#each {{this.writeSet}}>
<BlockCollapseSmall title="键:{{this.key}}">
值:{{formatData(this.value.type,this.value.bytes, this.value.value)}}<br>
预期版本:{{this.expectedVersion}}<br>
类型:{{this.value.type}}
</BlockCollapseSmall>
</#each>
</BlockCollapsePanel>
</#if>
<#if {{this.contractID}}>
<BlockCollapsePanel title="合约发布">
<table style="line-height:41px;">
<tr>
<td>合约地址:</td>
<td>{{this.contractID.address.value}}</td>
</tr>
<tr>
<td>合约公钥算法:</td>
<td>{{tranBase58(this.contractID.pubKey.value)}}</td>
</tr>
<tr>
<td>合约公钥:</td>
<td>{{this.contractID.pubKey.value}}</td>
</tr>
<tr>
<td>合约内容:</td>
<td>{{this.chainCode}}</td>
</tr>
</table>
</BlockCollapsePanel>
</#if>
<#if {{this.contractAddress}}>
<BlockCollapsePanel title="合约事件操作">
<table style="line-height:41px;">
<tr>
<td>合约参数:</td>
<td>{{argsToList(this.args)}}</td>
</tr>
<tr>
<td>合约地址:</td>
<td>{{this.contractAddress.value}} </td>
</tr>
<tr>
<td>合约事件:</td>
<td>{{this.event}}</td>
</tr>
</table>
</BlockCollapsePanel>
</#if>
<#if {{this.accountID}}>
<BlockCollapsePanel title="数据账户注册">
<table style="line-height:41px;">
<tr>
<td>数据账户地址:</td>
<td>{{this.accountID.address.value}}</td>
</tr>
<tr>
<td>账户公钥算法:</td>
<td>{{tranBase58(this.accountID.pubKey.value)}}</td>
</tr>
<tr>
<td>账户公钥:</td>
<td>{{this.accountID.pubKey.value}}</td>
</tr>
</table>
</BlockCollapsePanel>
</#if>
<#if {{this.userID}}>
<BlockCollapsePanel title="注册用户">
<table style="line-height:41px;">
<tr>
<td>用户地址:</td>
<td>{{this.userID.address.value}}</td>
</tr>
<tr>
<td>用户公钥算法:</td>
<td>{{tranBase58(this.userID.pubKey.value)}}</td>
</tr>
<tr>
<td>用户公钥数据:</td>
<td>{{this.userID.pubKey.value}}</td>
</tr>
</table>
</BlockCollapsePanel>
</#if>
<#if {{this.state}}>
<BlockCollapsePanel title="状态">
<fj-Row style="margin:16px 0;">
<fj-Col l=2>状态:</fj-Col>
<fj-Col l=10>{{stateItem(this.state)}} </fj-Col>
</fj-Row>
</BlockCollapsePanel>
</#if>
<#if {{this.participantName}}>
<BlockCollapsePanel title="参与方信息">
<table style="line-height:41px;">
<tr>
<td>参与方名称:</td>
<td>{{this.participantName}}</td>
</tr>
</table>
</BlockCollapsePanel>
</#if>
<#if {{this.participantRegisterIdentity}}>
<BlockCollapsePanel title="注册参与方">
<table style="line-height:41px;">
<tr>
<td>参与方地址:</td>
<td>{{this.participantRegisterIdentity.address.value}}</td>
</tr>
<tr>
<td>参与方公钥算法:</td>
<td>{{tranBase58(this.participantRegisterIdentity.pubKey.value)}}</td>
</tr>
<tr>
<td>参与方公钥数据:</td>
<td>{{this.participantRegisterIdentity.pubKey.value}}</td>
</tr>
</table>
</BlockCollapsePanel>
</#if>
<#if {{this.participantID}}>
<BlockCollapsePanel title="{{partItem(this.state)}}">
<table style="line-height:41px;">
<tr>
<td>参与方地址:</td>
<td>{{this.participantID.address.value}}</td>
</tr>
<tr>
<td>参与方公钥算法:</td>
<td>{{tranBase58(this.participantID.pubKey.value)}}</td>
</tr>
<tr>
<td>参与方公钥数据:</td>
<td>{{this.participantID.pubKey.value}}</td>
</tr>
</table>
</BlockCollapsePanel>
</#if>
<#if {{this.stateUpdateIdentity}}>
<BlockCollapsePanel title="更新参与方">
<table style="line-height:41px;">
<tr>
<td>参与方地址:</td>
<td>{{this.stateUpdateIdentity.address.value}}</td>
</tr>
<tr>
<td>参与方公钥算法:</td>
<td>{{tranBase58(this.stateUpdateIdentity.pubKey.value)}}</td>
</tr>
<tr>
<td>参与方公钥数据:</td>
<td>{{this.stateUpdateIdentity.pubKey.value}}</td>
</tr>
</table>
</BlockCollapsePanel>
</#if>
<#if {{this.eventAccountID}}>
<BlockCollapsePanel title="事件账户">
<table style="line-height:41px;width:100%;">
<tr>
<td>事件账户地址:</td>
<td>{{this.eventAccountID.address.value}}</td>
</tr>
<tr>
<td>事件账户公钥算法:</td>
<td>{{tranBase58(this.eventAccountID.pubKey.value)}}</td>
</tr>
</table>
</BlockCollapsePanel>
</#if>
<#if {{this.eventAddress || this.events}}>
<BlockCollapsePanel title="事件">
<table style="line-height:41px;width:100%;">
<tr>
<td>事件地址:</td>
<td>{{this.eventAddress.value || ''}}</td>
</tr>
</table>
<#each {{this.events}}>
<BlockCollapse title="事件:{{name}}">
<table style="line-height:41px;width:100%;">
<tr>
<td>事件序列:</td>
<td>{{sequence || 0}}</td>
</tr>
<#if {{this.content}}>
<tr>
<td>字节:</td>
<td>{{this.content.bytes && this.content.bytes.value || ''}}</td>
</tr>
<tr>
<td>类型:</td>
<td>{{this.content.type || ''}}</td>
</tr>
<tr>
<td>值:</td>
<td>{{this.content.value + ''}}</td>
</tr>
</#if>
</table>
</BlockCollapse>
</#each>
</BlockCollapsePanel>
</#if>
<#if {{this.roles}}>
<BlockCollapsePanel title="角色配置">
<#each {{this.roles}}>
<BlockCollapse title="角色:{{roleName}}">
<BlockCollapseSmall title="账本操作权限">
<table style="width:100%">
<tr>
<td>可以执行的操作:</td>
<td>{{enableLedgerPermissions && transform(enableLedgerPermissions) || ''}}</td>
</tr>
<#if {{disableLedgerPermissions && disableLedgerPermissions.length != 0}}>
<tr>
<td>不可执行的操作:</td>
<td>{{disableLedgerPermissions && transform(disableLedgerPermissions) || ''}}</td>
</tr>
</#if>
</table>
</BlockCollapseSmall>
<BlockCollapseSmall title="交易操作权限">
<table style="width:100%" >
<tr>
<td>可以执行的操作:</td>
<td>{{enableTransactionPermissions && transform(enableTransactionPermissions) || ''}}</td>
</tr>
<#if {{disableTransactionPermissions && disableTransactionPermissions.length != 0}}>
<tr>
<td>不可执行的操作:</td>
<td>{{disableTransactionPermissions && transform(disableTransactionPermissions) || ''}}</td>
</tr>
</#if>
</table>
</BlockCollapseSmall>
</BlockCollapse>
</#each>
</BlockCollapsePanel>
</#if>
<#if {{this.userRolesAuthorizations}}>
<BlockCollapsePanel title="用户权限配置">
<#each {{this.userRolesAuthorizations}}>
<table style="width:100%;line-height:41px;">
<tr>
<td>用户地址:</td>
<td>{{(userAddresses && userAddresses[0] && userAddresses[0].value) && userAddresses[0].value || ''}}</td>
</tr>
<tr>
<td>用户授权的角色清单:</td>
<td>{{authorizedRoles && authorizedRoles.join(',') || 'DEFAULT'}}</td>
</tr>
<tr>
<td>剔除的角色清单:</td>
<td>{{unauthorizedRoles && unauthorizedRoles.join(',') || ''}}</td>
</tr>
<tr>
<td>要更新的多角色权限策略:</td>
<td>{{policy && policy || ''}}</td>
</tr>
</table>
</#each>
</BlockCollapsePanel>
</#if>
</#each>
</BlockCollapse>
</#if> -->
</ant-Drawer>
</template>
\ No newline at end of file
......@@ -170,7 +170,7 @@ export default class Account extends Component {
width: '25%'
}, {
title: '账户公钥',
dataIndex: 'pubKey.value',
dataIndex: 'pubKey',
key: 'pubKey',
width: '25%',
render: (text, record, index) => nj`
......@@ -178,14 +178,14 @@ export default class Account extends Component {
`()
}, {
title: '默克尔树根哈希',
dataIndex: 'rootHash.value',
dataIndex: 'rootHash',
key: 'rootHash',
width: '25%',
render: (text, record, index) => nj`
<#if ${text}>
${text}
<#else>
<AccountRootHash address=${record.address.value}/>
<AccountRootHash address=${record.address}/>
</#else>
</#if>
`()
......
......@@ -126,14 +126,14 @@ export default class Contract extends Component {
key:'address'
}, {
title: '合约公钥',
dataIndex: 'pubKey.value',
dataIndex: 'pubKey',
key:'pubKey',
render: (text, record, index) => nj `
${text}<br/>算法:${tranBase58(text)}
`()
}, {
title: '合约根哈希',
dataIndex: 'rootHash.value',
dataIndex: 'rootHash',
key:'rootHash',
render: (text, record, index) => nj `
<#if ${text}>
......
......@@ -142,7 +142,7 @@ export default class Event extends Component {
key: 'address',
}, {
title: '账户公钥',
dataIndex: 'pubKey.value',
dataIndex: 'pubKey',
key: 'pubKey',
render: (text, record, index) => nj`
${text}<br/>算法:${tranBase58(text)}
......
......@@ -148,9 +148,9 @@
<span>合约地址:</span>
<span :dangerouslySetInnerHTML="{__html: highLIght(address.value)}"></span>
<span>合约公钥:</span>
<span :dangerouslySetInnerHTML="{__html: highLIght(pubKey.value) }"></span>
<span :dangerouslySetInnerHTML="{__html: highLIght(pubKey) }"></span>
<span>合约公钥算法:</span>
<span :dangerouslySetInnerHTML="{__html: tranBase58(pubKey.value) }"></span>
<span :dangerouslySetInnerHTML="{__html: tranBase58(pubKey) }"></span>
</p>
</article>
</#each>
......@@ -161,9 +161,9 @@
<span>数据账户地址:</span>
<span :dangerouslySetInnerHTML="{__html: highLIght(address.value)}"></span>
<span>数据账户公钥:</span>
<span :dangerouslySetInnerHTML="{__html: highLIght(pubKey.value)}"></span>
<span :dangerouslySetInnerHTML="{__html: highLIght(pubKey)}"></span>
<span>数据账户公钥算法:</span>
<span :dangerouslySetInnerHTML="{__html: tranBase58(pubKey.value)}"></span>
<span :dangerouslySetInnerHTML="{__html: tranBase58(pubKey)}"></span>
<span>默克尔树根哈希</span>
<span><AccountRootHash address={address.value}/></span>
</p>
......@@ -186,9 +186,9 @@
<span>用户地址:</span>
<span :dangerouslySetInnerHTML="{__html: highLIght(address.value)}"></span>
<span>用户公钥:</span>
<span :dangerouslySetInnerHTML="{__html: highLIght(pubKey.value)}"></span>
<span :dangerouslySetInnerHTML="{__html: highLIght(pubKey)}"></span>
<span>用户公钥算法:</span>
<span :dangerouslySetInnerHTML="{__html: tranBase58(pubKey.value)}"></span>
<span :dangerouslySetInnerHTML="{__html: tranBase58(pubKey)}"></span>
</p>
</article>
</#each>
......@@ -244,9 +244,9 @@
<span>合约地址:</span>
<span :dangerouslySetInnerHTML="{__html: highLIght(address.value)}"></span>
<span>合约公钥:</span>
<span :dangerouslySetInnerHTML="{__html: highLIght(pubKey.value) }"></span>
<span :dangerouslySetInnerHTML="{__html: highLIght(pubKey) }"></span>
<span>合约公钥算法:</span>
<span :dangerouslySetInnerHTML="{__html: tranBase58(pubKey.value) }"></span>
<span :dangerouslySetInnerHTML="{__html: tranBase58(pubKey) }"></span>
</p>
</article>
</#each>
......@@ -266,9 +266,9 @@
<span>数据账户地址:</span>
<span :dangerouslySetInnerHTML="{__html: highLIght(address.value)}"></span>
<span>数据账户公钥:</span>
<span :dangerouslySetInnerHTML="{__html: highLIght(pubKey.value)}"></span>
<span :dangerouslySetInnerHTML="{__html: highLIght(pubKey)}"></span>
<span>数据账户公钥算法:</span>
<span :dangerouslySetInnerHTML="{__html: tranBase58(pubKey.value)}"></span>
<span :dangerouslySetInnerHTML="{__html: tranBase58(pubKey)}"></span>
</p>
</article>
</#each>
......@@ -304,9 +304,9 @@
<span>用户地址:</span>
<span :dangerouslySetInnerHTML="{__html: highLIght(address.value)}"></span>
<span>用户公钥:</span>
<span :dangerouslySetInnerHTML="{__html: highLIght(pubKey.value)}"></span>
<span :dangerouslySetInnerHTML="{__html: highLIght(pubKey)}"></span>
<span>用户公钥算法:</span>
<span :dangerouslySetInnerHTML="{__html: tranBase58(pubKey.value)}"></span>
<span :dangerouslySetInnerHTML="{__html: tranBase58(pubKey)}"></span>
</p>
</article>
</#each>
......
......@@ -117,7 +117,7 @@ export default class User extends Component {
key:'address'
},{
title: '用户公钥',
dataIndex: 'pubKey.value',
dataIndex: 'pubKey',
key:'pubKey',
render: (text, record, index) => nj `
${text}<br>算法:${tranBase58(text)}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册