Merge branch 'feat/ui-0.5.0' into 'test'

Feat/ui 0.5.0

See merge request opensource/answer!310
This commit is contained in:
Li Shuailing 2022-12-02 09:38:33 +00:00
commit c12fbe912a
2 changed files with 10 additions and 10 deletions

View File

@ -189,7 +189,7 @@ const TagIntroduction = () => {
<div className="mb-3"> <div className="mb-3">
{t('synonyms.text')}{' '} {t('synonyms.text')}{' '}
<Tag <Tag
className="me-2 mb-2" className="me-2"
data={{ data={{
slug_name: tagName || '', slug_name: tagName || '',
main_tag_slug_name: '', main_tag_slug_name: '',
@ -209,15 +209,13 @@ const TagIntroduction = () => {
{!isEdit && {!isEdit &&
(synonymsData?.synonyms && (synonymsData?.synonyms &&
synonymsData.synonyms.length > 0 ? ( synonymsData.synonyms.length > 0 ? (
synonymsData.synonyms.map((item) => { <div className="m-n1">
return ( {synonymsData.synonyms.map((item) => {
<Tag return (
key={item.tag_id} <Tag key={item.tag_id} className="m-2" data={item} />
className="me-2 mb-2" );
data={item} })}
/> </div>
);
})
) : ( ) : (
<> <>
<div className="text-muted mb-3"> <div className="text-muted mb-3">

View File

@ -173,6 +173,8 @@ function diffText(newText: string, oldText: string): string {
if (typeof oldText !== 'string') { if (typeof oldText !== 'string') {
return newText return newText
?.replace(/\n/gi, '<br>') ?.replace(/\n/gi, '<br>')
?.replace(/<kbd/gi, '&lt;kbd')
?.replace(/<\/kbd>/gi, '&lt;/kbd&gt;')
?.replace(/<iframe/gi, '&lt;iframe') ?.replace(/<iframe/gi, '&lt;iframe')
?.replace(/<input/gi, '&lt;input'); ?.replace(/<input/gi, '&lt;input');
} }