Merge branch 'xqc_387' into debug

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

@@ -198,6 +198,9 @@ export const toTextProps = (json) => {
               // options.paraSpaceBefore = 0.1
               bulletFlag = false
             }
+            if(styleObj['line-height']){
+              options.lineSpacingMultiple=styleObj['line-height']
+            }
             slices.push({ text, options })
         } else if ('children' in item) _parse(item.children, styleObj)
     }