Merge branch 'dev' of https://github.com/dcloudio/uni-app into alpha

packages/uni-mp-toutiao/lib/uni.compiler.js

 const compiler = require('@dcloudio/uni-mp-weixin/lib/uni.compiler.js')
+const path = require('path')
+const t = require('@babel/types')
+
+function generateJsCode (properties = '{}') {
+  return `
+wx.createComponent({
+    generic:true,
+    props: ${properties},
+    render: function(){}
+})
+`
+}
+
+function generateCssCode (filename) {
+  return `
+@import "./${filename}"
+`
+}
+
+function hasOwn (obj, key) {
+  return Object.prototype.hasOwnProperty.call(obj, key)
+}
+
 module.exports = Object.assign({}, compiler, {
-  directive: 'tt:'
-})
+  directive: 'tt:',
+  resolveScopedSlots (slotName, {
+    genCode,
+    generate,
+    ownerName,
+    parentName,
+    parentNode,
+    resourcePath,
+    paramExprNode,
+    returnExprNodes,
+    traverseExpr
+  }, state) {
+    if (!state.scopedSlots) {
+      state.scopedSlots = {}
+    }
+    const baseName = `${ownerName}-${parentName}-${slotName}`
+    let componentName = baseName
+    if (!hasOwn(state.scopedSlots, baseName)) {
+      state.scopedSlots[baseName] = 0
+    }
+    if (state.scopedSlots[baseName]) {
+      componentName = baseName + state.scopedSlots[baseName]
+    }
+    state.scopedSlots[baseName]++
+    // parentNode.attr['generic:scoped-slots-' + slotName] = componentName
+    if (!parentNode.attr.generic) {
+      parentNode.attr.generic = {}
+    }
+    parentNode.attr.generic[slotName] = componentName
+
+    // 生成 scopedSlots 文件，包括 json,js,wxml,wxss,还需要更新 owner 的 usingComponents
+    if (!state.files) {
+      state.files = {}
+    }
+    const extname = path.extname(resourcePath)
+
+    // TODO 需要存储 resourcePath 相关 json
+
+    const templateFile = resourcePath.replace(ownerName + extname, componentName + extname)
+    const templateContent = generate(traverseExpr(returnExprNodes, state), state)
+
+    state.files[templateFile] = templateContent
+
+    const jsFile = resourcePath.replace(ownerName + extname, componentName + '.js')
+
+    const objectProperties = []
+
+    if (t.isObjectPattern(paramExprNode)) {
+      paramExprNode.properties.forEach(property => {
+        const key = property.key
+        const value = property.value
+        const valueObjectProperties = [
+          t.objectProperty(t.identifier('type'), t.nullLiteral())
+        ]
+        if (t.isIdentifier(value)) {
+          if (value.name !== key.name) {
+            state.errors.add(`解构插槽 Prop 时,不支持将${key.name}重命名为${value.name},重命名后会影响性能`)
+          }
+        } else if (t.isAssignmentPattern(value)) {
+          valueObjectProperties.push(t.objectProperty(t.identifier('default'), value.right))
+        }
+        objectProperties.push(t.objectProperty(key, t.objectExpression(valueObjectProperties)))
+      })
+    } else {
+      state.errors.add(`目前仅支持解构插槽 ${paramExprNode.name},如 v-slot="{ user }"`)
+    }
+    const jsContent = generateJsCode(genCode(t.objectExpression(objectProperties), true))
+    state.files[jsFile] = jsContent
+
+    try {
+      // TODO 使用 getPlatformExts 在单元测试报错，改从 state.options.platform 判断
+      const { getPlatformExts } = require('@dcloudio/uni-cli-shared')
+      const styleExtname = getPlatformExts().style
+      const styleFile = resourcePath.replace(ownerName + extname, componentName + styleExtname)
+      const styleContent = generateCssCode(ownerName + styleExtname)
+
+      state.files[styleFile] = styleContent
+    } catch (error) { }
+
+    // 用于后续修复字节跳动小程序不支持抽象节点导致的问题
+    const fixExtname = '.fix'
+    const extFile = resourcePath.replace(ownerName + extname, componentName + fixExtname)
+    state.files[extFile] = `${resourcePath.replace(ownerName + extname, ownerName)},${parentName},${componentName},scoped-slots-${slotName}`
+
+    if (!state.generic) {
+      state.generic = []
+    }
+    // 存储，方便后续生成 json
+    state.generic.push(componentName)
+
+    return ''
+  }
+})

