From e9640ccdc9fe57f91919e3f51462c780e44fadb0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 23 十二月 2020 13:14:20 +0800
Subject: [PATCH] 2020-12-23
---
src/menu/components/card/cardcomponent/index.jsx | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/menu/components/card/cardcomponent/index.jsx b/src/menu/components/card/cardcomponent/index.jsx
index f99c712..891d87f 100644
--- a/src/menu/components/card/cardcomponent/index.jsx
+++ b/src/menu/components/card/cardcomponent/index.jsx
@@ -17,7 +17,6 @@
class CardBoxComponent extends Component {
static propTpyes = {
offset: PropTypes.any, // 鍋忕Щ閲�
- MenuType: PropTypes.any, // 鑿滃崟绫诲瀷
cards: PropTypes.object, // 鍗＄墖琛岄厤缃俊鎭�
card: PropTypes.object, // 鍗＄墖閰嶇疆淇℃伅
deleteElement: PropTypes.func, // 鍗＄墖鍒犻櫎
@@ -51,9 +50,9 @@
}
shouldComponentUpdate (nextProps, nextState) {
- const { cards, MenuType } = this.props
+ const { cards } = this.props
- return !is(fromJS(cards), fromJS(nextProps.cards)) || !is(fromJS(this.state), fromJS(nextState)) || MenuType !== nextProps.MenuType
+ return !is(fromJS(cards), fromJS(nextProps.cards)) || !is(fromJS(this.state), fromJS(nextState))
}
/**
@@ -205,7 +204,7 @@
}
render() {
- const { cards, MenuType, offset } = this.props
+ const { cards, offset } = this.props
const { card, elements, side, settingVisible, dict } = this.state
let _style = {...card.style}
@@ -226,11 +225,11 @@
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
<Icon className="plus" title="娣诲姞鍏冪礌" onClick={this.addElement} type="plus" />
- {MenuType !== 'billPrint' ? <Icon className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton} type="plus-square" /> : null}
+ <Icon className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton} type="plus-square" />
<Icon className="edit" type="edit" onClick={() => this.setState({settingVisible: true})} />
<Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
{cards.subtype === 'propcard' ? <Icon className="close" title="鍒犻櫎鍗＄墖" type="delete" onClick={() => this.props.deleteElement(card)} /> : null}
- {MenuType !== 'billPrint' && card.setting.type === 'multi' ? <Switch size="small" onClick={this.changeSide} defaultChecked /> : null}
+ {card.setting.type === 'multi' ? <Switch size="small" onClick={this.changeSide} defaultChecked /> : null}
</div>
} trigger="hover">
<Icon type="tool" />
@@ -251,7 +250,6 @@
<SettingForm
dict={dict}
cards={cards}
- MenuType={MenuType}
setting={card.setting}
inputSubmit={this.settingSubmit}
wrappedComponentRef={(inst) => this.settingRef = inst}
--
Gitblit v1.8.0