From 71e3da644eca32a5aa40503e903efb0640748093 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 七月 2023 17:00:59 +0800
Subject: [PATCH] 2023-07-21
---
src/tabviews/zshare/actionList/normalbutton/index.jsx | 150 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 99 insertions(+), 51 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 84aeadd..fad39e6 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -464,10 +464,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' // 鍚庡彴瑙ｇ爜
@@ -507,10 +506,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' // 鍚庡彴瑙ｇ爜
@@ -540,10 +538,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' // 鍚庡彴瑙ｇ爜
@@ -613,10 +610,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' // 鍚庡彴瑙ｇ爜
@@ -660,10 +656,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' // 鍚庡彴瑙ｇ爜
@@ -693,10 +688,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' // 鍚庡彴瑙ｇ爜
@@ -1146,7 +1140,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
})
@@ -1167,7 +1161,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,7 +1182,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
})
@@ -1211,25 +1205,52 @@
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)
@@ -1261,21 +1282,26 @@
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
+
+ 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,
@@ -1316,6 +1342,12 @@
_params.method = 'post'
}
+ if (btn.ContentType) {
+ _params.headers = {
+ 'Content-Type': btn.ContentType
+ }
+ }
+
Api.directRequest(_params).then(res => {
if (typeof(res) !== 'object') {
let error = '鏈煡鐨勮繑鍥炵粨鏋滐紒'
@@ -1325,7 +1357,7 @@
}
let result = {
- mk_api_key: mkey,
+ mk_api_key: record.mk_api_key,
$ErrCode: 'E',
$ErrMesg: error
}
@@ -1335,12 +1367,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 : ''
}
@@ -1478,14 +1520,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}'`
})
@@ -1576,10 +1618,9 @@
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, '')
@@ -2148,6 +2189,10 @@
MKEmitter.emit('modifyTabs', newtab, true)
}
+
+ if (btn.execSuccess === 'popclose' && btn.$tabId) { // 鏍囩鍏抽棴鍒锋柊
+ MKEmitter.emit('refreshPopButton', btn.$tabId)
+ }
}
triggerNote = (res) => {
@@ -2566,6 +2611,10 @@
if (window.GLOB.breakpoint) {
MKEmitter.emit('refreshDebugTable')
}
+
+ if (btn.execError === 'popclose' && btn.$tabId) { // 鏍囩鍏抽棴鍒锋柊
+ MKEmitter.emit('refreshPopButton', btn.$tabId)
+ }
}
handleModelConfig = (config) => {
@@ -2858,7 +2907,6 @@
>
<MutilForm
BID={BID}
- dict={this.state.dict}
action={btnconfig}
inputSubmit={this.handleOk}
data={this.state.selines[0]}
@@ -2899,7 +2947,6 @@
>
<MutilForm
BID={BID}
- dict={this.state.dict}
action={btnconfig}
inputSubmit={this.handleOk}
data={this.state.selines[0]}
@@ -3028,14 +3075,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