李志伟 2 years ago
parent
commit
6f564122ba
1 changed files with 0 additions and 4 deletions
  1. 0
    4
      src/components/rich-editor/index.jsx

+ 0
- 4
src/components/rich-editor/index.jsx View File

9
     window.tinymce.init({
9
     window.tinymce.init({
10
       selector: `#${id}`,
10
       selector: `#${id}`,
11
       menubar: false,
11
       menubar: false,
12
-<<<<<<< HEAD
13
-      branding:false,
14
-=======
15
       language: 'zh_CN',
12
       language: 'zh_CN',
16
       plugins: 'image',
13
       plugins: 'image',
17
       image_description: false,   // 禁用图片描述
14
       image_description: false,   // 禁用图片描述
18
       image_dimensions: false,  // 禁用图片宽高设置
15
       image_dimensions: false,  // 禁用图片宽高设置
19
       toolbar: 'blocks fontfamily fontsize bold italic backcolor alignleft aligncenter alignright alignjustify image outdent indent undo redo removeformat',
16
       toolbar: 'blocks fontfamily fontsize bold italic backcolor alignleft aligncenter alignright alignjustify image outdent indent undo redo removeformat',
20
->>>>>>> e802d9d3811cf3d0cfc27f187e96c8dee54bfb7e
21
       setup: (editor) => {
17
       setup: (editor) => {
22
         editor.on('change', () => {
18
         editor.on('change', () => {
23
           props.onChange(editor.getContent());
19
           props.onChange(editor.getContent());