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 | 451 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 299 insertions(+), 152 deletions(-)
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index 30385fe..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 () {
@@ -90,43 +91,25 @@
/**
* @description 瑙﹀彂鎸夐挳鎿嶄綔
*/
- actionTrigger = (triggerId, record, type) => {
- const { setting, BID, btn } = this.props
- const { loading, disabled } = this.state
+ actionTrigger = (triggerId, _, type, lid) => {
+ const { setting, BID, btn, LID } = this.props
+ const { loading, disabled, dict } = this.state
if (loading || disabled) return
if (triggerId && btn.uuid !== triggerId) return
+ if (type === 'linkbtn' && !btn.$toolbtn && LID !== lid) return
if (setting.supModule && !BID) {
notification.warning({
top: 92,
- message: '闇�瑕佷笂绾т富閿�硷紒',
+ message: setting.supModTip || dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
duration: 5
})
- return
- } else if (type === 'linkbtn' && !btn.$toolbtn && !is(fromJS(this.props.selectedData || []), fromJS(record))) {
- return
- }
-
- if (btn.errorType === 'error1') {
- notification.warning({
- top: 92,
- message: '璇疯缃鍑哄垪锛�',
- duration: 5
- })
- return
- } else if (btn.errorType === 'error2') {
- notification.warning({
- top: 92,
- message: '鎸夐挳闇�鑷畾涔夊鍑烘暟鎹簮锛�',
- duration: 5
- })
- return
- }
-
- MKEmitter.emit('queryModuleParam', btn.$menuId, this.triggerExcelout)
- if (window.GLOB.systemType === 'production') {
- MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '瀵煎嚭Excel'})
+ } else {
+ MKEmitter.emit('queryModuleParam', btn.$menuId, this.triggerExcelout)
+ if (window.GLOB.systemType === 'production') {
+ MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '瀵煎嚭Excel'})
+ }
}
}
@@ -151,7 +134,7 @@
if (!valid) {
notification.warning({
top: 92,
- message: '鎼滅储鏉′欢涓嶅彲涓虹┖锛�',
+ message: window.GLOB.dict['miss_search'] || '鎼滅储鏉′欢涓嶅彲涓虹┖锛�',
duration: 5
})
return
@@ -165,10 +148,12 @@
if (btn.pagination !== 'true') {
if (btn.intertype === 'system') { // 浣跨敤绯荤粺鍑芥暟
let param = this.getExcelDefaultParam(viewParam.orderBy, viewParam.search)
-
+ if (btn.database === 'sso' && window.GLOB.mainSystemApi) {
+ param.rduri = window.GLOB.mainSystemApi
+ }
Api.genericInterface(param).then(result => {
if (result.status) {
- this.exportExcel(result.data, result.ErrCode, result.message)
+ this.exportExcel(result.data, result.ErrCode, result.message, viewParam.search)
} else {
this.execError(result)
}
@@ -184,10 +169,13 @@
param.username = sessionStorage.getItem('User_Name') || ''
param.fullname = sessionStorage.getItem('Full_Name') || ''
}
+ if (btn.dataM === 'true') {
+ param.dataM = sessionStorage.getItem('dataM') === 'true' ? 'Y' : ''
+ }
Api.genericInterface(param).then(result => {
if (result.status) {
- this.exportExcel(result.data, result.ErrCode, result.message)
+ this.exportExcel(result.data, result.ErrCode, result.message, viewParam.search)
} else {
this.execError(result)
}
@@ -226,7 +214,7 @@
Api.genericInterface(param).then(result => {
if (result.status) {
- this.exportExcel(result.data, result.ErrCode, result.message)
+ this.exportExcel(result.data, result.ErrCode, result.message, viewParam.search)
} else {
this.execError(result)
}
@@ -273,7 +261,7 @@
Api.genericInterface(res).then(result => {
if (result.status) {
- this.exportExcel(result.data, result.ErrCode, result.message)
+ this.exportExcel(result.data, result.ErrCode, result.message, viewParam.search)
} else {
this.execError(result)
}
@@ -346,14 +334,14 @@
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++
this.getExcelOutDoubleData(viewParam, pageIndex, pageSize, data)
} else {
data = data.concat(result.data)
- this.exportExcel(data, result.ErrCode, result.message)
+ this.exportExcel(data, result.ErrCode, result.message, viewParam.search)
}
} else {
this.execError(result)
@@ -379,6 +367,9 @@
let param = null
if (btn.intertype === 'system') { // 浣跨敤绯荤粺鍑芥暟
param = this.getExcelDefaultParam(viewParam.orderBy, viewParam.search, true, pageIndex, pageSize)
+ 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)
param.func = btn.innerFunc
@@ -387,7 +378,9 @@
param.username = sessionStorage.getItem('User_Name') || ''
param.fullname = sessionStorage.getItem('Full_Name') || ''
}
-
+ 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)
@@ -422,14 +415,14 @@
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++
this.getExcelOutData(viewParam, pageIndex, pageSize, data)
} else {
data = data.concat(result.data)
- this.exportExcel(data, result.ErrCode, result.message)
+ this.exportExcel(data, result.ErrCode, result.message, viewParam.search)
}
} else {
this.execError(result)
@@ -443,23 +436,71 @@
/**
* @description Excel 鐢熸垚
*/
- exportExcel = (data, ErrCode, msg) => {
+ exportExcel = (data = [], ErrCode, msg, search) => {
const { btn } = this.props
+ const { dict } = this.state
let imgCol = false
- let columns = btn.verify.columns.filter(col => {
+ let merge = false
+ let styles = []
+ let letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+
+ let columns = btn.verify.columns.map((col, index) => {
if (col.type === 'image') {
imgCol = true
}
+ if (btn.verify.merge === 'true' && /.+-.+/.test(col.Text)) {
+ merge = true
+ }
- if (col.type === 'number' && (col.decimal || col.decimal === 0) ) {
- col.round = Math.pow(10, col.decimal)
+ let i = Math.floor(index / 26)
+ let s = letters[i - 1] || ''
+ col.name = s + letters[index % 26]
+
+ if (col.type === 'number') {
+ if (col.decimal || col.decimal === 0) {
+ col.round = Math.pow(10, col.decimal)
+
+ if (col.format) {
+ let dec = Array(col.decimal).fill(0).join('')
+ dec = dec ? '.' + dec : ''
+ if (col.format === 'thdSeparator') {
+ col.z = '#,##0' + dec
+ } else if (col.format === 'thdSepPm') {
+ col.z = '#,##0' + dec + ';'
+ col.z = col.z + '[Red]-' + col.z
+ } else if (col.format === 'percent') {
+ let _dec = ''
+ if (col.decimal > 2) {
+ Array(col.decimal - 2).fill(0).join('')
+ _dec = _dec ? '.' + _dec : ''
+ }
+
+ col.z = '0' + _dec + '%'
+ }
+ }
+ }
+ } else if (col.type === 'text') {
+ if (col.wrapText === 'true') {
+ col.s = {alignment: { wrapText: true }}
+ }
+ if (col.textFormat) {
+ if (col.textFormat === 'YYYY-MM-DD') {
+ col.z = 'yyyy-mm-dd;@'
+ } else if (col.textFormat === 'YYYY-MM-DD HH:mm:ss') {
+ col.z = 'yyyy-mm-dd hh:mm:ss'
+ }
+ }
+ }
+
+ if (col.z || col.s) {
+ styles.push(col)
}
return col
})
- if (data && data[0]) {
+ if (data[0]) {
let errors = []
columns.forEach(col => {
if (col.output === 'false') return
@@ -471,7 +512,7 @@
if (errors.length) {
notification.error({
top: 92,
- message: '鏁版嵁涓己灏戝瓧娈碉細' + errors.join('銆�'),
+ message: (dict['miss_field'] || '鏁版嵁涓己灏戝瓧娈�') + '锛�' + errors.join('銆�'),
duration: 5
})
@@ -484,7 +525,14 @@
}
try {
- if (imgCol) {
+ if (btn.verify.excelHandle === 'true') {
+ // 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 || dict['exc_success'] || '瀵煎嚭鎴愬姛锛�'}
+ this.execSuccess(res)
+ })
+ } else if (imgCol) {
const column = columns.map(item => {
let col = {
title: item.Text,
@@ -501,7 +549,7 @@
let table = []
- data && data.forEach((item, index) => {
+ data.forEach((item, index) => {
let _row = {}
item.$Index = index + 1 + ''
@@ -509,18 +557,48 @@
columns.forEach((col, i) => {
let val = item[col.Column]
if (col.output === 'false') {
- if (col.type === 'number') {
+ if (col.type === 'number' && col.noValue !== 'false') {
val = 0
} else {
val = ''
}
- } else if (col.type === 'number' && typeof(val) === 'number') {
- if (col.abs === 'true') {
- val = Math.abs(val)
+ } else if (col.type === 'number') {
+ if (val && typeof(val) === 'string' && !isNaN(val)) {
+ val = +val
}
- if (col.round) {
- val = Math.round(val * col.round) / col.round
- // val = val.toFixed(col.decimal)
+ if (typeof(val) === 'number') {
+ if (col.abs === 'true') {
+ val = Math.abs(val)
+ }
+ if (col.round) {
+ val = Math.round(val * col.round) / col.round
+ }
+ if (col.noValue === 'false' && val === 0) {
+ val = ''
+ }
+ }
+ } else if (col.type === 'text') {
+ val = val + ''
+
+ if (col.textFormat) {
+ if (col.textFormat === 'YYYY-MM-DD' && /^[1-9]\d{3}(-|\/)(0[1-9]|1[0-2])(-|\/)(0[1-9]|[1-2][0-9]|3[0-1])/.test(val)) {
+ val = `${val.substr(0, 4)}-${val.substr(5, 2)}-${val.substr(8, 2)}`
+ } else if (col.textFormat === 'YYYY-MM-DD HH:mm:ss' && /^[1-9]\d{3}(-|\/)(0[1-9]|1[0-2])(-|\/)(0[1-9]|[1-2][0-9]|3[0-1]).([0-1][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]/.test(val)) {
+ val = `${val.substr(0, 4)}-${val.substr(5, 2)}-${val.substr(8, 2)} ${val.substr(11, 2)}:${val.substr(14, 2)}:${val.substr(17, 2)}`
+ }
+ }
+
+ if (col.noValue === 'false' && val < '1949-10-02') {
+ val = ''
+ }
+ }
+
+ if (val !== '') {
+ if (col.prefix) {
+ val = col.prefix + val
+ }
+ if (col.postfix) {
+ val = val + col.postfix
}
}
@@ -532,18 +610,8 @@
this.table2excel(column, table)
- this.execSuccess({ErrCode: ErrCode || 'S', message: msg || '瀵煎嚭鎴愬姛锛�'})
+ this.execSuccess({ErrCode: ErrCode || 'S', message: msg || dict['exc_success'] || '瀵煎嚭鎴愬姛锛�'})
} else {
- let letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
- let cols = []
-
- for (let index = 0; index < columns.length; index++) {
- let i = Math.floor(index / 26)
- let s = letters[i - 1] || ''
-
- cols.push(s + letters[index % 26])
- }
-
let table = []
let _header = []
let _topRow = {}
@@ -551,16 +619,16 @@
let requires = []
let merges = []
- columns.forEach((col, i) => {
+ columns.forEach(col => {
_header.push(col.Column)
_topRow[col.Column] = col.Text
colwidth.push({wch: col.Width || 20})
if (col.required === 'true') {
- requires.push(i)
+ requires.push(col.name)
}
})
- if (btn.verify.merge === 'true') {
+ if (merge) {
let fLine = {}
let sLine = {}
let sign = ''
@@ -572,16 +640,16 @@
sLine[col.Column] = _name
if (sign === _sign) {
- merges[merges.length - 1] = merges[merges.length - 1].split(':')[0] + `:${cols[i]}1`
+ merges[merges.length - 1] = merges[merges.length - 1].split(':')[0] + `:${col.name}1`
} else {
- merges.push(`${cols[i]}1:${cols[i]}2`)
+ merges.push(`${col.name}1:${col.name}2`)
sign = _sign
}
} else {
fLine[col.Column] = col.Text
sLine[col.Column] = col.Text
sign = ''
- merges.push(`${cols[i]}1:${cols[i]}2`)
+ merges.push(`${col.name}1:${col.name}2`)
}
})
@@ -591,7 +659,7 @@
table.push(_topRow)
}
- data && data.forEach((item, index) => {
+ data.forEach((item, index) => {
let _row = {}
item.$Index = index + 1 + ''
@@ -600,18 +668,48 @@
let val = item[col.Column]
if (col.output === 'false') {
- if (col.type === 'number') {
+ if (col.type === 'number' && col.noValue !== 'false') {
val = 0
} else {
val = ''
}
- } else if (col.type === 'number' && typeof(val) === 'number') {
- if (col.abs === 'true') {
- val = Math.abs(val)
+ } else if (col.type === 'number') {
+ if (val && typeof(val) === 'string' && !isNaN(val)) {
+ val = +val
}
- if (col.round) {
- val = Math.round(val * col.round) / col.round
- // val = val.toFixed(col.decimal)
+ if (typeof(val) === 'number') {
+ if (col.abs === 'true') {
+ val = Math.abs(val)
+ }
+ if (col.round) {
+ val = Math.round(val * col.round) / col.round
+ }
+ if (col.noValue === 'false' && val === 0) {
+ val = ''
+ }
+ }
+ } else if (col.type === 'text') {
+ val = val + ''
+
+ if (col.textFormat) {
+ if (col.textFormat === 'YYYY-MM-DD' && /^[1-9]\d{3}(-|\/)(0[1-9]|1[0-2])(-|\/)(0[1-9]|[1-2][0-9]|3[0-1])/.test(val)) {
+ val = `${val.substr(0, 4)}-${val.substr(5, 2)}-${val.substr(8, 2)}`
+ } else if (col.textFormat === 'YYYY-MM-DD HH:mm:ss' && /^[1-9]\d{3}(-|\/)(0[1-9]|1[0-2])(-|\/)(0[1-9]|[1-2][0-9]|3[0-1]).([0-1][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]/.test(val)) {
+ val = `${val.substr(0, 4)}-${val.substr(5, 2)}-${val.substr(8, 2)} ${val.substr(11, 2)}:${val.substr(14, 2)}:${val.substr(17, 2)}`
+ }
+ }
+
+ if (col.noValue === 'false' && val < '1949-10-02') {
+ val = ''
+ }
+ }
+
+ if (val !== '') {
+ if (col.prefix) {
+ val = col.prefix + val
+ }
+ if (col.postfix) {
+ val = val + col.postfix
}
}
@@ -631,53 +729,51 @@
if (requires.length) {
requires.forEach(col => {
- if (cols[col]) {
- ws[cols[col] + '1'].s = {font: { color: { rgb: 'F5222D' } }}
- }
+ ws[col + '1'].s = {font: { color: { rgb: 'F5222D' } }}
})
}
- if (merges.length) {
+ if (merge) {
ws['!merges'] = []
merges.forEach(item => {
ws['!merges'].push(XLSX.utils.decode_range(item))
})
- cols.forEach(col => {
- if (ws[col + '1'].s) {
- ws[col + '1'].s = {font: { color: { rgb: 'F5222D' } }, alignment: { horizontal: 'center', vertical: 'center' }}
- } else {
- ws[col + '1'].s = {alignment: { horizontal: 'center', vertical: 'center' }}
- }
- ws[col + '2'].s = {alignment: { horizontal: 'center', vertical: 'center' }}
+ columns.forEach(col => {
+ ws[col.name + '1'].s = ws[col.name + '1'].s || {}
+ ws[col.name + '1'].s.alignment = { horizontal: 'center', vertical: 'center' }
+
+ ws[col.name + '2'].s = {alignment: { horizontal: 'center', vertical: 'center' }}
})
}
- if (btn.verify.wrapText === 'true' && data) {
- let lines = data.length + 1
- let start = 2
- if (btn.verify.merge === 'true') {
- lines = data.length + 2
- }
- for (let n = 0; n < cols.length; n++) {
- for (let m = start; m <= lines; m++) {
- if (ws[cols[n] + m] && !ws[cols[n] + m].s) {
- ws[cols[n] + m].s = {alignment: { wrapText: true }}
+ // ws['A3'].s = {font: { sz: 10 , bold: true }, alignment: { horizontal: 'center', vertical: 'center' }, border: {top: {style: 'thin', color: '000000'}, left: {style: 'thin', color: '000000'}, bottom: {style: 'thin', color: '000000'}, right: {style: 'thin', color: '000000'}}};
+ // ws['A3'].z = '#,##0.00';
+ // ws['A3'].z = '#,##0.00;[Red]-#,##0.00;';
+ // ws["A1"].s = {fill: { bgColor: { rgb: "FFFFAA" }}, font: { color: { rgb: "1890FF" } }}
+
+ if (data.length && styles.length) {
+ for (let n = table.length - data.length + 1; n <= table.length; n++) {
+ styles.forEach(col => {
+ if (col.z) {
+ ws[col.name + n].z = col.z
}
- }
+ if (col.s) {
+ ws[col.name + n].s = col.s
+ }
+ })
}
}
-
- // ws["A1"].s = {fill: { bgColor: { rgb: "FFFFAA" }}, font: { color: { rgb: "1890FF" } }}
const wb = XLSX.utils.book_new()
XLSX.utils.book_append_sheet(wb, ws, btn.verify.sheet || 'Sheet1')
- XLSX.writeFile(wb, `${btn.$menuName || ''}${moment().format('YYYYMMDDHHmmss')}.xlsx`)
+ 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)
this.execError({ErrCode: 'N', message: 'Excel鐢熸垚澶辫触锛�'})
}
}
@@ -766,13 +862,16 @@
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 => {
- if (col.Column && col.Column !== '$Index') {
- _setting.arr_field.push(col.Column)
- }
+ if (col.output === 'false' || !col.Column || col.Column === '$Index') return
+
+ _setting.arr_field.push(col.Column)
})
_setting.arr_field = _setting.arr_field.join(',')
_setting.execute = btn.verify.defaultSql !== 'false'
@@ -781,10 +880,6 @@
if (!_setting.execute) {
_setting.dataresource = ''
- }
-
- if (/\s/.test(_setting.dataresource)) {
- _setting.dataresource = '(' + _setting.dataresource + ') tb'
}
let _customScript = ''
@@ -812,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
@@ -828,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
}
@@ -837,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
}
@@ -871,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') { // 瀹屾垚鍚庝笉鎻愮ず
@@ -880,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')
@@ -891,12 +1010,22 @@
if (btn.syncComponentId === 'multiComponent') {
btn.syncComponentIds.forEach((id, i) => {
setTimeout(() => {
- MKEmitter.emit('reloadData', id)
+ if (/\$focus/.test(id)) {
+ MKEmitter.emit('reloadData', id.split('$')[0], id.split('$')[1])
+ } else {
+ MKEmitter.emit('reloadData', id)
+ }
}, 20 * i)
})
+ } else if (/\$focus/.test(btn.syncComponentId)) {
+ MKEmitter.emit('reloadData', btn.syncComponentId.split('$')[0], btn.syncComponentId.split('$')[1])
} else {
MKEmitter.emit('reloadData', btn.syncComponentId)
}
+ }
+
+ if (tabId) {
+ MKEmitter.emit('reloadMenuView', tabId, btn.urlPar === 'true')
}
if (btn.switchTab && btn.switchTab.length > 0) {
@@ -918,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'
@@ -925,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({
@@ -951,7 +1082,38 @@
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) {
+ if (btn.syncComponentId === 'multiComponent') {
+ btn.syncComponentIds.forEach((id, i) => {
+ setTimeout(() => {
+ if (/\$focus/.test(id)) {
+ MKEmitter.emit('reloadData', id.split('$')[0], id.split('$')[1])
+ } else {
+ MKEmitter.emit('reloadData', id)
+ }
+ }, 20 * i)
+ })
+ } else if (/\$focus/.test(btn.syncComponentId)) {
+ MKEmitter.emit('reloadData', btn.syncComponentId.split('$')[0], btn.syncComponentId.split('$')[1])
+ } else {
+ MKEmitter.emit('reloadData', btn.syncComponentId)
+ }
+ }
+
+ if (tabId) {
+ MKEmitter.emit('reloadMenuView', tabId, btn.urlPar === 'true')
+ }
}
if (btn.execError === 'popclose' && btn.$tabId) { // 鏍囩鍏抽棴鍒锋柊
@@ -966,39 +1128,24 @@
if (hidden) return null
let label = ''
- let icon = ''
- let type = 'link'
- let className = ''
- if (btn.show === 'button') {
- label = btn.label
- icon = btn.icon || ''
- } else if (btn.show === 'link') {
- label = <span>{btn.label}{btn.icon ? <MkIcon style={{marginLeft: '8px'}} type={btn.icon}/> : ''}</span>
- icon = ''
+ if (btn.show === 'link') {
+ label = <span>{btn.label}{btn.icon ? <MkIcon style={{marginLeft: '8px'}} type={btn.icon} /> : ''}</span>
} else if (btn.show === 'icon') {
- icon = btn.icon || 'download'
- } else if (!btn.$toolbtn) {
- icon = btn.icon || ''
- label = btn.label
- className = 'mk-btn mk-' + btn.class
+ label = !loading ? <MkIcon type={btn.icon} /> : null
} else {
- type = ''
- icon = btn.icon || ''
- label = btn.label
- className = 'mk-btn mk-' + btn.class
+ label = <span>{!loading && btn.icon ? <MkIcon style={{marginRight: '8px'}} type={btn.icon} /> : ''}{btn.label}</span>
}
return (
<Button
- type={type}
+ type="link"
id={'button' + btn.uuid}
title={disabled ? (btn.reason || '') : (btn.show === 'icon' ? btn.label : '')}
loading={loading}
disabled={disabled}
style={btn.style || null}
- icon={icon}
- className={className}
+ className={btn.hover || ''}
onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
>{label}</Button>
)
--
Gitblit v1.8.0