From 315ba06bfe8692ba4d454bd7a373d4362d342797 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 09 八月 2023 12:36:51 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/zshare/actionList/normalbutton/index.jsx | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index a4f9f7c..425cce5 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -1714,10 +1714,15 @@
this.checkLoopRequest(params, _resolve)
}
} else if (res.ErrCode === 'C') {
+ let msg = res.message || ''
+ if (/\n|\r/.test(msg)) {
+ msg = msg.replace(/\n|\r/ig, '<br/>')
+ msg = <span dangerouslySetInnerHTML={{__html: msg}}></span>
+ }
const _this = this
confirm({
title: '璇风‘璁�',
- content: res.message,
+ content: msg,
onOk() {
return new Promise(resolve => {
Api.genericInterface(unCheckParam).then(result => {
--
Gitblit v1.8.0