完善模版导入

.env.development

-VUE_APP_API_URL = 'http://192.168.5.46/api/common/post'
-VUE_APP_UPLOADURLAPI_URL = 'http://192.168.5.46:8120'
+# VUE_APP_API_URL = 'http://192.168.5.46/api/common/post'
+# VUE_APP_UPLOADURLAPI_URL = 'http://192.168.5.46:8120'
 VUE_APP_VIITTOFILE_URL = 'http://192.168.5.46:8130'
 VUE_APP_NOTIFICATION_URL = 'http://localhost:8081'
 VUE_APP_DOWNLOAD_URL = 'http://192.168.5.46'
 VUE_APP_SHARE_URL = 'http://127.0.0.1:8080'
 VUE_APP_PDF_URL = 'http://127.0.0.1:5164'
-# VUE_APP_API_URL = 'https://reborn.oytour.com/api/common/post'
-# VUE_APP_UPLOADURLAPI_URL = 'https://upload.oytour.com'
-# VUE_APP_SHARE_URL = 'http://vitto.com'
\ No newline at end of file
+VUE_APP_API_URL = 'https://reborn.oytour.com/api/common/post'
+VUE_APP_UPLOADURLAPI_URL = 'https://upload.oytour.com'
+VUE_APP_SHARE_URL = 'http://vitto.com'
\ No newline at end of file

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 style="${styleArray[si]}"><span  style="${styleArray[si]}">${HtmlUtil.htmlEncodeByRegExp(x)}</span></p>`
+        content += `<p style="${styleArray[si]}"><span  style="${styleArray[si]}">${HtmlUtil.htmlEncodeByRegExp(x).replaceAll(" ","&nbsp;")}</span></p>`
     })
     
     const isVertical = item.layer.adjustments.typeTool.obj.textData.Ornt.value != 'Hrzn'
@@ -139,7 +139,7 @@ export const ResolveText = (item: any, index: number,offsetLeft:number,offsetTop
         defaultFontName: fontName && fontName.length>0 ? fontName[0]:'',
         defaultColor: color,
         fill: background,
-        lineHeight: leading<1?1:leading,
+        lineHeight: leading<1?1:Number(leading.toFixed(1)),
         wordSpace: tracking,
         vertical: isVertical,
         contentStr: value,