theluyuan/vue3-yuanma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wip: render function compat

Browse Source
This commit is contained in:
Evan You
2021-04-09 18:52:14 -04:00
parent 457a56e331
commit f05d6dfd98
20 changed files with 419 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/runtime-core/src/componentOptions.ts
View File

@@ -790,13 +790,13 @@ export function applyOptions(
if (__COMPAT__) {
if (
beforeDestroy &&
softAssertCompatEnabled(DeprecationTypes.OPTIONS_BEFORE_DESTROY)
softAssertCompatEnabled(DeprecationTypes.OPTIONS_BEFORE_DESTROY, instance)
) {
onBeforeUnmount(beforeDestroy.bind(publicThis))
}
if (
destroyed &&
softAssertCompatEnabled(DeprecationTypes.OPTIONS_DESTROYED)
softAssertCompatEnabled(DeprecationTypes.OPTIONS_DESTROYED, instance)
) {
onUnmounted(destroyed.bind(publicThis))
}
@@ -930,8 +930,11 @@ function resolveData(
instance.data = reactive(data)
} else {
// existing data: this is a mixin or extends.
if (__COMPAT__ && isCompatEnabled(DeprecationTypes.OPTIONS_DATA_MERGE)) {
deepMergeData(instance.data, data)
if (
__COMPAT__ &&
isCompatEnabled(DeprecationTypes.OPTIONS_DATA_MERGE, instance)
) {
deepMergeData(instance.data, data, instance)
} else {
extend(instance.data, data)
}