diff --git a/src/App.vue b/src/App.vue index 4b4f3e2af397e7bbe266bc40cdd062e042e994b6..6d452157d473f76dc9154b4288df0ecf7034b832 100644 --- a/src/App.vue +++ b/src/App.vue @@ -245,7 +245,7 @@ export default { const newText = formatText( originalText, selectionInfo, - "\n![video](", + "![video](", `${url} '${name}')\n` ); _this.text = newText; diff --git a/src/assets/js/utils.js b/src/assets/js/utils.js index 2866aacfaed5e207cddc51d0bf4c6b7d2239f668..88e05c3d1d466c7db61d089e3254e0ff50401893 100644 --- a/src/assets/js/utils.js +++ b/src/assets/js/utils.js @@ -385,12 +385,26 @@ export function getLinkTitle(linkEl, item) { const originTitle = linkEl.innerText; const titleEl = Array.from(linkEl.getElementsByClassName("md_link_title")); if (titleEl.length) return item.title || titleEl[0].innerText; - return /^http/.test(originTitle) ? "" : originTitle; + return /^(http|www)/.test(originTitle) ? "" : originTitle; +} + +export function removeLinkHeadAndEnd(link) { + if (!link) return ""; + return link.replace(/^https?:\/\//, "").replace(/\/$/, ""); } export function renderLinkCard(title, item) { + console.log(item.title); + console.log(item.url); + return ` - ${title || item.title || ""} + ${ + removeLinkHeadAndEnd(item.title) === removeLinkHeadAndEnd(item.url) + ? "" + : ` + ${title || item.title || ""} + ` + } ${`${item.description || ""}`} diff --git a/src/assets/style/markdown.less b/src/assets/style/markdown.less index a5d4940fe12da6ca81ccbe6becd67059ff5a2553..8a2836dc858bdfca0e134327d1e52673ec8f3317 100644 --- a/src/assets/style/markdown.less +++ b/src/assets/style/markdown.less @@ -10,7 +10,9 @@ .md_preview { font-family: -apple-system, SF UI Text, Arial, PingFang SC, Hiragino Sans GB, Microsoft YaHei, WenQuanYi Micro Hei, sans-serif, SimHei, SimSun; - + video { + display: block; + } img { max-width: 100%; height: auto; diff --git a/src/components/content/mixins/render-mixins.js b/src/components/content/mixins/render-mixins.js index 5a5d8e50a0cfce7bb34fa21bdcc03c54c2d677f5..97dcc3b3e4b3158296bf676f47488f1c64f8d441 100644 --- a/src/components/content/mixins/render-mixins.js +++ b/src/components/content/mixins/render-mixins.js @@ -72,15 +72,13 @@ export default { `; } - // if (text === "video") { - // return ``; - // } + if (text === "video") { + return `