diff --git a/examples/app.vue b/examples/app.vue
index b93032ac..e8cc10b3 100644
--- a/examples/app.vue
+++ b/examples/app.vue
@@ -1,11 +1,14 @@
-
diff --git a/examples/routers/menu.vue b/examples/routers/menu.vue
index 0c3b3ea0..a51cdec3 100644
--- a/examples/routers/menu.vue
+++ b/examples/routers/menu.vue
@@ -1,97 +1,46 @@
-
+
+
+
+
+ Navigation Three
+
+
+
+
+
+
+
diff --git a/package-lock.json b/package-lock.json
index 5b14c492..5e93bfda 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "iview",
- "version": "2.10.0",
+ "version": "2.10.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -14025,9 +14025,9 @@
"dev": true
},
"vue": {
- "version": "2.5.13",
- "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.13.tgz",
- "integrity": "sha512-3D+lY7HTkKbtswDM4BBHgqyq+qo8IAEE8lz8va1dz3LLmttjgo0FxairO4r1iN2OBqk8o1FyL4hvzzTFEdQSEw==",
+ "version": "2.5.15",
+ "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.15.tgz",
+ "integrity": "sha512-uUcDI147VCQYA/9AqoEECddWdTQgrhnwAd6KDsl0pF1hiLpxqaYqIgArhnegU+QZ18DQrKvZNcR3x2QM1iaroQ==",
"dev": true
},
"vue-hot-reload-api": {
@@ -14258,9 +14258,9 @@
}
},
"vue-template-compiler": {
- "version": "2.5.13",
- "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.13.tgz",
- "integrity": "sha512-15HWSgIxrGUcV0v7QRen2Y3fQsbgxXwMvjT/5XKMO0ANmaCcNh7y2OeIDTAuSGeosjb9+E1Pn2PHZ61VQWEgBQ==",
+ "version": "2.5.15",
+ "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.15.tgz",
+ "integrity": "sha512-v3GRVovW8fWO01SAJ+1MbdzbCN+hVBusoqUOBE5FR9dVMGo3p/WDO2gRS/+gEgAALtL7i5pxi+V2l6EauM3XDA==",
"dev": true,
"requires": {
"de-indent": "1.0.2",
diff --git a/package.json b/package.json
index fa0ce6e6..3e012265 100644
--- a/package.json
+++ b/package.json
@@ -99,13 +99,13 @@
"sinon-chai": "^3.0.0",
"style-loader": "^0.20.2",
"url-loader": "^1.0.1",
- "vue": "^2.5.13",
+ "vue": "^2.5.15",
"vue-hot-reload-api": "^2.3.0",
"vue-html-loader": "^1.2.4",
"vue-loader": "^14.2.1",
"vue-router": "^3.0.1",
"vue-style-loader": "^4.0.2",
- "vue-template-compiler": "^2.5.13",
+ "vue-template-compiler": "^2.5.15",
"webpack": "^3.11.0",
"webpack-dev-server": "^2.11.1",
"webpack-merge": "^3.0.0"
diff --git a/src/utils/assist.js b/src/utils/assist.js
index 8ad098ad..b7b73889 100644
--- a/src/utils/assist.js
+++ b/src/utils/assist.js
@@ -220,9 +220,10 @@ export function findComponentsDownward (context, componentName) {
// Find components upward
export function findComponentsUpward (context, componentName) {
let parents = [];
- if (context.$parent) {
- if (context.$parent.$options.name === componentName) parents.push(context.$parent);
- return parents.concat(findComponentsUpward(context.$parent, componentName));
+ const parent = context.$parent;
+ if (parent) {
+ if (parent.$options.name === componentName) parents.push(parent);
+ return parents.concat(findComponentsUpward(parent, componentName));
} else {
return [];
}