forked from dcloudio/uni-app
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: init lifetimes hook use ExtendedVue options
- Loading branch information
1 parent
c07b539
commit cdbb303
Showing
21 changed files
with
67 additions
and
92 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,10 @@ | ||
import parseBaseComponent from '../../../mp-weixin/runtime/wrapper/component-parser' | ||
|
||
export default function parseComponent (vueComponentOptions) { | ||
const componentOptions = parseBaseComponent(vueComponentOptions) | ||
export default function parseComponent (vueComponentOptions, needVueOptions) { | ||
const [componentOptions, vueOptions] = parseBaseComponent(vueComponentOptions, true) | ||
|
||
componentOptions.methods.$getAppWebview = function () { | ||
return plus.webview.getWebviewById(`${this.__wxWebviewId__}`) | ||
} | ||
return componentOptions | ||
} | ||
return needVueOptions ? [componentOptions, vueOptions] : componentOptions | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
import parseBaseComponent from '../../../mp-weixin/runtime/wrapper/component-parser' | ||
|
||
export default function parseComponent (vueComponentOptions) { | ||
const componentOptions = parseBaseComponent(vueComponentOptions) | ||
export default function parseComponent (vueComponentOptions, needVueOptions) { | ||
const [componentOptions, vueOptions] = parseBaseComponent(vueComponentOptions, true) | ||
// 京东小程序 lifetimes 存在兼容问题 | ||
const lifetimes = componentOptions.lifetimes | ||
Object.keys(lifetimes).forEach(key => { | ||
componentOptions[key] = lifetimes[key] | ||
}) | ||
return componentOptions | ||
return needVueOptions ? [componentOptions, vueOptions] : componentOptions | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
import parseBaseComponent from '../../../mp-weixin/runtime/wrapper/component-parser' | ||
|
||
export default function parseComponent (vueComponentOptions) { | ||
return parseBaseComponent(vueComponentOptions) | ||
} | ||
export default function parseComponent (vueComponentOptions, needVueOptions) { | ||
return parseBaseComponent(vueComponentOptions, needVueOptions) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,5 @@ | ||
import parseBasePage from './page-base-parser' | ||
|
||
import { | ||
isPage, | ||
initRelation | ||
} from './util' | ||
|
||
export default function parsePage (vuePageOptions) { | ||
return parseBasePage(vuePageOptions, { | ||
isPage, | ||
initRelation | ||
}) | ||
} | ||
return parseBasePage(vuePageOptions) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 2 additions & 7 deletions
9
src/platforms/quickapp-webview/runtime/wrapper/page-parser.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters