From cf9a399e7e71f72fac061a4c4cb7dee006a45740 Mon Sep 17 00:00:00 2001
From: "zhigang.li" <zhigang.li@tendcloud.com>
Date: Mon, 2 Jul 2018 17:18:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9showInkInFixed=E4=B8=BAshowIn?=
 =?UTF-8?q?k=EF=BC=8C=E5=A6=82=E6=9E=9C=E8=AE=BE=E4=B8=BAtrue=E5=88=99?=
 =?UTF-8?q?=E6=B0=B8=E8=BF=9C=E6=98=BE=E7=A4=BA=E5=B0=8F=E5=9C=86=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/routers/anchor.vue      | 2 +-
 src/components/anchor/anchor.vue | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/examples/routers/anchor.vue b/examples/routers/anchor.vue
index 783259b4..9c09acf3 100644
--- a/examples/routers/anchor.vue
+++ b/examples/routers/anchor.vue
@@ -3,7 +3,7 @@
 		<div class="link-wrapper">
             <Button @click="changeCon">修改为Window</Button>
             <Button @click="andLink">添加一个连接</Button>
-			<Anchor :bounds="100" @on-change="handleChange" @on-select="handleSelect" :style="{right: '100px'}" :affix="true" :offset-top="30" :scroll-offset="100" :container="scrollCon" show-ink-in-fixed>
+			<Anchor :bounds="100" @on-change="handleChange" @on-select="handleSelect" :style="{right: '100px'}" :affix="true" :offset-top="30" :scroll-offset="100" :container="scrollCon" show-ink>
 				<AnchorLink v-if="(link - 1) % 30 === 0" v-for="link in 300" :key="`link${link}`" :href="`#title-${link}`" :title="`title-${link}`">
                     <AnchorLink :scroll-offset="20" v-if="link === 61" href="#title-child-69" title="title-child-69"/>
                 </AnchorLink>
diff --git a/src/components/anchor/anchor.vue b/src/components/anchor/anchor.vue
index bd664177..6a6ac52c 100644
--- a/src/components/anchor/anchor.vue
+++ b/src/components/anchor/anchor.vue
@@ -3,7 +3,7 @@
 		<div :class="`${prefix}-wrapper`" :style="wrapperStyle">
             <div :class="`${prefix}`">
                 <div :class="`${prefix}-ink`">
-                    <span v-show="showInkBall" :class="`${prefix}-ink-ball`" :style="{top: `${inkTop}px`}"></span>
+                    <span v-show="showInk" :class="`${prefix}-ink-ball`" :style="{top: `${inkTop}px`}"></span>
                 </div>
                 <slot></slot>
             </div>
@@ -50,7 +50,7 @@ export default {
             default: 5
         },
         container: [String, HTMLElement],
-        showInkInFixed: {
+        showInk: {
             type: Boolean,
             default: false
         },
@@ -70,9 +70,6 @@ export default {
         },
         containerIsWindow () {
             return this.scrollContainer === window;
-        },
-        showInkBall () {
-            return this.showInkInFixed && (this.isAffixed || (!this.isAffixed && !this.upperFirstTitle && this.scrollContainer !== window));
         }
     },
     methods: {