Skip to content

O
open-platform
Commit 4e68c4f3 by 无尘
Options

fix: 修改markdown显示字段

parent 390ec659
Showing with 62 additions and 12 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>达摩开放平台</title><link href=./static/css/app.2a9168a186ef7e2d0005a4fe7d38ca63.css rel=stylesheet></head><body class=damolish><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.4dd517ee0531de752b70.js></script><script type=text/javascript src=./static/js/vendor.0f5b275d4a227ad49647.js></script><script type=text/javascript src=./static/js/app.9c50334119061bcb2895.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>达摩开放平台</title><link href=./static/css/app.34398a2ccec4c90c5bca52e35525ac0a.css rel=stylesheet></head><body class=damolish><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.1f63011786422e197ccf.js></script><script type=text/javascript src=./static/js/vendor.0f5b275d4a227ad49647.js></script><script type=text/javascript src=./static/js/app.a8ebc62c61d06b24fac4.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/css/app.2a9168a186ef7e2d0005a4fe7d38ca63.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.34398a2ccec4c90c5bca52e35525ac0a.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/8.5e787f5eb2f4bd7cfb7b.js → dist/static/js/7.7a9f6ebfddf9cc979084.js
webpackJsonp([8],{"2X9c":function(t,s,i){t.exports=i.p+"static/img/error_500.ed0cba4.svg"},FskK:function(t,s,i){"use strict";Object.defineProperty(s,"__esModule",{value:!0});var a=i("2X9c"),e=i.n(a),n={name:"page500",data:function(){return{img_500:e.a}},computed:{message:function(){return"抱歉，服务器出错了"}}},c={render:function(){var t=this.$createElement,s=this._self._c||t;return s("div",{staticStyle:{background:"#f0f2f5","margin-top":"-20px",height:"100%"}},[s("div",{staticClass:"wscn-http404"},[s("div",{staticClass:"pic-404"},[s("img",{staticClass:"pic-404__parent",attrs:{src:this.img_500,alt:"500"}})]),this._v(" "),s("div",{staticClass:"bullshit"},[s("div",{staticClass:"bullshit__headline"},[this._v(this._s(this.message))]),this._v(" "),s("a",{staticClass:"bullshit__return-home",attrs:{href:"#/companyGroup"}},[this._v("返回首页")])])])])},staticRenderFns:[]};var r=i("VU/8")(n,c,!1,function(t){i("wJ+N")},"data-v-d1f21788",null);s.default=r.exports},"wJ+N":function(t,s){}}); webpackJsonp([7],{"2X9c":function(t,s,i){t.exports=i.p+"static/img/error_500.ed0cba4.svg"},FskK:function(t,s,i){"use strict";Object.defineProperty(s,"__esModule",{value:!0});var a=i("2X9c"),e=i.n(a),n={name:"page500",data:function(){return{img_500:e.a}},computed:{message:function(){return"抱歉，服务器出错了"}}},c={render:function(){var t=this.$createElement,s=this._self._c||t;return s("div",{staticStyle:{background:"#f0f2f5","margin-top":"-20px",height:"100%"}},[s("div",{staticClass:"wscn-http404"},[s("div",{staticClass:"pic-404"},[s("img",{staticClass:"pic-404__parent",attrs:{src:this.img_500,alt:"500"}})]),this._v(" "),s("div",{staticClass:"bullshit"},[s("div",{staticClass:"bullshit__headline"},[this._v(this._s(this.message))]),this._v(" "),s("a",{staticClass:"bullshit__return-home",attrs:{href:"#/companyGroup"}},[this._v("返回首页")])])])])},staticRenderFns:[]};var r=i("VU/8")(n,c,!1,function(t){i("wJ+N")},"data-v-d1f21788",null);s.default=r.exports},"wJ+N":function(t,s){}});
\ No newline at end of file \ No newline at end of file
dist/static/js/8.ef8bd7ef9c9f7f52d202.js 0 → 100644
webpackJsonp([8],{"8Cff":function(t,e){},"R8S/":function(t,e){},m2x8:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n={name:"arrow-nav-bread",props:{menuData:{type:[Array,Object],default:function(){return[]}}},data:function(){return{requestProject:"openPlatform",titleData:[]}},watch:{menuData:function(t){t&&(this.titleData=t)}},mounted:function(){this.menuData&&(this.titleData=this.menuData)},methods:{changeRoute:function(t){this.$router.push(t)},redirectRoute:function(t){t&&this.changeRoute(t)}}},r={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"right-content-top border-box"},[a("div",{staticClass:"right-top-wrap flex flex-row flex-space-between flex-pack-center"},[a("div",{staticClass:"right-top-wrap_left flex flex-pack-center"},[a("div",{staticClass:"el-breadcrumb",attrs:{"aria-label":"Breadcrumb",role:"navigation"}},[t._l(t.titleData,function(e,n){return[a("span",{key:n,staticClass:"el-breadcrumb__item",on:{click:function(a){t.redirectRoute(e.path)}}},[a("span",{class:["el-breadcrumb__inner",e.path?"is-link":""],attrs:{role:"link"}},[t._v(t._s(e.name))]),t._v(" "),a("i",{staticClass:"el-breadcrumb__separator el-icon-arrow-right"})])]})],2)])])])},staticRenderFns:[]};var i=a("VU/8")(n,r,!1,function(t){a("8Cff")},"data-v-52a5e988",null).exports,o=a("auNG"),s=a("LlAa"),c={components:{arrowNavBread:i},data:function(){return{menuData:[{path:"/noticeList",name:"公告列表"},{path:"",name:"公告详情"}],noticeData:{groupName:"",htmlContent:"",title:""}}},methods:{getData:function(){var t=this,e={noticeId:t.$route.query.noticeId};Object(o.a)(e).then(function(e){var a=e.data;"0000"!=a.code?s.a.errorMsg(a):t.noticeData=a.result||{}}).catch(function(e){t.$message.error({duration:1e3,message:e.message})})}},mounted:function(){this.getData()}},l={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"notice-detail"},[a("div",{staticClass:"common-body"},[a("arrow-nav-bread",{attrs:{menuData:t.menuData}}),t._v(" "),a("div",{staticClass:"notice-detail-body"},[a("h2",[t._v("【"+t._s(t.noticeData.groupName)+"】"+t._s(t.noticeData.title))]),t._v(" "),a("div",{staticClass:"notice-detail-content"},[a("div",{staticClass:"markdown-content",domProps:{innerHTML:t._s(t.noticeData.htmlContent)}})]),t._v(" "),a("p",{staticClass:"notice-oprate font-14 color-0a1633"},[t._v(t._s(t.noticeData.operatorName))]),t._v(" "),a("p",{staticClass:"notice-date font-14 color-0a1633"},[t._v(t._s(t._f("timeStampToLineYmd")(t.noticeData.effectiveTime)))])])],1)])},staticRenderFns:[]};var u=a("VU/8")(c,l,!1,function(t){a("R8S/")},"data-v-44e7cb02",null);e.default=u.exports}});
\ No newline at end of file
dist/static/js/manifest.4dd517ee0531de752b70.js → dist/static/js/manifest.1f63011786422e197ccf.js
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=o(o.s=c[d]);return u};var r={},t={13:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"e1d089808563a1dca4d0",1:"adba71f29a9630854db5",2:"5ea71994ffb9873345e3",3:"2acdb0bfe14d02f22e32",4:"7c2a7394dc56bb340dee",5:"b3cf76f8c670cd2efb7e",6:"737da25334f9daa2d713",7:"ef03f48583a47962948c",8:"5e787f5eb2f4bd7cfb7b",9:"9caad4c0ba5b8b4813ee",10:"63807a09986add449f8a"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]); !function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var f,d,i,u=0,s=[];u<r.length;u++)d=r[u],t[d]&&s.push(t[d][0]),t[d]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);s.length;)s.shift()();if(c)for(u=0;u<c.length;u++)i=o(o.s=c[u]);return i};var r={},t={13:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"e1d089808563a1dca4d0",1:"adba71f29a9630854db5",2:"5ea71994ffb9873345e3",3:"2acdb0bfe14d02f22e32",4:"c5bbfde4427f15c80dc6",5:"b3cf76f8c670cd2efb7e",6:"737da25334f9daa2d713",7:"7a9f6ebfddf9cc979084",8:"ef8bd7ef9c9f7f52d202",9:"9caad4c0ba5b8b4813ee",10:"63807a09986add449f8a"}[e]+".js";var f=setTimeout(d,12e4);function d(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=d,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file \ No newline at end of file
package.json
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
"html2canvas": "^1.0.0-alpha.12", "html2canvas": "^1.0.0-alpha.12",
"js-md5": "^0.7.3", "js-md5": "^0.7.3",
"jspdf": "^1.5.3", "jspdf": "^1.5.3",
"markdown-it": "^10.0.0",
"marked": "^0.7.0", "marked": "^0.7.0",
"qrcodejs2": "0.0.2", "qrcodejs2": "0.0.2",
"requset": "0.0.1-security", "requset": "0.0.1-security",
......
src/components/markdown-content.vue
<!-- <!--
* @Descripttion: 当前组件信息
* @version: 1.0.0
* @Author: 无尘
* @Date: 2019-09-16 09:36:32
* @LastEditors: 无尘
* @LastEditTime: 2019-10-25 10:45:03
-->
<!--
<markdown-content :markdownData="formData"></markdown-content> <markdown-content :markdownData="formData"></markdown-content>
import markdownContent from '@/components/markdown-content.vue'; import markdownContent from '@/components/markdown-content.vue';
--> -->
<template> <template>
<div class="markdown-content" v-htmlContent="formData.content"></div> <div class="markdown-content" v-htmlContent="formData.htmlContent"></div>
</template> </template>
<script> <script>
export default { export default {
...@@ -40,6 +48,15 @@ export default { ...@@ -40,6 +48,15 @@ export default {
}; };
</script> </script>
<style lang="less"> <style lang="less">
.hljs-left {
text-align: left;
}
.hljs-center {
text-align: center;
}
.hljs-right {
text-align: right;
}
.markdown-content { .markdown-content {
h1, h1,
h2, h2,
......
src/components/open-doc-right.vue
<!-- <!--
* @Descripttion: 当前组件信息
* @version: 1.0.0
* @Author: 无尘
* @Date: 2019-09-11 16:35:18
* @LastEditors: 无尘
* @LastEditTime: 2019-10-25 10:44:45
-->
<!--
<open-doc-right ref="docContent" :currentDoc="currentDoc" :currentTab="currentTab" :searchData="searchData"></open-doc-right> <open-doc-right ref="docContent" :currentDoc="currentDoc" :currentTab="currentTab" :searchData="searchData"></open-doc-right>
import openDocRight from '@/components/open-doc-right.vue'; import openDocRight from '@/components/open-doc-right.vue';
--> -->
...@@ -44,7 +52,9 @@ import markdownContent from '@/components/markdown-content.vue'; ...@@ -44,7 +52,9 @@ import markdownContent from '@/components/markdown-content.vue';
import { getArtical, getApi, getErrorCode, getSearchDoc } from '@/api/document'; import { getArtical, getApi, getErrorCode, getSearchDoc } from '@/api/document';
import errMsg from '@/assets/js/error'; import errMsg from '@/assets/js/error';
import { processObject } from '@/assets/js/public'; import { processObject } from '@/assets/js/public';
import marked from 'marked'; // import marked from 'marked';
/* import MarkdownIt from 'markdown-it';
let marked = new MarkdownIt(); */
export default { export default {
props: { props: {
currentDoc: { currentDoc: {
...@@ -206,7 +216,7 @@ export default { ...@@ -206,7 +216,7 @@ export default {
.then(res => { .then(res => {
let resData = res.data; let resData = res.data;
if (resData.code == '0000') { if (resData.code == '0000') {
resData.result.content = marked(resData.result.content); // resData.result.content = marked.render(resData.result.content);
that.formData = resData.result || {}; that.formData = resData.result || {};
return; return;
} }
......
src/views/index/noticeDetail.vue
<!--
* @Descripttion: 当前组件信息
* @version: 1.0.0
* @Author: 无尘
* @Date: 2019-09-04 10:41:39
* @LastEditors: 无尘
* @LastEditTime: 2019-10-25 10:52:37
-->
<template> <template>
<div class="notice-detail"> <div class="notice-detail">
<div class="common-body"> <div class="common-body">
...@@ -5,7 +13,7 @@ ...@@ -5,7 +13,7 @@
<div class="notice-detail-body"> <div class="notice-detail-body">
<h2>【{{ noticeData.groupName }}】{{ noticeData.title }}</h2> <h2>【{{ noticeData.groupName }}】{{ noticeData.title }}</h2>
<div class="notice-detail-content"> <div class="notice-detail-content">
<div class="markdown-content" v-html="noticeData.content"></div> <div class="markdown-content" v-html="noticeData.htmlContent"></div>
</div> </div>
<p class="notice-oprate font-14 color-0a1633">{{ noticeData.operatorName }}</p> <p class="notice-oprate font-14 color-0a1633">{{ noticeData.operatorName }}</p>
<p class="notice-date font-14 color-0a1633">{{ noticeData.effectiveTime | timeStampToLineYmd }}</p> <p class="notice-date font-14 color-0a1633">{{ noticeData.effectiveTime | timeStampToLineYmd }}</p>
...@@ -17,7 +25,9 @@ ...@@ -17,7 +25,9 @@
import arrowNavBread from '@/components/nav/arrow-nav-bread.vue'; import arrowNavBread from '@/components/nav/arrow-nav-bread.vue';
import { getNoticeDetail } from '@/api/notice'; import { getNoticeDetail } from '@/api/notice';
import errMsg from '@/assets/js/error'; import errMsg from '@/assets/js/error';
import marked from 'marked'; // import marked from 'marked';
/* import MarkdownIt from 'markdown-it';
let marked = new MarkdownIt(); */
export default { export default {
components: { components: {
arrowNavBread arrowNavBread
...@@ -36,6 +46,7 @@ export default { ...@@ -36,6 +46,7 @@ export default {
], ],
noticeData: { noticeData: {
groupName: '', groupName: '',
htmlContent: '',
title: '' title: ''
} }
}; };
...@@ -50,7 +61,7 @@ export default { ...@@ -50,7 +61,7 @@ export default {
.then(res => { .then(res => {
let resData = res.data; let resData = res.data;
if (resData.code == '0000') { if (resData.code == '0000') {
resData.result.content = marked(resData.result.content); // resData.result.content = marked.render(resData.result.content);
that.noticeData = resData.result || {}; that.noticeData = resData.result || {};
return; return;
} }
...@@ -89,6 +100,15 @@ export default { ...@@ -89,6 +100,15 @@ export default {
font-size: 14px; font-size: 14px;
color: #0a1633; color: #0a1633;
line-height: 24px; line-height: 24px;
/deep/ .hljs-left {
text-align: left;
}
/deep/ .hljs-center {
text-align: center;
}
/deep/ .hljs-right {
text-align: right;
}
} }
.notice-oprate { .notice-oprate {
margin-top: 24px; margin-top: 24px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment