Compare commits

..

No commits in common. "cf2a3ba19a0d6c36921293fccc76175160d9d419" and "cb57af854f220cb560d63fbe580411e5c2e08661" have entirely different histories.

3 changed files with 179 additions and 206 deletions

View File

@ -1,10 +1,7 @@
<template> <template>
<view class="container"> <view class="container">
<view v-for="item in recommendThemeList" :key="item.themeName"> <view v-for="item in recommendThemeList" :key="item.themeName">
<RecommendPostsList <RecommendPostsList :recommendTheme="item" />
v-if="item.recommendPostsList.length > 0"
:recommendTheme="item"
/>
</view> </view>
</view> </view>
</template> </template>

View File

@ -13,26 +13,7 @@ function Markdown (vm) {
Markdown.prototype.onUpdate = function (content) { Markdown.prototype.onUpdate = function (content) {
if (this.vm.markdown) { if (this.vm.markdown) {
// return marked(content) return marked(content)
// 先处理内容,确保只有双波浪号才被解析为删除线
// 使用临时占位符保护单个波浪号
let processedContent = content;
// 1. 先保护双波浪号删除线语法
processedContent = processedContent.replace(/~~([^~]+?)~~/g, '__STRIKETHROUGH_START__$1__STRIKETHROUGH_END__');
// 2. 将剩余的单个波浪号转换为HTML实体
processedContent = processedContent.replace(/~/g, '&#126;');
// 3. 恢复双波浪号删除线语法
processedContent = processedContent.replace(/__STRIKETHROUGH_START__/g, '~~').replace(/__STRIKETHROUGH_END__/g, '~~');
return marked(processedContent, {
gfm: true,
breaks: false,
pedantic: false,
sanitize: false,
});
} }
} }

View File

@ -1,85 +1,79 @@
<template> <template>
<view class="zero-markdown-view"> <view class="zero-markdown-view">
<mp-html <mp-html :key="mpkey" :selectable="selectable" :scroll-table='scrollTable' :tag-style="tagStyle"
:key="mpkey" :markdown="true" :content="contentAi">
:selectable="selectable"
:scroll-table="scrollTable"
:tag-style="tagStyle"
:markdown="true"
:content="contentAi"
>
</mp-html> </mp-html>
</view> </view>
</template> </template>
<script> <script>
import mpHtml from "../mp-html/mp-html"; import mpHtml from '../mp-html/mp-html';
export default { export default {
name: "zero-markdown-view", name: 'zero-markdown-view',
components: { components: {
mpHtml, mpHtml
}, },
props: { props: {
markdown: { markdown: {
type: String, type: String,
default: "", default: ''
}, },
selectable: { selectable: {
type: [Boolean, String], type: [Boolean, String],
default: true, default: true
}, },
scrollTable: { scrollTable: {
type: Boolean, type: Boolean,
default: true, default: true
}, },
themeColor: { themeColor: {
type: String, type: String,
default: "#00A6FF", default: '#00A6FF'
}, },
codeBgColor: { codeBgColor: {
type: String, type: String,
default: "#2d2d2d", default: '#2d2d2d'
}, },
fontFamily: { fontFamily: {
type: String, type: String,
default: "PingFang SC, PingFang SC", default: 'PingFang SC, PingFang SC'
}, },
aiMode: { aiMode: {
type: Boolean, type: Boolean,
default: false, default: false
}, }
}, },
data() { data() {
return { return {
content: "", content: '',
tagStyle: "", tagStyle: '',
mpkey: "zero", mpkey: 'zero'
}; };
}, },
computed: { computed: {
contentAi() { contentAi() {
if (!this.content) { if (!this.content) {
return; // content return // content
} }
let htmlString = ""; let htmlString = ''
// //
const codeBlocks = const codeBlocks = this.content.match(/```[\s\S]*?```|```[\s\S]*?$/g) || []
this.content.match(/```[\s\S]*?```|```[\s\S]*?$/g) || []; const lastBlock = codeBlocks[codeBlocks.length - 1]
const lastBlock = codeBlocks[codeBlocks.length - 1]; if (lastBlock && !lastBlock.endsWith('```')) {
if (lastBlock && !lastBlock.endsWith("```")) {
// , // ,
htmlString = this.content + "\n"; htmlString = this.content + '\n'
} else { } else {
htmlString = this.content; htmlString = this.content
} }
return htmlString; return htmlString
}, },
}, },
watch: { watch: {
markdown: function (val) { markdown: function (val) {
this.content = this.markdown; this.content = this.markdown
}, }
}, },
created() { created() {
if (this.aiMode) { if (this.aiMode) {
@ -89,14 +83,15 @@ export default {
} }
}, },
mounted() { mounted() {
this.content = this.markdown; this.content = this.markdown
}, },
methods: { methods: {
initTagStyle() { initTagStyle() {
const themeColor = this.themeColor; const themeColor = this.themeColor
const codeBgColor = this.codeBgColor; const codeBgColor = this.codeBgColor
const fontFamily = this.fontFamily; const fontFamily = this.fontFamily
let zeroStyle = { let zeroStyle = {
p: ` p: `
margin:4px 0; margin:4px 0;
@ -204,13 +199,13 @@ export default {
font-size:12px; font-size:12px;
position: relative; position: relative;
`, `,
}; }
this.tagStyle = zeroStyle; this.tagStyle = zeroStyle
}, },
initTagStyleForAi() { initTagStyleForAi() {
const themeColor = this.themeColor; const themeColor = this.themeColor
const codeBgColor = this.codeBgColor; const codeBgColor = this.codeBgColor
const fontFamily = this.fontFamily; const fontFamily = this.fontFamily
let zeroStyle = { let zeroStyle = {
p: ` p: `
margin:4px 0; margin:4px 0;
@ -326,10 +321,10 @@ export default {
position: relative; position: relative;
font-family: ${fontFamily}; font-family: ${fontFamily};
`, `,
}; }
this.tagStyle = zeroStyle; this.tagStyle = zeroStyle
},
}, },
}
}; };
</script> </script>