From 5ae8e447c55f61508546e00559f54eb623a5c803 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 31 七月 2020 19:23:38 +0800
Subject: [PATCH] 2020-07-31
---
src/tabviews/scriptmanage/actionList/index.jsx | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/src/tabviews/scriptmanage/actionList/index.jsx b/src/tabviews/scriptmanage/actionList/index.jsx
index 83f24ac..8053551 100644
--- a/src/tabviews/scriptmanage/actionList/index.jsx
+++ b/src/tabviews/scriptmanage/actionList/index.jsx
@@ -15,7 +15,6 @@
BID: PropTypes.string, // 涓昏〃ID
BData: PropTypes.any, // 涓昏〃鏁版嵁
Tab: PropTypes.any, // 濡傛灉褰撳墠鍏冪礌涓烘爣绛炬椂锛宼ab涓烘爣绛句俊鎭�
- type: PropTypes.string, // 鍒ゆ柇褰撳墠涓轰富琛紙main锛夈�佸瓙琛紙sub锛夈�佸瓙琛ㄦ爣绛撅紙subtab锛�
MenuID: PropTypes.string, // 鑿滃崟ID
actions: PropTypes.array, // 鎸夐挳缁�
logcolumns: PropTypes.array, // 鏄剧ず鍒�
@@ -23,7 +22,7 @@
setting: PropTypes.any, // 椤甸潰閫氱敤璁剧疆
ContainerId: PropTypes.any, // tab椤甸潰ID锛岀敤浜庡脊绐楁帶鍒�
refreshdata: PropTypes.func, // 鎵ц瀹屾垚鍚庢暟鎹埛鏂�
- gettableselected: PropTypes.func // 鑾峰彇琛ㄦ牸涓暟鎹�
+ selectedData: PropTypes.array // 琛ㄦ牸閫変腑鏁版嵁
}
state = {
@@ -43,10 +42,10 @@
* @description 瑙﹀彂鎸夐挳鎿嶄綔
*/
actionTrigger = (item, record) => {
- const { setting } = this.props
+ const { setting, selectedData } = this.props
let _this = this
- let data = this.props.gettableselected() || []
+ let data = selectedData || []
if (record) { // 琛ㄦ牸涓Е鍙戞寜閽�
data = [record]
@@ -57,7 +56,7 @@
notification.warning({
top: 92,
message: this.props.dict['main.action.confirm.selectline'],
- duration: 10
+ duration: 5
})
return
} else if (item.Ot === 'requiredSgl' && data.length !== 1) {
@@ -65,7 +64,7 @@
notification.warning({
top: 92,
message: this.props.dict['main.action.confirm.selectSingleLine'],
- duration: 10
+ duration: 5
})
return
} else if (item.Ot !== 'notRequired' && !setting.primaryKey) {
@@ -73,7 +72,7 @@
notification.warning({
top: 92,
message: '鏈缃富閿紒',
- duration: 10
+ duration: 5
})
return
}
@@ -199,14 +198,14 @@
notification.error({
top: 92,
message: res.message || res.ErrMesg,
- duration: btn.verify && btn.verify.ntime ? btn.verify.ntime : 15
+ 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,
- duration: btn.verify && btn.verify.ftime ? btn.verify.ftime : 15
+ duration: btn.verify && btn.verify.ftime ? btn.verify.ftime : 10
})
} else if (res.ErrCode === 'NM') {
message.error(res.message || res.ErrMesg)
@@ -269,10 +268,6 @@
}
}
- if (this.props.type === 'subtab') {
- container = document.body
- }
-
return (
<Modal
title={title}
@@ -287,6 +282,7 @@
destroyOnClose
>
<MutilForm
+ menuType="HS"
dict={this.props.dict}
action={execAction}
inputSubmit={this.handleOk}
@@ -301,7 +297,7 @@
render() {
return (
- <div className="button-list toolbar-button">
+ <div className="script-button-list script-toolbar-button">
{this.props.actions.map((item, index) => {
return (
<Button
--
Gitblit v1.8.0