From 0227c25e4ed573d3095ada3f9c9a4ba5f18b0de5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 20 一月 2021 10:53:01 +0800
Subject: [PATCH] 2021-01-20
---
src/tabviews/zshare/actionList/excelInbutton/index.jsx | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
index 3b18453..0ffe673 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
@@ -23,7 +23,6 @@
Tab: PropTypes.any, // 濡傛灉褰撳墠鍏冪礌涓烘爣绛炬椂锛宼ab涓烘爣绛句俊鎭�
btn: PropTypes.object, // 鎸夐挳
setting: PropTypes.any, // 椤甸潰閫氱敤璁剧疆
- updateStatus: PropTypes.func, // 鎸夐挳鐘舵�佹洿鏂�
}
state = {
@@ -94,25 +93,28 @@
duration: 5
})
return
- }
-
- if (btn.verify && btn.verify.sheet && btn.verify.columns && btn.verify.columns.length > 0) {
- let primaryId = '' // 瀵煎叆鏃惰Id
- if (btn.Ot === 'requiredSgl') {
- primaryId = data[0][setting.primaryKey] || ''
- }
-
- this.setState({
- primaryId: primaryId
- }, () => {
- this.refs.excelIn.exceltrigger()
- })
- } else {
+ } else if (!btn.verify || !btn.verify.sheet || !btn.verify.columns || btn.verify.columns.length === 0) {
notification.warning({
top: 92,
message: 'excel瀵煎叆楠岃瘉淇℃伅鏈缃紒',
duration: 5
})
+ return
+ }
+
+ let primaryId = '' // 瀵煎叆鏃惰Id
+ if (btn.Ot === 'requiredSgl') {
+ primaryId = data[0][setting.primaryKey] || ''
+ }
+
+ this.setState({
+ primaryId: primaryId
+ }, () => {
+ this.refs.excelIn.exceltrigger()
+ })
+
+ if (window.GLOB.systemType === 'production') {
+ MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '瀵煎叆Excel'})
}
}
@@ -145,7 +147,9 @@
loading: false
})
- this.props.updateStatus('refresh', btn.execSuccess, btn)
+ if (btn.execSuccess !== 'never') {
+ MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execSuccess, btn)
+ }
}
/**
@@ -182,7 +186,9 @@
loading: false
})
- this.props.updateStatus('refresh', btn.execError, btn)
+ if (btn.execError !== 'never') {
+ MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execError, btn)
+ }
}
/**
@@ -410,6 +416,7 @@
return <div style={{display: 'inline-block'}} onClick={(e) => e.stopPropagation()}>
<Button
type="link"
+ title={show === 'icon' ? btn.label : ''}
loading={loading}
style={btn.btnstyle}
icon={show === 'text' ? '' : (show === 'icon' ? (btn.icon || 'upload') : (btn.icon || ''))}
--
Gitblit v1.8.0