From 2b749d9588a9c4af1d6e8f214fa1888ee8a50f42 Mon Sep 17 00:00:00 2001
From: "zhigang.li" <zhigang.li@tendcloud.com>
Date: Fri, 29 Jun 2018 17:15:39 +0800
Subject: [PATCH 1/6] commit

---
 examples/routers/anchor.vue           | 5 +++++
 src/components/anchor/anchor-link.vue | 2 +-
 src/styles/components/index.less      | 1 -
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/examples/routers/anchor.vue b/examples/routers/anchor.vue
index e53f2941..f99e3fbc 100644
--- a/examples/routers/anchor.vue
+++ b/examples/routers/anchor.vue
@@ -7,6 +7,7 @@
 				<AnchorLink v-if="(link - 1) % 30 === 0" v-for="link in 300" :key="`link${link}`" :href="`#title-${link}`" :title="`title-${link}`">
                     <AnchorLink v-if="link === 61" href="#title-child-69" title="title-child-69"/>
                 </AnchorLink>
+                <AnchorLink href="#lishi" title="李氏专跳"/>
                 <AnchorLink v-if="showNewLink" href="#new-link" title="这是动态添加的连接"/>
 			</Anchor>
 		</div>
@@ -32,6 +33,8 @@
                     </Panel>
                 </Collapse>
             </template>
+            <h1 id="lishi">李氏专跳</h1>
+            <p v-for="i in 100" :key="`chinese-${i}`">这是信息司大是大非胜多负少的{{i}}</p>
             <!-- <h1 id="new-link">这是新添加的哦哦哦哦哦 哦 </h1>
             <p v-for="i in 50" :key="`new-${i}`">这是信息司大是大非胜多负少的{{i}}</p> -->
         </div>
@@ -58,6 +61,8 @@
             </template>
             <h1 id="new-link">这是新添加的哦哦哦哦哦 哦 </h1>
             <p v-for="i in 50" :key="`new-${i}`">这是信息司大是大非胜多负少的{{i}}</p>
+            <h1 id="lishi">李氏专跳</h1>
+            <p v-for="i in 50" :key="`chinese-${i}`">这是信息司大是大非胜多负少的{{i}}</p>
         </div>
 
 	</div>
diff --git a/src/components/anchor/anchor-link.vue b/src/components/anchor/anchor-link.vue
index a009e1f7..d7a68df4 100644
--- a/src/components/anchor/anchor-link.vue
+++ b/src/components/anchor/anchor-link.vue
@@ -1,6 +1,6 @@
 <template>
 	<div :class="anchorLinkClasses">
-        <a :class="linkTitleClasses" href="javascript:void(0)" :data-href="href" @click="goAnchor" :title="title">{{ title }}</a>
+        <a :class="linkTitleClasses" :href="href" :data-href="href" @click.prevent="goAnchor" :title="title">{{ title }}</a>
         <slot></slot>
     </div>
 </template>
diff --git a/src/styles/components/index.less b/src/styles/components/index.less
index 754fc291..2e1b46e9 100644
--- a/src/styles/components/index.less
+++ b/src/styles/components/index.less
@@ -45,4 +45,3 @@
 @import "color-picker";
 @import "auto-complete";
 @import "anchor";
-@import "time";

