From ba9e189dd33c8d48f7f4ac36bcefeef9afb426f8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 17 七月 2023 23:40:49 +0800
Subject: [PATCH] 2023-07-17
---
src/tabviews/zshare/actionList/normalbutton/index.jsx | 410 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 300 insertions(+), 110 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 9f4b267..9ac4aef 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -1,8 +1,10 @@
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'
@@ -61,7 +63,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 +110,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]
@@ -329,6 +331,9 @@
return
}
} else if (!['inner', 'outer', 'system', 'custom'].includes(btn.intertype)) {
+ if (btn.OpenType === 'form' && btn.formType === 'count_line') {
+ return
+ }
// 鎺ュ彛绫诲瀷閿欒
notification.warning({
top: 92,
@@ -744,8 +749,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 +765,7 @@
let ids = data.map(d => { return d[setting.primaryKey] || ''})
ids = ids.filter(Boolean)
primaryId = ids.join(',')
- }
- if (setting.primaryKey) {
param[setting.primaryKey] = primaryId // 璁剧疆涓婚敭鍙傛暟
}
@@ -868,7 +873,11 @@
if (/'/.test(val)) {
val = val.replace(/'/ig, '"')
}
- _initFormfields.push(`@${_key}='${val}'`)
+ if (form.isconst) {
+ _initFormfields.push(`@${_key}=N'${val}'`)
+ } else {
+ _initFormfields.push(`@${_key}='${val}'`)
+ }
}
}
@@ -1061,42 +1070,56 @@
if (params[0].$unCheckParam) {
this.checkLoopRequest(params, _resolve)
+ } else if (btn.preFunc && params.length === 1) {
+ let param = params[0]
+ let _param = fromJS(param).toJS()
+ _param.func = btn.preFunc
+
+ Api.genericInterface(_param).then(res => {
+ if (res.status) {
+ if (res.ErrCode !== '-1') {
+ param = {...param, ...res}
+
+ delete param.status
+ delete param.ErrCode
+ delete param.ErrMesg
+ delete param.message
+
+ setTimeout(() => {
+ Api.genericInterface(param).then(result => {
+ if (!result.status) {
+ notification.warning({
+ top: 92,
+ message: result.message,
+ duration: 5
+ })
+ }
+ })
+ }, 600)
+ }
+
+ this.triggerNote(res) // 娑堟伅
+ this.execSuccess(res)
+ } else {
+ this.execError(res)
+ }
+ _resolve()
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
+ this.updateStatus()
+ _resolve()
+ })
} else if (params.length <= 20 && btn.execType !== 'single') {
let deffers = params.map((param, i) => {
return new Promise(resolve => {
setTimeout(() => {
- let _param = null
- if (btn.preFunc) {
- _param = fromJS(param).toJS()
- param.func = btn.preFunc
- }
Api.genericInterface(param).then(res => {
- if (btn.preFunc && res.status && res.ErrCode !== '-1') {
- _param = {..._param, ...res}
-
- delete _param.status
- delete _param.ErrCode
- delete _param.ErrMesg
- delete _param.message
-
- setTimeout(() => {
- Api.genericInterface(_param).then(result => {
- if (!result.status) {
- notification.warning({
- top: 92,
- message: result.message,
- duration: 5
- })
- }
- })
- }, 600)
- }
-
if (res.status) {
this.triggerNote(res) // 娑堟伅
}
resolve(res)
- }, () => {
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
this.updateStatus()
_resolve()
})
@@ -1123,7 +1146,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
})
@@ -1144,7 +1167,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
})
@@ -1165,7 +1188,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
})
@@ -1188,31 +1211,59 @@
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
+ 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()
})
@@ -1237,23 +1288,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 = '鏈煡鐨勮繑鍥炵粨鏋滐紒'
@@ -1262,7 +1363,7 @@
}
let result = {
- mk_api_key: mkey,
+ mk_api_key: record.mk_api_key,
$ErrCode: 'E',
$ErrMesg: error
}
@@ -1272,12 +1373,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 : ''
}
@@ -1365,7 +1476,8 @@
this.execError(res)
_resolve()
}
- }, () => {
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
this.updateStatus()
_resolve()
})
@@ -1414,14 +1526,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}'`
})
@@ -1566,36 +1678,8 @@
loadingNumber: params.length
})
- let _param = null
-
- if (btn.preFunc) {
- _param = fromJS(param).toJS()
- param.func = btn.preFunc
- }
-
Api.genericInterface(param).then(res => {
if (res.status) {
- if (btn.preFunc && res.ErrCode !== '-1') {
- _param = {..._param, ...res}
-
- delete _param.status
- delete _param.ErrCode
- delete _param.ErrMesg
- delete _param.message
-
- setTimeout(() => {
- Api.genericInterface(_param).then(result => {
- if (!result.status) {
- notification.warning({
- top: 92,
- message: result.message,
- duration: 5
- })
- }
- })
- }, 600)
- }
-
this.triggerNote(res) // 娑堟伅
if (params.length === 0) {
@@ -1608,7 +1692,8 @@
this.execError(res)
_resolve()
}
- }, () => {
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
this.updateStatus()
_resolve()
})
@@ -1671,7 +1756,8 @@
this.execError(res)
_resolve()
}
- }, () => {
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
this.updateStatus()
_resolve()
})
@@ -1733,7 +1819,8 @@
this.execError(res)
_resolve()
}
- }, () => {
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
this.updateStatus()
_resolve()
})
@@ -1803,7 +1890,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)
})
}
@@ -2062,7 +2150,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')
@@ -2098,6 +2196,10 @@
MKEmitter.emit('modifyTabs', newtab, true)
}
+
+ if (btn.execSuccess === 'popclose' && btn.$tabId) { // 鏍囩鍏抽棴鍒锋柊
+ MKEmitter.emit('refreshPopButton', btn.$tabId)
+ }
}
triggerNote = (res) => {
@@ -2117,7 +2219,18 @@
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)
+ }
}
}
@@ -2140,8 +2253,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) && options.sysType !== 'cloud') {
+ domain1 = 'https://cloud.mk9h.cn/'
+ domain2 = 'https://cloud.mk9h.cn:8443/'
+ }
+
Api.genericInterface(param).then(res => {
- // res.data = [{openid: 'o2E7gvoSFvQRG7I8_gZxf4y3ONkQ', send_id: '2223333', first: '鎮ㄧ殑缂磋垂淇℃伅濡備笅', keyword1: '010000000001', keyword2: '2022骞�07鏈�03鏃�', keyword3: '渚涙殩缂磋垂', keyword4: '20鍏�', keyword5: '鎴愬姛', 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,
@@ -2149,7 +2269,12 @@
duration: 5
})
return
- } else if (!res.send_data || res.send_data.length === 0) {
+ }
+
+ let sends = res.send_data || []
+ sends = sends.filter(item => !!item.openid)
+
+ if (sends.length === 0) {
return
}
@@ -2173,13 +2298,13 @@
}
verify.wxNoteKeys.forEach(item => {
- _param.data[item.key] = {value: '', color: item.color}
+ _param.data[item.key] = {value: ''}
})
- let params = res.send_data.map(item => {
+ let params = sends.map(item => {
let m = fromJS(_param).toJS()
- m.touser = item.openid || ''
+ m.touser = item.openid
if (item.bid && m.miniprogram && m.miniprogram.pagepath.indexOf('MenuId') > -1) {
m.miniprogram.pagepath = m.miniprogram.pagepath + `&BID=${item.bid}`
}
@@ -2197,21 +2322,25 @@
return m
})
- Api.wxAccessToken().then(res => {
+ Api.wxAccessToken(domain1).then(res => {
if (!res.oa_access_token) return
params.forEach(n => {
- if (!n.touser) return
-
- 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())
@@ -2358,6 +2487,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
+ }
})
})
}
@@ -2465,6 +2617,10 @@
if (window.GLOB.breakpoint) {
MKEmitter.emit('refreshDebugTable')
+ }
+
+ if (btn.execError === 'popclose' && btn.$tabId) { // 鏍囩鍏抽棴鍒锋柊
+ MKEmitter.emit('refreshPopButton', btn.$tabId)
}
}
@@ -2621,7 +2777,8 @@
fieldlen: item.fieldlength || 50,
writein: item.writein !== 'false',
type: item.type,
- value: item.initval
+ value: item.initval,
+ isconst: item.constant === 'true'
}
let key = item.field.toLowerCase()
@@ -2853,6 +3010,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: this.state.dict['main.action.confirm.selectline'],
+ duration: 5
+ })
+ return
+ } else if (data.length !== 1) {
+ // 闇�瑕侀�夋嫨鍗曡鏃讹紝鏍￠獙鏁版嵁
+ notification.warning({
+ top: 92,
+ message: this.state.dict['main.action.confirm.selectSingleLine'],
+ 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
@@ -2863,6 +3051,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 {
@@ -2894,8 +3084,8 @@
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 <>
--
Gitblit v1.8.0