From 551c730771fa88b49ce145e231cfed7d83ba6776 Mon Sep 17 00:00:00 2001
From: "mo.duan" <mo.duan@tendcloud.com>
Date: Tue, 24 Sep 2019 12:02:52 +0800
Subject: [PATCH] optimize Tabs

---
 examples/routers/tabs.vue    | 44 +++++++++++++++++++++++++-----------
 src/components/tabs/tabs.vue |  2 +-
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/examples/routers/tabs.vue b/examples/routers/tabs.vue
index 390624cf..a82fa940 100644
--- a/examples/routers/tabs.vue
+++ b/examples/routers/tabs.vue
@@ -55,22 +55,40 @@
 <!--        }-->
 <!--    }-->
 <!--</script>-->
+<!--<template>-->
+<!--    <div>-->
+<!--        <Button @click="showSecond = !showSecond">change</Button>-->
+<!--        <Tabs value="name1">-->
+<!--            <TabPane label="标签一" name="name1" :index="1">标签一的内容</TabPane>-->
+<!--            <TabPane label="标签二" name="name2" :index="2" v-if="showSecond">标签二的内容</TabPane>-->
+<!--            <TabPane label="标签三" name="name3" :index="3">标签三的内容</TabPane>-->
+<!--        </Tabs>-->
+<!--    </div>-->
+<!--</template>-->
+<!--<script>-->
+<!--    export default {-->
+<!--        data () {-->
+<!--            return {-->
+<!--                showSecond: false-->
+<!--            }-->
+<!--        }-->
+<!--    }-->
+<!--</script>-->
 <template>
-    <div>
-        <Button @click="showSecond = !showSecond">change</Button>
-        <Tabs value="name1">
-            <TabPane label="标签一" name="name1" :index="1">标签一的内容</TabPane>
-            <TabPane label="标签二" name="name2" :index="2" v-if="showSecond">标签二的内容</TabPane>
-            <TabPane label="标签三" name="name3" :index="3">标签三的内容</TabPane>
-        </Tabs>
-    </div>
+    <Tabs>
+        <TabPane label="macOS" icon="logo-apple">
+            <Tabs>
+                <TabPane label="macOS" icon="logo-apple">标签一的内容</TabPane>
+                <TabPane label="Windows" icon="logo-windows">标签二的内容</TabPane>
+                <TabPane label="Linux" icon="logo-tux">标签三的内容</TabPane>
+            </Tabs>
+        </TabPane>
+        <TabPane label="Windows" icon="logo-windows">标签二的内容</TabPane>
+        <TabPane label="Linux" icon="logo-tux">标签三的内容</TabPane>
+    </Tabs>
 </template>
 <script>
     export default {
-        data () {
-            return {
-                showSecond: false
-            }
-        }
+
     }
 </script>
diff --git a/src/components/tabs/tabs.vue b/src/components/tabs/tabs.vue
index 4341c306..4ff7531c 100644
--- a/src/components/tabs/tabs.vue
+++ b/src/components/tabs/tabs.vue
@@ -217,7 +217,7 @@
                         if (item.tab === this.name) {
                             TabPanes.push(item);
                         }
-                    } else if (this.$children.indexOf(item) !== -1) {
+                    }else if (this.$children.includes(item)) { // #6279 #6299
                         TabPanes.push(item);
                     }
                 });