From 252573372993e2909079add2279953aee347338e Mon Sep 17 00:00:00 2001
From: "zhigang.li" <zhigang.li@tendcloud.com>
Date: Fri, 29 Jun 2018 17:31:05 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3anchor=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=9C=A8=E9=A1=B5=E9=9D=A2=E6=B2=A1=E6=9C=89=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E9=94=9A=E7=82=B9=E6=97=B6=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/anchor/anchor.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/anchor/anchor.vue b/src/components/anchor/anchor.vue
index 0e273d20..c86a8aff 100644
--- a/src/components/anchor/anchor.vue
+++ b/src/components/anchor/anchor.vue
@@ -93,6 +93,7 @@ export default {
         handleHashChange () {
             const url = window.location.href;
             const sharpLinkMatch = sharpMatcherRegx.exec(url);
+            if (!sharpLinkMatch) return;
             this.currentLink = sharpLinkMatch[0];
             this.currentId = sharpLinkMatch[1];
         },

From 576329cc63bfd6f32d7f176d177cf4a7199fc436 Mon Sep 17 00:00:00 2001
From: "zhigang.li" <zhigang.li@tendcloud.com>
Date: Fri, 29 Jun 2018 18:10:14 +0800
Subject: [PATCH 3/6] use link.js for anchor

---
 src/components/anchor/anchor-link.vue |  8 ++++++--
 src/components/anchor/anchor.vue      | 15 ++++-----------
 src/mixins/link.js                    |  9 +++++----
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/components/anchor/anchor-link.vue b/src/components/anchor/anchor-link.vue
index 4b480209..3c9eab2d 100644
--- a/src/components/anchor/anchor-link.vue
+++ b/src/components/anchor/anchor-link.vue
@@ -5,9 +5,11 @@
     </div>
 </template>
 <script>
+import mixinsLink from '../../mixins/link';
 export default {
     name: 'AnchorLink',
     inject: ['anchorCom'],
+    mixins: [ mixinsLink ],
     props: {
         href: String,
         title: String
@@ -31,8 +33,10 @@ export default {
         }
     },
     methods: {
-        goAnchor () {
-            this.anchorCom.turnTo(this.href);
+        goAnchor (event) {
+            this.currentLink = this.href;
+            this.$emit('on-select', this.href);
+            this.handleCheckClick(event);
         }
     },
     mounted () {
diff --git a/src/components/anchor/anchor.vue b/src/components/anchor/anchor.vue
index c86a8aff..3ce7128e 100644
--- a/src/components/anchor/anchor.vue
+++ b/src/components/anchor/anchor.vue
@@ -25,7 +25,6 @@ export default {
             prefix: 'ivu-anchor',
             isAffixed: false, // current affixed state
             inkTop: 0,
-            linkHeight: 0,
             animating: false, // if is scrolling now
             currentLink: '', // current show link =>  #href -> currentLink = #href
             currentId: '', // current show title id =>  #href -> currentId = href
@@ -83,13 +82,6 @@ export default {
             const scrollTop = document.documentElement.scrollTop || document.body.scrollTop || e.target.scrollTop;
             this.getCurrentScrollAtTitleId(scrollTop);
         },
-        turnTo (href) {
-            this.currentLink = href;
-            this.$router.push({
-                path: href
-            });
-            this.$emit('on-select', href);
-        },
         handleHashChange () {
             const url = window.location.href;
             const sharpLinkMatch = sharpMatcherRegx.exec(url);
@@ -159,8 +151,7 @@ export default {
             off(window, 'hashchange', this.handleHashChange);
         },
         init () {
-            const anchorLink = findComponentDownward(this, 'AnchorLink');
-            this.linkHeight = anchorLink ? anchorLink.$el.getBoundingClientRect().height : 0;
+            // const anchorLink = findComponentDownward(this, 'AnchorLink');
             this.handleHashChange();
             this.$nextTick(() => {
                 this.removeListener();
@@ -178,7 +169,9 @@ export default {
     watch: {
         '$route' () {
             this.handleHashChange();
-            this.handleScrollTo();
+            this.$nextTick(() => {
+                this.handleScrollTo();
+            })
         },
         container () {
             this.init();
diff --git a/src/mixins/link.js b/src/mixins/link.js
index cabd46c4..0e70fec1 100644
--- a/src/mixins/link.js
+++ b/src/mixins/link.js
@@ -26,14 +26,15 @@ export default {
     methods: {
         handleClick () {
             const isRoute = this.$router;
+            let href = this.to || this.href;
             if (isRoute) {
-                this.replace ? this.$router.replace(this.to) : this.$router.push(this.to);
+                this.replace ? this.$router.replace(href) : this.$router.push(href);
             } else {
-                window.location.href = this.to;
+                window.location.href = href;
             }
         },
         handleCheckClick (event) {
-            if (this.to) {
+            if (this.to || this.href) {
                 if (this.target === '_blank') {
                     return false;
                 } else {
@@ -43,4 +44,4 @@ export default {
             }
         }
     }
-};
\ No newline at end of file
+};

From 2c68755aa523e9af0cdc516bcd31da8fbb95a18d Mon Sep 17 00:00:00 2001
From: "zhigang.li" <zhigang.li@tendcloud.com>
Date: Fri, 29 Jun 2018 18:12:37 +0800
Subject: [PATCH 4/6] update

---
 src/mixins/link.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mixins/link.js b/src/mixins/link.js
index 0e70fec1..0b016f79 100644
--- a/src/mixins/link.js
+++ b/src/mixins/link.js
@@ -26,7 +26,7 @@ export default {
     methods: {
         handleClick () {
             const isRoute = this.$router;
-            let href = this.to || this.href;
+            const href = this.to || this.href;
             if (isRoute) {
                 this.replace ? this.$router.replace(href) : this.$router.push(href);
             } else {

From 9d553a2b81dc45c7cf83738008aa3fa74a9b67bf Mon Sep 17 00:00:00 2001
From: "zhigang.li" <zhigang.li@tendcloud.com>
Date: Fri, 29 Jun 2018 18:13:33 +0800
Subject: [PATCH 5/6] update

---
 src/components/anchor/anchor.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/anchor/anchor.vue b/src/components/anchor/anchor.vue
index 3ce7128e..52072ad2 100644
--- a/src/components/anchor/anchor.vue
+++ b/src/components/anchor/anchor.vue
@@ -11,7 +11,7 @@
 	</component>
 </template>
 <script>
-import { scrollTop, findComponentDownward, findComponentsDownward, sharpMatcherRegx } from '../../utils/assist';
+import { scrollTop, findComponentsDownward, sharpMatcherRegx } from '../../utils/assist';
 import { on, off } from '../../utils/dom';
 export default {
     name: 'Anchor',
@@ -171,7 +171,7 @@ export default {
             this.handleHashChange();
             this.$nextTick(() => {
                 this.handleScrollTo();
-            })
+            });
         },
         container () {
             this.init();

From 7ff2f71a2f9db26890bdfe5ecdfb06ac907c4d06 Mon Sep 17 00:00:00 2001
From: "zhigang.li" <zhigang.li@tendcloud.com>
Date: Fri, 29 Jun 2018 18:25:41 +0800
Subject: [PATCH 6/6] fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复on-select事件不触发
---
 src/components/anchor/anchor-link.vue | 13 ++++++++-----
 src/mixins/link.js                    |  7 +++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/components/anchor/anchor-link.vue b/src/components/anchor/anchor-link.vue
index 3c9eab2d..999609db 100644
--- a/src/components/anchor/anchor-link.vue
+++ b/src/components/anchor/anchor-link.vue
@@ -5,11 +5,9 @@
     </div>
 </template>
 <script>
-import mixinsLink from '../../mixins/link';
 export default {
     name: 'AnchorLink',
     inject: ['anchorCom'],
-    mixins: [ mixinsLink ],
     props: {
         href: String,
         title: String
@@ -33,10 +31,15 @@ export default {
         }
     },
     methods: {
-        goAnchor (event) {
+        goAnchor () {
             this.currentLink = this.href;
-            this.$emit('on-select', this.href);
-            this.handleCheckClick(event);
+            this.anchorCom.$emit('on-select', this.href);
+            const isRoute = this.$router;
+            if (isRoute) {
+                this.$router.push(this.href);
+            } else {
+                window.location.href = this.href;
+            }
         }
     },
     mounted () {
diff --git a/src/mixins/link.js b/src/mixins/link.js
index 0b016f79..c1ca1872 100644
--- a/src/mixins/link.js
+++ b/src/mixins/link.js
@@ -26,15 +26,14 @@ export default {
     methods: {
         handleClick () {
             const isRoute = this.$router;
-            const href = this.to || this.href;
             if (isRoute) {
-                this.replace ? this.$router.replace(href) : this.$router.push(href);
+                this.replace ? this.$router.replace(this.to) : this.$router.push(this.to);
             } else {
-                window.location.href = href;
+                window.location.href = this.to;
             }
         },
         handleCheckClick (event) {
-            if (this.to || this.href) {
+            if (this.to) {
                 if (this.target === '_blank') {
                     return false;
                 } else {