From 1d1ef9c117f162f5ee48237b67d69fbd015b10d1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 23 七月 2023 10:32:40 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/zshare/actionList/excelInbutton/index.jsx | 153 ++++++++++++++++++++++++++++----------------------
1 files changed, 85 insertions(+), 68 deletions(-)
diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
index d0cba8c..8227172 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
@@ -36,31 +36,11 @@
}
UNSAFE_componentWillMount () {
- const { btn, selectedData, BData } = this.props
- let disabled = false
+ const { btn, selectedData, BData, disabled } = this.props
- if (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 +54,12 @@
}
UNSAFE_componentWillReceiveProps (nextProps) {
- const { btn, selectedData, BData } = this.props
+ const { btn } = this.props
- let disabled = false
- if (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})
}
}
@@ -112,6 +68,43 @@
return
}
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})
}
/**
@@ -206,12 +199,26 @@
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(() => {
+ MKEmitter.emit('reloadData', id)
+ }, 20 * i)
+ })
+ } 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)
}
}
@@ -253,6 +260,10 @@
MKEmitter.emit('popclose')
} else if (btn.execError !== 'never') {
MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execError, btn, '', this.state.selines)
+ }
+
+ if (btn.execError === 'popclose' && btn.$tabId) { // 鏍囩鍏抽棴鍒锋柊
+ MKEmitter.emit('refreshPopButton', btn.$tabId)
}
}
@@ -303,7 +314,7 @@
})
}
- let result = getExcelInSql(btn, data, this.state.dict, (this.props.BID || ''), this.state.primaryId)
+ let result = getExcelInSql(btn, data, (this.props.BID || ''), this.state.primaryId)
if (result.errors) {
notification.warning({
@@ -328,13 +339,11 @@
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, '*/')
+ result.sql = result.sql.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+ result.bottom = result.bottom.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
} else {
- result.sql = result.sql.replace(/@\$|\$@/ig, '')
- result.bottom = result.bottom.replace(/@\$|\$@/ig, '')
+ result.sql = result.sql.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+ result.bottom = result.bottom.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
}
param.excel_in_type = 'true'
@@ -405,7 +414,8 @@
} else {
this.execError(res)
}
- }, () => {
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
this.execError({})
})
} else {
@@ -415,7 +425,8 @@
} else {
this.execError(res)
}
- }, () => {
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
this.execError({})
})
}
@@ -428,11 +439,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 +469,8 @@
this.execError(res)
resolve(false)
}
- }, () => {
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
this.execError({})
})
} else {
@@ -490,6 +504,7 @@
} else {
param.$token = btn.exInterface || ''
}
+ ver_token = true
} else {
if (window.GLOB.systemType === 'production' && btn.proInterface) {
param.rduri = btn.proInterface
@@ -516,9 +531,11 @@
return Api.genericInterface(res)
}).then(response => {
- if (!response) return
+ if (!response || response.ErrCode === 'LoginError') return
// 鍥炶皟璇锋眰
- if (btn.callbackFunc) {
+ if (ver_token && response.ErrMesg === 'token_error') {
+ this.execError(response)
+ } else if (btn.callbackFunc ) {
// 瀛樺湪鍥炶皟鍑芥暟鏃讹紝璋冪敤
delete response.message
delete response.status
@@ -535,7 +552,7 @@
}
}
}).then(res => {
- if (!res) return
+ if (!res || res.ErrCode === 'LoginError') return
if (res.status) {
this.execSuccess(res)
--
Gitblit v1.8.0