From 42fae277ae5ebe794fc070bf38482a919eb661fc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 25 十一月 2020 14:36:02 +0800
Subject: [PATCH] 2020-11-25
---
src/templates/sharecomponent/columncomponent/index.jsx | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/src/templates/sharecomponent/columncomponent/index.jsx b/src/templates/sharecomponent/columncomponent/index.jsx
index a1e0242..b24f1db 100644
--- a/src/templates/sharecomponent/columncomponent/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/index.jsx
@@ -20,8 +20,6 @@
static propTpyes = {
menu: PropTypes.object, // 涓夌骇鑿滃崟淇℃伅
config: PropTypes.object, // 閰嶇疆淇℃伅
- pasteContent: PropTypes.object, // 绮樿创閰嶇疆淇℃伅
- sysRoles: PropTypes.array, // 瑙掕壊鍒楄〃锛屾潈闄愬垎閰�
updatecolumn: PropTypes.func // 鏇存柊
}
@@ -50,18 +48,7 @@
const { config } = this.props
const { columnlist } = this.state
- if (
- nextProps.pasteContent &&
- nextProps.pasteContent.columns &&
- nextProps.pasteContent.copyType === 'columns' &&
- nextProps.pasteContent.columns.length > 0
- ) {
- if (columnlist.filter(col => !col.origin).length === 0) {
- this.setState({columnlist: nextProps.pasteContent.columns}, () => {
- this.props.updatecolumn({...config, columns: nextProps.pasteContent.columns})
- })
- }
- } else if (!is(fromJS(nextProps.config.columns), fromJS(config.columns)) && !is(fromJS(nextProps.config.columns), fromJS(columnlist))) {
+ if (!is(fromJS(nextProps.config.columns), fromJS(config.columns)) && !is(fromJS(nextProps.config.columns), fromJS(columnlist))) {
this.setState({columnlist: fromJS(nextProps.config.columns).toJS()})
}
}
@@ -117,7 +104,7 @@
this.setState({
modaltype: 'columns',
card: card,
- formlist: getColumnForm(card, this.props.sysRoles, menulist)
+ formlist: getColumnForm(card, menulist)
})
} else {
this.setState({
--
Gitblit v1.8.0