Merge branch 'master' into 1.4.0

src/utils/psdParser/text.ts

@@ -92,7 +92,7 @@ export const ResolveText = (item: any, index: number,offsetLeft:number,offsetTop
     let content = ''
     valuesStr.forEach((x: any,si:number) => {
         if(x!='')
-        content += `<p><span  style="${styleArray[si]}">${HtmlUtil.htmlEncodeByRegExp(x)}</span></p>`
+        content += `<p style="${styleArray[si]}"><span  style="${styleArray[si]}">${HtmlUtil.htmlEncodeByRegExp(x)}</span></p>`
     })
     
     const isVertical = item.layer.adjustments.typeTool.obj.textData.Ornt.value != 'Hrzn'
@@ -250,7 +250,7 @@ const getShadows = (drsh: any) => {
     const distance = DrSh.Dstn.value
     var angleInRadians = angle * Math.PI / 180;
     const shadowColor = `rgba(${parseInt(r)},${parseInt(g)},${parseInt(b)},${DrSh.Opct.value / 100})`
-    const x = Math.round(distance * Math.cos(angleInRadians));
+    const x = -Math.round(distance * Math.cos(angleInRadians));
     const y = Math.round(distance * Math.sin(angleInRadians));
 
     let result: PPTElementShadow = {