From 6f35b90c88a37c54b461e359b141e38065237acc Mon Sep 17 00:00:00 2001 From: Aicirou <2643053021@qq.com> Date: Sat, 30 May 2020 19:28:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2md=E6=B8=B2=E6=9F=93=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 52 +++----- package.json | 2 +- public/images/baidu-pan-logo.png | Bin 0 -> 6447 bytes src/api/components.markdown.js | 8 ++ src/components/index.js | 3 + src/components/markdown/index.vue | 146 +++++++++++++++++++++ src/components/markdown/plugin/baidupan.js | 38 ++++++ src/main.js | 2 + src/views/Layout.vue | 3 - src/views/common/Markdown.vue | 6 +- src/views/page/GoList.vue | 7 +- vue.config.js | 1 + yarn.lock | 20 ++- 13 files changed, 237 insertions(+), 51 deletions(-) create mode 100644 public/images/baidu-pan-logo.png create mode 100644 src/api/components.markdown.js create mode 100644 src/components/index.js create mode 100644 src/components/markdown/index.vue create mode 100644 src/components/markdown/plugin/baidupan.js diff --git a/package-lock.json b/package-lock.json index 796a2db..1944e86 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2016,6 +2016,7 @@ "version": "1.0.10", "resolved": "http://registry.npm.taobao.org/argparse/download/argparse-1.0.10.tgz", "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=", + "dev": true, "requires": { "sprintf-js": "~1.0.2" } @@ -3129,6 +3130,12 @@ "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=", "dev": true }, + "highlight.js": { + "version": "9.18.1", + "resolved": "https://registry.npm.taobao.org/highlight.js/download/highlight.js-9.18.1.tgz", + "integrity": "sha1-7SGqAB/mJSuxCj121HVzxlOf4Tw=", + "dev": true + }, "supports-color": { "version": "7.1.0", "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-7.1.0.tgz", @@ -4709,7 +4716,8 @@ "entities": { "version": "2.0.0", "resolved": "https://registry.npm.taobao.org/entities/download/entities-2.0.0.tgz", - "integrity": "sha1-aNYITKsbB5dnVA2A5Wo5tCPkq/Q=" + "integrity": "sha1-aNYITKsbB5dnVA2A5Wo5tCPkq/Q=", + "dev": true }, "errno": { "version": "0.1.7", @@ -6519,12 +6527,6 @@ "integrity": "sha1-TAb8y0YC/iYCs8k9+C1+fb8aio4=", "dev": true }, - "highlight.js": { - "version": "9.18.1", - "resolved": "https://registry.npm.taobao.org/highlight.js/download/highlight.js-9.18.1.tgz", - "integrity": "sha1-7SGqAB/mJSuxCj121HVzxlOf4Tw=", - "dev": true - }, "hmac-drbg": { "version": "1.0.1", "resolved": "http://registry.npm.taobao.org/hmac-drbg/download/hmac-drbg-1.0.1.tgz", @@ -7596,14 +7598,6 @@ "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", "dev": true }, - "linkify-it": { - "version": "2.2.0", - "resolved": "https://registry.npm.taobao.org/linkify-it/download/linkify-it-2.2.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flinkify-it%2Fdownload%2Flinkify-it-2.2.0.tgz", - "integrity": "sha1-47VGl+eL+RXHCjis14/QngBYsc8=", - "requires": { - "uc.micro": "^1.0.1" - } - }, "load-json-file": { "version": "1.1.0", "resolved": "https://registry.npm.taobao.org/load-json-file/download/load-json-file-1.1.0.tgz", @@ -7865,17 +7859,10 @@ "object-visit": "^1.0.0" } }, - "markdown-it": { - "version": "10.0.0", - "resolved": "https://registry.npm.taobao.org/markdown-it/download/markdown-it-10.0.0.tgz", - "integrity": "sha1-q/xk8UGxci1mNAIETkOSfx9QqNw=", - "requires": { - "argparse": "^1.0.7", - "entities": "~2.0.0", - "linkify-it": "^2.0.0", - "mdurl": "^1.0.1", - "uc.micro": "^1.0.5" - } + "marked": { + "version": "1.1.0", + "resolved": "https://registry.npm.taobao.org/marked/download/marked-1.1.0.tgz", + "integrity": "sha1-YlBK1NEVUMlCk1zMXjnWTlpMTlA=" }, "md5.js": { "version": "1.3.5", @@ -7894,11 +7881,6 @@ "integrity": "sha1-aZs8OKxvHXKAkaZGULZdOIUC/Vs=", "dev": true }, - "mdurl": { - "version": "1.0.1", - "resolved": "https://registry.npm.taobao.org/mdurl/download/mdurl-1.0.1.tgz", - "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=" - }, "media-typer": { "version": "0.3.0", "resolved": "https://registry.npm.taobao.org/media-typer/download/media-typer-0.3.0.tgz", @@ -11285,7 +11267,8 @@ "sprintf-js": { "version": "1.0.3", "resolved": "http://registry.npm.taobao.org/sprintf-js/download/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true }, "sshpk": { "version": "1.16.1", @@ -11952,11 +11935,6 @@ "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", "dev": true }, - "uc.micro": { - "version": "1.0.6", - "resolved": "https://registry.npm.taobao.org/uc.micro/download/uc.micro-1.0.6.tgz", - "integrity": "sha1-nEEagCpAmpH8bPdAgbq6NLJEmaw=" - }, "uglify-js": { "version": "3.4.10", "resolved": "https://registry.npm.taobao.org/uglify-js/download/uglify-js-3.4.10.tgz", diff --git a/package.json b/package.json index ce1f94b..2446ed4 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "js-cookie": "^2.2.1", "lodash": "^4.17.15", "lowdb": "^1.0.0", - "markdown-it": "^10.0.0", + "marked": "^1.1.0", "node-sass": "^4.14.0", "sass-loader": "^8.0.2", "v-viewer": "^1.5.1", diff --git a/public/images/baidu-pan-logo.png b/public/images/baidu-pan-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..b51334a47b2db721ff8c88d109dcb50f198df1a5 GIT binary patch literal 6447 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 JPDHLkV1ntZO1l66 literal 0 HcmV?d00001 diff --git a/src/api/components.markdown.js b/src/api/components.markdown.js new file mode 100644 index 0000000..9198977 --- /dev/null +++ b/src/api/components.markdown.js @@ -0,0 +1,8 @@ +import request from '@/plugin/axios' + +export function ComponentsMarkdownBase (url) { + return request({ + url, + method: 'get' + }) +} diff --git a/src/components/index.js b/src/components/index.js new file mode 100644 index 0000000..1487e15 --- /dev/null +++ b/src/components/index.js @@ -0,0 +1,3 @@ +import Vue from 'vue' + +Vue.component('markdown', () => import('./markdown')) diff --git a/src/components/markdown/index.vue b/src/components/markdown/index.vue new file mode 100644 index 0000000..48d815e --- /dev/null +++ b/src/components/markdown/index.vue @@ -0,0 +1,146 @@ + + + + + diff --git a/src/components/markdown/plugin/baidupan.js b/src/components/markdown/plugin/baidupan.js new file mode 100644 index 0000000..a352844 --- /dev/null +++ b/src/components/markdown/plugin/baidupan.js @@ -0,0 +1,38 @@ + +import cdnpath from "@/libs/util.cdn"; + +export default (quote) => { + const _quote = quote.replace(/<[^<>]+>/g, '').trim() + const bdPanUrl = /^https:\/\/pan\.baidu\.com\/s\/[a-z0-9]+$/i + const bdPanUrlPwd = /^链接: https:\/\/pan\.baidu\.com\/s\/[a-z0-9]+ 密码: [a-z0-9]{4}$/i + if (bdPanUrl.test(_quote)) { + return `
+ +
+ +
+
${_quote}
+ +
` + } else if (bdPanUrlPwd.test(_quote)) { + const url = _quote.match(/https:\/\/pan\.baidu\.com\/s\/[a-z0-9]+/i) + const pwd = _quote.match(/[a-z0-9]{4}$/i) + return `
+
+ +
+ +
+
${url[0]}
+ +
+
+ 密码 + ${pwd[0]} +
+
+
` + } else { + return false + } +} diff --git a/src/main.js b/src/main.js index 2889b62..b36347a 100644 --- a/src/main.js +++ b/src/main.js @@ -14,6 +14,8 @@ import VueClipboard from "vue-clipboard2"; import VueLazyload from "vue-lazyload"; import Viewer from "v-viewer"; import cdnpath from "./libs/util.cdn"; +// 组件 +import '@/components' import "viewerjs/dist/viewer.css"; import "@/assets/style/theme/register.scss"; diff --git a/src/views/Layout.vue b/src/views/Layout.vue index 5246740..d87ff40 100644 --- a/src/views/Layout.vue +++ b/src/views/Layout.vue @@ -3,7 +3,6 @@
- @@ -17,7 +16,6 @@