From 3a4f58e3883bd841f2658c38889fdc43a4b9cc8d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 21 一月 2021 16:59:13 +0800
Subject: [PATCH] 2021-01-21
---
src/tabviews/zshare/actionList/normalbutton/index.jsx | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 3679856..663002f 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -927,6 +927,7 @@
let param = this.state.checkParam
confirm({
title: res.message || res.ErrMesg,
+ content: '缁х画鎵ц锛�',
onOk() {
return new Promise(resolve => {
Api.genericInterface(param).then((result) => {
@@ -1198,9 +1199,9 @@
*/
getModels = () => {
const { setting, BID, btn } = this.props
- const { btnconfig } = this.state
+ const { btnconfig, visible } = this.state
- if (!this.state.visible || !btnconfig || !btnconfig.setting) return null
+ if (!btnconfig || !btnconfig.setting) return null
let title = btnconfig.setting.title
let width = btnconfig.setting.width + 'vw'
@@ -1225,7 +1226,7 @@
maskClosable={clickouter}
getContainer={container}
wrapClassName='action-modal'
- visible={this.state.visible}
+ visible={visible}
width={width}
onOk={this.handleOk}
confirmLoading={this.state.confirmLoading}
@@ -1248,7 +1249,7 @@
render() {
const { btn, show, style } = this.props
- const { loadingNumber, loading } = this.state
+ const { loadingNumber, loading, visible } = this.state
if (show === 'actionList') {
return <div style={{display: 'inline-block'}} onClick={(e) => e.stopPropagation()}>
@@ -1259,7 +1260,7 @@
className={'mk-btn mk-' + btn.class}
onClick={() => {this.actionTrigger()}}
>{loadingNumber ? `(${loadingNumber})` : '' + btn.label}</Button>
- {this.getModels()}
+ {visible ? this.getModels() : null}
</div>
} else if (show && show.indexOf('plus') > -1) {
return <div className="mk-btn-wrap">
@@ -1270,7 +1271,7 @@
style={{fontSize: show.substring(4) + 'px'}}
onClick={() => {this.actionTrigger()}}
></Button>
- {this.getModels()}
+ {visible ? this.getModels() : null}
</div>
} else { // icon銆乼ext銆� all 鍗＄墖
return <div style={{display: 'inline-block'}} onClick={(e) => e.stopPropagation()}>
@@ -1282,7 +1283,7 @@
icon={show === 'text' ? '' : (btn.icon || '')}
onClick={() => {this.actionTrigger()}}
>{show === 'icon' && btn.icon ? '' : btn.label}</Button>
- {this.getModels()}
+ {visible ? this.getModels() : null}
</div>
}
}
--
Gitblit v1.8.0