@mpxjs/core 2.7.52 → 2.8.0-beta.2

package/src/core/mergeOptions.js

@@ -1,8 +1,14 @@
-import { isObject, aliasReplace, findItem, makeMap } from '../helper/utils'
 import { getConvertRule } from '../convertor/convertor'
-import { error, warn } from '../helper/log'
 import builtInKeysMap from '../platform/patch/builtInKeysMap'
 import { implemented } from './implement'
+import {
+  isObject,
+  aliasReplace,
+  makeMap,
+  findItem,
+  error,
+  warn
+} from '@mpxjs/utils'
 
 let currentHooksMap = {}
 let curType
@@ -203,7 +209,7 @@ function extractPageHooks (options) {
 }
 
 function mergeMixins (parent, child) {
-  for (let key in child) {
+  for (const key in child) {
     if (currentHooksMap[key]) {
       mergeHooks(parent, child, key)
     } else if (/^(data|dataFn)$/.test(key)) {
@@ -247,7 +253,7 @@ export function mergeShallowObj (parent, child, key) {
 
 function mergeDataFn (parent, child, key) {
   let parentVal = parent[key]
-  let childVal = child[key]
+  const childVal = child[key]
 
   if (typeof parentVal === 'function' && key === 'data') {
     parent.dataFn = parentVal
@@ -345,7 +351,7 @@ function transformHOOKS (options) {
     const componentHooksMap = makeMap(convertRule.lifecycle.component)
     for (const key in options) {
       // 使用Component创建page实例，页面专属生命周期&自定义方法需写在methods内部
-      if (typeof options[key] === 'function' && key !== 'dataFn' && !componentHooksMap[key]) {
+      if (typeof options[key] === 'function' && key !== 'dataFn' && key !== 'setup' && !componentHooksMap[key]) {
         if (!options.methods) options.methods = {}
         options.methods[key] = options[key]
         delete options[key]