From c7aece35a62b6e91fd98a625bf0e53f64bfbd18d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 17 八月 2023 16:22:15 +0800
Subject: [PATCH] 2023-08-17
---
src/tabviews/zshare/actionList/normalbutton/index.jsx | 579 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 418 insertions(+), 161 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 8a351f8..f07a1dd 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -1,14 +1,13 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import moment from 'moment'
+import qs from 'qs'
import { is, fromJS } from 'immutable'
import { Button, Modal, notification, message, Drawer, Switch, Checkbox, Progress } from 'antd'
+import md5 from 'md5'
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'
@@ -32,7 +31,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
visible: false,
formdata: null,
selines: null,
@@ -61,7 +59,7 @@
if (btn.OpenType === 'form') {
let data = selectedData && selectedData[0] ? selectedData[0] : null
- if (btn.formType === 'counter') {
+ if (btn.formType === 'counter' || btn.formType === 'count_line') {
let count = 0
if (data && data[btn.field]) {
count = +data[btn.field]
@@ -108,7 +106,7 @@
if (btn.OpenType === 'form') {
let data = nextProps.selectedData && nextProps.selectedData[0] ? nextProps.selectedData[0] : null
- if (btn.formType === 'counter') {
+ if (btn.formType === 'counter' || btn.formType === 'count_line') {
let count = 0
if (data && data[btn.field]) {
count = +data[btn.field]
@@ -258,7 +256,7 @@
// 闇�瑕侀�夋嫨琛屾椂锛屾牎楠屾暟鎹�
notification.warning({
top: 92,
- message: this.state.dict['main.action.confirm.selectline'],
+ message: '璇烽�夋嫨琛岋紒',
duration: 5
})
return
@@ -266,15 +264,7 @@
// 闇�瑕侀�夋嫨鍗曡鏃讹紝鏍￠獙鏁版嵁
notification.warning({
top: 92,
- message: this.state.dict['main.action.confirm.selectSingleLine'],
- duration: 5
- })
- return
- } else if (!['requiredSgl', 'notRequired', 'requiredOnce', 'required'].includes(btn.Ot)) {
- // 鏁版嵁閫夋嫨绫诲瀷鏍￠獙
- notification.warning({
- top: 92,
- message: '鎸夐挳琛岃缃敊璇紒',
+ message: '璇烽�夋嫨鍗曡鏁版嵁锛�',
duration: 5
})
return
@@ -329,6 +319,9 @@
return
}
} else if (!['inner', 'outer', 'system', 'custom'].includes(btn.intertype)) {
+ if (btn.OpenType === 'form' && btn.formType === 'count_line') {
+ return
+ }
// 鎺ュ彛绫诲瀷閿欒
notification.warning({
top: 92,
@@ -350,7 +343,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)
@@ -459,10 +452,9 @@
}
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
- param.LText = param.LText.replace(/\$@/ig, '/*')
- param.LText = param.LText.replace(/@\$/ig, '*/')
+ param.LText = param.LText.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
} else {
- param.LText = param.LText.replace(/@\$|\$@/ig, '')
+ param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
}
param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
@@ -502,10 +494,9 @@
}
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
- param.LText = param.LText.replace(/\$@/ig, '/*')
- param.LText = param.LText.replace(/@\$/ig, '*/')
+ param.LText = param.LText.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
} else {
- param.LText = param.LText.replace(/@\$|\$@/ig, '')
+ param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
}
param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
@@ -535,10 +526,9 @@
}
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
- param.LText = param.LText.replace(/\$@/ig, '/*')
- param.LText = param.LText.replace(/@\$/ig, '*/')
+ param.LText = param.LText.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
} else {
- param.LText = param.LText.replace(/@\$|\$@/ig, '')
+ param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
}
param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
@@ -608,10 +598,9 @@
}
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
- param.LText = param.LText.replace(/\$@/ig, '/*')
- param.LText = param.LText.replace(/@\$/ig, '*/')
+ param.LText = param.LText.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
} else {
- param.LText = param.LText.replace(/@\$|\$@/ig, '')
+ param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
}
param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
@@ -655,10 +644,9 @@
}
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
- param.LText = param.LText.replace(/\$@/ig, '/*')
- param.LText = param.LText.replace(/@\$/ig, '*/')
+ param.LText = param.LText.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
} else {
- param.LText = param.LText.replace(/@\$|\$@/ig, '')
+ param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
}
param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
@@ -688,10 +676,9 @@
}
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
- param.LText = param.LText.replace(/\$@/ig, '/*')
- param.LText = param.LText.replace(/@\$/ig, '*/')
+ param.LText = param.LText.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
} else {
- param.LText = param.LText.replace(/@\$|\$@/ig, '')
+ param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
}
param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
@@ -744,8 +731,10 @@
let _params = []
if ( btn.Ot === 'notRequired' || btn.Ot === 'requiredSgl' || btn.Ot === 'requiredOnce' ) {
- let param = {
- func: btn.innerFunc || ''
+ let param = {}
+
+ if (btn.innerFunc) {
+ param.func = btn.innerFunc
}
if (this.props.BID) {
@@ -758,9 +747,7 @@
let ids = data.map(d => { return d[setting.primaryKey] || ''})
ids = ids.filter(Boolean)
primaryId = ids.join(',')
- }
- if (setting.primaryKey) {
param[setting.primaryKey] = primaryId // 璁剧疆涓婚敭鍙傛暟
}
@@ -983,11 +970,6 @@
let district = sessionStorage.getItem('district') || ''
let address = sessionStorage.getItem('address') || ''
- if (sessionStorage.getItem('isEditState') === 'true') {
- userName = sessionStorage.getItem('CloudUserName') || ''
- fullName = sessionStorage.getItem('CloudFullName') || ''
- }
-
// 鍒濆鍖栧嚟璇佸強鐢ㄦ埛淇℃伅瀛楁
_sql += `
/* 鍑瘉鍙婄敤鎴蜂俊鎭垵濮嬪寲璧嬪�� */
@@ -1016,6 +998,12 @@
_sql = _sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
_sql = _sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
_sql = _sql.replace(/@typename@/ig, `'admin'`)
+
+ if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
+ _sql = _sql.replace(/@datam@/ig, '\'Y\'')
+ } else {
+ _sql = _sql.replace(/@datam@/ig, '\'\'')
+ }
return _sql
}
@@ -1093,13 +1081,14 @@
}, 600)
}
- this.triggerNote(res) // 娑堟伅
+ this.triggerNote(res, _param.ID) // 娑堟伅
this.execSuccess(res)
} else {
this.execError(res)
}
_resolve()
- }, () => {
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
this.updateStatus()
_resolve()
})
@@ -1109,10 +1098,11 @@
setTimeout(() => {
Api.genericInterface(param).then(res => {
if (res.status) {
- this.triggerNote(res) // 娑堟伅
+ this.triggerNote(res, param.ID) // 娑堟伅
}
resolve(res)
- }, () => {
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
this.updateStatus()
_resolve()
})
@@ -1139,7 +1129,7 @@
_resolve()
})
} else { // 瓒呭嚭20涓姹傛椂寰幆鎵ц
- if (btn.progress === 'progressbar' && btn.$toolbtn && params.length > 1) {
+ if (btn.progress === 'progressbar' && params.length > 1) {
this.setState({
loadingTotal: params.length
})
@@ -1160,7 +1150,7 @@
_params = this.getInnerParam(data, formdata, btn.callbackType === 'script')
}
- if (_params.length > 1 && btn.progress === 'progressbar' && btn.$toolbtn) {
+ if (_params.length > 1 && btn.progress === 'progressbar') {
this.setState({
loadingTotal: _params.length
})
@@ -1181,7 +1171,7 @@
params = this.getInnerParam(data, formdata, btn.callbackType === 'script')
}
- if (params.length > 1 && btn.progress === 'progressbar' && btn.$toolbtn) {
+ if (params.length > 1 && btn.progress === 'progressbar') {
this.setState({
loadingTotal: params.length
})
@@ -1204,31 +1194,65 @@
let record = {
BID: param.BID || '',
ID: param.ID || '',
- callbacksql: param.$callbacksql || ''
+ callbacksql: param.$callbacksql || '',
+ mk_api_key: ''
}
delete param.$callbacksql
- if (!param.func) {
+ if (param.$pice) {
+ record = param.$record
+
+ delete param.$record
+
+ this.customOuterRequest(params, param, record, _resolve)
+ return
+ } else if (!param.func) {
this.customOuterRequest(params, param, record, _resolve)
return
}
Api.genericInterface(param).then(res => {
+ record.mk_api_key = res.mk_api_key || ''
+
if (res.status) {
- if ((res.mk_ex_invoke === 'false' || res.mk_ex_invoke === false) && params.length === 0) {
+ if (res.mk_ex_invoke + '' === 'false' && params.length === 0) {
this.execSuccess(res)
_resolve()
- } else if ((res.mk_ex_invoke === 'false' || res.mk_ex_invoke === false) && params.length > 0) {
+ } else if (res.mk_ex_invoke + '' === 'false' && params.length > 0) {
this.customLoopRequest(params, _resolve)
} else {
- this.customOuterRequest(params, res, record, _resolve)
+ if (res.mk_ex_data) { // 鏁版嵁鍒嗘壒鎵ц
+ if (Array.isArray(res.mk_ex_data) && res.mk_ex_data.length > 0) {
+ let pices = res.mk_ex_data.map(item => {
+ item.$pice = true
+ item.$record = {...record}
+
+ if (item.hasOwnProperty('mk_api_key')) {
+ item.$record.mk_api_key = item.mk_api_key || record.mk_api_key || ''
+
+ delete item.mk_api_key
+ }
+ return item
+ })
+ params = [...pices, ...params]
+ this.customLoopRequest(params, _resolve)
+ } else if (params.length === 0) {
+ this.execSuccess(res)
+ _resolve()
+ } else {
+ this.customLoopRequest(params, _resolve)
+ }
+ } else {
+ this.customOuterRequest(params, res, record, _resolve)
+ }
}
} else {
this.execError(res)
_resolve()
}
- }, () => {
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
this.updateStatus()
_resolve()
})
@@ -1253,23 +1277,73 @@
url = btn.interface
}
- let mkey = result.mk_api_key || ''
-
- delete result.mk_ex_invoke
- delete result.status
- delete result.message
- delete result.ErrCode
- delete result.ErrMesg
- delete result.mk_api_key
-
+
let param = {}
- Object.keys(result).forEach(key => {
- key = key.replace(/^mk_/ig, '')
- param[key] = result[key]
- })
+ if (result.$pice) {
+ delete result.$pice
- Api.directRequest(url, btn.method, param, btn.cross).then(res => {
+ param = {...result}
+ } else {
+ delete result.mk_ex_invoke
+ delete result.status
+ delete result.message
+ delete result.ErrCode
+ delete result.ErrMesg
+ delete result.mk_api_key
+
+ Object.keys(result).forEach(key => {
+ key = key.replace(/^mk_/ig, '')
+ param[key] = result[key]
+ })
+ }
+
+ let _params = {
+ url: url,
+ method: btn.method || 'post'
+ }
+
+ if (btn.cross === 'true') {
+ if (JSON.stringify(param) !== '{}') {
+ if (btn.stringify === 'qs') {
+ _params.data = qs.stringify(param)
+ } else if (btn.stringify === 'JSON') {
+ _params.data = param
+ } else {
+ _params.data = JSON.stringify(param)
+ }
+ }
+ } else {
+ let _url = url
+ if (JSON.stringify(param) !== '{}') {
+ if (_params.method === 'get') {
+ let keys = Object.keys(param).map(key => `${key}=${param[key]}`)
+ _url = _url + '?' + keys.join('&')
+ } else if (_params.method === 'post') {
+ if (btn.stringify === 'qs') {
+ _params.data = qs.stringify(param)
+ } else if (btn.stringify === 'JSON') {
+ _params.data = param
+ } else {
+ _params.data = JSON.stringify(param)
+ }
+ }
+ }
+
+ _url = _url.replace(/&/ig, '%26')
+
+ _params.url = '/trans/redirect?rd=' + _url + '&method=' + _params.method
+
+ _params.method = 'post'
+ }
+
+ if (btn.ContentType) {
+ _params.headers = {
+ 'Content-Type': btn.ContentType
+ }
+ }
+
+ Api.directRequest(_params).then(res => {
if (typeof(res) !== 'object') {
let error = '鏈煡鐨勮繑鍥炵粨鏋滐紒'
@@ -1278,7 +1352,7 @@
}
let result = {
- mk_api_key: mkey,
+ mk_api_key: record.mk_api_key,
$ErrCode: 'E',
$ErrMesg: error
}
@@ -1288,12 +1362,22 @@
if (Array.isArray(res)) {
res = { data: res }
}
- res.mk_api_key = mkey
+
+ if (btn.outerBlacklist) {
+ let list = btn.outerBlacklist.split(',').map(m => m.toLowerCase())
+ Object.keys(res).forEach(key => {
+ if (list.includes(key.toLowerCase())) {
+ delete res[key]
+ }
+ })
+ }
+
+ res.mk_api_key = record.mk_api_key
this.customCallbackRequest(params, res, record, _resolve)
}
}, (e) => {
let result = {
- mk_api_key: mkey,
+ mk_api_key: record.mk_api_key,
$ErrCode: 'E',
$ErrMesg: e && e.statusText ? e.statusText : ''
}
@@ -1371,6 +1455,8 @@
Api.genericInterface(param).then(res => {
if (res.status) {
+ this.triggerNote(res, param.ID) // 娑堟伅
+
if (params.length === 0) {
this.execSuccess(res)
_resolve()
@@ -1381,7 +1467,8 @@
this.execError(res)
_resolve()
}
- }, () => {
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
this.updateStatus()
_resolve()
})
@@ -1430,14 +1517,14 @@
if (typeof(val) === 'string') {
val = val.replace(/'/ig, '"')
}
- keys.push(key)
+ keys.push('[' + key + ']')
vals.push(`'${val}'`)
}
})
lines.push({
table: tb,
- insert: `Insert into ${pre}${tb} (${keys.join(',')},mk_level,mk_id,mk_bid)`,
+ insert: `Insert into ${pre}${tb} (${keys.join(',')},[mk_level],[mk_id],[mk_bid])`,
select: `Select ${vals.join(',')},'${level}','${id}','${bid}'`
})
@@ -1521,17 +1608,16 @@
sql = sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
sql = sql.replace(/@typename@/ig, `'admin'`)
- if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
+ if (window.GLOB.debugger === true) {
console.info(sql.replace(/\n\s{8}/ig, '\n'))
}
param.LText = sql
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
- param.LText = param.LText.replace(/\$@/ig, '/*')
- param.LText = param.LText.replace(/@\$/ig, '*/')
+ param.LText = param.LText.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
} else {
- param.LText = param.LText.replace(/@\$|\$@/ig, '')
+ param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
}
param.LText = param.LText.replace(/\$check@|@check\$/ig, '')
@@ -1558,7 +1644,7 @@
Sort: index + 1
}))
- if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
+ if (window.GLOB.debugger === true) {
let sql = [...lineMap.values()].map(item => (`
${item.insert}
${item.selects.join(` union all
@@ -1584,7 +1670,7 @@
Api.genericInterface(param).then(res => {
if (res.status) {
- this.triggerNote(res) // 娑堟伅
+ this.triggerNote(res, param.ID) // 娑堟伅
if (params.length === 0) {
this.execSuccess(res)
@@ -1596,7 +1682,8 @@
this.execError(res)
_resolve()
}
- }, () => {
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
this.updateStatus()
_resolve()
})
@@ -1617,7 +1704,7 @@
Api.genericInterface(param).then(res => {
if (res.status) {
- this.triggerNote(res) // 娑堟伅
+ this.triggerNote(res, param.ID) // 娑堟伅
if (params.length === 0) {
this.execSuccess(res)
@@ -1626,15 +1713,20 @@
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,
+ title: '璇风‘璁�',
+ content: msg,
onOk() {
return new Promise(resolve => {
Api.genericInterface(unCheckParam).then(result => {
if (result.status) {
- _this.triggerNote(result) // 娑堟伅
+ _this.triggerNote(result, param.ID) // 娑堟伅
if (params.length === 0) {
_this.execSuccess(result)
@@ -1659,7 +1751,8 @@
this.execError(res)
_resolve()
}
- }, () => {
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
this.updateStatus()
_resolve()
})
@@ -1721,7 +1814,8 @@
this.execError(res)
_resolve()
}
- }, () => {
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
this.updateStatus()
_resolve()
})
@@ -1740,8 +1834,8 @@
if (window.GLOB.mainSystemApi) {
result.rduri = window.GLOB.mainSystemApi
}
- } else if (btn.sysInterface === 'true' && options.cloudServiceApi) {
- result.rduri = options.cloudServiceApi
+ } else if (btn.sysInterface === 'true' && window.GLOB.cloudServiceApi) {
+ result.rduri = window.GLOB.cloudServiceApi
result.userid = sessionStorage.getItem('CloudUserID') || ''
result.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
} else if (btn.sysInterface !== 'true') {
@@ -1791,7 +1885,8 @@
return
}
this.outerCallbackRequest(params, res, record, outParam, _resolve)
- }, () => {
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
this.outerCallbackRequest(params, {status: false, message: 500, ErrCode: 'E', ErrMesg: 500}, record, outParam, _resolve)
})
}
@@ -1873,6 +1968,8 @@
Api.genericInterface(param).then(res => {
if (res.status) {
+ this.triggerNote(res, param.ID) // 娑堟伅
+
// 涓�娆¤姹傛垚鍔燂紝杩涜涓嬩竴椤硅姹�
if (params.length === 0) {
this.execSuccess(res)
@@ -1962,7 +2059,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)) {
@@ -1980,44 +2086,9 @@
if (!res.message) {
res.ErrCode = '-1'
}
- } else if (/@close_tab@|@close_popup@|@goback@/i.test(res.message)) {
- sign = res.message.match(/@close_tab@|@close_popup@|@goback@/i)[0].toLowerCase()
- res.message = res.message.replace(/@close_tab@|@close_popup@|@goback@/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
- })
+ } else if (/@close_tab@|@close_popup@|@goback@|@no_target_menu@/i.test(res.message)) {
+ sign = res.message.match(/@close_tab@|@close_popup@|@goback@|@no_target_menu@/i)[0].toLowerCase()
+ res.message = res.message.replace(/@close_tab@|@close_popup@|@goback@|@no_target_menu@/i, '')
}
let id = ''
@@ -2028,6 +2099,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]
@@ -2050,7 +2168,17 @@
MKEmitter.emit('refreshDebugTable')
}
- btn.syncComponentId && MKEmitter.emit('reloadData', btn.syncComponentId)
+ if (btn.syncComponentId) {
+ if (btn.syncComponentId === 'multiComponent') {
+ btn.syncComponentIds.forEach((id, i) => {
+ setTimeout(() => {
+ MKEmitter.emit('reloadData', id)
+ }, 20 * i)
+ })
+ } else {
+ MKEmitter.emit('reloadData', btn.syncComponentId)
+ }
+ }
if (tabId) {
MKEmitter.emit('reloadMenuView', tabId, 'table')
@@ -2067,7 +2195,7 @@
node && node.scrollIntoView({behavior: 'smooth', block: 'center', inline: 'nearest'})
}
- if (btn.openmenu && Array.isArray(btn.openmenu) && btn.openmenu.length > 0) {
+ if (btn.openmenu && Array.isArray(btn.openmenu) && btn.openmenu.length > 0 && sign !== '@no_target_menu@') {
let menuId = btn.openmenu.slice(-1)[0]
let newtab = window.GLOB.mkThdMenus.filter(m => m.MenuID === menuId)[0]
@@ -2086,17 +2214,25 @@
MKEmitter.emit('modifyTabs', newtab, true)
}
+
+ if (btn.execSuccess === 'popclose' && btn.$tabId) { // 鏍囩鍏抽棴鍒锋柊
+ MKEmitter.emit('refreshPopButton', btn.$tabId)
+ }
}
- triggerNote = (res) => {
+ triggerNote = (res, ID) => {
const { btn } = this.props
if (!btn.verify) return
- if (btn.verify.noteEnable !== 'true' && btn.verify.wxNote !== 'true') return
+ if (btn.verify.noteEnable !== 'true' && btn.verify.wxNote !== 'true' && btn.verify.printEnable !== 'true') return
let id = ''
if (btn.output) {
id = res.mk_b_id || res[btn.output] || ''
+ }
+
+ if (btn.verify.printEnable === 'true') {
+ this.billPrint(id || ID)
}
if (!id) return
@@ -2105,8 +2241,29 @@
this.sendMessage(btn.verify, id)
}
if (btn.verify.wxNote === 'true') {
- this.sendWxMessage(btn.verify, id)
+ if (btn.verify.wxTemplateId === 'mk_category_temp') {
+ let verify = fromJS(btn.verify).toJS()
+ verify.wxTemplateId = verify.wxCustomTempId
+
+ verify.wxNoteKeys = verify.wxNoteKeys.filter(item => item.key)
+
+ if (!verify.wxTemplateId || verify.wxNoteKeys.length === 0) return
+
+ this.sendWxMessage(verify, id)
+ } else {
+ this.sendWxMessage(btn.verify, id)
+ }
}
+ }
+
+ billPrint = (id) => {
+ const { btn } = this.props
+
+ if (!id) return
+
+ setTimeout(() => {
+ window.open('#/billprint/' + window.btoa(window.encodeURIComponent(JSON.stringify({ id: id, tempId: btn.verify.printTempId, pageId: btn.$MenuID || '', dataM: sessionStorage.getItem('dataM') }))))
+ }, 500)
}
sendWxMessage = (verify, id) => {
@@ -2128,8 +2285,15 @@
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ let domain1 = ''
+ let domain2 = ''
+ if (['8IFltwzyKcu15iA8fqSyb6m-pMa88a3ZTu0No3vDHgo', 'LOB-bbt9jVncGh7IOAUdESh1Sgzcbt62UwOqSqcK9ok'].includes(verify.wxTemplateId) && window.GLOB.sysType !== 'cloud') {
+ domain1 = 'https://cloud.mk9h.cn/'
+ domain2 = 'https://cloud.mk9h.cn:8443/'
+ }
+
Api.genericInterface(param).then(res => {
- res.send_data = [{openid: 'o2E7gvoSFvQRG7I8_gZxf4y3ONkQ', send_id: Utils.getuuid(), first: '鎮ㄧ殑缂磋垂淇℃伅濡備笅', p1: '010000000001', p2: '2022骞�07鏈�03鏃�', p3: '渚涙殩缂磋垂', p4: '20鍏�', p5: '鎴愬姛', remark: '鎰熻阿鎮ㄧ殑浣跨敤锛�'}]
+ // res.send_data = [{openid: 'o2E7gvoSFvQRG7I8_gZxf4y3ONkQ', send_id: Utils.getuuid(), p1: '010000000001', p2: '鏄庣', p3: 'dddd', p4: '椤洪', p5: '鎴愬姛'}]
if (!res.status) {
notification.warning({
top: 92,
@@ -2190,19 +2354,25 @@
return m
})
- Api.wxAccessToken().then(res => {
+ Api.wxAccessToken(domain1).then(res => {
if (!res.oa_access_token) return
params.forEach(n => {
- Api.wxNginxRequest(`cgi-bin/message/template/send?access_token=${res.oa_access_token}`, 'post', n).then(re => {
+ Api.wxNginxRequest(`${domain2}cgi-bin/message/template/send?access_token=${res.oa_access_token}`, 'post', JSON.stringify(n)).then(re => {
if (verify.wxNoteCallback === 'true') {
+ let msg = re.errmsg || ''
+
+ if (msg.length > 50) {
+ msg = msg.substr(0, 50)
+ }
+
let _p = {
func: 's_get_sms_weixin_local_suc_err',
upid: id,
send_id: n.client_msg_id || '',
status_result: re.errcode === 0 ? 'S' : 'E',
errcode: re.errcode,
- msg_result: re.errmsg
+ msg_result: msg
}
_p.LText = Utils.formatOptions(Utils.getuuid())
@@ -2349,6 +2519,29 @@
duration: 5
})
}
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') {
+ let param = {
+ func: 's_visitor_login',
+ timestamp: moment().format('YYYY-MM-DD HH:mm:ss'),
+ SessionUid: 'bh0bapabtd45epsgra79segbch6c1ibk',
+ TypeCharOne: 'pc',
+ appkey: '202004041613277377A6A2456D34A4948AE84'
+ }
+
+ param.LText = md5(window.btoa('bh0bapabtd45epsgra79segbch6c1ibk' + param.timestamp))
+ param.secretkey = md5(param.LText + 'mingke' + param.timestamp)
+
+ let params = {
+ url: 'https://sso.mk9h.cn/webapi/dologon',
+ method: 'post',
+ data: JSON.stringify(param)
+ }
+
+ Api.directRequest(params)
+
+ return
+ }
})
})
}
@@ -2361,8 +2554,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, '')
@@ -2384,11 +2598,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 || '鎵ц澶辫触锛�',
@@ -2405,16 +2628,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
})
@@ -2456,6 +2677,10 @@
if (window.GLOB.breakpoint) {
MKEmitter.emit('refreshDebugTable')
+ }
+
+ if (btn.execError === 'popclose' && btn.$tabId) { // 鏍囩鍏抽棴鍒锋柊
+ MKEmitter.emit('refreshPopButton', btn.$tabId)
}
}
@@ -2656,7 +2881,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, '')
@@ -2703,7 +2928,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)
@@ -2749,7 +2974,6 @@
>
<MutilForm
BID={BID}
- dict={this.state.dict}
action={btnconfig}
inputSubmit={this.handleOk}
data={this.state.selines[0]}
@@ -2790,7 +3014,6 @@
>
<MutilForm
BID={BID}
- dict={this.state.dict}
action={btnconfig}
inputSubmit={this.handleOk}
data={this.state.selines[0]}
@@ -2845,6 +3068,37 @@
})
}
+ changeLineCount = (count) => {
+ const { btn, selectedData } = this.props
+ const { disabled } = this.state
+
+ if (disabled) return
+
+ let data = selectedData || []
+
+ if (data.length === 0) {
+ // 闇�瑕侀�夋嫨琛屾椂锛屾牎楠屾暟鎹�
+ notification.warning({
+ top: 92,
+ message: '璇烽�夋嫨琛岋紒',
+ duration: 5
+ })
+ return
+ } else if (data.length !== 1) {
+ // 闇�瑕侀�夋嫨鍗曡鏃讹紝鏍￠獙鏁版嵁
+ notification.warning({
+ top: 92,
+ message: '璇烽�夋嫨鍗曡鏁版嵁锛�',
+ duration: 5
+ })
+ return
+ }
+
+ this.setState({count}, () => {
+ MKEmitter.emit('refreshLineData', btn.$menuId, btn, data[0].$$uuid, count)
+ })
+ }
+
render() {
const { btn } = this.props
const { loadingNumber, loadingTotal, loading, disabled, hidden, check, count } = this.state
@@ -2855,6 +3109,8 @@
return <Switch loading={loading} checked={check} disabled={disabled || loading} title={disabled ? (btn.reason || '') : ''} onChange={(val,e) => {e.stopPropagation();this.actionTrigger()}} style={btn.style} className={btn.size === 'large' ? 'ant-switch-large' : ''} size={btn.size} checkedChildren={btn.openText || ''} unCheckedChildren={btn.closeText || ''}/>
} else if (btn.formType === 'counter') {
return <MkCounter count={count} disabled={disabled} btn={btn} onChange={this.changeCount}/>
+ } else if (btn.formType === 'count_line') {
+ return <MkCounter count={count} disabled={disabled} btn={btn} onChange={this.changeLineCount}/>
} else if (btn.formType === 'radio') {
return <Checkbox className={btn.checkType || ''} disabled={disabled || loading} title={disabled ? (btn.reason || '') : ''} checked={check} onChange={(e) => {e.stopPropagation();this.actionTrigger()}} style={btn.style}></Checkbox>
} else {
@@ -2886,14 +3142,15 @@
className = 'mk-btn mk-' + (btn.class || 'unset')
}
- if (loadingNumber && !loadingTotal && btn.$toolbtn && (!btn.show || btn.show === 'button')) {
- label = (loadingNumber && !loadingTotal ? `(${loadingNumber})` : '') + btn.label
+ if (loadingNumber && btn.progress !== 'progressbar' && btn.$toolbtn && (!btn.show || btn.show === 'button')) {
+ label = (loadingNumber ? `(${loadingNumber})` : '') + btn.label
}
return <>
<Button
type={type}
icon={icon}
+ id={'button' + btn.uuid}
title={disabled ? (btn.reason || '') : (btn.show === 'icon' ? btn.label : '')}
loading={loading}
disabled={disabled}
--
Gitblit v1.8.0