From eb0c4703ec7cd21dc921ae113b7e3be69c641c1d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 17 九月 2021 15:18:06 +0800
Subject: [PATCH] 2021-09-17
---
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 487 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 314 insertions(+), 173 deletions(-)
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index d967530..ec5a55a 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -3,7 +3,7 @@
import moment from 'moment'
import {connect} from 'react-redux'
import { is, fromJS } from 'immutable'
-import { Button, Modal, notification, message } from 'antd'
+import { Button, Modal, notification, message, Icon } from 'antd'
import * as XLSX from 'xlsx'
import Utils from '@/utils/utils.js'
@@ -11,41 +11,42 @@
import Api from '@/api'
import zhCN from '@/locales/zh-CN/main.js'
import enUS from '@/locales/en-US/main.js'
+import MKEmitter from '@/utils/events.js'
import './index.scss'
class ExcelOutButton extends Component {
static propTpyes = {
BID: PropTypes.string, // 涓昏〃ID
- BData: PropTypes.any, // 涓昏〃鏁版嵁
+ position: PropTypes.any, // 鎸夐挳浣嶇疆锛屽伐鍏锋爮涓簍oolbar
+ show: PropTypes.any, // 鏄剧ず鏍峰紡
Tab: PropTypes.any, // 濡傛灉褰撳墠鍏冪礌涓烘爣绛炬椂锛宼ab涓烘爣绛句俊鎭�
- MenuID: PropTypes.string, // 鑿滃崟ID
btn: PropTypes.object, // 鎸夐挳
- columns: PropTypes.array, // 瀛楁鍒�
setting: PropTypes.any, // 椤甸潰閫氱敤璁剧疆
- ContainerId: PropTypes.any, // tab椤甸潰ID锛岀敤浜庡脊绐楁帶鍒�
updateStatus: PropTypes.func, // 鎸夐挳鐘舵�佹洿鏂�
- getexceloutparam: PropTypes.func, // 鑾峰彇琛ㄦ牸涓弬鏁�
- triggerBtn: PropTypes.any,
}
state = {
dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
- excelName: '',
+ excelName: '', // 鏂囦欢鍚�
search: '', // 鎼滅储鏉′欢
- loading: false
- }
-
- /**
- * @description 澶栭儴瑙﹀彂鎸夐挳鐐瑰嚮
- */
- UNSAFE_componentWillReceiveProps(nextProps) {
- if (nextProps.triggerBtn && !is(fromJS(this.props.triggerBtn), fromJS(nextProps.triggerBtn)) && nextProps.triggerBtn.button.uuid === this.props.btn.uuid) {
- this.actionTrigger()
- }
+ loading: false // 瀵煎嚭涓�
}
shouldComponentUpdate (nextProps, nextState) {
return !is(fromJS(this.props), fromJS(nextProps)) || !is(fromJS(this.state), fromJS(nextState))
+ }
+
+ componentDidMount () {
+ MKEmitter.addListener('triggerBtnId', this.actionTrigger)
+ MKEmitter.addListener('returnModuleParam', this.triggerExcelout)
+ }
+
+ componentWillUnmount () {
+ this.setState = () => {
+ return
+ }
+ MKEmitter.removeListener('triggerBtnId', this.actionTrigger)
+ MKEmitter.removeListener('returnModuleParam', this.triggerExcelout)
}
/**
@@ -57,22 +58,23 @@
loading: true,
excelName: name
})
- this.props.updateStatus('start')
} else if (type === 'over') {
this.setState({
loading: false
})
- this.props.updateStatus('over')
}
}
/**
* @description 瑙﹀彂鎸夐挳鎿嶄綔
*/
- actionTrigger = () => {
+ actionTrigger = (triggerId) => {
const { setting, Tab, BID, btn } = this.props
+ const { loading } = this.state
- if (Tab && Tab.supMenu && !BID) {
+ if ((triggerId && btn.uuid !== triggerId) || loading) return
+
+ if (((Tab && Tab.supMenu) || setting.supModule) && !BID) {
notification.warning({
top: 92,
message: '闇�瑕佷笂绾т富閿�硷紒',
@@ -81,36 +83,50 @@
return
}
- if (
- btn.intertype === 'inner' && !btn.innerFunc &&
- ((setting.interType === 'inner' && setting.innerFunc) || setting.interType === 'outer')
- ) {
+ if (btn.intertype === 'system' && setting.interType !== 'system') {
notification.warning({
top: 92,
message: '瀵煎嚭鎸夐挳閰嶇疆閿欒锛�',
duration: 5
})
return
+ } else if (btn.intertype === 'inner' && !btn.innerFunc) {
+ notification.warning({
+ top: 92,
+ message: '瀵煎嚭鎸夐挳閰嶇疆閿欒锛�',
+ duration: 5
+ })
+ return
+ } else if (!btn.verify || !btn.verify.columns || btn.verify.columns.length === 0) {
+ notification.warning({
+ top: 92,
+ message: '璇疯缃鍑哄垪锛�',
+ duration: 5
+ })
+ return
}
- this.triggerExcelout()
+ MKEmitter.emit('queryModuleParam', btn.$menuId, btn.uuid)
+ if (window.GLOB.systemType === 'production') {
+ MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '瀵煎嚭Excel'})
+ }
}
/**
* @description Excel 瀵煎嚭
*/
- triggerExcelout = () => {
+ triggerExcelout = (menuId, btnId, viewParam) => {
const { btn } = this.props
- let viewParam = this.props.getexceloutparam()
+
+ if (btn.$menuId !== menuId || btn.uuid !== btnId || !viewParam) return
+
let name = `${viewParam.menuName}${moment().format('YYYYMMDDHHmmss')}.xlsx`
let pageSize = 1000
if (btn.search === 'true' && viewParam.search && viewParam.search.length > 0) {
let valid = false
viewParam.search.forEach(item => {
- if (Array.isArray(item.value) && item.value.length > 0) {
- valid = true
- } else if (item.value || item.value === 0) {
+ if (item.value || item.value === 0) {
valid = true
}
})
@@ -125,21 +141,21 @@
}
}
- if (btn.intertype === 'inner' && !btn.innerFunc && !viewParam.arr_field) { // 浣跨敤绯荤粺鍑芥暟
+ if (btn.intertype === 'system' && !viewParam.arr_field) { // 浣跨敤绯荤粺鍑芥暟
notification.warning({
top: 92,
message: '鏈缃樉绀哄垪锛�',
duration: 5
})
return
- } else if (btn.intertype === 'inner' && !btn.innerFunc && btn.verify && btn.verify.enable === 'true') {
+ } else if (btn.intertype === 'system' && btn.verify && btn.verify.enable === 'true') {
this.setState({search: fromJS(viewParam.search).toJS()})
}
this.updateStatus('start', name)
if (btn.pagination !== 'true') {
- if (btn.intertype === 'inner' && !btn.innerFunc) { // 浣跨敤绯荤粺鍑芥暟
+ if (btn.intertype === 'system') { // 浣跨敤绯荤粺鍑芥暟
let param = this.getExcelDefaultParam(viewParam.arr_field, viewParam.orderBy, viewParam.search)
Api.genericInterface(param).then(result => {
@@ -151,7 +167,7 @@
}, () => {
this.execError({})
})
- } else if (btn.intertype === 'inner' && btn.innerFunc) { // 浣跨敤鍐呴儴鍑芥暟
+ } else if (btn.intertype === 'inner') { // 浣跨敤鍐呴儴鍑芥暟
let param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search)
param.func = btn.innerFunc
@@ -171,13 +187,21 @@
if (btn.sysInterface === 'true' && options.cloudServiceApi) {
param.rduri = options.cloudServiceApi
} else if (btn.sysInterface !== 'true') {
- param.rduri = btn.interface
+ if (window.GLOB.systemType === 'production' && btn.proInterface) {
+ param.rduri = btn.proInterface
+ } else {
+ param.rduri = btn.interface
+ }
}
} else {
if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
param.rduri = window.GLOB.mainSystemApi
} else if (btn.sysInterface !== 'true') {
- param.rduri = btn.interface
+ if (window.GLOB.systemType === 'production' && btn.proInterface) {
+ param.rduri = btn.proInterface
+ } else {
+ param.rduri = btn.interface
+ }
}
}
@@ -209,13 +233,21 @@
if (btn.sysInterface === 'true' && options.cloudServiceApi) {
res.rduri = options.cloudServiceApi
} else if (btn.sysInterface !== 'true') {
- res.rduri = btn.interface
+ if (window.GLOB.systemType === 'production' && btn.proInterface) {
+ res.rduri = btn.proInterface
+ } else {
+ res.rduri = btn.interface
+ }
}
} else {
if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
res.rduri = window.GLOB.mainSystemApi
} else if (btn.sysInterface !== 'true') {
- res.rduri = btn.interface
+ if (window.GLOB.systemType === 'production' && btn.proInterface) {
+ res.rduri = btn.proInterface
+ } else {
+ res.rduri = btn.interface
+ }
}
}
@@ -270,13 +302,21 @@
if (btn.sysInterface === 'true' && options.cloudServiceApi) {
res.rduri = options.cloudServiceApi
} else if (btn.sysInterface !== 'true') {
- res.rduri = btn.interface
+ if (window.GLOB.systemType === 'production' && btn.proInterface) {
+ res.rduri = btn.proInterface
+ } else {
+ res.rduri = btn.interface
+ }
}
} else {
if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
res.rduri = window.GLOB.mainSystemApi
} else if (btn.sysInterface !== 'true') {
- res.rduri = btn.interface
+ if (window.GLOB.systemType === 'production' && btn.proInterface) {
+ res.rduri = btn.proInterface
+ } else {
+ res.rduri = btn.interface
+ }
}
}
@@ -316,14 +356,14 @@
getExcelOutData = (viewParam, pageIndex, pageSize, data) => {
const { btn } = this.props
let param = null
- if (btn.intertype === 'inner' && !btn.innerFunc) { // 浣跨敤绯荤粺鍑芥暟
+ if (btn.intertype === 'system') { // 浣跨敤绯荤粺鍑芥暟
if (!viewParam.arr_field) {
this.execError({ErrCode: 'N', message: '鏈缃樉绀哄垪锛�'})
return
}
param = this.getExcelDefaultParam(viewParam.arr_field, viewParam.orderBy, viewParam.search, true, pageIndex, pageSize)
- } else if (btn.intertype === 'inner' && btn.innerFunc) { // 浣跨敤鍐呴儴鍑芥暟
+ } else if (btn.intertype === 'inner') { // 浣跨敤鍐呴儴鍑芥暟
param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search, true, pageIndex, pageSize)
param.func = btn.innerFunc
@@ -334,13 +374,21 @@
if (btn.sysInterface === 'true' && options.cloudServiceApi) {
param.rduri = options.cloudServiceApi
} else if (btn.sysInterface !== 'true') {
- param.rduri = btn.interface
+ if (window.GLOB.systemType === 'production' && btn.proInterface) {
+ param.rduri = btn.proInterface
+ } else {
+ param.rduri = btn.interface
+ }
}
} else {
if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
param.rduri = window.GLOB.mainSystemApi
} else if (btn.sysInterface !== 'true') {
- param.rduri = btn.interface
+ if (window.GLOB.systemType === 'production' && btn.proInterface) {
+ param.rduri = btn.proInterface
+ } else {
+ param.rduri = btn.interface
+ }
}
}
@@ -373,110 +421,151 @@
* @description Excel 鐢熸垚
*/
exportExcel = (data) => {
- const { columns, btn } = this.props
- if (data && data.length > 0) {
- try {
- let _header = []
- let _topRow = {}
- let colwidth = []
+ const { btn } = this.props
+
+ try {
+ let imgCol = btn.verify.columns.filter(col => col.type === 'image')[0]
- let hidecolumns = []
-
- let verifyColumn = {} // 璁板綍楠岃瘉淇℃伅涓殑Excel鍒楅厤缃�
- if (btn.verify && btn.verify.columns && btn.verify.columns.length > 0) {
- btn.verify.columns.forEach(col => {
- if (col.export === 'false') {
- hidecolumns.push(col.Column)
- return
- }
- verifyColumn[col.Column] = col
- })
- }
-
- columns.forEach(col => {
- if (col.Hide === 'true' || hidecolumns.includes(col.field)) {
- hidecolumns.push(col.field)
- return
+ if (imgCol) {
+ const column = btn.verify.columns.map(item => {
+ let col = {
+ title: item.Text,
+ key: item.Column,
+ type: 'text',
+ width: (item.Width || 20) * 10
}
- if (!data[0].hasOwnProperty(col.field)) return
- if (_topRow[col.field]) return
-
- if (verifyColumn[col.field]) { // 浼樺厛浣跨敤楠岃瘉淇℃伅涓殑鍒楄缃�
- _header.push(col.field)
- _topRow[col.field] = verifyColumn[col.field].Text
-
- colwidth.push({width: verifyColumn[col.field].Width})
- } else {
- _header.push(col.field)
- _topRow[col.field] = col.label
-
- let _colwidth = Math.floor(col.Width / 6)
-
- if (!_colwidth || _colwidth < 5) {
- _colwidth = 5
- }
-
- colwidth.push({width: _colwidth})
+ if (item.type === 'image') {
+ col.type = 'image'
+ col.height = col.width
}
- })
-
- if (btn.verify && btn.verify.columns && btn.verify.columns.length > 0) {
- btn.verify.columns.forEach(col => {
- if (hidecolumns.includes(col.Column)) return
- if (!data[0].hasOwnProperty(col.Column)) return
- if (_topRow[col.Column]) return
-
- _header.push(col.Column)
- _topRow[col.Column] = col.Text
-
- colwidth.push({width: col.Width})
- })
- }
-
- Object.keys(data[0]).forEach(key => {
- if (hidecolumns.includes(key)) return
- if (_topRow[key]) return
-
- _header.push(key)
- _topRow[key] = key
-
- colwidth.push({width: 12})
+ return col
})
let table = []
- table.push(_topRow)
-
- data.forEach(item => {
+ data && data.forEach((item, index) => {
let _row = {}
- _header.forEach(field => {
- _row[field] = item[field]
+
+ item.$Index = index + 1 + ''
+
+ btn.verify.columns.forEach((col, i) => {
+ if (item[col.Column] && col.abs === 'true') {
+ _row[col.Column] = Math.abs(item[col.Column])
+ } else {
+ _row[col.Column] = item[col.Column]
+ }
})
-
+
table.push(_row)
})
- const ws = XLSX.utils.json_to_sheet(table, {header: _header, skipHeader: true})
-
- ws['!cols'] = colwidth
-
- const wb = XLSX.utils.book_new()
- XLSX.utils.book_append_sheet(wb, ws, 'Sheet1')
-
- XLSX.writeFile(wb, this.state.excelName)
+ this.table2excel(column, table, this.state.excelName.replace(/\.xlsx/ig, '.xls'))
if (btn.verify && btn.verify.enable === 'true' && btn.verify.script) {
this.execCustomScript()
} else {
this.execSuccess({ErrCode: 'S', ErrMesg: '瀵煎嚭鎴愬姛锛�'})
}
- } catch {
- this.execError({ErrCode: 'N', message: 'Excel鐢熸垚澶辫触锛�'})
+
+ } else {
+ let _header = []
+ let _topRow = {}
+ let colwidth = []
+ let abses = []
+
+ btn.verify.columns.forEach(col => {
+ if (_topRow[col.Column]) return
+
+ _header.push(col.Column)
+ _topRow[col.Column] = col.Text
+
+ if (col.abs === 'true') {
+ abses.push(col.Column)
+ }
+
+ colwidth.push({width: col.Width || 20})
+ })
+
+ let table = []
+
+ table.push(_topRow)
+
+ data && data.forEach((item, index) => {
+ let _row = {}
+
+ item.$Index = index + 1 + ''
+
+ _header.forEach(field => {
+ if (item[field] && abses.includes(field)) {
+ _row[field] = Math.abs(item[field])
+ } else {
+ _row[field] = item[field]
+ }
+ })
+
+ table.push(_row)
+ })
+
+ const ws = XLSX.utils.json_to_sheet(table, {header: _header, skipHeader: true})
+
+ ws['!cols'] = colwidth
+
+ const wb = XLSX.utils.book_new()
+ XLSX.utils.book_append_sheet(wb, ws, 'Sheet1')
+
+ XLSX.writeFile(wb, this.state.excelName)
+
+ if (btn.verify && btn.verify.enable === 'true' && btn.verify.script) {
+ this.execCustomScript()
+ } else {
+ this.execSuccess({ErrCode: 'S', ErrMesg: '瀵煎嚭鎴愬姛锛�'})
+ }
}
- } else {
- this.execError({ErrCode: 'N', message: '鏈煡璇㈠埌瀵煎嚭鏁版嵁锛�'})
+ } catch (e) {
+ this.execError({ErrCode: 'N', message: 'Excel鐢熸垚澶辫触锛�'})
}
}
+
+ table2excel = (column, data, excelName) => {
+ let thead = column.reduce((result, item) => {
+ return result + `<th>${item.title}</th>`
+ }, '')
+
+ thead = `<thead><tr>${thead}</tr></thead>`
+
+ let tbody = data.reduce((result, row) => {
+ const temp = column.reduce((tds, col) => {
+ let cell = '<td></td>'
+ if (col.type !== 'image' || !row[col.key]) {
+ cell = `<td style="width: ${col.width}px;">${row[col.key]}</td>`
+ } else if (col.type === 'image') {
+ cell = `<td style="width: ${col.width}px;height: ${col.height}px;"><img src="${row[col.key]}" width="${col.width * 0.75}"></td>`
+ }
+ return tds + cell
+ }, '')
+ return result + `<tr>${temp}</tr>`
+ }, '')
+
+ tbody = `<tbody>${tbody}</tbody>`
+
+ const table = thead + tbody
+
+ let html = "<html xmlns:o='urn:schemas-microsoft-com:office:office' xmlns:x='urn:schemas-microsoft-com:office:excel' xmlns='http://www.w3.org/TR/REC-html40'>"
+ html += '<head><meta http-equiv="content-type" content="application/vnd.ms-excel; charset=UTF-8">'
+ html += '<xml><x:ExcelWorkbook><x:ExcelWorksheets><x:ExcelWorksheet><x:Name>Sheet1</x:Name><x:WorksheetOptions><x:Print><x:ValidPrinterInfo/></x:Print></x:WorksheetOptions></x:ExcelWorksheet></x:ExcelWorksheets></x:ExcelWorkbook></xml></head>'
+ html += `<body><table>${table}</table></body>`
+ html += '</html>'
+
+ let url = 'data:application/vnd.ms-excel;charset=utf-8,' + encodeURIComponent(html)
+ // let url = 'data:application/vnd.ms-excel;base64,' + window.btoa(unescape(encodeURIComponent(html)))
+ let link = document.createElement('a')
+ link.href = url
+ link.download = excelName
+ document.body.appendChild(link)
+ link.click()
+ document.body.removeChild(link)
+ }
+
/**
* @description 鎵ц鑷畾涔夎剼鏈�
@@ -486,7 +575,7 @@
const { search } = this.state
let script = btn.verify.script
- if (this.props.dataManager) { // 鏁版嵁鏉冮檺
+ if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
script = script.replace(/\$@/ig, '/*')
script = script.replace(/@\$/ig, '*/')
} else {
@@ -506,24 +595,25 @@
})
let param = {
- func: 'sPC_TableData_InUpDe'
+ func: 'sPC_TableData_InUpDe',
+ menuname: btn.logLabel
}
if (this.props.BID) {
param.BID = this.props.BID
}
- let { LText, LText1, LText2 } = Utils.sPCInUpDeFormatOptions(script)
-
- param.LText2 = LText2
- param.LText1 = LText1
- param.LText = LText
-
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
+ param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ param.secretkey = Utils.encrypt('', param.timestamp)
+ param.LText = Utils.formatOptions(script)
if (this.props.menuType === 'HS') { // 鍑芥暟 sPC_TableData_InUpDe 浜戠楠岃瘉
- param.open_key = Utils.encrypt(param.secretkey, param.timestamp, true)
+ param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
+ }
+
+ if (window.GLOB.probation) {
+ param.s_debug_type = 'Y'
}
Api.genericInterface(param).then((res) => {
@@ -549,7 +639,7 @@
}
// 鏁版嵁绠＄悊鏉冮檺
- if (this.props.dataManager) {
+ if (sessionStorage.getItem('dataM') === 'true') {
param.dataM = 'Y'
}
@@ -569,7 +659,7 @@
* @description 鑾峰彇榛樿瀛樺偍杩囩▼璇锋眰鍙傛暟
*/
getExcelDefaultParam = (arr_field, orderBy, search, pagination = false, pageIndex = 1, pageSize = 100) => {
- const { setting } = this.props
+ const { setting, btn } = this.props
let _search = Utils.joinMainSearchkey(search)
@@ -579,34 +669,33 @@
func: 'sPC_Get_TableData',
obj_name: 'data',
arr_field: arr_field,
- custom_script: setting.customScript || '',
- default_sql: setting.default || 'true'
+ custom_script: setting.customScript,
+ default_sql: setting.default || 'true',
+ menuname: btn.logLabel
}
// 鏁版嵁绠＄悊鏉冮檺
- if (this.props.dataManager) {
+ if (sessionStorage.getItem('dataM') === 'true') {
param.dataM = 'Y'
}
if (this.props.BID) {
param.BID = this.props.BID
}
+
+ let userName = sessionStorage.getItem('User_Name') || ''
+ let fullName = sessionStorage.getItem('Full_Name') || ''
+ let RoleID = sessionStorage.getItem('role_id') || ''
+ let departmentcode = sessionStorage.getItem('departmentcode') || ''
+ let organization = sessionStorage.getItem('organization') || ''
+ let city = sessionStorage.getItem('city') || ''
+
+ if (sessionStorage.getItem('isEditState') === 'true') {
+ userName = sessionStorage.getItem('CloudUserName') || ''
+ fullName = sessionStorage.getItem('CloudFullName') || ''
+ }
let _dataresource = setting.dataresource
-
- if (/\s/.test(_dataresource)) {
- _dataresource = '(' + _dataresource + ') tb'
- }
-
- if (this.props.dataManager) { // 鏁版嵁鏉冮檺
- _dataresource = _dataresource.replace(/\$@/ig, '/*')
- _dataresource = _dataresource.replace(/@\$/ig, '*/')
- param.custom_script = param.custom_script.replace(/\$@/ig, '/*')
- param.custom_script = param.custom_script.replace(/@\$/ig, '*/')
- } else {
- _dataresource = _dataresource.replace(/@\$|\$@/ig, '')
- param.custom_script = param.custom_script.replace(/@\$|\$@/ig, '')
- }
let regoptions = null
if (setting.queryType === 'statistics' || param.custom_script) {
@@ -620,6 +709,15 @@
})
regoptions.push({
+ reg: new RegExp('@login_city@', 'ig'),
+ value: city
+ }, {
+ reg: new RegExp('@userName@', 'ig'),
+ value: userName
+ }, {
+ reg: new RegExp('@fullName@', 'ig'),
+ value: fullName
+ }, {
reg: new RegExp('@orderBy@', 'ig'),
value: orderBy
}, {
@@ -647,6 +745,9 @@
}
if (param.custom_script) {
+ param.custom_script = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@departmentcode nvarchar(50),@organization nvarchar(50),@login_city nvarchar(50) select @ErrorCode='',@retmsg ='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @departmentcode='${departmentcode}', @organization='${organization}', @login_city='${city}'
+ ${param.custom_script}
+ `
regoptions.forEach(item => {
param.custom_script = param.custom_script.replace(item.reg, item.value)
})
@@ -664,17 +765,22 @@
insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@
`
}
-
- param.custom_script = Utils.formatOptions(param.custom_script)
}
+ // 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
+ if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) {
+ param.custom_script && console.info(`${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${param.custom_script}`)
+ LText && console.info(LText)
+ }
+
+ param.custom_script = Utils.formatOptions(param.custom_script)
param.LText = Utils.formatOptions(LText)
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
+ param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
param.DateCount = ''
if (this.props.menuType === 'HS') { // 浜戠鏁版嵁楠岃瘉
- param.open_key = Utils.encrypt(param.secretkey, param.timestamp, true)
+ param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
}
return param
@@ -709,7 +815,14 @@
loading: false
})
- this.props.updateStatus('refresh', btn.execSuccess)
+ if (btn.execSuccess !== 'never') {
+ MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execSuccess, btn)
+ }
+ if (btn.switchTab && btn.switchTab.length > 0) {
+ let id = btn.switchTab[btn.switchTab.length - 1]
+ let node = document.getElementById('tab' + id)
+ node && node.click()
+ }
}
/**
@@ -746,30 +859,58 @@
loading: false
})
- this.props.updateStatus('refresh', btn.execError)
+ if (btn.execError !== 'never') {
+ MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execError, btn)
+ }
}
render() {
- const { btn } = this.props
+ const { btn, show } = this.props
const { loading } = this.state
- return (
- <div className="mk-btn-wrap">
+ if (show === 'actionList') {
+ return (
<Button
className={'mk-btn mk-' + btn.class}
icon={btn.icon}
- onClick={() => {this.actionTrigger()}}
+ onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
loading={loading}
>{btn.label}</Button>
- </div>
- )
+ )
+ } else { // icon銆乼ext銆� all 鍗＄墖
+ let label = ''
+ let icon = ''
+
+ if (show === 'button') {
+ label = btn.label
+ icon = btn.icon || ''
+ } else if (show === 'link') {
+ label = <span>{btn.label}{btn.icon ? <Icon style={{marginLeft: '8px'}} type={btn.icon}/> : ''}</span>
+ icon = ''
+ } else if (show === 'icon') {
+ icon = btn.icon || 'download'
+ // } else if (show === 'text') {
+ } else {
+ label = btn.label
+ }
+
+ return (
+ <Button
+ type="link"
+ title={show === 'icon' ? btn.label : ''}
+ loading={loading}
+ style={btn.style}
+ icon={icon}
+ onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
+ >{label}</Button>
+ )
+ }
}
}
const mapStateToProps = (state) => {
return {
- menuType: state.editLevel,
- dataManager: state.dataManager
+ menuType: state.editLevel
}
}
--
Gitblit v1.8.0