From 30c350ff93af3fcc7dcd9b78eb110212b2d44a49 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 11 二月 2020 08:53:53 +0800
Subject: [PATCH] 2020-02-11
---
src/templates/formtabconfig/index.jsx | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/templates/formtabconfig/index.jsx b/src/templates/formtabconfig/index.jsx
index 8bee0c4..af05280 100644
--- a/src/templates/formtabconfig/index.jsx
+++ b/src/templates/formtabconfig/index.jsx
@@ -75,6 +75,7 @@
const { menu, btnTab, config } = this.props
let _config = ''
+ let columns = []
if (!config) {
_config = JSON.parse(JSON.stringify(Source.baseConfig))
@@ -84,8 +85,13 @@
// _config.action = Source.baseConfig.action
}
+ if (menu && menu.LongParam && menu.LongParam.columns) {
+ columns = menu.LongParam.columns
+ }
+
this.setState({
config: _config,
+ columns: columns,
originMenu: JSON.parse(JSON.stringify(_config)),
selectedTables: _config.tables,
menuformlist: [
@@ -2075,7 +2081,8 @@
width={700}
onCancel={this.editModalCancel}
footer={[
- <Button key="delete" className="mk-btn mk-purple" onClick={this.creatFunc} loading={this.state.funcLoading}>{this.state.dict['header.menu.func.create']}</Button>,
+ this.state.card && this.state.card.btnType !== 'cancel' ?
+ <Button key="delete" className="mk-btn mk-purple" onClick={this.creatFunc} loading={this.state.funcLoading}>{this.state.dict['header.menu.func.create']}</Button> : null,
<Button key="cancel" onClick={this.editModalCancel}>{this.state.dict['header.cancel']}</Button>,
<Button key="confirm" type="primary" onClick={this.handleSubmit}>{this.state.dict['header.confirm']}</Button>
]}
@@ -2141,7 +2148,14 @@
onCancel={() => { this.setState({ profileVisible: false }) }}
destroyOnClose
>
- <VerifyCard card={this.state.card} columns={this.state.config.columns} wrappedComponentRef={(inst) => this.verifyRef = inst} dict={this.state.dict} />
+ <VerifyCard
+ card={this.state.card}
+ btnTab={this.props.btnTab}
+ config={this.state.config}
+ columns={this.state.columns}
+ wrappedComponentRef={(inst) => this.verifyRef = inst}
+ dict={this.state.dict}
+ />
</Modal>
{/* 璁剧疆鍏ㄥ眬閰嶇疆鍙婂垪琛ㄦ暟鎹簮 */}
<Modal
--
Gitblit v1.8.0