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

src/views/Editor/Thumbnails/index.vue

@@ -472,7 +472,8 @@ const GetTripTemplate = async () =>{
             SlidesData.forEach((x: any) => {
               x.elements.forEach((y:any)=>{
                 if(y.content && y.defaultFontName && y.defaultFontName.includes(',')) y.defaultFontName = y.defaultFontName.split(',')[0]
-                if(y.contentStr && y.content && y.content.includes(y.contentStr)){
+                if(y.content && y.content.includes(" ")) y.content=y.content.replaceAll(' ','')
+                if(y.contentStr && !y.contentStr.includes('<p') && 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)
@@ -730,7 +731,11 @@ const sellGetTripTemplate = async () =>{
            SlidesData.forEach((x,i)=>{
             x.elements.forEach((y:any)=>{
               if(y.content && y.defaultFontName && y.defaultFontName.includes(',')) y.defaultFontName = y.defaultFontName.split(',')[0]
-              if(y.contentStr && y.content && y.content.includes(y.contentStr)){
+              if(y.content && (y.content.includes('&amp;nbsp;'))){
+                y.content = y.content.replaceAll('&amp;nbsp;','&nbsp;')
+                //y.content=y.content.replaceAll('&nbsp;',' ')
+              }
+              if(y.contentStr && !y.contentStr.includes('<p') && 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)