From 6670694ca7c96f210ec22b5ab5b9fd2cf266e9a8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 11 四月 2025 17:54:42 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/views/tabledesign/index.jsx | 9 +--------
src/api/index.js | 8 ++++----
src/views/pcdesign/index.jsx | 9 +--------
src/views/mobdesign/index.jsx | 9 +--------
src/views/menudesign/index.jsx | 9 +--------
5 files changed, 8 insertions(+), 36 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index f62a6f2..b432ebf 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -62,8 +62,8 @@
return Promise.reject(response.data)
} else {
if (response.data.ErrCode === 'E' && /姝婚攣/.test(response.data.message)) {
- response.data.message = '鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庨噸璇曪紒'
- response.data.ErrMesg = '鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庨噸璇曪紒'
+ response.data.message = window.GLOB.dict['server_busy'] || '鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庨噸璇曪紒'
+ response.data.ErrMesg = response.data.message
}
if (response.config.requestId) {
response.data.$requestId = response.config.requestId
@@ -73,11 +73,11 @@
}, (error) => {
let response = error.response || ''
- if (!response && (error.message.includes('Network Error') || error.message.includes('CORS'))) {
+ if (!response) {
notification.error({
className: 'notification-custom-error',
bottom: 0,
- message: '缃戠粶杩炴帴澶辫触锛�',
+ message: error.message.includes('Network Error') && lang === 'zh-CN' ? '缃戠粶杩炴帴澶辫触锛�' : error.message,
placement: 'bottomRight',
duration: 15
})
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index f50902f..1904f57 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -1057,18 +1057,11 @@
}, 300 + (+sessionStorage.getItem('mkDelay')))
}
- netError = (error) => {
+ netError = () => {
this.setState({
menuloading: false
})
- if (!error) {
- notification.warning({
- top: 92,
- message: '淇濆瓨澶辫触锛岃妫�鏌ョ綉缁滄槸鍚︽甯搞��',
- duration: 5
- })
- }
MKEmitter.emit('completeSave')
}
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index e024273..9e9d219 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -1835,18 +1835,11 @@
}, 300 + (+sessionStorage.getItem('mkDelay')))
}
- netError = (error) => {
+ netError = () => {
this.setState({
menuloading: false
})
- if (!error) {
- notification.warning({
- top: 92,
- message: '淇濆瓨澶辫触锛岃妫�鏌ョ綉缁滄槸鍚︽甯搞��',
- duration: 5
- })
- }
MKEmitter.emit('completeSave')
}
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index 2515dc9..497620c 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -1537,18 +1537,11 @@
}, 300 + (+sessionStorage.getItem('mkDelay')))
}
- netError = (error) => {
+ netError = () => {
this.setState({
menuloading: false
})
- if (!error) {
- notification.warning({
- top: 92,
- message: '淇濆瓨澶辫触锛岃妫�鏌ョ綉缁滄槸鍚︽甯搞��',
- duration: 5
- })
- }
MKEmitter.emit('completeSave')
}
diff --git a/src/views/tabledesign/index.jsx b/src/views/tabledesign/index.jsx
index a526f99..2593829 100644
--- a/src/views/tabledesign/index.jsx
+++ b/src/views/tabledesign/index.jsx
@@ -736,18 +736,11 @@
}, 300 + (+sessionStorage.getItem('mkDelay')))
}
- netError = (error) => {
+ netError = () => {
this.setState({
menuloading: false
})
- if (!error) {
- notification.warning({
- top: 92,
- message: '淇濆瓨澶辫触锛岃妫�鏌ョ綉缁滄槸鍚︽甯搞��',
- duration: 5
- })
- }
MKEmitter.emit('completeSave')
}
--
Gitblit v1.8.0