Merge branch 'daweifeng-master' into develop

AllenFang · AllenFang · commit c1d1d72b69ff · 2020-02-16T15:38:32.000+08:00
diff --git a/packages/react-bootstrap-table2/src/contexts/index.js b/packages/react-bootstrap-table2/src/contexts/index.js
@@ -85,11 +85,11 @@ const withContext = Base =>
     }
 
     UNSAFE_componentWillReceiveProps(nextProps) {
-      if (nextProps.columns.filter(col => col.sort).length > 0 && !this.SortContext) {
+      if (nextProps.columns.filter(col => col.sort).length <= 0) {
+        this.SortContext = null;
+      } else if (!this.SortContext) {
         this.SortContext = createSortContext(
           dataOperator, this.isRemoteSort, this.handleRemoteSortChange);
-      } else {
-        this.SortContext = null;
       }
       if (!nextProps.pagination && this.props.pagination) {
         this.PaginationContext = null;

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;`