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] 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
+};