@dcloudio/uni-quickapp-webview 2.0.1-alpha-36320220919002 → 2.0.1-alpha-36720221017001

package/dist/index.js

@@ -1382,7 +1382,7 @@ function hasHook (hook, vueOptions) {
     return false
   }
 
-  if (isFn(vueOptions[hook])) {
+  if (isFn(vueOptions[hook]) || Array.isArray(vueOptions[hook])) {
     return true
   }
   const mixins = vueOptions.mixins;
@@ -2046,21 +2046,40 @@ function initBehavior (options) {
 }
 
 function selectAllComponents (mpInstance, selector, $refs) {
-  const components = mpInstance.selectAllComponents(selector);
+  const components = mpInstance.selectAllComponents(selector) || [];
   components.forEach(component => {
     const ref = component.dataset.ref;
     $refs[ref] = component.$vm || component;
   });
 }
 
+function syncRefs (refs, newRefs) {
+  const oldKeys = new Set(...Object.keys(refs));
+  const newKeys = Object.keys(newRefs);
+  newKeys.forEach(key => {
+    const oldValue = refs[key];
+    const newValue = newRefs[key];
+    if (Array.isArray(oldValue) && Array.isArray(newValue) && oldValue.length === newValue.length && newValue.every(value => oldValue.includes(value))) {
+      return
+    }
+    refs[key] = newValue;
+    oldKeys.delete(key);
+  });
+  oldKeys.forEach(key => {
+    delete refs[key];
+  });
+  return refs
+}
+
 function initRefs (vm) {
   const mpInstance = vm.$scope;
+  const refs = {};
   Object.defineProperty(vm, '$refs', {
     get () {
       const $refs = {};
       selectAllComponents(mpInstance, '.vue-ref', $refs);
       // TODO 暂不考虑 for 中的 scoped
-      const forComponents = mpInstance.selectAllComponents('.vue-ref-in-for');
+      const forComponents = mpInstance.selectAllComponents('.vue-ref-in-for') || [];
       forComponents.forEach(component => {
         const ref = component.dataset.ref;
         if (!$refs[ref]) {
@@ -2068,7 +2087,7 @@ function initRefs (vm) {
         }
         $refs[ref].push(component.$vm || component);
       });
-      return $refs
+      return syncRefs(refs, $refs)
     }
   });
 }
@@ -2224,7 +2243,7 @@ function stringifyQuery (obj, encodeStr = encode) {
 function parseBaseComponent (vueComponentOptions, {
   isPage,
   initRelation
-} = {}) {
+} = {}, needVueOptions) {
   const [VueComponent, vueOptions] = initVueComponent(Vue, vueComponentOptions);
 
   const options = {
@@ -2307,14 +2326,20 @@ function parseBaseComponent (vueComponentOptions, {
     });
   }
 
+  if (needVueOptions) {
+    return [componentOptions, vueOptions, VueComponent]
+  }
   if (isPage) {
     return componentOptions
   }
   return [componentOptions, VueComponent]
 }
 
-function parseComponent (vueOptions) {
-  const [componentOptions, VueComponent] = parseBaseComponent(vueOptions);
+function parseComponent (vueComponentOptions, needVueOptions) {
+  const [componentOptions, vueOptions, VueComponent] = parseBaseComponent(vueComponentOptions, {
+    isPage,
+    initRelation
+  }, true);
 
   componentOptions.lifetimes.attached = function attached () {
     const properties = this.properties;
@@ -2348,7 +2373,7 @@ function parseComponent (vueOptions) {
 
   componentOptions.methods.__l = handleLink$1;
 
-  return componentOptions
+  return needVueOptions ? [componentOptions, vueOptions] : componentOptions
 }
 
 const hooks$1 = [
@@ -2359,13 +2384,10 @@ const hooks$1 = [
 
 hooks$1.push(...PAGE_EVENT_HOOKS);
 
-function parseBasePage (vuePageOptions, {
-  isPage,
-  initRelation
-}) {
-  const pageOptions = parseComponent(vuePageOptions);
+function parseBasePage (vuePageOptions) {
+  const [pageOptions, vueOptions] = parseComponent(vuePageOptions, true);
 
-  initHooks(pageOptions.methods, hooks$1, vuePageOptions);
+  initHooks(pageOptions.methods, hooks$1, vueOptions);
 
   pageOptions.methods.onLoad = function (query) {
     this.options = query;
@@ -2385,10 +2407,7 @@ function parseBasePage (vuePageOptions, {
 }
 
 function parsePage (vuePageOptions) {
-  const pageOptions = parseBasePage(vuePageOptions, {
-    isPage,
-    initRelation
-  });
+  const pageOptions = parseBasePage(vuePageOptions);
   // 页面需要在 ready 中触发，其他组件是在 handleLink 中触发
   pageOptions.lifetimes.ready = function ready () {
     if (this.$vm && this.$vm.mpType === 'page') {
@@ -2520,7 +2539,7 @@ if (typeof Proxy !== 'undefined' && "quickapp-webview" !== 'app-plus') {
       if (eventApi[name]) {
         return eventApi[name]
       }
-      if (!hasOwn(qa, name) && !hasOwn(protocols, name)) {
+      if (typeof qa[name] !== 'function' && !hasOwn(protocols, name)) {
         return
       }
       return promisify(name, wrapper(name, qa[name]))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-quickapp-webview",
-  "version": "2.0.1-alpha-36320220919002",
+  "version": "2.0.1-alpha-36720221017001",
   "description": "uni-app quickapp-webview",
   "main": "dist/index.js",
   "repository": {
@@ -17,5 +17,5 @@
     "name": "quickapp-webview",
     "title": "快应用(Webview)版"
   },
-  "gitHead": "b2851f78cf0ce4c18aa1e9c0033ab1bcc9306444"
+  "gitHead": "7d7030aaaffab530253dc4cf02f87a13023c0d1f"
 }