From 24842b40de5cd60700bf69dfd38a0332f5431e36 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 五月 2025 10:55:07 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 131 ++++++++++++++++++++++++++-----------------
1 files changed, 79 insertions(+), 52 deletions(-)
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index f3ce2a3..053530d 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -23,9 +23,10 @@
}
state = {
- loading: false, // 瀵煎嚭涓�
+ loading: false,
hidden: false,
- disabled: false
+ disabled: false,
+ dict: window.GLOB.dict
}
UNSAFE_componentWillMount () {
@@ -92,7 +93,7 @@
*/
actionTrigger = (triggerId, _, type, lid) => {
const { setting, BID, btn, LID } = this.props
- const { loading, disabled } = this.state
+ const { loading, disabled, dict } = this.state
if (loading || disabled) return
if (triggerId && btn.uuid !== triggerId) return
@@ -101,19 +102,7 @@
if (setting.supModule && !BID) {
notification.warning({
top: 92,
- message: '闇�瑕佷笂绾т富閿�硷紒',
- duration: 5
- })
- } else if (btn.errorType === 'error1') {
- notification.warning({
- top: 92,
- message: '璇疯缃鍑哄垪锛�',
- duration: 5
- })
- } else if (btn.errorType === 'error2') {
- notification.warning({
- top: 92,
- message: '鎸夐挳闇�鑷畾涔夊鍑烘暟鎹簮锛�',
+ message: setting.supModTip || dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
duration: 5
})
} else {
@@ -145,7 +134,7 @@
if (!valid) {
notification.warning({
top: 92,
- message: '鎼滅储鏉′欢涓嶅彲涓虹┖锛�',
+ message: window.GLOB.dict['miss_search'] || '鎼滅储鏉′欢涓嶅彲涓虹┖锛�',
duration: 5
})
return
@@ -159,10 +148,8 @@
if (btn.pagination !== 'true') {
if (btn.intertype === 'system') { // 浣跨敤绯荤粺鍑芥暟
let param = this.getExcelDefaultParam(viewParam.orderBy, viewParam.search)
- if (btn.database === 'sso') {
- if ((window.GLOB.mkHS || window.GLOB.systemType === 'production') && window.GLOB.mainSystemApi) {
- param.rduri = window.GLOB.mainSystemApi
- }
+ if (btn.database === 'sso' && window.GLOB.mainSystemApi) {
+ param.rduri = window.GLOB.mainSystemApi
}
Api.genericInterface(param).then(result => {
if (result.status) {
@@ -347,7 +334,7 @@
Api.genericInterface(res).then(result => {
if (result.status) {
if (!result.data) {
- this.execError({ErrCode: 'N', message: '鏈幏鍙栧埌鏁版嵁淇℃伅锛�'})
+ this.execError({ErrCode: 'N', message: window.GLOB.dict['no_data'] || '鏈幏鍙栧埌鏁版嵁淇℃伅锛�'})
} else if (result.data.length >= pageSize) {
data = data.concat(result.data)
pageIndex++
@@ -380,10 +367,8 @@
let param = null
if (btn.intertype === 'system') { // 浣跨敤绯荤粺鍑芥暟
param = this.getExcelDefaultParam(viewParam.orderBy, viewParam.search, true, pageIndex, pageSize)
- if (btn.database === 'sso') {
- if ((window.GLOB.mkHS || window.GLOB.systemType === 'production') && window.GLOB.mainSystemApi) {
- param.rduri = window.GLOB.mainSystemApi
- }
+ if (btn.database === 'sso' && window.GLOB.mainSystemApi) {
+ param.rduri = window.GLOB.mainSystemApi
}
} else if (btn.intertype === 'inner') { // 浣跨敤鍐呴儴鍑芥暟
param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search, true, pageIndex, pageSize)
@@ -396,7 +381,6 @@
if (btn.dataM === 'true') {
param.dataM = sessionStorage.getItem('dataM') === 'true' ? 'Y' : ''
}
-
} else if (btn.intertype === 'outer' && !btn.innerFunc) { // 浣跨敤澶栭儴鍑芥暟
param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search, true, pageIndex, pageSize)
@@ -431,7 +415,7 @@
Api.genericInterface(param).then(result => {
if (result.status) {
if (!result.data) {
- this.execError({ErrCode: 'N', message: '鏈幏鍙栧埌鏁版嵁淇℃伅锛�'})
+ this.execError({ErrCode: 'N', message: window.GLOB.dict['no_data'] || '鏈幏鍙栧埌鏁版嵁淇℃伅锛�'})
} else if (result.data.length >= pageSize) {
data = data.concat(result.data)
pageIndex++
@@ -454,6 +438,7 @@
*/
exportExcel = (data = [], ErrCode, msg, search) => {
const { btn } = this.props
+ const { dict } = this.state
let imgCol = false
let merge = false
@@ -527,7 +512,7 @@
if (errors.length) {
notification.error({
top: 92,
- message: '鏁版嵁涓己灏戝瓧娈碉細' + errors.join('銆�'),
+ message: (dict['miss_field'] || '鏁版嵁涓己灏戝瓧娈�') + '锛�' + errors.join('銆�'),
duration: 5
})
@@ -544,7 +529,7 @@
// eslint-disable-next-line
let func = new Function('XLSX', 'data', 'columns', 'searches', 'callback', btn.verify.excel_func)
func(XLSX, data, columns, search, (res) => {
- res = res || {ErrCode: ErrCode || 'S', message: msg || '瀵煎嚭鎴愬姛锛�'}
+ res = res || {ErrCode: ErrCode || 'S', message: msg || dict['exc_success'] || '瀵煎嚭鎴愬姛锛�'}
this.execSuccess(res)
})
} else if (imgCol) {
@@ -625,7 +610,7 @@
this.table2excel(column, table)
- this.execSuccess({ErrCode: ErrCode || 'S', message: msg || '瀵煎嚭鎴愬姛锛�'})
+ this.execSuccess({ErrCode: ErrCode || 'S', message: msg || dict['exc_success'] || '瀵煎嚭鎴愬姛锛�'})
} else {
let table = []
let _header = []
@@ -785,7 +770,7 @@
XLSX.writeFile(wb, `${btn.verify.excelName || btn.$menuName || ''}${moment().format('YYYYMMDDHHmmss')}.xlsx`)
- this.execSuccess({ErrCode: ErrCode || 'S', message: msg || '瀵煎嚭鎴愬姛锛�'})
+ this.execSuccess({ErrCode: ErrCode || 'S', message: msg || dict['exc_success'] || '瀵煎嚭鎴愬姛锛�'})
}
} catch (e) {
console.warn(e)
@@ -877,7 +862,10 @@
let _setting = {}
let _orderBy = orderBy || ''
+
if (btn.verify.dataType === 'custom') {
+ _setting.uuid = btn.uuid
+ _setting.interType = 'system'
_setting.arr_field = []
btn.verify.columns.forEach(col => {
@@ -892,10 +880,6 @@
if (!_setting.execute) {
_setting.dataresource = ''
- }
-
- if (/\s/.test(_setting.dataresource)) {
- _setting.dataresource = '(' + _setting.dataresource + ') tb'
}
let _customScript = ''
@@ -923,11 +907,28 @@
_tailScript = _tailScript.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
}
+ if (btn.$flowId && window.GLOB.UserCacheMap.has(btn.$flowId)) {
+ let flow = window.GLOB.UserCacheMap.get(btn.$flowId)
+ _setting.dataresource = _setting.dataresource.replace(/@works_flow_code@/ig, `'${flow.flow_code}'`)
+ _customScript = _customScript.replace(/@works_flow_code@/ig, `'${flow.flow_code}'`)
+ _tailScript = _tailScript.replace(/@works_flow_code@/ig, `'${flow.flow_code}'`)
+ }
+
_setting.customScript = _customScript // 鏁寸悊鍚庤嚜瀹氫箟鑴氭湰
_setting.tailScript = _tailScript // 鍚庣疆鑷畾涔夎剼鏈�
_setting.laypage = pagination
- _setting.custompage = /@pageSize@|@orderBy@/i.test(_setting.dataresource + _setting.customScript)
+ _setting.custompage = false
+
+ if (/order\s+by\s+sort_id\s*$/i.test(_setting.dataresource)) {
+ _setting.custompage = true
+ } else if (/@pageSize@|@orderBy@|@mk_total/i.test(_setting.dataresource + _setting.customScript)) {
+ _setting.custompage = true
+ }
+
+ if (/\s/.test(_setting.dataresource)) {
+ _setting.dataresource = '(' + _setting.dataresource + ') tb'
+ }
_setting.queryType = btn.verify.queryType
_setting.$name = btn.logLabel
@@ -939,6 +940,10 @@
_setting.laypage = pagination
_setting.arr_field = _setting.all_field || _setting.arr_field
+ if (setting.sub_field || setting.laypage !== pagination) {
+ _setting.uuid = btn.uuid
+ }
+
delete _setting.sub_field
}
@@ -948,17 +953,9 @@
primaryId = primaryId ? 'excel:' + primaryId : ''
}
- let param = UtilsDM.getDefaultQueryParam(_setting, search, _orderBy, pageIndex, pageSize, primaryId, BID)
+ let param = UtilsDM.getQueryDataParams(_setting, search, _orderBy, pageIndex, pageSize, BID, primaryId)
- param.DateCount = ''
-
- // 鏁版嵁绠＄悊鏉冮檺
- if (sessionStorage.getItem('dataM') === 'true') {
- param.dataM = 'Y'
- }
- if (BID) {
- param.BID = BID
- }
+ delete param.DateCount
return param
}
@@ -982,7 +979,8 @@
})
} else if (res.ErrCode === 'Y') { // 鎵ц鎴愬姛
Modal.success({
- title: res.message
+ title: res.message,
+ okText: window.GLOB.dict['got_it'] || '鐭ラ亾浜�'
})
} else if (res.ErrCode === '-1') { // 瀹屾垚鍚庝笉鎻愮ず
@@ -991,6 +989,16 @@
this.setState({
loading: false
})
+
+ let tabId = ''
+ if (btn.refreshTab && btn.refreshTab.length > 0) {
+ tabId = btn.refreshTab[btn.refreshTab.length - 1]
+ }
+
+ if (tabId && btn.$MenuID === tabId) { // 鍒锋柊褰撳墠鑿滃崟鏃讹紝鍋滄鍏朵粬鎿嶄綔
+ MKEmitter.emit('reloadMenuView', tabId, btn.urlPar === 'true')
+ return
+ }
if (btn.execSuccess === 'closepoptab') {
MKEmitter.emit('popclose')
@@ -1015,6 +1023,10 @@
MKEmitter.emit('reloadData', btn.syncComponentId)
}
}
+
+ if (tabId) {
+ MKEmitter.emit('reloadMenuView', tabId, btn.urlPar === 'true')
+ }
if (btn.switchTab && btn.switchTab.length > 0) {
let id = btn.switchTab[btn.switchTab.length - 1]
@@ -1035,6 +1047,7 @@
*/
execError = (res = {}) => {
const { btn } = this.props
+ const { dict } = this.state
if (!['LoginError', 'C', '-2', 'E', 'N', 'F', 'NM'].includes(res.ErrCode)) {
res.ErrCode = 'E'
@@ -1042,23 +1055,24 @@
if (res.ErrCode === 'E') {
Modal.error({
- title: res.message || '鎵ц澶辫触锛�',
+ title: res.message || dict['exc_fail'] || '鎵ц澶辫触锛�',
+ okText: dict['got_it'] || '鐭ラ亾浜�'
})
} else if (res.ErrCode === 'N') {
notification.error({
top: 92,
- message: res.message || '鎵ц澶辫触锛�',
+ message: res.message || dict['exc_fail'] || '鎵ц澶辫触锛�',
duration: btn.verify && btn.verify.ntime ? btn.verify.ntime : 10
})
} else if (res.ErrCode === 'F') {
notification.error({
className: 'notification-custom-error',
top: 92,
- message: res.message || '鎵ц澶辫触锛�',
+ message: res.message || dict['exc_fail'] || '鎵ц澶辫触锛�',
duration: btn.verify && btn.verify.ftime ? btn.verify.ftime : 10
})
} else if (res.ErrCode === 'NM') {
- message.error(res.message || '鎵ц澶辫触锛�')
+ message.error(res.message || dict['exc_fail'] || '鎵ц澶辫触锛�')
}
this.setState({
@@ -1068,6 +1082,15 @@
if (btn.execError === 'closepoptab') {
MKEmitter.emit('popclose')
} else if (btn.execError !== 'never') {
+ let tabId = ''
+ if (btn.refreshTab && btn.refreshTab.length > 0) {
+ tabId = btn.refreshTab[btn.refreshTab.length - 1]
+ }
+ if (tabId && btn.$MenuID === tabId) { // 鍒锋柊褰撳墠鑿滃崟鏃讹紝鍋滄鍏朵粬鎿嶄綔
+ MKEmitter.emit('reloadMenuView', tabId, btn.urlPar === 'true')
+ return
+ }
+
MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execError, btn, '', [])
if (btn.syncComponentId) {
@@ -1087,6 +1110,10 @@
MKEmitter.emit('reloadData', btn.syncComponentId)
}
}
+
+ if (tabId) {
+ MKEmitter.emit('reloadMenuView', tabId, btn.urlPar === 'true')
+ }
}
if (btn.execError === 'popclose' && btn.$tabId) { // 鏍囩鍏抽棴鍒锋柊
--
Gitblit v1.8.0