From 6ed64ed071c75901ed8848131bfefa51c5c27fce Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 24 九月 2020 23:51:51 +0800 Subject: [PATCH] 2020-09-24 --- src/menu/actioncomponent/actionform/index.jsx | 44 +++++++++----------------------------------- 1 files changed, 9 insertions(+), 35 deletions(-) diff --git a/src/menu/actioncomponent/actionform/index.jsx b/src/menu/actioncomponent/actionform/index.jsx index b383f2c..953fea6 100644 --- a/src/menu/actioncomponent/actionform/index.jsx +++ b/src/menu/actioncomponent/actionform/index.jsx @@ -6,7 +6,6 @@ import Api from '@/api' import options from '@/store/options.js' -import Utils from '@/utils/utils.js' import './index.scss' const { TextArea } = Input @@ -16,7 +15,7 @@ exec: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'icon', 'class', 'execSuccess', 'execError'], excelIn: ['label', 'Ot', 'OpenType', 'intertype', 'show', 'icon', 'class', 'sheet', 'execSuccess', 'execError'], excelOut: ['label', 'OpenType', 'intertype', 'show', 'icon', 'class', 'execSuccess', 'execError', 'pagination', 'search'], - popview: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'tabType', 'linkTab', 'popClose'], + popview: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'popClose'], tab: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'linkmenu'], innerpage: ['label', 'Ot', 'OpenType', 'pageTemplate', 'show', 'icon', 'class'], funcbutton: ['label', 'OpenType', 'funcType', 'show', 'icon', 'class'] @@ -28,7 +27,6 @@ setting: PropTypes.object, // 椤甸潰璁剧疆 formlist: PropTypes.any, // 琛ㄥ崟淇℃伅 card: PropTypes.any, // 鎸夐挳淇℃伅 - tabs: PropTypes.array, // 鎵�鏈夋爣绛鹃〉 inputSubmit: PropTypes.any // 鍥炶溅鎻愪氦浜嬩欢 } @@ -119,14 +117,6 @@ } else { item.options = this.state.insertUpdateOptions } - } else if (item.key === 'linkTab') { - item.options = [ - { - value: '', - text: '鏂板缓' - }, - ...this.props.tabs - ] } else if (item.key === 'OpenType') { item.initVal = _opentype } @@ -245,26 +235,6 @@ _fieldval.class = 'dgreen' } - this.props.form.setFieldsValue(_fieldval) - }) - } else if (key === 'tabType') { - let _tabs = this.props.tabs.filter(tab => tab.type === value) - let _fieldval = {} - - this.setState({ - formlist: this.state.formlist.map(item => { - if (item.key === 'linkTab') { - item.options = [ - { - value: '', - text: '鏂板缓' - }, - ..._tabs - ] - } - return item - }) - }, () => { this.props.form.setFieldsValue(_fieldval) }) } else if (key === 'funcType') { @@ -643,8 +613,13 @@ values.uuid = this.props.card.uuid values.verify = this.props.card.verify || null - if (values.show === 'icon') { - + if (values.show === 'icon' && !values.icon) { + notification.warning({ + top: 92, + message: '璇烽�夋嫨鍥炬爣锛�', + duration: 5 + }) + return } else if (values.OpenType === 'excelOut') { if (values.intertype === 'system' && setting.interType !== 'system') { notification.warning({ @@ -656,8 +631,7 @@ } values.Ot = 'notRequired' - } else if (values.OpenType === 'popview' && !values.linkTab) { // 娌℃湁鍏宠仈鏍囩锛堟柊寤烘椂锛夛紝鍒涘缓鏂版爣绛綢d - values.linkTab = Utils.getuuid() + } else if (values.OpenType === 'popview') { values.createTab = true // 鐢ㄤ簬鏍囪鎸夐挳澶嶅埗鏃讹紝鏄惁澶嶅埗鍘熸湁鏍囩 } else if (values.OpenType === 'funcbutton') { // 杞崲鎵撳嵃鏃舵墦寮�鏂瑰紡 if (values.funcType === 'print') { -- Gitblit v1.8.0