Compare commits

..

No commits in common. "5d22923101aba7bb3dc4fde7de4fd9ae3085ab90" and "da851b45fd33729f43b1f586a5694316fa69bc95" have entirely different histories.

4 changed files with 4 additions and 3 deletions

View File

@ -60,6 +60,7 @@ 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
@ -87,6 +88,7 @@ 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()
} }
}) })

View File

@ -79,6 +79,7 @@ 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 组件不共享搜索条件

View File

@ -161,6 +161,7 @@ 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
} }

View File

@ -22,11 +22,8 @@ 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