From b6c7f588b831d6fa4eb23b50ec08ea0b263a0717 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 17 六月 2024 20:27:56 +0800
Subject: [PATCH] 2024-06-17
---
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
index cb62553..4aba73f 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -978,7 +978,12 @@
content = <span dangerouslySetInnerHTML={{__html: content}}></span>
} else if (content !== '') {
content = `${col.prefix || ''}${content}${col.postfix || ''}`
- content = content.replace(/\n/ig, '<br/>').replace(/\s/ig, ' ')
+ if (!col.evalchars || col.evalchars.includes('enter')) {
+ content = content.replace(/\n/ig, '<br/>')
+ }
+ if (!col.evalchars || col.evalchars.includes('space')) {
+ content = content.replace(/\s/ig, ' ')
+ }
content = <span dangerouslySetInnerHTML={{__html: content}}></span>
}
@@ -1292,7 +1297,12 @@
content = <span dangerouslySetInnerHTML={{__html: content}}></span>
} else if (content !== '') {
content = `${col.prefix || ''}${content}${col.postfix || ''}`
- content = content.replace(/\n/ig, '<br/>').replace(/\s/ig, ' ')
+ if (!col.evalchars || col.evalchars.includes('enter')) {
+ content = content.replace(/\n/ig, '<br/>')
+ }
+ if (!col.evalchars || col.evalchars.includes('space')) {
+ content = content.replace(/\s/ig, ' ')
+ }
content = <span dangerouslySetInnerHTML={{__html: content}}></span>
}
@@ -1874,7 +1884,7 @@
let _sso = _sql
deForms.forEach(item => {
- if (item.database === 'sso' && (window.GLOB.mkHS || window.GLOB.systemType === 'production')) {
+ if (item.database === 'sso') {
let sql = _sso + item.base_sql
_sso = ''
--
Gitblit v1.8.0