Skip to content

Commit 0efd3a3

Browse files
authored
refactor(markdown): highlightjs更新使用@11 (DevCloudFE#1755)
1 parent 4b7e09e commit 0efd3a3

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

packages/devui-vue/devui/editor-md/src/composables/md-render-service.ts

+14-13
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as hljs from 'highlight.js';
1+
import hljs from 'highlight.js';
22
import MarkdownIt from 'markdown-it';
33
import { filterXSS, getDefaultCSSWhiteList, getDefaultWhiteList, IWhiteList } from 'xss';
44
import { mermaidRender, refreshMermaid } from '../plugins/mermaid';
@@ -15,21 +15,23 @@ export class MDRenderService {
1515
if (lang && hljs.getLanguage(lang)) {
1616
try {
1717
return hljs.highlight(str, { language: lang }).value;
18-
} catch (_) { }
18+
} catch (_) {}
1919
}
2020
return '';
21-
}
21+
},
2222
}) as any;
2323
private baseUrl = '';
2424
private breaks = true;
2525
private renderParse: Function | undefined;
2626

2727
constructor() {
2828
this.setDefaultXss();
29-
this.mdt.use(tocAndAnchor, {
30-
linkify: false,
31-
anchorLink: false
32-
}).use(mermaidRender, { id: 'devui-mermaid' });
29+
this.mdt
30+
.use(tocAndAnchor, {
31+
linkify: false,
32+
anchorLink: false,
33+
})
34+
.use(mermaidRender, { id: 'devui-mermaid' });
3335
}
3436

3537
private setDefaultXss() {
@@ -46,7 +48,6 @@ export class MDRenderService {
4648
this.xssWhiteList['path'] = ['style', 'class', 'd', 'id', 'fill', 'stroke'];
4749
this.xssWhiteList['th'] = ['style'];
4850
this.xssWhiteList['td'] = ['style'];
49-
5051
}
5152

5253
setBaseUrl(url: string) {
@@ -71,15 +72,15 @@ export class MDRenderService {
7172

7273
setCustomXssRules(rules: ICustomXssRule[]) {
7374
if (rules) {
74-
rules.forEach(rule => {
75+
rules.forEach((rule) => {
7576
this.xssWhiteList[rule['key']] = rule['value'];
7677
});
7778
}
7879
}
7980

8081
setCustomRendererRules(rules: ICustomRenderRule[]) {
8182
if (rules) {
82-
rules.forEach(rule => {
83+
rules.forEach((rule) => {
8384
this.mdt.renderer.rules[rule['key']] = rule['value'];
8485
});
8586
}
@@ -90,7 +91,7 @@ export class MDRenderService {
9091
}
9192

9293
setPlugins(plugins: Array<MdPlugin>) {
93-
plugins.forEach(item => {
94+
plugins.forEach((item) => {
9495
const { plugin, opts } = item;
9596
this.mdt.use(plugin, opts);
9697
});
@@ -139,7 +140,7 @@ export class MDRenderService {
139140
top: true,
140141
left: true,
141142
bottom: true,
142-
right: true
143+
right: true,
143144
}),
144145
},
145146
});
@@ -153,7 +154,7 @@ export class MDRenderService {
153154

154155
public setRules(mdRules: Record<string, any>): void {
155156
if (mdRules) {
156-
Object.keys(mdRules).forEach(rule => {
157+
Object.keys(mdRules).forEach((rule) => {
157158
this.mdt[rule].set(mdRules[rule]);
158159
});
159160
}

packages/devui-vue/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
"@devui-design/icons": "^1.3.0",
5050
"@floating-ui/dom": "^0.4.4",
5151
"@iktakahiro/markdown-it-katex": "^4.0.1",
52-
"katex": "^0.12.0",
5352
"@types/codemirror": "0.0.97",
5453
"@types/lodash-es": "^4.17.4",
5554
"@vue/shared": "^3.2.33",
@@ -63,7 +62,8 @@
6362
"diff2html": "^3.4.35",
6463
"echarts": "5.3.3",
6564
"fs-extra": "^10.0.0",
66-
"highlight.js": "10.7.3",
65+
"highlight.js": "^11.6.0",
66+
"katex": "^0.12.0",
6767
"lodash": "^4.17.21",
6868
"lodash-es": "^4.17.20",
6969
"markdown-it": "12.2.0",

0 commit comments

Comments
 (0)