Merge branch 'dev'

Author: newer2333

packages/devui-vue/devui-cli/commands/build.js

@@ -30,7 +30,7 @@ const rollupOptions = {
     /codemirror/,
     'highlight.js',
     /markdown-it/,
-    /mermaid/,
+    /^mermaid/,
     'xss',
     'diff2html',
   ],

packages/devui-vue/devui/editor-md/src/editor-md.scss

@@ -1,5 +1,6 @@
 @import '../../styles-var/devui-var.scss';
 @import './assets/editor.scss';
+@import 'codemirror/lib/codemirror.css';
 
 $font-family: helvetica, arial, 'PingFang', 'Microsoft YaHei', 'Hiragino Sans GB', 'Microsoft JhengHei', sans-serif;
 

packages/devui-vue/devui/editor-md/src/editor-md.tsx

@@ -7,7 +7,6 @@ import Toolbar from './components/toolbar';
 import MdRender from './components/md-render';
 import { locale } from './utils';
 import './editor-md.scss';
-import 'codemirror/lib/codemirror.css';
 
 export default defineComponent({
   name: 'DEditorMd',