From 444907c4ca79253a5af6dc6a96569966bb794673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Tue, 13 Mar 2018 18:37:16 +0800
Subject: [PATCH] update Vue

---
 examples/app.vue          |  13 ++--
 examples/routers/menu.vue | 129 ++++++++++++--------------------------
 package-lock.json         |  14 ++---
 package.json              |   4 +-
 src/utils/assist.js       |   7 ++-
 5 files changed, 60 insertions(+), 107 deletions(-)

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 @@
 <style lang="less">
     @import "../src/styles/index.less";
 </style>
-<style scoped>
-nav { margin-bottom: 40px; }
-ul { display: flex; flex-wrap: wrap; }
-li { display: inline-block; }
-li + li { border-left: solid 1px #bbb; padding-left: 10px; margin-left: 10px; }
+<style lang="less" scoped>
+nav {
+    margin-bottom: 40px;
+
+    ul { display: flex; flex-wrap: wrap; }
+    li { display: inline-block; }
+    li + li { border-left: solid 1px #bbb; padding-left: 10px; margin-left: 10px; }
+}
 .container{ padding: 10px 40px 0; }
 .v-link-active { color: #bbb; }
 </style>
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 @@
 <template>
-    <div>
-        <Menu :theme="theme1"  active-name="1" accordion @on-select="handleSelect" @on-open-change="handleOpen" :open-names="openArr">
-            <Menu-item name="1">
-                <Icon type="ios-paper"></Icon>
-                一级1
-            </Menu-item>
-            <Menu-item name="2">
-                <Icon type="ios-people"></Icon>
-                一级2
-            </Menu-item>
+    <Menu active-name="1-2" :open-names="['1']">
+        <Submenu name="1">
+            <template slot="title">
+                <Icon type="ios-analytics"></Icon>
+                Navigation One
+            </template>
+            <MenuGroup title="Item 1">
+                <MenuItem name="1-1">Option 1</MenuItem>
+                <MenuItem name="1-2">Option 2</MenuItem>
+            </MenuGroup>
+            <MenuGroup title="Item 2">
+                <MenuItem name="1-3">Option 3</MenuItem>
+                <MenuItem name="1-4">Option 4</MenuItem>
+            </MenuGroup>
+        </Submenu>
+        <Submenu name="2">
+            <template slot="title">
+                <Icon type="ios-filing"></Icon>
+                Navigation Two
+            </template>
+            <MenuItem name="2-1">Option 5</MenuItem>
+            <MenuItem name="2-2">Option 6</MenuItem>
             <Submenu name="3">
-                <template slot="title">
-                    <Icon type="ios-people"></Icon>
-                    一级3
-                </template>
-                <Menu-item name="3-1">二级1</Menu-item>
-                <Menu-item name="3-2">二级2</Menu-item>
-                <Submenu name="3-3">
-                    <template slot="title">
-                        <Icon type="stats-bars"></Icon>
-                        二级3
-                    </template>
-                    <Menu-item name="3-3-1">三级1</Menu-item>
-                    <Menu-item name="3-3-2">三级2</Menu-item>
-                    <Submenu name="3-3-3">
-                        <template slot="title">
-                            <Icon type="stats-bars"></Icon>
-                            三级3
-                        </template>
-                        <Menu-item name="3-3-3-1">四级1</Menu-item>
-                        <Menu-item name="3-3-3-2">四级2</Menu-item>
-                        <MenuGroup title="Menu-Group">
-                            <MenuItem name="3-3-3-3-1">
-                                <Icon type="document-text"></Icon>
-                                Group-item1
-                            </MenuItem>
-                            <MenuItem name="3-3-3-3-2">
-                                <Icon type="chatbubbles"></Icon>
-                                Group-item2
-                            </MenuItem>
-                        </MenuGroup>
-                    </Submenu>
-                    <Submenu name="3-3-4">
-                        <template slot="title">
-                            <Icon type="stats-bars"></Icon>
-                            三级4
-                        </template>
-                        <Menu-item name="3-3-4-1">四级1</Menu-item>
-                        <Menu-item name="3-3-4-2">四级2</Menu-item>
-                    </Submenu>
-                </Submenu>
-                <Submenu name="3-4">
-                    <template slot="title">
-                        <Icon type="stats-bars"></Icon>
-                        二级4
-                    </template>
-                    <Menu-item name="3-4-1">三级1</Menu-item>
-                    <Menu-item name="3-4-2">三级2</Menu-item>
-                </Submenu>
+                <template slot="title">Submenu</template>
+                <MenuItem name="3-1">Option 7</MenuItem>
+                <MenuItem name="3-2">Option 8</MenuItem>
             </Submenu>
-            <Menu-item name="4">
-                <Icon type="settings"></Icon>
-                一级4
-            </Menu-item>
-        </Menu>
-        <br>
-        <p>切换主题</p>
-        <Radio-group v-model="theme1">
-            <Radio label="light"></Radio>
-            <Radio label="dark"></Radio>
-            <Radio label="primary"></Radio>
-        </Radio-group>
-        <Input v-model="value4" icon="ios-clock-outline" placeholder="请输入..." style="width: 200px"></Input>
-    </div>
+        </Submenu>
+        <Submenu name="4">
+            <template slot="title">
+                <Icon type="ios-gear"></Icon>
+                Navigation Three
+            </template>
+            <MenuItem name="4-1">Option 9</MenuItem>
+            <MenuItem name="4-2">Option 10</MenuItem>
+            <MenuItem name="4-3">Option 11</MenuItem>
+            <MenuItem name="4-4">Option 12</MenuItem>
+        </Submenu>
+    </Menu>
 </template>
 <script>
     export default {
-        data () {
-            return {
-                theme1: 'dark',
-                value4: '',
-                openArr: ['3', '3-3', '3-3-3']
-            };
-        },
-        methods: {
-            handleSelect (name) {
-                // console.log(name);
-                return name;
-            },
-            handleOpen (openArr) {
-                // console.log(openArr);
-                return openArr;
-            }
-        }
-    };
+
+    }
 </script>
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 [];
     }