Merge branch 'master' into router

.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'
+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,

src/views/Editor/Toolbar/ElementTemplateData.vue

 <template> 
-    <div class="q-mt-xs bg-white q-pa-xs rounded ElementTemplateData">
+    <div class="bg-white rounded ElementTemplateData">
         <div class="column text-mdall">
             <div class="column">
                 <template v-if="CoverImg&&!isCoverImg">
@@ -501,6 +501,9 @@
             }) 
             return
         }
+        let color = datas.addColor.Name.slice(0,1)
+        let colorList = ColorList.value.filter(x=>{ return x.Name.toLowerCase().includes(color.toLowerCase())})
+        if(colorList.length>0&&!datas.addColor.Code) datas.addColor.Code = colorList[0].ID
         if(datas.addColor.Content.indexOf('#')==-1){
             ElMessage({
                 showClose: true,

src/views/TemplateCenter/colour.vue

@@ -365,22 +365,25 @@
             message: '请完善颜色名称',
             type: 'warning',
         }) 
-    if(!datas.params.Content){
-        ElMessage({
-            showClose: true,
-            message: '请完善颜色的16进制',
-            type: 'warning',
-        }) 
-        return
-    }
-    if(datas.params.Content.indexOf('#')==-1){
-        ElMessage({
-            showClose: true,
-            message: "色号需要在最前面加 # 号",
-            type: 'warning',
-        }) 
-        return
-    }
+        let color = datas.params.Name.slice(0,1)
+        let colorList = ColorList.value.filter(x=>{ return x.Name.toLowerCase().includes(color.toLowerCase())})
+        if(colorList.length>0&&!datas.params.Code) datas.addColor.Code = colorList[0].ID
+        if(!datas.params.Content){
+            ElMessage({
+                showClose: true,
+                message: '请完善颜色的16进制',
+                type: 'warning',
+            }) 
+            return
+        }
+        if(datas.params.Content.indexOf('#')==-1){
+            ElMessage({
+                showClose: true,
+                message: "色号需要在最前面加 # 号",
+                type: 'warning',
+            }) 
+            return
+        }
       datas.requestLoading = true
       if(datas.type==2) datas.params.Code = ''
       const result = await ConfigService.SetTemplateConfigData(datas.params)