diff --git a/app/DataBase/output_pc.py b/app/DataBase/output_pc.py index 3908128..3966dac 100644 --- a/app/DataBase/output_pc.py +++ b/app/DataBase/output_pc.py @@ -697,6 +697,7 @@ body{ right: -20px; } .item{ + white-space: pre-line; margin-top: 15px; display: flex; width: 100%; @@ -923,56 +924,61 @@ html_end = ''' const message = chatMessages[i]; const messageElement = document.createElement('div'); const messageElementRefer = document.createElement('div'); + const formattedText = message.text.replace(/\\n/g, "
"); + var formattedReferText = ""; if (message.type == 1) { if (message.is_send == 1) { messageElement.className = "item item-right"; - messageElement.innerHTML = `
${message.text}
` + messageElement.innerHTML = `
${formattedText}
` } else if (message.is_send == 0) { messageElement.className = "item item-left"; - messageElement.innerHTML = `
${message.text}
` + messageElement.innerHTML = `
${formattedText}
` } } else if (message.type == 0) { messageElement.className = "item item-center"; - messageElement.innerHTML = `${message.text}` + messageElement.innerHTML = `${formattedText}` } else if (message.type == 3) { if (message.is_send == 1) { messageElement.className = "item item-right"; - messageElement.innerHTML = `
` + messageElement.innerHTML = `
` } else if (message.is_send == 0) { messageElement.className = "item item-left"; - messageElement.innerHTML = `
` + messageElement.innerHTML = `
` } } else if (message.type == 43) { if (message.is_send == 1) { messageElement.className = "item item-right"; - messageElement.innerHTML = `
` + messageElement.innerHTML = `
` } else if (message.is_send == 0) { messageElement.className = "item item-left"; - messageElement.innerHTML = `
` + messageElement.innerHTML = `
` } } else if (message.type == 49) { if (message.sub_type == 57){ + if (message.refer_text) { + formattedReferText = message.refer_text.replace(/\\n/g, "
"); + } if (message.is_send == 1) { messageElement.className = "item item-right"; - messageElement.innerHTML = `
${message.text}
` + messageElement.innerHTML = `
${formattedText}
` if (message.refer_text) { messageElementRefer.className = "item item-right item-refer"; - messageElementRefer.innerHTML = `
${message.refer_text}
` + messageElementRefer.innerHTML = `
${formattedReferText}
` } } else if (message.is_send == 0) { messageElement.className = "item item-left"; - messageElement.innerHTML = `
${message.text}
` + messageElement.innerHTML = `
${formattedText}
` if (message.refer_text) { messageElementRefer.className = "item item-left item-refer"; - messageElementRefer.innerHTML = `
${message.refer_text}
` + messageElementRefer.innerHTML = `
${formattedReferText}
` } } } @@ -980,11 +986,11 @@ html_end = ''' else if (message.type == 34) { if (message.is_send == 1) { messageElement.className = "item item-right"; - messageElement.innerHTML = `
${message.voice_to_text == "" ? "" : `
${message.voice_to_text}
`}
` + messageElement.innerHTML = `
${message.voice_to_text == "" ? "" : `
${message.voice_to_text}
`}
` } else if (message.is_send == 0) { messageElement.className = "item item-left"; - messageElement.innerHTML = `
${message.voice_to_text == "" ? "" : `
${message.voice_to_text}
`}
` + messageElement.innerHTML = `
${message.voice_to_text == "" ? "" : `
${message.voice_to_text}
`}
` } } chatContainer.appendChild(messageElement);