@dcloudio/uni-mp-harmony 2.0.2-4080720251210002 → 2.0.2-5000420260318002

package/dist/index.js

@@ -326,7 +326,7 @@ const promiseInterceptor = {
 };
 
 const SYNC_API_RE =
-  /^\$|__f__|Window$|WindowStyle$|sendHostEvent|sendNativeEvent|restoreGlobal|requireGlobal|getCurrentSubNVue|getMenuButtonBoundingClientRect|^report|interceptors|Interceptor$|getSubNVueById|requireNativePlugin|rpx2px|upx2px|hideKeyboard|canIUse|^create|Sync$|Manager$|base64ToArrayBuffer|arrayBufferToBase64|getLocale|setLocale|invokePushCallback|getWindowInfo|getDeviceInfo|getAppBaseInfo|getSystemSetting|getAppAuthorizeSetting|initUTS|requireUTS|registerUTS/;
+  /^\$|__f__|Window$|WindowStyle$|sendHostEvent|sendNativeEvent|restoreGlobal|requireGlobal|getCurrentSubNVue|getMenuButtonBoundingClientRect|^report|interceptors|Interceptor$|getSubNVueById|requireNativePlugin|rpx2px|upx2px|hideKeyboard|canIUse|^create|Sync$|Manager$|base64ToArrayBuffer|arrayBufferToBase64|getLocale|setLocale|invokePushCallback|getWindowInfo|getDeviceInfo|getAppBaseInfo|getSystemSetting|getAppAuthorizeSetting|initUTS|requireUTS|registerUTS|getFacialRecognitionMetaInfo/;
 
 const CONTEXT_API_RE = /^create|Manager$/;
 
@@ -1682,6 +1682,15 @@ function createObserver (name) {
   return function observer (newVal, oldVal) {
     if (this.$vm) {
       this.$vm[name] = newVal; // 为了触发其他非 render watcher
+    } else {
+      // mp-harmony 平台兼容 observer 触发时 this.$vm 不稳定的情况
+      {
+        // 缓存在 attached 之前触发的 observer 更新
+        if (!this._pendingProps) {
+          this._pendingProps = {};
+        }
+        this._pendingProps[name] = newVal;
+      }
     }
   }
 }
@@ -2223,68 +2232,45 @@ function isPage () {
 const instances = Object.create(null);
 
 function initRelation ({
-  vuePid,
+  options,
   mpInstance
 }) {
   // triggerEvent 后，接收事件时机特别晚，已经到了 ready 之后
   const nodeId = mpInstance.nodeId + '';
   const webviewId = mpInstance.pageinstance.__pageId__ + '';
 
-  instances[webviewId + '_' + nodeId] = mpInstance.$vm;
+  instances[webviewId + '_' + nodeId] = mpInstance;
 
-  this.triggerEvent('__l', {
-    vuePid,
+  Object.assign(options, {
     nodeId,
     webviewId
   });
+
+  handleLink$1.call(mpInstance, {
+    detail: options
+  });
 }
 
 function handleLink$1 ({
-  detail: {
-    nodeId,
-    webviewId
-  }
+  detail
 }) {
-  const vm = instances[webviewId + '_' + nodeId];
-  if (!vm) {
+  const { nodeId, webviewId } = detail;
+  const mpInstance = instances[webviewId + '_' + nodeId];
+  if (!mpInstance) {
     return
   }
-  let parentVm = instances[webviewId + '_' + vm.$scope.ownerId];
+
+  const owner = instances[webviewId + '_' + mpInstance.ownerId];
+  let parentVm = owner && owner.$vm;
+
   if (!parentVm) {
     parentVm = this.$vm;
   }
 
-  vm.$parent = parentVm;
-  vm.$root = parentVm.$root;
-  parentVm.$children.push(vm);
-
-  const createdVm = function () {
-    vm.__call_hook('created');
-  };
-  const mountedVm = function () {
-    // 处理当前 vm 子
-    if (vm._$childVues) {
-      vm._$childVues.forEach(([createdVm]) => createdVm());
-      vm._$childVues.forEach(([, mountedVm]) => mountedVm());
-      delete vm._$childVues;
-    }
-    vm.__call_hook('beforeMount');
-    vm._isMounted = true;
-    vm.__call_hook('mounted');
-    vm.__call_hook('onReady');
-  };
-  // 当 parentVm 已经 mounted 时，直接触发，否则延迟
-  if (!parentVm || parentVm._isMounted) {
-    createdVm();
-    mountedVm();
-  } else {
-    (parentVm._$childVues || (parentVm._$childVues = [])).push([createdVm, mountedVm]);
-  }
+  detail.parent = parentVm;
 }
 
 function parseApp (vm) {
-  Vue.prototype._$fallback = true; // 降级（调整原 vue 的部分生命周期，如 created，beforeMount,inject,provide）
-
   Vue.mixin({
     created () { // 处理 injections, triggerEvent 是异步，且触发时机很慢，故延迟 relation 设置
       if (this.mpType !== 'app') {
@@ -2445,25 +2431,25 @@ function parseBaseComponent (vueComponentOptions, {
   return [componentOptions, VueComponent]
 }
 
-function resolvePropsData (properties) {
-  {
-    const propsData = {};
-    Object.keys(properties).forEach(name => {
-      propsData[name] = resolvePropValue(properties[name]);
-    });
-    return propsData
-  }
-}
-
-function resolvePropValue (prop) {
-  {
-    if (isPlainObject(prop) && hasOwn(prop, 'value')) {
-      // 目前 mp-harmony 的 prop 返回的是配置项？
-      return prop.value
-    }
-  }
-  return prop
-}
+function resolvePropsData (properties) {
+  {
+    const propsData = {};
+    Object.keys(properties).forEach(name => {
+      propsData[name] = resolvePropValue(properties[name]);
+    });
+    return propsData
+  }
+}
+
+function resolvePropValue (prop) {
+  {
+    if (isPlainObject(prop) && hasOwn(prop, 'value')) {
+      // 目前 mp-harmony 的 prop 返回的是配置项？
+      return prop.value
+    }
+  }
+  return prop
+}
 
 function parseComponent (vueComponentOptions, needVueOptions) {
   const [componentOptions, vueOptions, VueComponent] = parseBaseComponent(vueComponentOptions, {
@@ -2496,18 +2482,28 @@ function parseComponent (vueComponentOptions, needVueOptions) {
 
     initVueIds(resolvePropValue(properties.vueId), this);
 
+    // 处理父子关系
+    initRelation.call(this, {
+      options,
+      mpInstance: this
+    });
+
     // 初始化 vue 实例
     this.$vm = new VueComponent(options);
 
+    // mp-harmony 平台兼容 observer 触发时 this.$vm 不稳定的情况
+    {
+      if (this._pendingProps) {
+        Object.keys(this._pendingProps).forEach(name => {
+          this.$vm[name] = this._pendingProps[name];
+        });
+        delete this._pendingProps;
+      }
+    }
+
     // 处理$slots,$scopedSlots（暂不支持动态变化$slots）
     initSlots(this.$vm, resolvePropValue(properties.vueSlots));
 
-    // 处理父子关系
-    initRelation.call(this, {
-      vuePid: this._$vuePid,
-      mpInstance: this
-    });
-
     // 触发首次 setData
     this.$vm.$mount();
   };

package/lib/uni.config.js

@@ -1,5 +1,8 @@
 const fs = require('fs')
 const path = require('path')
+const {
+  parseJson
+} = require('@dcloudio/uni-cli-shared/lib/json')
 
 const SIGN_DIR_NAME = 'sign'
 // TODO quickapp ide 有bug，不识别项目根目录 sign，暂时拷贝到 .quickapp 目录
@@ -36,7 +39,7 @@ module.exports = {
     Object.assign(platformOptions, manifestJson['mp-harmony'] || {}, platformOptions)
   },
   copyWebpackOptions (platformOptions, vueOptions) {
-    const copyOptions = []
+    const copyOptions = ['ascf.config.json']
     let jsConfigPath = path.resolve(process.env.UNI_INPUT_DIR, 'jsconfig.json')
     if (!fs.existsSync(jsConfigPath)) {
       jsConfigPath = path.resolve(__dirname, 'assets/jsconfig.json')
@@ -48,6 +51,14 @@ module.exports = {
       copyOptions.push(signCopyOption)
     }
 
+    const extJsonPath = path.resolve(process.env.UNI_INPUT_DIR, 'ext.json')
+    if (fs.existsSync(extJsonPath)) {
+      copyOptions.push({
+        from: extJsonPath,
+        transform: content => JSON.stringify(parseJson(content.toString(), true), null, 2)
+      })
+    }
+
     return copyOptions
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-mp-harmony",
-  "version": "2.0.2-4080720251210002",
+  "version": "2.0.2-5000420260318002",
   "description": "uni-app mp-harmony",
   "main": "dist/index.js",
   "repository": {
@@ -17,5 +17,5 @@
     "name": "mp-harmony",
     "title": "鸿蒙元服务"
   },
-  "gitHead": "18c75eccfcdabb303c0675cafdc44bc3cf58d7be"
+  "gitHead": "5ee212292b880f06dde5d198e5ceb09f9d3769e1"
 }