From 1a67732f77de8afd138b6e75235edcc4c0e9a166 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 16 一月 2020 23:29:57 +0800 Subject: [PATCH] 2020-01-16 --- src/templates/formtabconfig/settingform/index.jsx | 60 +++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 33 insertions(+), 27 deletions(-) diff --git a/src/templates/formtabconfig/settingform/index.jsx b/src/templates/formtabconfig/settingform/index.jsx index adbd0b7..b6b8b60 100644 --- a/src/templates/formtabconfig/settingform/index.jsx +++ b/src/templates/formtabconfig/settingform/index.jsx @@ -23,8 +23,7 @@ UNSAFE_componentWillMount() { const { config, menu } = this.props - console.log(menu) - console.log(config) + let _tabs = [] let _select = [] let _tabMap = new Map() @@ -34,12 +33,24 @@ try { _columns = menu.LongParam.columns.filter(item => item.field && item.type !== 'colspan') - // config.groups.forEach(group => { - // if (group.isDefault) { - // _columns.push() - // } - // group.sublist - // }) + config.groups.forEach(group => { + if (group.isDefault) { + let list = group.sublist.filter(item => !item.origin) + _columns = [..._columns, ...list] + } else { + _columns = [..._columns, ...group.sublist] + } + }) + + let _colMap = new Map() + _columns = _columns.filter(item => { + if (_colMap.has(item.field)) { + return false + } else { + _colMap.set(item.field, true) + return true + } + }) _interType = menu.LongParam.setting.interType } catch { notification.warning({ @@ -78,18 +89,7 @@ return new Promise((resolve, reject) => { this.props.form.validateFieldsAndScroll((err, values) => { if (!err) { - values.actionfixed = values.actionfixed === 'true' - values.columnfixed = values.columnfixed === 'true' - - if (values.interType === 'inner' && !values.innerFunc && !values.dataresource) { - notification.warning({ - top: 92, - message: '璇疯嚜瀹氫箟鍑芥暟鎴栧~鍐欐暟鎹簮锛�', - duration: 10 - }) - } else { - resolve(values) - } + resolve(values) } else { reject(err) } @@ -100,12 +100,6 @@ onChange = (e) => { this.setState({ interType: e.target.value - }) - } - - selectChange = (val) => { - this.props.form.setFieldsValue({ - order: `${val} desc` }) } @@ -157,6 +151,19 @@ } ] })(<Input placeholder="" autoComplete="off" />)} + </Form.Item> + </Col> + <Col span={12}> + <Form.Item label="鍒楁暟"> + {getFieldDecorator('cols', { + initialValue: setting.cols || '2' + })( + <Select> + <Select.Option value="1">1鍒�</Select.Option> + <Select.Option value="2">2鍒�</Select.Option> + <Select.Option value="3">3鍒�</Select.Option> + </Select> + )} </Form.Item> </Col> <Col span={12}> @@ -245,7 +252,6 @@ })( <Select getPopupContainer={() => document.getElementById('commontable-setting-form')} - onChange={this.selectChange} > <Select.Option key='unset' value="">涓嶈缃�</Select.Option> {columns.length === 0 ? -- Gitblit v1.8.0