From 233709a44a2f5cfff9b8fb955ebcdc6889c0d40b Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 19 十一月 2019 09:12:28 +0800 Subject: [PATCH] 2019-11-19 --- src/components/sidemenu/comtableconfig/actionform/index.jsx | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/components/sidemenu/comtableconfig/actionform/index.jsx b/src/components/sidemenu/comtableconfig/actionform/index.jsx index 4beb9ba..45308f8 100644 --- a/src/components/sidemenu/comtableconfig/actionform/index.jsx +++ b/src/components/sidemenu/comtableconfig/actionform/index.jsx @@ -4,6 +4,9 @@ import './index.scss' const btnIcons = [{ + MenuID: '', + text: 'unset' +}, { MenuID: 'plus', text: 'plus' }, { @@ -72,9 +75,9 @@ _options = ['label', 'Ot', 'OpenType', 'pageTemplate', 'icon', 'class'] } else { if (this.state.interType === 'outer') { - _options = ['label', 'OpenType', 'intertype', 'interface', 'func', 'callbackFunc', 'Ot', 'icon', 'class'] + _options = ['label', 'OpenType', 'intertype', 'innerFunc', 'interface', 'outerFunc', 'callbackFunc', 'Ot', 'icon', 'class'] } else { - _options = ['label', 'OpenType', 'intertype', 'func', 'Ot', 'icon', 'class'] + _options = ['label', 'OpenType', 'intertype', 'innerFunc', 'Ot', 'icon', 'class'] } } this.setState({ @@ -92,9 +95,9 @@ if (key === 'intertype') { let _options = null if (value === 'outer') { - _options = ['label', 'OpenType', 'intertype', 'interface', 'func', 'callbackFunc', 'Ot', 'icon', 'class'] + _options = ['label', 'OpenType', 'intertype', 'innerFunc', 'interface', 'outerFunc', 'callbackFunc', 'Ot', 'icon', 'class'] } else { - _options = ['label', 'OpenType', 'intertype', 'func', 'Ot', 'icon', 'class'] + _options = ['label', 'OpenType', 'intertype', 'innerFunc', 'Ot', 'icon', 'class'] } this.setState({ interType: value, @@ -109,7 +112,6 @@ getFields() { const { getFieldDecorator } = this.props.form const fields = [] - console.log(this.state.formlist) this.state.formlist.forEach((item, index) => { if (item.hidden) return @@ -150,7 +152,7 @@ > {item.options.map(option => <Select.Option id={option.MenuID} title={option.text} key={option.MenuID} value={option.MenuID}> - {item.key === 'icon' && <Icon type={option.MenuID} />} {option.text} + {item.key === 'icon' && option.MenuID && <Icon type={option.MenuID} />} {option.text} </Select.Option> )} </Select> @@ -216,9 +218,9 @@ _options = ['label', 'Ot', 'OpenType', 'pageTemplate', 'icon', 'class'] } else { if (_intertype === 'outer') { - _options = ['label', 'OpenType', 'intertype', 'interface', 'func', 'callbackFunc', 'Ot', 'icon', 'class'] + _options = ['label', 'OpenType', 'intertype', 'innerFunc', 'interface', 'outerFunc', 'callbackFunc', 'Ot', 'icon', 'class'] } else { - _options = ['label', 'OpenType', 'intertype', 'func', 'Ot', 'icon', 'class'] + _options = ['label', 'OpenType', 'intertype', 'innerFunc', 'Ot', 'icon', 'class'] } } this.setState({ -- Gitblit v1.8.0