Commit c1d1d72

committed

Merge branch 'daweifeng-master' into develop

2 parents 1aa4bbc + f534b30 commit c1d1d72Copy full SHA for c1d1d72

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -85,11 +85,11 @@ const withContext = Base =>`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`UNSAFE_componentWillReceiveProps(nextProps) {`
`88`		`- if (nextProps.columns.filter(col => col.sort).length > 0 && !this.SortContext) {`
	`88`	`+ if (nextProps.columns.filter(col => col.sort).length <= 0) {`
	`89`	`+ this.SortContext = null;`
	`90`	`+ } else if (!this.SortContext) {`
`89`	`91`	`this.SortContext = createSortContext(`
`90`	`92`	`dataOperator, this.isRemoteSort, this.handleRemoteSortChange);`
`91`		`- } else {`
`92`		`- this.SortContext = null;`
`93`	`93`	`}`
`94`	`94`	`if (!nextProps.pagination && this.props.pagination) {`
`95`	`95`	`this.PaginationContext = null;`

Comments

(0)