Merge remote-tracking branch 'origin/master'

dev_forum
杨树明 6 years ago
commit 9bb0fe1dc9

@ -1933,14 +1933,14 @@ class Listofworks extends Component {
loadingstate: true, loadingstate: true,
}) })
this.Startsorting(this.state.order, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit); this.Startsorting(this.state.order, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, null, this.state.limit);
} else if (checkedValues.length === data.length) { } else if (checkedValues.length === data.length) {
this.setState({ this.setState({
unlimited: 0, unlimited: 0,
course_groupyslstwo: [], course_groupyslstwo: [],
loadingstate: true, loadingstate: true,
}) })
this.Startsorting(this.state.order, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit); this.Startsorting(this.state.order, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, null, this.state.limit);
} else { } else {
// console.log(checkedValues); // console.log(checkedValues);
this.setState({ this.setState({
@ -1948,7 +1948,7 @@ class Listofworks extends Component {
unlimited: 1, unlimited: 1,
loadingstate: true loadingstate: true
}) })
this.Startsorting(this.state.order, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit); this.Startsorting(this.state.order, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, null, this.state.limit);
} }
@ -1965,9 +1965,9 @@ class Listofworks extends Component {
course_groupysls: undefined, course_groupysls: undefined,
checkedValuesineinfo:[], checkedValuesineinfo:[],
loadingstate: true, loadingstate: true,
page: 1,
}) })
this.Startsorting(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.searchtext, this.state.page, this.state.limit); this.Startsorting(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.searchtext, 1, this.state.limit);
} else if (checkedValues.length === data.length) { } else if (checkedValues.length === data.length) {
this.setState({ this.setState({
unlimitedtwo: 1, unlimitedtwo: 1,
@ -1975,7 +1975,7 @@ class Listofworks extends Component {
checkedValuesineinfo:[], checkedValuesineinfo:[],
loadingstate: true, loadingstate: true,
}) })
this.Startsorting(this.state.order, this.state.checcourse_groupyslstwokedValuesine, checkedValues, this.state.searchtext, this.state.page, this.state.limit); this.Startsorting(this.state.order, this.state.checcourse_groupyslstwokedValuesine, checkedValues, this.state.searchtext, 1, this.state.limit);
} else { } else {
this.setState({ this.setState({
checkedValuesineinfo: checkedValues, checkedValuesineinfo: checkedValues,
@ -1983,7 +1983,7 @@ class Listofworks extends Component {
unlimitedtwo: 0, unlimitedtwo: 0,
loadingstate: true, loadingstate: true,
}) })
this.Startsorting(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.searchtext, this.state.page, this.state.limit); this.Startsorting(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.searchtext, 1, this.state.limit);
} }

Loading…
Cancel
Save