Merge branch 'master' of http://gitlab.oytour.com/viitto/pptist

src/utils/psdParser/text.ts

@@ -70,9 +70,12 @@ export const ResolveText = (item: any, index: number,offsetLeft:number,offsetTop
     if(objectEFFFects && objectEFFFects.data?.FrFX?.enab){
         stroke = getStrokeHandler(objectEFFFects)
     }
-    let content = `<p><span  style="${style}">${HtmlUtil.htmlEncodeByRegExp(value)}</span></p>`
+    const valuesStr = value.split('\r')
+    let content = ''
+    valuesStr.forEach((x: any) => {
+        content += `<p><span  style="${style}">${HtmlUtil.htmlEncodeByRegExp(x)}</span></p>`
+    })
     
-
     const isVertical = item.layer.adjustments.typeTool.obj.textData.Ornt.value != 'Hrzn'
     if(isVertical) {
         let checkWord = value[0]+value[value.length-1]

src/views/Editor/Thumbnails/index.vue

@@ -466,7 +466,8 @@ const GetTripTemplate = async () =>{
           }else if(SlidesData.length>0){
             SlidesData.forEach((x: any) => {
               x.elements.forEach((y:any)=>{
-                if(y.contentStr && y.content.includes(y.contentStr)){
+                if(y.content && y.defaultFontName && y.defaultFontName.includes(',')) y.defaultFontName = y.defaultFontName.split(',')[0]
+                if(y.contentStr && y.content && y.content.includes(y.contentStr)){
                   let temp = HtmlUtil.htmlEncodeByRegExp(y.contentStr)
                   if(temp!=y.contentStr) {
                     y.content = y.content.replace(y.contentStr,temp)
@@ -707,10 +708,12 @@ const sellGetTripTemplate = async () =>{
         if(SalesBack.value==0) slidesStore.setTitle(dataRes.data.data.Title)
         if(SalesBack.value==0&&searchData.value.sellId){
           let SlidesData = JSON.parse(dataObj.TempData)
+
           let newSlides = []
-          await SlidesData.forEach((x,i)=>{
+           SlidesData.forEach((x,i)=>{
             x.elements.forEach((y:any)=>{
-              if(y.contentStr && y.content.includes(y.contentStr)){
+              if(y.content && y.defaultFontName && y.defaultFontName.includes(',')) y.defaultFontName = y.defaultFontName.split(',')[0]
+              if(y.contentStr && y.content && y.content.includes(y.contentStr)){
                 let temp = HtmlUtil.htmlEncodeByRegExp(y.contentStr)
                 if(temp!=y.contentStr) {
                   y.content = y.content.replace(y.contentStr,temp)

src/views/Market/Index.vue

@@ -4,7 +4,7 @@
         <div class="relative" style="padding: 22px 17px; max-width:1440px; margin:0 auto;z-index: 2;">
             <div :class="[datas.scrollTop>200?'MarketHeader':'']">
                 <div class="row items-center">
-                    <img class="q-pr-36" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pptTD.png" style="height: 28px;" />
+                    <img class="q-pr-36 cusor-pointer" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pptTD.png" style="height: 28px;" @click="forwordHandler('/space')" />
                     <div class="row grow Market-select reactive">
                         <el-input v-model="queryObj.Title" placeholder="请输入关键字" class="input-with-select q-pr-33">
                             <template #append>
@@ -329,7 +329,7 @@ const SwitchingVersion = (row: Object) =>{
 const BeFondOf = (row: Object) => {
     row.checked = !row.checked
 }
-
+const forwordHandler = (path:string)=>router.push({path})
 // 删除模版
 const deleteTemplate = (item:any) => {
     ElMessageBox.confirm(