From 2bccb9ec7bdefe23292a22bc153463cfa1479a49 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 六月 2024 16:25:42 +0800
Subject: [PATCH] 2024-06-21
---
src/tabviews/zshare/actionList/excelInbutton/index.jsx | 443 ++++++++++++++++++++++++++----------------------------
1 files changed, 215 insertions(+), 228 deletions(-)
diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
index d865dab..1be21b1 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
@@ -6,10 +6,7 @@
import ExcelIn from './excelin'
import Utils, { getExcelInSql } from '@/utils/utils.js'
-import options from '@/store/options.js'
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 MkIcon from '@/components/mk-icon'
// import './index.scss'
@@ -27,40 +24,20 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
loading: false,
selines: null,
disabled: false,
hidden: false,
primaryId: '',
+ dict: window.GLOB.dict
}
UNSAFE_componentWillMount () {
- const { btn, selectedData, BData } = this.props
- let disabled = false
+ const { btn, selectedData, BData, disabled } = this.props
- if (btn.control !== 'parent' && btn.controlField && selectedData && selectedData.length > 0) { // 琛ㄦ牸涓寜閽殣钘忔帶鍒�
- selectedData.forEach(item => {
- let s = item[btn.controlField] !== undefined ? item[btn.controlField] + '' : ''
- if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
- disabled = true
- }
- })
- this.setState({hidden: disabled && btn.control === 'hidden'})
- } else if (btn.control === 'parent') {
- if (!BData || !BData.hasOwnProperty(btn.controlField)) {
- this.setState({hidden: true})
- } else {
- let s = BData[btn.controlField] + ''
- if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
- this.setState({hidden: true})
- } else {
- this.setState({hidden: false})
- }
- }
- }
-
- if (this.props.disabled || disabled) {
+ if (btn.controlField) {
+ this.setStatus(btn, selectedData || [], BData, disabled)
+ } else if (disabled) {
this.setState({disabled: true})
}
}
@@ -74,36 +51,12 @@
}
UNSAFE_componentWillReceiveProps (nextProps) {
- const { btn, selectedData, BData } = this.props
+ const { btn } = this.props
- let disabled = false
- if (btn.control !== 'parent' && btn.controlField && !is(fromJS(nextProps.selectedData || []), fromJS(selectedData || []))) {
- if (nextProps.selectedData && nextProps.selectedData.length > 0) { // 琛ㄦ牸涓寜閽殣钘忔帶鍒�
- nextProps.selectedData.forEach(item => {
- let s = item[btn.controlField] !== undefined ? item[btn.controlField] + '' : ''
- if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
- disabled = true
- }
- })
- }
- this.setState({disabled, hidden: disabled && btn.control === 'hidden'})
- } else if (btn.control === 'parent' && !is(fromJS(nextProps.BData || {}), fromJS(BData || {}))) {
- if (!nextProps.BData || !nextProps.BData.hasOwnProperty(btn.controlField)) {
- this.setState({hidden: true})
- } else {
- let s = nextProps.BData[btn.controlField] + ''
- if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
- this.setState({hidden: true})
- } else {
- this.setState({hidden: false})
- }
- }
- }
-
- if (nextProps.disabled || disabled) {
- this.setState({disabled: true})
+ if (btn.controlField) {
+ this.setStatus(btn, nextProps.selectedData || [], nextProps.BData, nextProps.disabled)
} else {
- this.setState({disabled: false})
+ this.setState({disabled: nextProps.disabled === true})
}
}
@@ -113,61 +66,86 @@
}
MKEmitter.removeListener('triggerBtnId', this.actionTrigger)
}
+
+ setStatus = (btn, data, BData, disprop) => {
+ let disabled = false
+ let hidden = false
+
+ if (btn.control !== 'parent') {
+ if (data.length > 0) {
+ data.forEach(item => {
+ let s = item[btn.controlField] !== undefined ? item[btn.controlField] + '' : ''
+ if (btn.controlVals.includes(s) || item.$lock) {
+ disabled = true
+ }
+ })
+ } else if (btn.controlVals.includes('')) {
+ disabled = true
+ }
+ } else {
+ if (!BData || !BData.hasOwnProperty(btn.controlField)) {
+ hidden = true
+ } else {
+ let s = BData[btn.controlField] + ''
+ if (btn.controlVals.includes(s)) {
+ hidden = true
+ }
+ }
+ }
+
+ if (disabled && btn.control === 'hidden') {
+ hidden = true
+ }
+
+ if (disprop) {
+ disabled = true
+ }
+
+ this.setState({hidden, disabled})
+ }
/**
* @description 瑙﹀彂鎸夐挳鎿嶄綔
*/
- actionTrigger = (triggerId, record, type) => {
- const { setting, BID, btn, selectedData } = this.props
- const { loading, disabled } = this.state
+ actionTrigger = (triggerId, record, type, lid) => {
+ const { setting, BID, btn, selectedData, 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
+
+ let data = record || selectedData || []
if (setting.supModule && !BID) {
notification.warning({
top: 92,
- message: '闇�瑕佷笂绾т富閿�硷紒',
+ message: dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
duration: 5
})
- return
- } else if (type === 'linkbtn' && !btn.$toolbtn && !is(fromJS(selectedData || []), fromJS(record))) {
- return
- }
-
- let data = record || selectedData || []
-
- if (btn.Ot === 'requiredSgl' && data.length !== 1) {
+ } else if (btn.Ot === 'requiredSgl' && data.length !== 1) {
// 闇�瑕侀�夋嫨鍗曡鏃讹紝鏍￠獙鏁版嵁
notification.warning({
top: 92,
- message: this.state.dict['main.action.confirm.selectSingleLine'],
+ message: dict['select_single_row'] || '璇烽�夋嫨鍗曡鏁版嵁锛�',
duration: 5
})
- return
- } else if (!btn.verify || !btn.verify.sheet || !btn.verify.columns || btn.verify.columns.length === 0) {
- notification.warning({
- top: 92,
- message: 'excel瀵煎叆楠岃瘉淇℃伅鏈缃紒',
- duration: 5
+ } else {
+ let primaryId = '' // 瀵煎叆鏃惰Id
+ if (btn.Ot === 'requiredSgl' && setting.primaryKey) {
+ primaryId = data[0][setting.primaryKey] || ''
+ }
+
+ this.setState({
+ selines: data,
+ primaryId: primaryId
+ }, () => {
+ this.refs.excelIn.exceltrigger()
})
- return
- }
-
- let primaryId = '' // 瀵煎叆鏃惰Id
- if (btn.Ot === 'requiredSgl' && setting.primaryKey) {
- primaryId = data[0][setting.primaryKey] || ''
- }
-
- this.setState({
- selines: data,
- primaryId: primaryId
- }, () => {
- this.refs.excelIn.exceltrigger()
- })
-
- if (window.GLOB.systemType === 'production') {
- MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '瀵煎叆Excel'})
+
+ if (window.GLOB.systemType === 'production') {
+ MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '瀵煎叆Excel'})
+ }
}
}
@@ -179,20 +157,22 @@
* 4銆佹ā鎬佹鎵ц鎴愬姛鍚庢槸鍚﹀叧闂�
* 5銆侀�氱煡涓诲垪琛ㄥ埛鏂�
*/
- execSuccess = (res) => {
+ execSuccess = (res = {}) => {
const { btn } = this.props
+ const { dict } = this.state
- if (res && (res.ErrCode === 'S' || !res.ErrCode)) { // 鎵ц鎴愬姛
+ if (res.ErrCode === 'S' || !res.ErrCode) { // 鎵ц鎴愬姛
notification.success({
top: 92,
- message: res.ErrMesg || this.state.dict['main.action.confirm.success'],
+ message: res.message || dict['exc_success'] || '鎵ц鎴愬姛锛�',
duration: btn.verify && btn.verify.stime ? btn.verify.stime : 2
})
- } else if (res && res.ErrCode === 'Y') { // 鎵ц鎴愬姛
+ } else if (res.ErrCode === 'Y') { // 鎵ц鎴愬姛
Modal.success({
- title: res.ErrMesg || this.state.dict['main.action.confirm.success']
+ title: res.message || dict['exc_success'] || '鎵ц鎴愬姛锛�',
+ okText: dict['got_it'] || '鐭ラ亾浜�',
})
- } else if (res && res.ErrCode === '-1') { // 瀹屾垚鍚庝笉鎻愮ず
+ } else if (res.ErrCode === '-1') { // 瀹屾垚鍚庝笉鎻愮ず
}
@@ -206,12 +186,32 @@
MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execSuccess, btn, '', this.state.selines)
}
- btn.syncComponentId && MKEmitter.emit('reloadData', btn.syncComponentId)
-
+ 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 (btn.switchTab && btn.switchTab.length > 0) {
let id = btn.switchTab[btn.switchTab.length - 1]
let node = document.getElementById('tab' + id)
node && node.click()
+ }
+
+ if (btn.execSuccess === 'popclose' && btn.$tabId) { // 鏍囩鍏抽棴鍒锋柊
+ MKEmitter.emit('refreshPopButton', btn.$tabId)
}
}
@@ -221,28 +221,34 @@
* 2銆乪xcel瀵煎嚭锛屽け璐ュ悗鍙栨秷瀵煎嚭鎸夐挳鍔犺浇涓姸鎬�
* 3銆侀�氱煡涓诲垪琛ㄥ埛鏂�
*/
- execError = (res) => {
+ execError = (res = {}) => {
const { btn } = this.props
+ const { dict } = this.state
+
+ if (!['LoginError', 'C', '-2', 'E', 'N', 'F', 'NM'].includes(res.ErrCode)) {
+ res.ErrCode = 'E'
+ }
if (res.ErrCode === 'E') {
Modal.error({
- title: res.message || res.ErrMesg,
+ title: res.message || dict['exc_fail'] || '鎵ц澶辫触锛�',
+ okText: dict['got_it'] || '鐭ラ亾浜�'
})
} else if (res.ErrCode === 'N') {
notification.error({
top: 92,
- message: res.message || res.ErrMesg,
+ 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 || res.ErrMesg,
+ 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 || res.ErrMesg)
+ message.error(res.message || dict['exc_fail'] || '鎵ц澶辫触锛�')
}
this.setState({
@@ -253,49 +259,49 @@
MKEmitter.emit('popclose')
} else if (btn.execError !== 'never') {
MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execError, btn, '', this.state.selines)
+
+ 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 (btn.execError === 'popclose' && btn.$tabId) { // 鏍囩鍏抽棴鍒锋柊
+ MKEmitter.emit('refreshPopButton', btn.$tabId)
}
}
/**
* @description Excel 瀵煎叆
*/
- getexceldata = (data, errors, sheetName, errDetail) => {
- const { btn } = this.props
+ getexceldata = (data, error) => {
+ const { btn, BID } = this.props
- if (errors) {
- if (errors === 'notexit') {
- notification.warning({
- top: 92,
- message: '宸ヤ綔琛ㄣ��' + sheetName + '銆嬩笉瀛樺湪锛�',
- duration: 5
- })
- } else if (errors === 'empty') {
- notification.warning({
- top: 92,
- message: '宸ヤ綔琛ㄣ��' + sheetName + '銆嬩负绌猴紒',
- duration: 5
- })
- } else if (errors === 'headerError') {
- notification.warning({
- top: 92,
- message: `宸ヤ綔琛ㄣ��${sheetName}銆嬭〃澶撮敊璇紝${errDetail}`,
- duration: 5
- })
- }
+ if (error) {
+ notification.warning({
+ top: 92,
+ message: error,
+ duration: 5
+ })
this.setState({ loading: false })
return
}
-
- if (!data || data.length === 0) {
- notification.warning({
- top: 92,
- message: '鏈幏鍙栧埌宸ヤ綔琛ㄣ��' + sheetName + '銆嬫暟鎹紒',
- duration: 5
- })
- this.setState({ loading: false })
- return
- } else if (data.length * btn.verify.columns.length > 30000) {
+
+ if (data.length * btn.verify.columns.length > 30000) {
notification.warning({
top: 92,
message: '褰撳墠瀵煎叆鏁版嵁閲忚繃澶э紝濡傞亣閿欒鎻愮ず锛岃鍒嗘壒瀵煎叆锛�',
@@ -303,7 +309,7 @@
})
}
- let result = getExcelInSql(btn, data, this.state.dict, (this.props.BID || ''), this.state.primaryId)
+ let result = getExcelInSql(btn, data, (BID || ''), this.state.primaryId)
if (result.errors) {
notification.warning({
@@ -320,42 +326,35 @@
excel_in: result.lines
}
- if (this.props.BID) {
- param.BID = this.props.BID
+ if (BID) {
+ param.BID = BID
}
if (btn.intertype === 'system') { // 绯荤粺瀛樺偍杩囩▼
param.func = 'sPC_TableData_InUpDe'
-
- if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
- result.sql = result.sql.replace(/\$@/ig, '/*')
- result.sql = result.sql.replace(/@\$/ig, '*/')
- result.bottom = result.bottom.replace(/\$@/ig, '/*')
- result.bottom = result.bottom.replace(/@\$/ig, '*/')
- } else {
- result.sql = result.sql.replace(/@\$|\$@/ig, '')
- result.bottom = result.bottom.replace(/@\$|\$@/ig, '')
- }
-
- param.excel_in_type = 'true'
- param.LText1 = Utils.formatOptions(result.insert)
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.LText2 = result.bottom
+
+ delete param.excel_in
+
+ // param.excel_in_type = 'true'
+ param.exec_type = window.GLOB.execType || 'y'
param.LText = result.sql
+ param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
let unCheckParam = null
- if (/\$check@|@check\$/ig.test(param.LText2) || /\$check@|@check\$/ig.test(param.LText)) {
+ if (/\$check@|@check\$/ig.test(param.LText)) {
unCheckParam = fromJS(param).toJS()
param.LText = param.LText.replace(/\$check@|@check\$/ig, '')
- param.LText2 = param.LText2.replace(/\$check@|@check\$/ig, '')
}
- param.LText2 = Utils.formatOptions(param.LText2)
- param.LText = Utils.formatOptions(param.LText)
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
- if (window.GLOB.mkHS && param.timestamp) { // 浜戠楠岃瘉
+ param.LText = Utils.formatOptions(param.LText, param.exec_type)
+ param.secretkey = Utils.encrypt('', param.timestamp)
+ if (window.GLOB.mkHS) { // 浜戠楠岃瘉
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
+ }
+
+ if (btn.database === 'sso' && window.GLOB.mainSystemApi) {
+ param.rduri = window.GLOB.mainSystemApi
}
param.menuname = btn.logLabel
@@ -366,12 +365,8 @@
if (unCheckParam) {
unCheckParam.LText = unCheckParam.LText.replace(/\$check@/ig, '/*').replace(/@check\$/ig, '*/')
- unCheckParam.LText = Utils.formatOptions(unCheckParam.LText)
- unCheckParam.LText2 = unCheckParam.LText2.replace(/\$check@/ig, '/*').replace(/@check\$/ig, '*/')
- unCheckParam.LText2 = Utils.formatOptions(unCheckParam.LText2)
-
- unCheckParam.secretkey = Utils.encrypt(unCheckParam.LText, unCheckParam.timestamp)
-
+ unCheckParam.LText = Utils.formatOptions(unCheckParam.LText, unCheckParam.exec_type)
+ unCheckParam.secretkey = Utils.encrypt('', unCheckParam.timestamp)
unCheckParam.menuname = btn.logLabel
if (window.GLOB.probation) {
@@ -384,8 +379,10 @@
} else if (res.ErrCode === 'C') {
const _this = this
confirm({
- title: '缁х画鎵ц锛�',
+ title: window.GLOB.dict['exec_sure'] || '璇风‘璁�',
content: res.message,
+ okText: window.GLOB.dict['ok'] || '纭畾',
+ cancelText: window.GLOB.dict['cancel'] || '鍙栨秷',
onOk() {
return new Promise(resolve => {
Api.genericInterface(unCheckParam).then(result => {
@@ -405,7 +402,8 @@
} else {
this.execError(res)
}
- }, () => {
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
this.execError({})
})
} else {
@@ -415,12 +413,21 @@
} else {
this.execError(res)
}
- }, () => {
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
this.execError({})
})
}
} else if (btn.intertype === 'inner' && btn.innerFunc) { // 鑷畾涔夊瓨鍌ㄨ繃绋�
param.func = btn.innerFunc
+
+ if (btn.recordUser === 'true') {
+ 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((res) => {
if (res.status) {
@@ -428,11 +435,13 @@
} else {
this.execError(res)
}
- }, () => {
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
this.execError({})
})
} else if (btn.intertype === 'outer') { // 澶栭儴鎺ュ彛
let _outParam = null
+ let ver_token = false
new Promise(resolve => {
// 鍐呴儴璇锋眰
@@ -456,7 +465,8 @@
this.execError(res)
resolve(false)
}
- }, () => {
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
this.execError({})
})
} else {
@@ -467,39 +477,26 @@
// 澶栭儴璇锋眰
_outParam = fromJS(res).toJS()
- 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
- } else {
- param.rduri = btn.interface
- }
+ if (btn.sysInterface === 'true') {
+ if (window.GLOB.mainSystemApi) {
+ param.rduri = window.GLOB.mainSystemApi
}
- } else {
- 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 (btn.sysInterface === 'external') {
+ if (window.GLOB.systemType === 'production') {
+ param.$token = btn.exProInterface || ''
} 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
- }
+ param.$token = btn.exInterface || ''
+ }
+ ver_token = true
+ } 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
}
}
@@ -508,7 +505,8 @@
}
if (window.GLOB.mkHS && res.func === 's_sDataDictb_excelIn') { // s_sDataDictb_excelIn 浜戠楠岃瘉
- param.LText = Utils.formatOptions(result.sql)
+ let sql = `Declare @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),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)`
+ param.LText = Utils.formatOptions(sql)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
@@ -516,9 +514,12 @@
return Api.genericInterface(res)
}).then(response => {
- if (!response) return
+ if (!response || response.ErrCode === 'LoginError') return
// 鍥炶皟璇锋眰
- if (btn.callbackFunc) {
+ if (ver_token && response.ErrCode === 'token_error') {
+ response.ErrCode = 'E'
+ this.execError(response)
+ } else if (btn.callbackFunc ) {
// 瀛樺湪鍥炶皟鍑芥暟鏃讹紝璋冪敤
delete response.message
delete response.status
@@ -535,7 +536,7 @@
}
}
}).then(res => {
- if (!res) return
+ if (!res || res.ErrCode === 'LoginError') return
if (res.status) {
this.execSuccess(res)
@@ -553,38 +554,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 || 'upload'
- } 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}
- icon={icon}
- className={className}
+ className={btn.hover || ''}
onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
>{label}</Button>
<ExcelIn btn={btn} triggerExcelIn={() => this.setState({ loading: true })} returndata={this.getexceldata} ref="excelIn" />
--
Gitblit v1.8.0