packages/uni-quickapp-webview/LICENSE

+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file

packages/uni-template-compiler/lib/template/generate.js

@@ -65,7 +65,12 @@ function processElement (ast, state, isRoot) {
       Object.keys(ast.attr.generic).forEach(scopedSlotName => {
         slots.push(scopedSlotName)
       })
-      delete ast.attr.generic
+      if (platformName === 'mp-toutiao') {
+        // 用于字节跳动小程序模拟抽象节点
+        ast.attr.generic = `{{${JSON.stringify(ast.attr.generic)}}}`.replace(/"/g, '\'')
+      } else {
+        delete ast.attr.generic
+      }
     }
     if (slots.length && platformName !== 'mp-alipay') { // 标记 slots
       ast.attr['vue-slots'] = '{{[' + slots.reverse().map(slotName => `'${slotName}'`).join(',') + ']}}'

packages/vue-cli-plugin-uni/generator.js

@@ -56,7 +56,7 @@ module.exports = (api, options, rootOptions) => {
         '@dcloudio/uni-quickapp-native': version,
         '@dcloudio/uni-quickapp-webview': version,
         '@dcloudio/uni-stat': version,
-        '@vue/shared': '*', // TODO
+        '@vue/shared': '^3.0.0-rc.4', // TODO
         flyio: '^0.6.2',
         vuex: '^3.2.0'
       },

packages/webpack-uni-mp-loader/lib/plugin/generate-component.js

@@ -6,7 +6,8 @@ const {
   getPlatformExts
 } = require('@dcloudio/uni-cli-shared')
 const {
-  getComponentSet
+  getComponentSet,
+  getJsonFile
 } = require('@dcloudio/uni-cli-shared/lib/cache')
 
 const {
@@ -15,7 +16,7 @@ const {
 
 const EMPTY_COMPONENT_LEN = 'Component({})'.length
 
-const uniPath = require('@dcloudio/uni-cli-shared/lib/platform').getMPRuntimePath()
+const uniPath = normalizePath(require('@dcloudio/uni-cli-shared/lib/platform').getMPRuntimePath())
 
 function findModule (modules, resource, altResource) {
   return modules.find(
@@ -66,6 +67,7 @@ module.exports = function generateComponent (compilation) {
     const concatenatedModules = modules.filter(module => module.modules)
     const uniModuleId = modules.find(module => module.resource && normalizePath(module.resource) === uniPath).id
     const styleImports = {}
+    const fixSlots = {}
 
     Object.keys(assets).forEach(name => {
       if (components.has(name.replace('.js', ''))) {
@@ -147,6 +149,57 @@ module.exports = function generateComponent (compilation) {
           }
         }
       }
+      // 处理字节跳动小程序作用域插槽
+      const fixExtname = '.fix'
+      if (name.endsWith(fixExtname)) {
+        const source = assets[name].source()
+        const [ownerName, parentName, componentName, slotName] = source.split(',')
+        const json = getJsonFile(ownerName)
+        if (json) {
+          const data = JSON.parse(json)
+          const usingComponents = data.usingComponents || {}
+          const componentPath = path.relative('/', usingComponents[parentName])
+          const slots = fixSlots[componentPath] = fixSlots[componentPath] || {}
+          const slot = slots[slotName] = slots[slotName] || {}
+          slot[componentName] = '/' + name.replace(fixExtname, '')
+          delete assets[name]
+
+          const jsonFile = assets[`${componentPath}.json`]
+          if (jsonFile) {
+            const oldSource = jsonFile.__$oldSource || jsonFile.source()
+            const sourceObj = JSON.parse(oldSource)
+            Object.values(slots).forEach(components => {
+              const usingComponents = sourceObj.usingComponents = sourceObj.usingComponents || {}
+              Object.assign(usingComponents, components)
+            })
+            delete sourceObj.componentGenerics
+            const source = JSON.stringify(sourceObj, null, 2)
+            jsonFile.source = function () {
+              return source
+            }
+            jsonFile.__$oldSource = oldSource
+          }
+
+          const templateFile = assets[`${componentPath}${getPlatformExts().template}`]
+          if (templateFile) {
+            const oldSource = templateFile.__$oldSource || templateFile.source()
+            let templateSource
+            Object.keys(slots).forEach(name => {
+              const reg = new RegExp(`<${name} (.+?)></${name}>`)
+              templateSource = oldSource.replace(reg, string => {
+                const props = string.match(reg)[1]
+                return Object.keys(slots[name]).map(key => {
+                  return `<block tt:if="{{generic['${name.replace(/^scoped-slots-/, '')}']==='${key}'}}"><${key} ${props}></${key}></block>`
+                }).join('')
+              })
+            })
+            templateFile.source = function () {
+              return templateSource
+            }
+            templateFile.__$oldSource = oldSource
+          }
+        }
+      }
     })
   }
   if (process.env.UNI_FEATURE_OBSOLETE !== 'false') {

src/core/runtime/wrapper/util.js

@@ -229,6 +229,11 @@ export function initProperties (props, isBehavior = false, file = '') {
       type: String,
       value: ''
     }
+    // 用于字节跳动小程序模拟抽象节点
+    properties.generic = {
+      type: Object,
+      value: null
+    }
     properties.vueSlots = { // 小程序不能直接定义 $slots 的 props，所以通过 vueSlots 转换到 $slots
       type: null,
       value: [],

src/core/service/api/network/request.js

@@ -50,7 +50,8 @@ onMethod('onRequestTaskStateChange', function ({
   data,
   statusCode,
   header,
-  errMsg
+  errMsg,
+  cookies
 }) {
   const {
     args,
@@ -67,7 +68,8 @@ onMethod('onRequestTaskStateChange', function ({
         data,
         statusCode,
         header,
-        errMsg: 'request:ok'
+        errMsg: 'request:ok',
+        cookies
       }, args))
       break
     case 'fail':
@@ -99,16 +101,16 @@ class RequestTask {
   }
 }
 
-export function request (args, callbackId) {
-  let contentType
-  for (const name in args.header) {
-    if (name.toLowerCase() === 'content-type') {
-      contentType = args.header[name]
-      break
-    }
-  }
-  if (args.method !== 'GET' && contentType.indexOf('application/json') === 0 && isPlainObject(args.data)) {
-    args.data = JSON.stringify(args.data)
+export function request (args, callbackId) {
+  let contentType
+  for (const name in args.header) {
+    if (name.toLowerCase() === 'content-type') {
+      contentType = args.header[name]
+      break
+    }
+  }
+  if (args.method !== 'GET' && contentType.indexOf('application/json') === 0 && isPlainObject(args.data)) {
+    args.data = JSON.stringify(args.data)
   }
   const {
     requestTaskId
@@ -120,4 +122,4 @@ export function request (args, callbackId) {
   }
 
   return new RequestTask(requestTaskId)
-}
+}

src/platforms/app-plus/service/api/device/ibeacon.js

 import {
-  invoke,
-  publish
+  invoke
 } from '../../bridge'
 
-let beaconUpdateState = false
-
-export function onBeaconUpdate () {
-  if (!beaconUpdateState) {
-    plus.ibeacon.onBeaconUpdate(function (data) {
-      publish('onBeaconUpdated', data)
-    })
-    beaconUpdateState = true
-  }
+export function onBeaconUpdate (callbackId) {
+  plus.ibeacon.onBeaconUpdate(data => invoke(callbackId, data))
 }
 
-let beaconServiceChangeState = false
-
-export function onBeaconServiceChange () {
-  if (!beaconServiceChangeState) {
-    plus.ibeacon.onBeaconServiceChange(function (data) {
-      publish('onBeaconServiceChange', data)
-      publish('onBeaconServiceChanged', data)
-    })
-    beaconServiceChangeState = true
-  }
+export function onBeaconServiceChange (callbackId) {
+  plus.ibeacon.onBeaconServiceChange(data => invoke(callbackId, data))
 }
+export const onBeaconServiceChanged = onBeaconServiceChange
 
 export function getBeacons (params, callbackId) {
   plus.ibeacon.getBeacons({

src/platforms/app-plus/service/api/network/request.js

@@ -16,13 +16,35 @@ const publishStateChange = res => {
   delete requestTasks[requestTaskId]
 }
 
+const cookiesPrase = header => {
+  let cookiesStr = header['Set-Cookie']
+  let cookiesArr = []
+  if (!cookiesStr) {
+    return []
+  }
+  if (cookiesStr[0] === '[' && cookiesStr[cookiesStr.length - 1] === ']') {
+    cookiesStr = cookiesStr.slice(1, -1)
+  }
+  const handleCookiesArr = cookiesStr.split(';')
+  for (let i = 0; i < handleCookiesArr.length; i++) {
+    if (handleCookiesArr[i].indexOf('Expires=') !== -1) {
+      cookiesArr.push(handleCookiesArr[i].replace(',', ''))
+    } else {
+      cookiesArr.push(handleCookiesArr[i])
+    }
+  }
+  cookiesArr = cookiesArr.join(';').split(',')
+
+  return cookiesArr
+}
+
 export function createRequestTaskById (requestTaskId, {
   url,
   data,
   header,
   method = 'GET',
   responseType,
-  sslVerify = true,
+  sslVerify = true,
   firstIpv4 = false
 } = {}) {
   const stream = requireNativePlugin('stream')
@@ -76,7 +98,7 @@ export function createRequestTaskById (requestTaskId, {
     // weex 官方文档未说明实际支持 timeout，单位：ms
     timeout: timeout || 6e5,
     // 配置和weex模块内相反
-    sslVerify: !sslVerify,
+    sslVerify: !sslVerify,
     firstIpv4: firstIpv4
   }
   if (method !== 'GET') {
@@ -102,7 +124,8 @@ export function createRequestTaskById (requestTaskId, {
           state: 'success',
           data: ok && responseType === 'arraybuffer' ? base64ToArrayBuffer(data) : data,
           statusCode,
-          header: headers
+          header: headers,
+          cookies: cookiesPrase(headers)
         })
       } else {
         publishStateChange({
@@ -157,4 +180,4 @@ export function operateRequestTask ({
   return {
     errMsg: 'operateRequestTask:fail'
   }
-}
+}

src/platforms/mp-alipay/runtime/api/protocols.js

@@ -285,16 +285,18 @@ const protocols = { // 需要做转换的 API 列表
   getSavedFileInfo: {
     args: {
       filePath: 'apFilePath'
-    },
-    returnValue (result) {
-      if (result.fileList && result.fileList.length) {
-        result.fileList.forEach(file => {
-          file.filePath = file.apFilePath
-          delete file.apFilePath
-        })
-      }
-      return {}
     }
+  },
+  getSavedFileList: {
+    returnValue (result) {
+      if (result.fileList && result.fileList.length) {
+        result.fileList.forEach(file => {
+          file.filePath = file.apFilePath
+          delete file.apFilePath
+        })
+      }
+      return {}
+    }
   },
   removeSavedFile: {
     args: {

src/platforms/mp-baidu/runtime/wrapper/component-parser.js

@@ -15,10 +15,10 @@ export default function parseComponent (vueOptions) {
   const componentOptions = parseBaseComponent(vueOptions, {
     isPage,
     initRelation
-  })
-
-  // 关于百度小程序生命周期的说明(组件作为页面时):
-  // lifetimes:attached --> methods:onShow --> methods:onLoad --> methods:onReady
+  })
+
+  // 关于百度小程序生命周期的说明(组件作为页面时):
+  // lifetimes:attached --> methods:onShow --> methods:onLoad --> methods:onReady
   // 这里在强制将onShow挪到onLoad之后触发,另外一处修改在page-parser.js
   const oldAttached = componentOptions.lifetimes.attached
   componentOptions.lifetimes.attached = function attached () {
@@ -28,36 +28,28 @@ export default function parseComponent (vueOptions) {
       this.pageinstance.$vm = this.$vm
       if (hasOwn(this.pageinstance, '_$args')) {
         this.$vm.$mp.query = this.pageinstance._$args
-        this.$vm.__call_hook('onLoad', this.pageinstance._$args)
+        this.$vm.__call_hook('onLoad', this.pageinstance._$args)
         this.$vm.__call_hook('onShow')
         delete this.pageinstance._$args
       }
-    } else {
-      // 百度小程序组件不触发methods内的onReady
-      if (this.$vm) {
-        this.$vm._isMounted = true
-        this.$vm.__call_hook('mounted')
-      }
-    }
-  }
-
-  if (newLifecycle) {
-    delete componentOptions.lifetimes.ready
-    componentOptions.methods.onReady = function () {
+    } else {
+      // 百度小程序组件不触发methods内的onReady
       if (this.$vm) {
         this.$vm._isMounted = true
         this.$vm.__call_hook('mounted')
-        this.$vm.__call_hook('onReady')
-      } else {
-        // this.is && console.warn(this.is + ' is not attached')
       }
     }
   }
 
+  if (newLifecycle) {
+    componentOptions.methods.onReady = componentOptions.lifetimes.ready
+    delete componentOptions.lifetimes.ready
+  }
+
   componentOptions.messages = {
     __l: componentOptions.methods.__l
   }
   delete componentOptions.methods.__l
 
   return componentOptions
-}
+}