Commit dc88ec77 authored by 罗超's avatar 罗超

优化乱码问题

parent a864f59b
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
"vue": "^3.4.21", "vue": "^3.4.21",
"vue-konva": "^3.0.2", "vue-konva": "^3.0.2",
"vue-router": "^4.0.13", "vue-router": "^4.0.13",
"vue-waterfall-plugin-next": "^2.4.3",
"vue-waypoint": "^4.3.0", "vue-waypoint": "^4.3.0",
"vue3-leaderline": "^1.2.11", "vue3-leaderline": "^1.2.11",
"vuedraggable": "^4.1.0" "vuedraggable": "^4.1.0"
......
...@@ -467,7 +467,8 @@ const GetTripTemplate = async () =>{ ...@@ -467,7 +467,8 @@ const GetTripTemplate = async () =>{
SlidesData.forEach((x: any) => { SlidesData.forEach((x: any) => {
x.elements.forEach((y:any)=>{ x.elements.forEach((y:any)=>{
if(y.content && y.defaultFontName && y.defaultFontName.includes(',')) y.defaultFontName = y.defaultFontName.split(',')[0] 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) let temp = HtmlUtil.htmlEncodeByRegExp(y.contentStr)
if(temp!=y.contentStr) { if(temp!=y.contentStr) {
y.content = y.content.replace(y.contentStr,temp) y.content = y.content.replace(y.contentStr,temp)
...@@ -725,7 +726,11 @@ const sellGetTripTemplate = async () =>{ ...@@ -725,7 +726,11 @@ const sellGetTripTemplate = async () =>{
SlidesData.forEach((x,i)=>{ SlidesData.forEach((x,i)=>{
x.elements.forEach((y:any)=>{ x.elements.forEach((y:any)=>{
if(y.content && y.defaultFontName && y.defaultFontName.includes(',')) y.defaultFontName = y.defaultFontName.split(',')[0] 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) let temp = HtmlUtil.htmlEncodeByRegExp(y.contentStr)
if(temp!=y.contentStr) { if(temp!=y.contentStr) {
y.content = y.content.replace(y.contentStr,temp) y.content = y.content.replace(y.contentStr,temp)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment