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

mokacao · Mar 7, 2019 · de83565 · de83565
2 parents cb17819 + f4f88f8
commit de83565
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/packages/uni-app-plus/dist/index.js b/packages/uni-app-plus/dist/index.js
@@ -402,16 +402,16 @@ function initRefs (vm) {
       const $refs = Object.create(null);
       const components = mpInstance.selectAllComponents('.__ref__');
       components.forEach(component => {
-        const id = component.id;
-        $refs[id] = component.$vm;
+        const ref = component.dataset.ref;
+        $refs[ref] = component.$vm;
       });
       const forComponents = mpInstance.selectAllComponents('.__ref-in-for__');
       forComponents.forEach(component => {
-        const id = component.id;
-        if (!$refs[id]) {
-          $refs[id] = [];
+        const ref = component.dataset.ref;
+        if (!$refs[ref]) {
+          $refs[ref] = [];
         }
-        $refs[id].push(component.$vm);
+        $refs[ref].push(component.$vm);
       });
       return $refs
     }

diff --git a/packages/uni-app-plus/package.json b/packages/uni-app-plus/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@dcloudio/uni-app-plus",
-	"version": "0.0.1",
+	"version": "0.0.2",
 	"description": "uni-app app-plus",
 	"main": "dist/index.js",
 	"scripts": {

diff --git a/packages/uni-mp-weixin/dist/index.js b/packages/uni-mp-weixin/dist/index.js
@@ -404,16 +404,16 @@ function initRefs (vm) {
       const $refs = Object.create(null);
       const components = mpInstance.selectAllComponents('.__ref__');
       components.forEach(component => {
-        const id = component.id;
-        $refs[id] = component.$vm;
+        const ref = component.dataset.ref;
+        $refs[ref] = component.$vm;
       });
       const forComponents = mpInstance.selectAllComponents('.__ref-in-for__');
       forComponents.forEach(component => {
-        const id = component.id;
-        if (!$refs[id]) {
-          $refs[id] = [];
+        const ref = component.dataset.ref;
+        if (!$refs[ref]) {
+          $refs[ref] = [];
         }
-        $refs[id].push(component.$vm);
+        $refs[ref].push(component.$vm);
       });
       return $refs
     }

diff --git a/packages/uni-mp-weixin/package.json b/packages/uni-mp-weixin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@dcloudio/uni-mp-weixin",
-	"version": "0.0.7",
+	"version": "0.0.8",
 	"description": "uni-app mp-weixin",
 	"main": "dist/index.js",
 	"scripts": {

diff --git a/src/core/runtime/wrapper/util.js b/src/core/runtime/wrapper/util.js
@@ -147,16 +147,16 @@ export function initRefs (vm) {
       const $refs = Object.create(null)
       const components = mpInstance.selectAllComponents('.__ref__')
       components.forEach(component => {
-        const id = component.id
-        $refs[id] = component.$vm
+        const ref = component.dataset.ref
+        $refs[ref] = component.$vm
       })
       const forComponents = mpInstance.selectAllComponents('.__ref-in-for__')
       forComponents.forEach(component => {
-        const id = component.id
-        if (!$refs[id]) {
-          $refs[id] = []
+        const ref = component.dataset.ref
+        if (!$refs[ref]) {
+          $refs[ref] = []
         }
-        $refs[id].push(component.$vm)
+        $refs[ref].push(component.$vm)
       })
       return $refs
     }