Merge branch 'bug7116'

src/views/ppt_manage/newVersion/utils/untils.js

@@ -187,15 +187,15 @@ export const toTextProps = (json) => {
                 url: styleObj['href']
             }
             if (bulletFlag && styleObj['list-type'] === 'ol') {
-              options.bullet = { type: 'number', indent: 20 * 0.75 }
-              options.breakLine=true
-              options.paraSpaceBefore = 0.1
+              // options.bullet = { type: 'number', indent: 20 * 0.75 }
+              // options.breakLine=true
+              // options.paraSpaceBefore = 0.1
               bulletFlag = false
             }
             if (bulletFlag && styleObj['list-type'] === 'ul') {
-              options.bullet = { indent: 20 * 0.75 }
-              options.breakLine=true
-              options.paraSpaceBefore = 0.1
+              // options.bullet = { indent: 20 * 0.75 }
+              // options.breakLine=true
+              // options.paraSpaceBefore = 0.1
               bulletFlag = false
             }
             if(styleObj['line-height']){
@@ -206,7 +206,7 @@ export const toTextProps = (json) => {
     }
   }
   _parse(json)
-  //console.log('slice', slices)
+  console.log('slice', slices)
   return slices
 }
 //将text中被转义的字符转义回来,如:a<b 在富文本内会被转义成 a&lt;b