Skip to content

Commit

Permalink
Merge pull request #1296 from didi/fix-swan-page-initsetup
Browse files Browse the repository at this point in the history
fix: 百度小程序page使用setup报错
  • Loading branch information
hiyuki authored Oct 18, 2023
2 parents df58f64 + 9bd24b5 commit 62d48dd
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions packages/core/src/core/proxy.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ import {
getFirstKey,
callWithErrorHandling,
warn,
error
error,
getEnvObj
} from '@mpxjs/utils'
import {
BEFORECREATE,
Expand All @@ -45,6 +46,8 @@ import {

let uid = 0

const envObj = getEnvObj()

class RenderTask {
resolved = false

Expand Down Expand Up @@ -235,14 +238,14 @@ export default class MpxProxy {
const setupResult = callWithErrorHandling(setup, this, 'setup function', [
this.props,
{
triggerEvent: this.target.triggerEvent.bind(this.target),
triggerEvent: this.target.triggerEvent ? this.target.triggerEvent.bind(this.target) : noop,
refs: this.target.$refs,
asyncRefs: this.target.$asyncRefs,
forceUpdate: this.forceUpdate.bind(this),
selectComponent: this.target.selectComponent.bind(this.target),
selectAllComponents: this.target.selectAllComponents.bind(this.target),
createSelectorQuery: this.target.createSelectorQuery.bind(this.target),
createIntersectionObserver: this.target.createIntersectionObserver.bind(this.target)
createSelectorQuery: this.target.createSelectorQuery ? this.target.createSelectorQuery.bind(this.target) : envObj.createSelectorQuery.bind(envObj),
createIntersectionObserver: this.target.createIntersectionObserver ? this.target.createIntersectionObserver.bind(this.target) : envObj.createIntersectionObserver.bind(envObj)
}
])
if (!isObject(setupResult)) {
Expand Down

0 comments on commit 62d48dd

Please sign in to comment.