OSDN > 浏览软件 > Internet > 比原链Bytom > SCM > git > bytom-dashboard > 提交

比原链Bytom
Fork
bytom-java-sdk
homebrew-bytom
bytom-node-sdk
Bytom-JS-SDK
shuttle
equity
bytom
Byone
vapor
Bytom-Dapp-Demo
pybtm
bytom-electron
bytom-spv
bytom-spanner
bytom-kit
bytom-dashboard

bytom-dashboard: 提交

dashboard of Bytom

Revert "update tripple tags"

This reverts commit 9159b71a77d0424874ddc1a9487ea8ed86e35b1a.

--- a/src/features/app/components/Navigation/Navigation.jsx

+++ b/src/features/app/components/Navigation/Navigation.jsx

		@@ -13,9 +13,6 @@ class Navigation extends React.Component {
13	13	constructor(props) {
14	14	super(props)
15	15	this.openTutorial = this.openTutorial.bind(this)
16		- this.state={
17		- transaction:0
18		- }
19	16	}
20	17
21	18	openTutorial(event) {

		@@ -35,35 +32,10 @@ class Navigation extends React.Component {
35	32	</div>}
36	33	<ul className={styles.navigation}>
37	34	<li className={styles.navigationTitle}>{t('crumbName.coreData')}</li>
38		- <li >
39		- <Link to='/transactions'
40		- onClick={() =>{this.setState({transaction:0})}}
41		- activeClassName={this.state.transaction ==0 && styles.active}>
42		- {navIcon('transaction', styles)}
43		- {capitalize(t('crumbName.transaction'))}
44		- </Link>
45		- </li>
46	35	<li>
47		- <Link to={{
48		- pathname: '/transactions',
49		- state: { title: '"营业执照" 存证'}
50		- }}
51		- onClick={() =>{this.setState({transaction:1})}}
52		- activeClassName={this.state.transaction ==1 && styles.active}
53		- >
	36	+ <Link to='/transactions' activeClassName={styles.active}>
54	37	{navIcon('transaction', styles)}
55		- {'"营业执照" 存证'}
56		- </Link>
57		- </li>
58		- <li>
59		- <Link activeClassName={this.state.transaction ==2 && styles.active} to={{
60		- pathname: '/transactions',
61		- state: { title: '"不动产证明" 存证' }
62		- }}
63		- onClick={() =>{this.setState({transaction:2})}}
64		- >
65		- {navIcon('transaction', styles)}
66		- {'"不动产证明" 存证'}
	38	+ {capitalize(t('crumbName.transaction'))}
67	39	</Link>
68	40	</li>
69	41	<li>

--- a/src/features/shared/actions/create.js

+++ b/src/features/shared/actions/create.js

		@@ -10,14 +10,7 @@ export default function(type, options = {}) {
10	10	const created = (param) => ({ type: `CREATED_${type.toUpperCase()}`, param })
11	11
12	12	return {
13		- showCreate: (title) =>
14		- title? push({
15		- pathname: createPath,
16		- state: {
17		- title
18		- }
19		- })
20		- :push(createPath),
	13	+ showCreate: push(createPath),
21	14	created,
22	15	submitForm: (data) => {
23	16	const clientApi = options.clientApi ? options.clientApi() : chainClient()[`${type}s`]

--- a/src/features/shared/components/BaseList/BaseList.jsx

+++ b/src/features/shared/components/BaseList/BaseList.jsx

		@@ -16,9 +16,9 @@ class ItemList extends React.Component {
16	16	const t = this.props.t
17	17
18	18	const objectName = humanize(t(`crumbName.${type.toLowerCase()}` ))
19		- const title = this.props.title \|\| capitalize(t(`crumbName.${type.toLowerCase()}` ) \|\| label)
	19	+ const title = capitalize(t(`crumbName.${type.toLowerCase()}` ) \|\| label)
20	20
21		- const newButton = <button key='showCreate' className='btn btn-primary' onClick={() =>this.props.showCreate(this.props.title)}>
	21	+ const newButton = <button key='showCreate' className='btn btn-primary' onClick={this.props.showCreate}>
22	22	+ { this.props.createLabel \|\| t('crumbName.new')}
23	23	</button>
24	24	if (!this.props.skipCreate) {

		@@ -63,7 +63,6 @@ class ItemList extends React.Component {
63	63	<this.props.listItemComponent
64	64	key={item.id}
65	65	item={item}
66		- title={this.props.title}
67	66	btmAmountUnit={this.props.btmAmountUnit}
68	67	{...this.props.itemActions}/>)
69	68

		@@ -133,7 +132,7 @@ export const mapStateToProps = (type, itemComponent, additionalProps = {}) => (s
133	132	export const mapDispatchToProps = (type) => (dispatch) => {
134	133	return {
135	134	pushList: (query, pageNumber) => dispatch(actions[type].pushList(query, pageNumber)),
136		- showCreate: (title) => dispatch(actions[type].showCreate(title)),
	135	+ showCreate: () => dispatch(actions[type].showCreate),
137	136	}
138	137	}
139	138

--- a/src/features/shared/components/PageTitle/PageTitle.jsx

+++ b/src/features/shared/components/PageTitle/PageTitle.jsx

		@@ -22,10 +22,7 @@ class PageTitle extends React.Component {
22	22	<ul className={styles.crumbs}>
23	23	{this.props.breadcrumbs.map(crumb =>
24	24	<li className={styles.crumb} key={crumb.name}>
25		- {!crumb.last && <Link to={{
26		- pathname: '/' + crumb.path,
27		- state: { title: this.props.changedTitle }
28		- }}>
	25	+ {!crumb.last && <Link to={'/' + crumb.path}>
29	26	{capitalize(crumb.name)}
30	27	<img src={chevron} className={styles.chevron} />
31	28	</Link>}

		@@ -61,8 +58,6 @@ const mapStateToProps = (state, ownProps) => {
61	58	const pathname = state.routing.locationBeforeTransitions.pathname
62	59	const breadcrumbs = []
63	60
64		- const title = state.routing.locationBeforeTransitions.state && state.routing.locationBeforeTransitions.state.title
65		-
66	61	let currentRoutes = routes.childRoutes
67	62	let currentPath = []
68	63	pathname.split('/').forEach(component => {

		@@ -85,11 +80,7 @@ const mapStateToProps = (state, ownProps) => {
85	80
86	81	breadcrumbs[breadcrumbs.length - 1].last = true
87	82
88		- if(title){
89		- breadcrumbs[0].name = title
90		- }
91	83	return {
92		- changedTitle: title,
93	84	breadcrumbs,
94	85	flashMessages: state.app.flashMessages,
95	86	}

--- a/src/features/transactions/components/List.jsx

+++ b/src/features/transactions/components/List.jsx

		@@ -15,9 +15,8 @@ class List extends React.Component {
15	15	}
16	16	}
17	17	render() {
18		- const title = this.props.location.state && this.props.location.state.title
19	18	const ItemList = BaseList.ItemList
20		- return (<ItemList title={ title} { ...this.props} />)
	19	+ return (<ItemList {...this.props} />)
21	20	}
22	21	}
23	22

--- a/src/features/transactions/components/ListItem/ListItem.jsx

+++ b/src/features/transactions/components/ListItem/ListItem.jsx

		@@ -54,12 +54,7 @@ class ListItem extends React.Component {
54	54	<RelativeTime timestamp={item.timestamp} />
55	55	</span>}
56	56
57		- <Link className={styles.viewLink}
58		- to={{
59		- pathname: `/transactions/${item.id}`,
60		- state: { title: this.props.title}
61		- }}
62		- >
	57	+ <Link className={styles.viewLink} to={`/transactions/${item.id}`}>
63	58	{t('commonWords.viewDetails')}
64	59	</Link>
65	60	</div>

		@@ -1,4 +1,3 @@
1		-
2	1	.border {
3	2	padding-top: $gutter-size;
4	3	border-top: 1px solid $border-inverse-color;