From 613d7ada2c5a89d21fdaa4a92f914c27b06f171b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 09 八月 2023 11:43:32 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/zshare/actionList/normalbutton/index.jsx | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index c07350f..a4f9f7c 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -2106,8 +2106,8 @@
}
} else if (res.ErrCode === 'Y') { // 鎵ц鎴愬姛
let msg = res.message || '鎵ц鎴愬姛锛�'
- if (/\n/.test(msg)) {
- msg = msg.replace(/\n/ig, '<br/>')
+ if (/\n|\r/.test(msg)) {
+ msg = msg.replace(/\n|\r/ig, '<br/>')
msg = <span dangerouslySetInnerHTML={{__html: msg}}></span>
}
Modal.success({
@@ -2580,8 +2580,8 @@
if (res.ErrCode === 'E') {
let msg = res.message || '鎵ц澶辫触锛�'
- if (/\n/.test(msg)) {
- msg = msg.replace(/\n/ig, '<br/>')
+ if (/\n|\r/.test(msg)) {
+ msg = msg.replace(/\n|\r/ig, '<br/>')
msg = <span dangerouslySetInnerHTML={{__html: msg}}></span>
}
Modal.error({
--
Gitblit v1.8.0