From ac1d52c46ff9019fcc93cf3d5e7ab17cf850824e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 10 八月 2023 16:05:24 +0800
Subject: [PATCH] 2023-08-10
---
src/tabviews/zshare/actionList/normalbutton/index.jsx | 178 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 112 insertions(+), 66 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 78522ba..7ab6d6e 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -9,8 +9,6 @@
import Api from '@/api'
import Utils, { getSysDefaultSql } from '@/utils/utils.js'
import options from '@/store/options.js'
-import zhCN from '@/locales/zh-CN/main.js'
-import enUS from '@/locales/en-US/main.js'
import asyncSpinComponent from '@/utils/asyncSpinComponent'
import { updateForm } from '@/utils/utils-update.js'
import MKEmitter from '@/utils/events.js'
@@ -34,7 +32,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
visible: false,
formdata: null,
selines: null,
@@ -260,7 +257,7 @@
// 闇�瑕侀�夋嫨琛屾椂锛屾牎楠屾暟鎹�
notification.warning({
top: 92,
- message: this.state.dict['main.action.confirm.selectline'],
+ message: '璇烽�夋嫨琛岋紒',
duration: 5
})
return
@@ -268,7 +265,7 @@
// 闇�瑕侀�夋嫨鍗曡鏃讹紝鏍￠獙鏁版嵁
notification.warning({
top: 92,
- message: this.state.dict['main.action.confirm.selectSingleLine'],
+ message: '璇烽�夋嫨鍗曡鏁版嵁锛�',
duration: 5
})
return
@@ -355,7 +352,7 @@
} else if (btn.OpenType === 'prompt') {
this.setState({loading: true})
confirm({
- title: btn.tipTitle || this.state.dict['main.action.confirm.tip'],
+ title: btn.tipTitle || '纭畾瑕佹墽琛屽悧?',
onOk() {
return new Promise(resolve => {
_this.execSubmit(data, resolve)
@@ -981,11 +978,6 @@
let city = sessionStorage.getItem('city') || ''
let district = sessionStorage.getItem('district') || ''
let address = sessionStorage.getItem('address') || ''
-
- if (sessionStorage.getItem('isEditState') === 'true') {
- userName = sessionStorage.getItem('CloudUserName') || ''
- fullName = sessionStorage.getItem('CloudFullName') || ''
- }
// 鍒濆鍖栧嚟璇佸強鐢ㄦ埛淇℃伅瀛楁
_sql += `
@@ -1722,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 => {
@@ -2061,7 +2058,16 @@
*/
execSuccess = (res = {}) => {
const { btn } = this.props
- const { btnconfig, autoMatic } = this.state
+ const { autoMatic } = this.state
+
+ if (autoMatic) {
+ this.setState({
+ loading: false,
+ visible: false
+ })
+ MKEmitter.emit('autoExecOver', btn.uuid, 'success')
+ return
+ }
let sign = ''
if (/^@speak@/i.test(res.message)) {
@@ -2084,41 +2090,6 @@
res.message = res.message.replace(/@close_tab@|@close_popup@|@goback@|@no_target_menu@/i, '')
}
- if ((res.ErrCode === 'S' || !res.ErrCode) || autoMatic) { // 鎵ц鎴愬姛
- if (btn.formType !== 'counter' || res.message) {
- notification.success({
- top: 92,
- message: res.message || '鎵ц鎴愬姛锛�',
- duration: btn.verify && btn.verify.stime ? btn.verify.stime : 2
- })
- }
- } else if (res.ErrCode === 'Y') { // 鎵ц鎴愬姛
- Modal.success({
- title: res.message || '鎵ц鎴愬姛锛�'
- })
- } else if (res.ErrCode === '-1') { // 瀹屾垚鍚庝笉鎻愮ず
-
- }
-
- this.setState({
- loadingNumber: '',
- loadingTotal: '',
- })
-
- if (autoMatic) {
- this.setState({
- loading: false,
- visible: false
- })
- MKEmitter.emit('autoExecOver', btn.uuid, 'success')
- return
- } else if (btn.OpenType !== 'pop' || !btnconfig || btnconfig.setting.finish !== 'unclose') {
- this.setState({
- loading: false,
- visible: false
- })
- }
-
let id = ''
if (btn.output) {
id = res.mk_b_id || res[btn.output] || ''
@@ -2127,6 +2098,53 @@
if (res.mk_icon) {
sessionStorage.setItem('avatar', res.mk_icon)
}
+
+ res.ErrCode = res.ErrCode || 'S'
+
+ if (res.ErrCode === 'S') { // 鎵ц鎴愬姛
+ if (btn.formType !== 'counter' || res.message) {
+ notification.success({
+ top: 92,
+ message: res.message || '鎵ц鎴愬姛锛�',
+ duration: btn.verify && btn.verify.stime ? btn.verify.stime : 2
+ })
+ }
+ } else if (res.ErrCode === 'Y') { // 鎵ц鎴愬姛
+ let msg = res.message || '鎵ц鎴愬姛锛�'
+ if (/\n|\r/.test(msg)) {
+ msg = msg.replace(/\n|\r/ig, '<br/>')
+ msg = <span dangerouslySetInnerHTML={{__html: msg}}></span>
+ }
+ Modal.success({
+ title: msg,
+ onOk: () => {
+ this.successContinue(sign, id)
+ }
+ })
+ return
+ } else if (res.ErrCode === '-1') { // 瀹屾垚鍚庝笉鎻愮ず
+
+ }
+
+ this.successContinue(sign, id)
+ }
+
+ successContinue = (sign, id) => {
+ const { btn } = this.props
+ const { btnconfig } = this.state
+
+ this.setState({
+ loadingNumber: '',
+ loadingTotal: '',
+ })
+
+ if (btn.OpenType !== 'pop' || !btnconfig || btnconfig.setting.finish !== 'unclose') {
+ this.setState({
+ loading: false,
+ visible: false
+ })
+ }
+
let tabId = ''
if (btn.refreshTab && btn.refreshTab.length > 0) {
tabId = btn.refreshTab[btn.refreshTab.length - 1]
@@ -2521,8 +2539,29 @@
*/
execError = (res = {}) => {
const { btn } = this.props
- const { btnconfig, autoMatic } = this.state
+ const { autoMatic } = this.state
+ if (autoMatic) {
+ notification.error({
+ top: 92,
+ message: res.message || '鎵ц澶辫触锛�',
+ duration: 10
+ })
+
+ this.setState({
+ loading: false,
+ loadingNumber: '',
+ loadingTotal: '',
+ visible: false
+ })
+ MKEmitter.emit('autoExecOver', btn.uuid, 'error')
+ return
+ }
+
+ if (!['LoginError', 'C', '-2', 'E', 'N', 'F', 'NM'].includes(res.ErrCode)) {
+ res.ErrCode = 'E'
+ }
+
let sign = ''
if (/^@speak@/i.test(res.message)) {
res.message = res.message.replace(/^@speak@/i, '')
@@ -2544,11 +2583,20 @@
res.message = res.message.replace(/@close_tab@|@close_popup@|@goback@/i, '')
}
- if (res.ErrCode === 'E' && !autoMatic) {
+ if (res.ErrCode === 'E') {
+ let msg = res.message || '鎵ц澶辫触锛�'
+ if (/\n|\r/.test(msg)) {
+ msg = msg.replace(/\n|\r/ig, '<br/>')
+ msg = <span dangerouslySetInnerHTML={{__html: msg}}></span>
+ }
Modal.error({
- title: res.message || '鎵ц澶辫触锛�',
+ title: msg,
+ onOk: () => {
+ this.errorContinue(sign)
+ }
})
- } else if (res.ErrCode === 'N' || autoMatic) {
+ return
+ } else if (res.ErrCode === 'N') {
notification.error({
top: 92,
message: res.message || '鎵ц澶辫触锛�',
@@ -2565,16 +2613,14 @@
message.error(res.message || '鎵ц澶辫触锛�')
}
- if (autoMatic) {
- this.setState({
- loading: false,
- loadingNumber: '',
- loadingTotal: '',
- visible: false
- })
- MKEmitter.emit('autoExecOver', btn.uuid, 'error')
- return
- } else if (btn.OpenType !== 'pop' || !btnconfig || btnconfig.setting.finish !== 'unclose') {
+ this.errorContinue(sign)
+ }
+
+ errorContinue = (sign) => {
+ const { btn } = this.props
+ const { btnconfig } = this.state
+
+ if (btn.OpenType !== 'pop' || !btnconfig || btnconfig.setting.finish !== 'unclose') {
this.setState({
loading: false
})
@@ -2820,7 +2866,7 @@
_item.fieldlen = item.decimal || 0
} else if (['text', 'textarea', 'linkMain'].includes(_item.type)) {
_item.value = _item.value + ''
- _item.value = _item.value.replace(/\t*|\v*/g, '') // 鍘婚櫎鍒惰〃绗�
+ _item.value = _item.value.replace(/\t+|\v+/g, '') // 鍘婚櫎鍒惰〃绗�
if (item.interception !== 'false') { // 鍘婚櫎棣栧熬绌烘牸
_item.value = _item.value.replace(/(^\s*|\s*$)/g, '')
@@ -2867,7 +2913,7 @@
this.execSubmit(selines, () => {}, result)
} else {
confirm({
- title: btn.tipTitle || this.state.dict['main.action.confirm.tip'],
+ title: btn.tipTitle || '纭畾瑕佹墽琛屽悧?',
onOk() {
return new Promise(resolve => {
_this.execSubmit(selines, resolve, result)
@@ -3019,7 +3065,7 @@
// 闇�瑕侀�夋嫨琛屾椂锛屾牎楠屾暟鎹�
notification.warning({
top: 92,
- message: this.state.dict['main.action.confirm.selectline'],
+ message: '璇烽�夋嫨琛岋紒',
duration: 5
})
return
@@ -3027,7 +3073,7 @@
// 闇�瑕侀�夋嫨鍗曡鏃讹紝鏍￠獙鏁版嵁
notification.warning({
top: 92,
- message: this.state.dict['main.action.confirm.selectSingleLine'],
+ message: '璇烽�夋嫨鍗曡鏁版嵁锛�',
duration: 5
})
return
--
Gitblit v1.8.0