fix: use <a> if the page doesn't exist

fix #506
saberland · Oct 6, 2019 · 8e3daa9 · 8e3daa9
1 parent 1cc0757
commit 8e3daa9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/packages/saber/vue-renderer/app/components/SaberLink.js b/packages/saber/vue-renderer/app/components/SaberLink.js
@@ -16,6 +16,7 @@ export default {
   render(h, { data, children, parent }) {
     const attrs = { ...data.attrs }
     const isExternal = typeof attrs.to === 'string' && isAbsoluteUrl(attrs.to)
+    let tag = 'a'
 
     if (isExternal) {
       if (HTTP_RE.test(attrs.to)) {
@@ -29,8 +30,16 @@ export default {
       delete attrs.to
     } else {
       if (typeof attrs.to === 'string') {
-        attrs.to = parent.$saber.getPageLink(attrs.to)
+        const link = parent.$saber.getPageLink(attrs.to)
+        if (link) {
+          tag = 'router-link'
+          attrs.to = link
+        } else {
+          attrs.href = attrs.to
+          delete attrs.to
+        }
       } else {
+        tag = 'router-link'
         const { route } = parent.$router.resolve(attrs.to)
         attrs.to = parent.$saber.getPageLink(route.fullPath)
       }
@@ -39,7 +48,7 @@ export default {
     delete attrs.openLinkInNewTab
 
     return h(
-      isExternal ? 'a' : 'router-link',
+      tag,
       {
         ...data,
         attrs

diff --git a/packages/saber/vue-renderer/app/create-app.js b/packages/saber/vue-renderer/app/create-app.js
@@ -128,11 +128,6 @@ export default context => {
           throw new TypeError(`Expect link to be a string`)
         }
 
-        // Already a route path, directly return
-        if (/^\//.test(link)) {
-          return link
-        }
-
         const matched = /^([^#?]+)([#?].*)?$/.exec(link)
 
         if (!matched) {
@@ -145,6 +140,9 @@ export default context => {
         )
         const extra = matched[2] || ''
         for (const route of this.$router.options.routes) {
+          if (route.path === matched[1]) {
+            return link
+          }
           if (
             route.meta &&
             route.meta.__relative &&
@@ -153,8 +151,9 @@ export default context => {
             return `${route.path}${extra}`
           }
         }
-        // Not a page, return the whole link directly
-        return `${matched[1]}${extra}`
+
+        // Not a page
+        return undefined
       }
     }
   }