Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

可编辑div空格编码特殊处理&&变量编辑页联想不到自定义节点问题修复 #7164

Merged
merged 2 commits into from
Nov 10, 2023
Merged

可编辑div空格编码特殊处理&&变量编辑页联想不到自定义节点问题修复 #7164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7a101f
bugfix: 可编辑div空格编码特殊处理&&变量编辑页联想不到自定义节点问题修复
ywywZhou Nov 10, 2023
946ce98
minor: 正则优化
ywywZhou Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,8 +417,10 @@
return item.type === 'button' ? item.value : item.textContent
}).join('')
}
// 用户手动输入 渲染时需要切开展示
domValue = domValue.replace(/&nbsp;/g, '<span>&</span><span>nbsp</span><span>;</span>')
// 用户手动输入的空格编码渲染时需要切开展示
domValue = domValue.replace(/&(nbsp|ensp|emsp|thinsp|zwnj|zwj);/g, ($0, $1) => {
return `<span>&</span><span>${$1}</span><span>;</span>`
})

// 初始化时是通过innerText进行复制的，如果有多个连续空格则只会显示一个，所以需手动将转为&nbsp;
domValue = domValue.replace(/( )/g, '&nbsp;')
Expand Down
6 changes: 4 additions & 2 deletions frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,8 +386,10 @@
return item.type === 'button' ? item.value : item.textContent
}).join('')
}
// 用户手动输入&nbsp;渲染时需要切开展示
domValue = domValue.replace(/&nbsp;/g, '<span>&</span><span>nbsp</span><span>;</span>')
// 用户手动输入的空格编码渲染时需要切开展示
domValue = domValue.replace(/&(nbsp|ensp|emsp|thinsp|zwnj|zwj);/g, ($0, $1) => {
return `<span>&</span><span>${$1}</span><span>;</span>`
})

// 初始化时是通过innerText进行复制的，如果有多个连续空格则只会显示一个，所以需手动将转为&nbsp;
domValue = domValue.replace(/( )/g, '&nbsp;')
Expand Down
1 change: 1 addition & 0 deletions ...sktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableEdit.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@
<template v-if="!atomConfigLoading && renderConfig.length">
<RenderForm
ref="renderForm"
:constants="constants"
:scheme="renderConfig"
:form-option="renderOption"
v-model="renderData">
Expand Down
Loading