Skip to content

Commit

Permalink
fix: compatibility with vetur (PanJiaChen#1700)
Browse files Browse the repository at this point in the history
  • Loading branch information
PanJiaChen authored May 4, 2020
1 parent 9580c43 commit fc26c31
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 12 deletions.
6 changes: 3 additions & 3 deletions src/components/Tinymce/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ export default {
_this.fullscreen = e.state
})
},
//it will try to keep these URLs intact
//https://www.tiny.cloud/docs-3x/reference/configuration/Configuration3x@convert_urls/
//https://stackoverflow.com/questions/5196205/disable-tinymce-absolute-to-relative-url-conversions
// it will try to keep these URLs intact
// https://www.tiny.cloud/docs-3x/reference/configuration/Configuration3x@convert_urls/
// https://stackoverflow.com/questions/5196205/disable-tinymce-absolute-to-relative-url-conversions
convert_urls: false
// 整合七牛上传
// images_dataimg_filter(img) {
Expand Down
25 changes: 16 additions & 9 deletions src/layout/components/Sidebar/Link.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@

<template>
<!-- eslint-disable vue/require-component-is -->
<component v-bind="linkProps(to)">
<component :is="type" v-bind="linkProps(to)">
<slot />
</component>
</template>
Expand All @@ -16,19 +14,28 @@ export default {
required: true
}
},
computed: {
isExternal() {
return isExternal(this.to)
},
type() {
if (this.isExternal) {
return 'a'
}
return 'router-link'
}
},
methods: {
linkProps(url) {
if (isExternal(url)) {
linkProps(to) {
if (this.isExternal) {
return {
is: 'a',
href: url,
href: to,
target: '_blank',
rel: 'noopener'
}
}
return {
is: 'router-link',
to: url
to: to
}
}
}
Expand Down

0 comments on commit fc26c31

Please sign in to comment.