From 58826d6f4eab9f8c9acf9fa8696f60039c645cfe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 八月 2024 18:18:00 +0800
Subject: [PATCH] 2024-08-20
---
src/tabviews/zshare/actionList/normalbutton/index.jsx | 190 +++++++++++++++++------------------------------
1 files changed, 70 insertions(+), 120 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index be2ee38..9b32ef3 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -48,7 +48,6 @@
dict: window.GLOB.dict
}
- moduleParams = null
preCallback = null
UNSAFE_componentWillMount () {
@@ -469,11 +468,11 @@
param.ID = primaryId
if (retmsg) {
- const { sql, callbacksql } = getSysDefaultSql(btn, setting, '', param, data[0], columns, retmsg, this.moduleParams) // 鏁版嵁婧�
+ const { sql, callbacksql } = getSysDefaultSql(btn, setting, '', param, data[0], columns, retmsg) // 鏁版嵁婧�
param.LText = sql
param.$callbacksql = callbacksql
} else {
- param.LText = getSysDefaultSql(btn, setting, '', param, data[0], columns, false, this.moduleParams) // 鏁版嵁婧�
+ param.LText = getSysDefaultSql(btn, setting, '', param, data[0], columns, false) // 鏁版嵁婧�
if (btn.output) {
param.key_back_type = 'Y'
}
@@ -505,11 +504,11 @@
param.ID = primaryId || Utils.getguid()
if (retmsg) {
- const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, retmsg, this.moduleParams) // 鏁版嵁婧�
+ const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, retmsg) // 鏁版嵁婧�
param.LText = sql
param.$callbacksql = callbacksql
} else {
- param.LText = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, false, this.moduleParams) // 鏁版嵁婧�
+ param.LText = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, false) // 鏁版嵁婧�
if (btn.output) {
param.key_back_type = 'Y'
}
@@ -531,11 +530,11 @@
param.ID = primaryId
if (retmsg) {
- const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, retmsg, this.moduleParams) // 鏁版嵁婧�
+ const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, retmsg) // 鏁版嵁婧�
param.LText = sql
param.$callbacksql = callbacksql
} else {
- param.LText = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, false, this.moduleParams) // 鏁版嵁婧�
+ param.LText = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, false) // 鏁版嵁婧�
if (btn.output) {
param.key_back_type = 'Y'
}
@@ -597,11 +596,11 @@
param.ID = primaryId
if (retmsg) {
- const { sql, callbacksql } = getSysDefaultSql(btn, setting, '', param, cell, columns, retmsg, this.moduleParams) // 鏁版嵁婧�
+ const { sql, callbacksql } = getSysDefaultSql(btn, setting, '', param, cell, columns, retmsg) // 鏁版嵁婧�
param.LText = sql
param.$callbacksql = callbacksql
} else {
- param.LText = getSysDefaultSql(btn, setting, '', param, cell, columns, false, this.moduleParams) // 鏁版嵁婧�
+ param.LText = getSysDefaultSql(btn, setting, '', param, cell, columns, false) // 鏁版嵁婧�
if (btn.output) {
param.key_back_type = 'Y'
}
@@ -637,11 +636,11 @@
param.ID = Utils.getguid()
if (retmsg) {
- const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, cell, columns, retmsg, this.moduleParams) // 鏁版嵁婧�
+ const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, cell, columns, retmsg) // 鏁版嵁婧�
param.LText = sql
param.$callbacksql = callbacksql
} else {
- param.LText = getSysDefaultSql(btn, setting, formdata, param, cell, columns, false, this.moduleParams) // 鏁版嵁婧�
+ param.LText = getSysDefaultSql(btn, setting, formdata, param, cell, columns, false) // 鏁版嵁婧�
if (btn.output) {
param.key_back_type = 'Y'
}
@@ -663,11 +662,11 @@
param.ID = primaryId
if (retmsg) {
- const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, cell, columns, retmsg, this.moduleParams) // 鏁版嵁婧�
+ const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, cell, columns, retmsg) // 鏁版嵁婧�
param.LText = sql
param.$callbacksql = callbacksql
} else {
- param.LText = getSysDefaultSql(btn, setting, formdata, param, cell, columns, false, this.moduleParams) // 鏁版嵁婧�
+ param.LText = getSysDefaultSql(btn, setting, formdata, param, cell, columns, false) // 鏁版嵁婧�
if (btn.output) {
param.key_back_type = 'Y'
}
@@ -1006,53 +1005,10 @@
* @description 鎸夐挳鎻愪氦鎵ц
*/
execSubmit = (data, _resolve, formdata, force) => {
- const { setting, btn } = this.props
- this.moduleParams = null
+ const { btn } = this.props
if (btn.preButton && !force) {
this.trigger(btn.preButton, data, _resolve, formdata, 0)
- } else if (btn.verify && btn.verify.invalid === 'true' && setting.dataresource) {
- MKEmitter.emit('queryModuleParam', btn.$menuId, (param) => {
- let datasource = setting.dataresource
- let customScript = setting.customScript || ''
- let allSearch = Utils.getAllSearchOptions(param.search)
-
- let regoptions = allSearch.map(item => {
- return {
- reg: new RegExp('@' + item.key + '@', 'ig'),
- value: `'${item.value}'`
- }
- })
-
- regoptions.push({
- reg: new RegExp('@userName@', 'ig'),
- value: `'${sessionStorage.getItem('User_Name') || ''}'`
- }, {
- reg: new RegExp('@fullName@', 'ig'),
- value: `'${sessionStorage.getItem('Full_Name') || ''}'`
- }, {
- reg: new RegExp('@orderBy@', 'ig'),
- value: setting.order
- }, {
- reg: new RegExp('@pageSize@', 'ig'),
- value: 10
- }, {
- reg: new RegExp('@pageIndex@', 'ig'),
- value: 1
- })
-
- regoptions.forEach(item => {
- datasource = datasource.replace(item.reg, item.value)
- customScript = customScript.replace(item.reg, item.value)
- })
-
- this.moduleParams = {
- datasource,
- customScript
- }
-
- this.execRealSubmit(data, _resolve, formdata)
- })
} else {
this.execRealSubmit(data, _resolve, formdata)
}
@@ -2556,7 +2512,7 @@
}
sendWxMessage = (verify, id) => {
- let domain = ''
+ let domain = window.GLOB.baseurl
let appId = window.GLOB.WXAppID || ''
if (verify.wxAppId && verify.wxAppId !== appId) {
@@ -2576,14 +2532,7 @@
appId = 'wx4d8a34c8d4494872'
}
- if (!window.GLOB.nginx && !domain) {
- notification.warning({
- top: 92,
- message: 'nginx鏈嶅姟灏氭湭寮�鍚紝涓嶅彲鍙戦�佹ā鏉挎秷鎭��',
- duration: 5
- })
- return
- } else if (!appId) {
+ if (!appId) {
notification.warning({
top: 92,
message: '灏氭湭娣诲姞鍏紬鍙稩D锛屼笉鍙彂閫佹ā鏉挎秷鎭��',
@@ -2663,62 +2612,63 @@
return m
})
- Api.wxAccessToken(appId, domain).then(res => {
- if (!res.access_token) return
-
- params.forEach(n => {
- Api.wxNginxRequest(`${domain}cgi-bin/message/template/send?access_token=${res.access_token}`, 'post', JSON.stringify(n)).then(re => {
- if (verify.wxNoteCallback === 'true') {
- let msg = re.errmsg || ''
+ // cgi-bin/message/template/send
+ params.forEach(n => {
+ Api.directRequest({
+ url: domain + 'wechat/send?appid=' + appId,
+ method: 'post',
+ data: 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: msg
- }
-
- _p.LText = Utils.getuuid()
- _p.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- _p.secretkey = Utils.encrypt(_p.LText, _p.timestamp)
-
- Api.genericInterface(_p).then(result => {
- if (!result.status) {
- notification.warning({
- top: 92,
- message: result.message,
- duration: 5
- })
- }
- })
- } else if (re.errcode !== 0 && re.errmsg) {
- let msgs = [
- {errcode: -1, errmsg: '绯荤粺绻佸繖锛岃绋嶅�欏啀璇�'},
- {errcode: 40001, errmsg: 'access_token 鏃犳晥'},
- {errcode: 40003, errmsg: '涓嶅悎娉曠殑 OpenID'},
- {errcode: 40014, errmsg: '涓嶅悎娉曠殑 access_token'},
- {errcode: 40033, errmsg: '涓嶅悎娉曠殑璇锋眰瀛楃'},
- {errcode: 43004, errmsg: '闇�瑕佹帴鏀惰�呭叧娉�'},
- {errcode: 43019, errmsg: '闇�瑕佸皢鎺ユ敹鑰呬粠榛戝悕鍗曚腑绉婚櫎'},
- {errcode: 50005, errmsg: '鐢ㄦ埛鏈叧娉ㄥ叕浼楀彿'}
- ]
-
- let msg = msgs.filter(m => m.errcode === re.errcode)[0]
- msg = msg || re
-
- notification.warning({
- top: 92,
- message: msg.errmsg,
- duration: 5
- })
+ 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: msg
+ }
+
+ _p.LText = Utils.getuuid()
+ _p.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ _p.secretkey = Utils.encrypt(_p.LText, _p.timestamp)
+
+ Api.genericInterface(_p).then(result => {
+ if (!result.status) {
+ notification.warning({
+ top: 92,
+ message: result.message,
+ duration: 5
+ })
+ }
+ })
+ } else if (re.errcode !== 0 && re.errmsg) {
+ let msgs = [
+ {errcode: -1, errmsg: '绯荤粺绻佸繖锛岃绋嶅�欏啀璇�'},
+ {errcode: 40001, errmsg: 'access_token 鏃犳晥'},
+ {errcode: 40003, errmsg: '涓嶅悎娉曠殑 OpenID'},
+ {errcode: 40014, errmsg: '涓嶅悎娉曠殑 access_token'},
+ {errcode: 40033, errmsg: '涓嶅悎娉曠殑璇锋眰瀛楃'},
+ {errcode: 43004, errmsg: '闇�瑕佹帴鏀惰�呭叧娉�'},
+ {errcode: 43019, errmsg: '闇�瑕佸皢鎺ユ敹鑰呬粠榛戝悕鍗曚腑绉婚櫎'},
+ {errcode: 50005, errmsg: '鐢ㄦ埛鏈叧娉ㄥ叕浼楀彿'}
+ ]
+
+ let msg = msgs.filter(m => m.errcode === re.errcode)[0]
+ msg = msg || re
+
+ notification.warning({
+ top: 92,
+ message: msg.errmsg,
+ duration: 5
+ })
+ }
})
})
})
--
Gitblit v1.8.0