From 102be577a7f8df2ae30045d55a1a5fc584f90363 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 19 十二月 2022 18:31:38 +0800
Subject: [PATCH] 2022-12-19
---
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 394 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 245 insertions(+), 149 deletions(-)
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index cbc490b..8dc3084 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -1,7 +1,6 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import moment from 'moment'
-import {connect} from 'react-redux'
import { is, fromJS } from 'immutable'
import { Button, Modal, notification, message } from 'antd'
import * as XLSX from 'xlsx'
@@ -19,13 +18,10 @@
static propTpyes = {
BID: PropTypes.string, // 涓昏〃ID
BData: PropTypes.any, // 涓昏〃鏁版嵁
- show: PropTypes.any, // 鏄剧ず鏍峰紡
- Tab: PropTypes.any, // 濡傛灉褰撳墠鍏冪礌涓烘爣绛炬椂锛宼ab涓烘爣绛句俊鎭�
btn: PropTypes.object, // 鎸夐挳
setting: PropTypes.any, // 椤甸潰閫氱敤璁剧疆
updateStatus: PropTypes.func, // 鎸夐挳鐘舵�佹洿鏂�
disabled: PropTypes.any, // 琛屾寜閽鐢�
- lineId: PropTypes.any, // 琛岀储寮�+涓婚敭鍊硷紝鐢ㄤ簬琛屾寜閽弻鍑�
}
state = {
@@ -64,7 +60,6 @@
componentDidMount () {
MKEmitter.addListener('triggerBtnId', this.actionTrigger)
- MKEmitter.addListener('returnModuleParam', this.triggerExcelout)
}
UNSAFE_componentWillReceiveProps (nextProps) {
@@ -95,7 +90,6 @@
return
}
MKEmitter.removeListener('triggerBtnId', this.actionTrigger)
- MKEmitter.removeListener('returnModuleParam', this.triggerExcelout)
}
/**
@@ -117,51 +111,41 @@
/**
* @description 瑙﹀彂鎸夐挳鎿嶄綔
*/
- actionTrigger = (triggerId, record) => {
- const { setting, Tab, BID, btn } = this.props
+ actionTrigger = (triggerId, record, type) => {
+ const { setting, BID, btn } = this.props
const { loading, disabled } = this.state
if (loading || disabled) return
- if (triggerId) {
- if (btn.uuid !== triggerId) return
- if (this.props.lineId && record && record[0] && this.props.lineId !== record[0].$$key) {
- return
- }
- }
+ if (triggerId && btn.uuid !== triggerId) return
- if (((Tab && Tab.supMenu) || setting.supModule) && !BID) {
+ if (setting.supModule && !BID) {
notification.warning({
top: 92,
message: '闇�瑕佷笂绾т富閿�硷紒',
duration: 5
})
return
+ } else if (type === 'linkbtn' && !btn.$toolbtn && !is(fromJS(this.props.selectedData || []), fromJS(record))) {
+ return
}
- 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) {
+ if (!btn.verify || !btn.verify.columns || btn.verify.columns.length === 0) {
notification.warning({
top: 92,
message: '璇疯缃鍑哄垪锛�',
duration: 5
})
return
+ } else if (btn.intertype === 'system' && setting.interType !== 'system' && btn.verify.dataType !== 'custom') {
+ notification.warning({
+ top: 92,
+ message: '瀵煎嚭鎸夐挳閰嶇疆閿欒锛�',
+ duration: 5
+ })
+ return
}
- MKEmitter.emit('queryModuleParam', btn.$menuId, btn.uuid)
+ MKEmitter.emit('queryModuleParam', btn.$menuId, this.triggerExcelout)
if (window.GLOB.systemType === 'production') {
MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '瀵煎嚭Excel'})
}
@@ -170,15 +154,13 @@
/**
* @description Excel 瀵煎嚭
*/
- triggerExcelout = (menuId, btnId, viewParam) => {
+ triggerExcelout = (viewParam) => {
const { btn } = this.props
-
- 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) {
+ if (((btn.intertype === 'system' && btn.verify.dataType === 'custom' && btn.verify.useSearch === 'true') || btn.intertype !== 'system' || btn.verify.dataType !== 'custom') && btn.search === 'true' && viewParam.search && viewParam.search.length > 0) {
let valid = false
viewParam.search.forEach(item => {
if (item.value || item.value === 0) {
@@ -196,16 +178,34 @@
}
}
- if (btn.intertype === 'system' && !viewParam.arr_field) { // 浣跨敤绯荤粺鍑芥暟
- notification.warning({
- top: 92,
- message: '鏈缃樉绀哄垪锛�',
- duration: 5
- })
- return
- } else if (btn.intertype === 'system' && btn.verify && btn.verify.enable === 'true') {
+ if (btn.intertype === 'system') { // 浣跨敤绯荤粺鍑芥暟
+ if (btn.verify.dataType !== 'custom' && !viewParam.arr_field) {
+ notification.warning({
+ top: 92,
+ message: '鎸夐挳闇�鑷畾涔夊鍑烘暟鎹紒',
+ duration: 5
+ })
+ return
+ } else if (btn.verify.dataType === 'custom') {
+ viewParam.arr_field = []
+ btn.verify.columns.forEach(col => {
+ if (col.Column && col.Column !== '$Index') {
+ viewParam.arr_field.push(col.Column)
+ }
+ })
+ viewParam.arr_field = viewParam.arr_field.join(',')
+
+ viewParam.orderBy = btn.verify.order || ''
+ }
+ }
+ if (btn.intertype === 'system' && btn.verify.enable === 'true') {
this.setState({search: fromJS(viewParam.search).toJS()})
}
+ if (btn.intertype === 'system' && btn.verify.dataType === 'custom' && btn.verify.useSearch === 'false') {
+ viewParam.search = []
+ }
+
+ viewParam.orderBy = viewParam.orderBy || viewParam.arr_field.split(',')[0]
this.updateStatus('start', name)
@@ -238,9 +238,11 @@
} else if (btn.intertype === 'outer' && !btn.innerFunc) { // 浣跨敤澶栭儴鍑芥暟
let param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search)
- if (this.props.menuType === 'HS') {
+ if (window.GLOB.mkHS) {
if (btn.sysInterface === 'true' && options.cloudServiceApi) {
param.rduri = options.cloudServiceApi
+ param.userid = sessionStorage.getItem('CloudUserID') || ''
+ param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
} else if (btn.sysInterface !== 'true') {
if (window.GLOB.systemType === 'production' && btn.proInterface) {
param.rduri = btn.proInterface
@@ -249,13 +251,25 @@
}
}
} else {
- if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
- param.rduri = window.GLOB.mainSystemApi
- } else if (btn.sysInterface !== 'true') {
+ if (btn.sysInterface === 'true') {
+ if (window.GLOB.mainSystemApi) {
+ param.rduri = window.GLOB.mainSystemApi
+ }
+ } else if (btn.sysInterface === 'external') {
+ if (window.GLOB.systemType === 'production') {
+ param.$token = btn.exProInterface || ''
+ } else {
+ param.$token = btn.exInterface || ''
+ }
+ } else {
if (window.GLOB.systemType === 'production' && btn.proInterface) {
param.rduri = btn.proInterface
} else {
param.rduri = btn.interface
+ }
+ let host = window.GLOB.baseurl.replace(/http(s):\/\//, '')
+ if (param.rduri.indexOf(host) === -1 && /\/dostars/.test(param.rduri)) {
+ param.$login = true
}
}
}
@@ -284,9 +298,11 @@
delete res.message
delete res.status
- if (this.props.menuType === 'HS') {
+ if (window.GLOB.mkHS) {
if (btn.sysInterface === 'true' && options.cloudServiceApi) {
res.rduri = options.cloudServiceApi
+ res.userid = sessionStorage.getItem('CloudUserID') || ''
+ res.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
} else if (btn.sysInterface !== 'true') {
if (window.GLOB.systemType === 'production' && btn.proInterface) {
res.rduri = btn.proInterface
@@ -295,13 +311,25 @@
}
}
} else {
- if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
- res.rduri = window.GLOB.mainSystemApi
- } else if (btn.sysInterface !== 'true') {
+ if (btn.sysInterface === 'true') {
+ if (window.GLOB.mainSystemApi) {
+ res.rduri = window.GLOB.mainSystemApi
+ }
+ } else if (btn.sysInterface === 'external') {
+ if (window.GLOB.systemType === 'production') {
+ res.$token = btn.exProInterface || ''
+ } else {
+ res.$token = btn.exInterface || ''
+ }
+ } else {
if (window.GLOB.systemType === 'production' && btn.proInterface) {
res.rduri = btn.proInterface
} else {
res.rduri = btn.interface
+ }
+ let host = window.GLOB.baseurl.replace(/http(s):\/\//, '')
+ if (res.rduri.indexOf(host) === -1 && /\/dostars/.test(res.rduri)) {
+ res.$login = true
}
}
}
@@ -353,9 +381,11 @@
delete res.message
delete res.status
- if (this.props.menuType === 'HS') {
+ if (window.GLOB.mkHS) {
if (btn.sysInterface === 'true' && options.cloudServiceApi) {
res.rduri = options.cloudServiceApi
+ res.userid = sessionStorage.getItem('CloudUserID') || ''
+ res.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
} else if (btn.sysInterface !== 'true') {
if (window.GLOB.systemType === 'production' && btn.proInterface) {
res.rduri = btn.proInterface
@@ -364,13 +394,25 @@
}
}
} else {
- if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
- res.rduri = window.GLOB.mainSystemApi
- } else if (btn.sysInterface !== 'true') {
+ if (btn.sysInterface === 'true') {
+ if (window.GLOB.mainSystemApi) {
+ res.rduri = window.GLOB.mainSystemApi
+ }
+ } else if (btn.sysInterface === 'external') {
+ if (window.GLOB.systemType === 'production') {
+ res.$token = btn.exProInterface || ''
+ } else {
+ res.$token = btn.exInterface || ''
+ }
+ } else {
if (window.GLOB.systemType === 'production' && btn.proInterface) {
res.rduri = btn.proInterface
} else {
res.rduri = btn.interface
+ }
+ let host = window.GLOB.baseurl.replace(/http(s):\/\//, '')
+ if (res.rduri.indexOf(host) === -1 && /\/dostars/.test(res.rduri)) {
+ res.$login = true
}
}
}
@@ -425,9 +467,11 @@
} else if (btn.intertype === 'outer' && !btn.innerFunc) { // 浣跨敤澶栭儴鍑芥暟
param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search, true, pageIndex, pageSize)
- if (this.props.menuType === 'HS') {
+ if (window.GLOB.mkHS) {
if (btn.sysInterface === 'true' && options.cloudServiceApi) {
param.rduri = options.cloudServiceApi
+ param.userid = sessionStorage.getItem('CloudUserID') || ''
+ param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
} else if (btn.sysInterface !== 'true') {
if (window.GLOB.systemType === 'production' && btn.proInterface) {
param.rduri = btn.proInterface
@@ -436,13 +480,26 @@
}
}
} else {
- if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
- param.rduri = window.GLOB.mainSystemApi
- } else if (btn.sysInterface !== 'true') {
+ if (btn.sysInterface === 'true') {
+ if (window.GLOB.mainSystemApi) {
+ param.rduri = window.GLOB.mainSystemApi
+ }
+ } else if (btn.sysInterface === 'external') {
+ if (window.GLOB.systemType === 'production') {
+ param.$token = btn.exProInterface || ''
+ } else {
+ param.$token = btn.exInterface || ''
+ }
+ } else {
if (window.GLOB.systemType === 'production' && btn.proInterface) {
param.rduri = btn.proInterface
} else {
param.rduri = btn.interface
+ }
+
+ let host = window.GLOB.baseurl.replace(/http(s):\/\//, '')
+ if (param.rduri.indexOf(host) === -1 && /\/dostars/.test(param.rduri)) {
+ param.$login = true
}
}
}
@@ -478,11 +535,22 @@
exportExcel = (data) => {
const { btn } = this.props
- let columns = btn.verify.columns.filter(col => col.output !== 'false')
+ let imgCol = false
+ let columns = btn.verify.columns.filter(col => {
+ if (col.output === 'false') return false
+
+ if (col.type === 'image') {
+ imgCol = true
+ }
+
+ if (col.type === 'number' && (col.decimal || col.decimal === 0) ) {
+ col.round = Math.pow(10, col.decimal)
+ }
+
+ return col
+ })
try {
- let imgCol = columns.filter(col => col.type === 'image')[0]
-
if (imgCol) {
const column = columns.map(item => {
let col = {
@@ -506,11 +574,18 @@
item.$Index = index + 1 + ''
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]
+ let val = item[col.Column]
+ if (typeof(val) === 'number') {
+ if (col.abs === 'true') {
+ val = Math.abs(val)
+ }
+ if (col.round) {
+ val = Math.round(val * col.round) / col.round
+ val = val.toFixed(col.decimal)
+ }
}
+
+ _row[col.Column] = val
})
table.push(_row)
@@ -523,23 +598,14 @@
} else {
this.execSuccess({ErrCode: 'S', ErrMesg: '瀵煎嚭鎴愬姛锛�'})
}
-
} else {
let _header = []
let _topRow = {}
let colwidth = []
- let abses = []
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})
})
@@ -552,12 +618,20 @@
item.$Index = index + 1 + ''
- _header.forEach(field => {
- if (item[field] && abses.includes(field)) {
- _row[field] = Math.abs(item[field])
- } else {
- _row[field] = item[field]
+ columns.forEach((col, i) => {
+ let val = item[col.Column]
+
+ if (typeof(val) === 'number') {
+ if (col.abs === 'true') {
+ val = Math.abs(val)
+ }
+ if (col.round) {
+ val = Math.round(val * col.round) / col.round
+ val = val.toFixed(col.decimal)
+ }
}
+
+ _row[col.Column] = val
})
table.push(_row)
@@ -665,7 +739,7 @@
param.secretkey = Utils.encrypt('', param.timestamp)
param.LText = Utils.formatOptions(script)
- if (this.props.menuType === 'HS') { // 鍑芥暟 sPC_TableData_InUpDe 浜戠楠岃瘉
+ if (window.GLOB.mkHS) { // 绯荤粺鍑芥暟浜戠楠岃瘉
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
}
@@ -718,6 +792,39 @@
getExcelDefaultParam = (arr_field, orderBy, search, pagination = false, pageIndex = 1, pageSize = 100) => {
const { setting, btn } = this.props
+ let defaultSql = setting.execute || setting.default || 'true'
+ let customScript = setting.customScript || ''
+ let _dataresource = setting.dataresource || ''
+ let queryType = setting.queryType
+
+ if (btn.verify.dataType === 'custom') {
+ defaultSql = btn.verify.defaultSql || 'true'
+ _dataresource = btn.verify.dataresource || ''
+ queryType = btn.verify.queryType
+
+ if (/\s/.test(_dataresource)) {
+ _dataresource = '(' + _dataresource + ') tb'
+ }
+ customScript = ''
+ btn.verify.scripts && btn.verify.scripts.forEach(script => {
+ if (script.status !== 'false') {
+ customScript += `
+ ${script.sql}
+ `
+ }
+ })
+
+ if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
+ _dataresource = _dataresource.replace(/\$@/ig, '/*')
+ _dataresource = _dataresource.replace(/@\$/ig, '*/')
+ customScript = customScript.replace(/\$@/ig, '/*')
+ customScript = customScript.replace(/@\$/ig, '*/')
+ } else {
+ _dataresource = _dataresource.replace(/@\$|\$@/ig, '')
+ customScript = customScript.replace(/@\$|\$@/ig, '')
+ }
+ }
+
let _search = Utils.joinMainSearchkey(search)
_search = _search ? 'where ' + _search : ''
@@ -726,8 +833,8 @@
func: 'sPC_Get_TableData',
obj_name: 'data',
arr_field: arr_field,
- custom_script: setting.customScript,
- default_sql: setting.default || 'true',
+ custom_script: customScript,
+ default_sql: defaultSql,
menuname: btn.logLabel
}
@@ -745,17 +852,20 @@
let RoleID = sessionStorage.getItem('role_id') || ''
let departmentcode = sessionStorage.getItem('departmentcode') || ''
let organization = sessionStorage.getItem('organization') || ''
+ let mk_user_type = sessionStorage.getItem('mk_user_type') || ''
+ let nation = sessionStorage.getItem('nation') || ''
+ let province = sessionStorage.getItem('province') || ''
let city = sessionStorage.getItem('city') || ''
+ let district = sessionStorage.getItem('district') || ''
+ let address = sessionStorage.getItem('address') || ''
if (sessionStorage.getItem('isEditState') === 'true') {
userName = sessionStorage.getItem('CloudUserName') || ''
fullName = sessionStorage.getItem('CloudFullName') || ''
}
-
- let _dataresource = setting.dataresource
let regoptions = null
- if (setting.queryType === 'statistics' || param.custom_script) {
+ if (queryType === 'statistics' || param.custom_script) {
let allSearch = Utils.getAllSearchOptions(search)
regoptions = allSearch.map(item => {
@@ -766,9 +876,6 @@
})
regoptions.push({
- reg: new RegExp('@login_city@', 'ig'),
- value: city
- }, {
reg: new RegExp('@userName@', 'ig'),
value: userName
}, {
@@ -776,7 +883,7 @@
value: fullName
}, {
reg: new RegExp('@orderBy@', 'ig'),
- value: orderBy
+ value: orderBy || ''
}, {
reg: new RegExp('@pageSize@', 'ig'),
value: pageSize
@@ -786,7 +893,7 @@
})
}
- if (setting.queryType === 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
+ if (queryType === 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
regoptions.forEach(item => {
_dataresource = _dataresource.replace(item.reg, item.value)
})
@@ -795,14 +902,14 @@
let LText = ''
- if (setting.default !== 'false' && !pagination) {
+ if (defaultSql !== 'false' && !pagination) {
LText = ` select ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_dataresource} ${_search}) tmptable order by tmptable.rows `
- } else if (setting.default !== 'false') {
+ } else if (defaultSql !== 'false') {
LText = ` select top ${pageSize} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_dataresource} ${_search}) tmptable where rows > ${pageSize * (pageIndex - 1)} order by tmptable.rows `
}
if (param.custom_script) {
- param.custom_script = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(50),@mk_organization nvarchar(50),@login_city nvarchar(50) select @ErrorCode='',@retmsg ='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @login_city='${city}'
+ param.custom_script = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100) select @ErrorCode='',@retmsg ='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}'
${param.custom_script}
`
regoptions.forEach(item => {
@@ -822,6 +929,10 @@
insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@
`
}
+ } else if (LText) {
+ LText = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100) select @ErrorCode='',@retmsg ='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}'
+ ${LText}
+ `
}
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
@@ -836,12 +947,8 @@
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
param.DateCount = ''
- if (this.props.menuType === 'HS') { // 浜戠鏁版嵁楠岃瘉
+ if (window.GLOB.mkHS) { // 浜戠鏁版嵁楠岃瘉
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
- }
-
- if (setting.transaction === 'true') {
- param.func = 'sPC_Get_TableData_try'
}
return param
@@ -881,6 +988,9 @@
} else if (btn.execSuccess !== 'never') {
MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execSuccess, btn, '', [])
}
+
+ btn.syncComponentId && MKEmitter.emit('reloadData', btn.syncComponentId)
+
if (btn.switchTab && btn.switchTab.length > 0) {
let id = btn.switchTab[btn.switchTab.length - 1]
let node = document.getElementById('tab' + id)
@@ -930,62 +1040,48 @@
}
render() {
- const { btn, show } = this.props
+ const { btn } = this.props
const { loading, hidden, disabled } = this.state
if (hidden) return null
- if (show === 'actionList') {
- return (
- <Button
- className={'mk-btn mk-' + btn.class}
- icon={btn.icon}
- disabled={disabled}
- title={disabled ? (btn.reason || '') : ''}
- onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
- loading={loading}
- >{btn.label}</Button>
- )
- } else { // icon銆乼ext銆� all 鍗＄墖
- let label = ''
- let icon = ''
+ let label = ''
+ let icon = ''
+ let type = 'link'
+ let className = ''
- if (show === 'button') {
- label = btn.label
- icon = btn.icon || ''
- } else if (show === 'link') {
- label = <span>{btn.label}{btn.icon ? <MkIcon 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={disabled ? (btn.reason || '') : (show === 'icon' ? btn.label : '')}
- loading={loading}
- disabled={disabled}
- style={btn.style}
- icon={icon}
- onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
- >{label}</Button>
- )
+ 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 = ''
+ } 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
+ } else {
+ type = ''
+ icon = btn.icon || ''
+ label = btn.label
+ className = 'mk-btn mk-' + btn.class
}
+
+ return (
+ <Button
+ type={type}
+ title={disabled ? (btn.reason || '') : (btn.show === 'icon' ? btn.label : '')}
+ loading={loading}
+ disabled={disabled}
+ style={btn.style || null}
+ icon={icon}
+ className={className}
+ onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
+ >{label}</Button>
+ )
}
}
-const mapStateToProps = (state) => {
- return {
- menuType: state.editLevel
- }
-}
-
-const mapDispatchToProps = () => {
- return {}
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(ExcelOutButton)
\ No newline at end of file
+export default ExcelOutButton
\ No newline at end of file
--
Gitblit v1.8.0