Merge pull request '去掉排除问题过程' (#3) from dev_csw into master
Reviewed-on: http://121.41.2.71:3000/wyw/mh_jy_safe_web/pulls/3
This commit is contained in:
commit
5d22923101
@ -60,7 +60,6 @@ class ListPage extends React.Component {
|
|||||||
|
|
||||||
loadData = (params) => {
|
loadData = (params) => {
|
||||||
if (this.state.loadDataFunc) {
|
if (this.state.loadDataFunc) {
|
||||||
console.log('调用查询中间过程', 5)
|
|
||||||
if (!this.state.loadDataFunc.length) {
|
if (!this.state.loadDataFunc.length) {
|
||||||
this.directSearchStop = true
|
this.directSearchStop = true
|
||||||
this.directSearchParams = params
|
this.directSearchParams = params
|
||||||
@ -88,7 +87,6 @@ class ListPage extends React.Component {
|
|||||||
loadDataFunc: data
|
loadDataFunc: data
|
||||||
}, () => {
|
}, () => {
|
||||||
if (!this.props.preventDefaultSearch || this.directSearchStop) {
|
if (!this.props.preventDefaultSearch || this.directSearchStop) {
|
||||||
console.log('调用查询中间过程', 4)
|
|
||||||
this.refOfSearch && this.refOfSearch.handleSearch()
|
this.refOfSearch && this.refOfSearch.handleSearch()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@ -79,7 +79,6 @@ class AdvanceSearch extends Component {
|
|||||||
const { search, dispatch } = this.props
|
const { search, dispatch } = this.props
|
||||||
let stopSelfChangeSearch = false
|
let stopSelfChangeSearch = false
|
||||||
let stopSelfExtraSearch = false
|
let stopSelfExtraSearch = false
|
||||||
console.log('共享搜索条件', this.shareKey)
|
|
||||||
if (this.shareKey) {
|
if (this.shareKey) {
|
||||||
const instances = search.shareIns[this.shareKey] || []
|
const instances = search.shareIns[this.shareKey] || []
|
||||||
// 同一 filterList 组里面的 Search 组件不共享搜索条件
|
// 同一 filterList 组里面的 Search 组件不共享搜索条件
|
||||||
|
|||||||
@ -161,7 +161,6 @@ class Search extends React.Component {
|
|||||||
if (errorLabel) return
|
if (errorLabel) return
|
||||||
|
|
||||||
const { onSearch } = this.props
|
const { onSearch } = this.props
|
||||||
console.log('调用查询中间过程', 2)
|
|
||||||
onSearch instanceof Function && onSearch(rule)
|
onSearch instanceof Function && onSearch(rule)
|
||||||
return rule
|
return rule
|
||||||
}
|
}
|
||||||
|
|||||||
@ -22,8 +22,11 @@ export default {
|
|||||||
return ret
|
return ret
|
||||||
},
|
},
|
||||||
*getTableData ({ payload, url, onComplete }, { call, put }) {
|
*getTableData ({ payload, url, onComplete }, { call, put }) {
|
||||||
|
console.log('执行前',appService.getTableData)
|
||||||
const ret = yield call(appService.getTableData, { payload, url })
|
const ret = yield call(appService.getTableData, { payload, url })
|
||||||
|
console.log('执行后')
|
||||||
if (typeof onComplete === 'function') {
|
if (typeof onComplete === 'function') {
|
||||||
|
console.log('执行后',ret)
|
||||||
onComplete(ret)
|
onComplete(ret)
|
||||||
}
|
}
|
||||||
return ret
|
return ret
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user