From 4de5be49a7d128118def405c5ce24771526cc188 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 05 一月 2021 21:34:55 +0800 Subject: [PATCH] Merge branch 'master' into bms --- src/menu/components/group/groupsetting/settingform/index.jsx | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 54 insertions(+), 4 deletions(-) diff --git a/src/menu/components/group/tabsetting/settingform/index.jsx b/src/menu/components/group/groupsetting/settingform/index.jsx similarity index 63% rename from src/menu/components/group/tabsetting/settingform/index.jsx rename to src/menu/components/group/groupsetting/settingform/index.jsx index 73da976..e8240e5 100644 --- a/src/menu/components/group/tabsetting/settingform/index.jsx +++ b/src/menu/components/group/groupsetting/settingform/index.jsx @@ -1,6 +1,6 @@ import React, {Component} from 'react' import PropTypes from 'prop-types' -import { Form, Row, Col, Input, Tooltip, Icon, InputNumber, Select } from 'antd' +import { Form, Row, Col, Input, Tooltip, Icon, InputNumber, Select, Radio } from 'antd' import './index.scss' @@ -12,7 +12,8 @@ } state = { - roleList: [] + roleList: [], + print: this.props.setting.print || 'false' } UNSAFE_componentWillMount () { @@ -52,9 +53,9 @@ } render() { - const { setting } = this.props + const { setting, dict } = this.props const { getFieldDecorator } = this.props.form - const { roleList } = this.state + const { roleList, print } = this.state const formItemLayout = { labelCol: { @@ -108,6 +109,55 @@ </Form.Item> </Col> <Col span={12}> + <Form.Item label="鎵撳嵃鎸夐挳"> + {getFieldDecorator('print', { + initialValue: print + })( + <Radio.Group style={{whiteSpace: 'nowrap'}} onChange={(e) => {this.setState({print: e.target.value})}}> + <Radio key="true" value="true"> 鏄剧ず </Radio> + <Radio key="false" value="false"> 闅愯棌 </Radio> + </Radio.Group> + )} + </Form.Item> + </Col> + {print === 'true' ? <Col span={12}> + <Form.Item label="鎵撳嵃灏哄"> + {getFieldDecorator('pageSize', { + initialValue: setting.pageSize || 'A4', + rules: [ + { + required: true, + message: '璇烽�夋嫨鎵撳嵃灏哄!' + } + ] + })( + <Select> + <Select.Option value="A3">A3</Select.Option> + <Select.Option value="A4">A4</Select.Option> + <Select.Option value="A5">A5</Select.Option> + </Select> + )} + </Form.Item> + </Col> : null} + {print === 'true' ? <Col span={12}> + <Form.Item label="鎵撳嵃甯冨眬"> + {getFieldDecorator('pageLayout', { + initialValue: setting.pageLayout || 'vertical', + rules: [ + { + required: true, + message: dict['mob.required.select'] + '鎵撳嵃甯冨眬!' + } + ] + })( + <Radio.Group> + <Radio value="vertical">绾靛悜</Radio> + <Radio value="horizontal">妯悜</Radio> + </Radio.Group> + )} + </Form.Item> + </Col> : null} + <Col span={12}> <Form.Item label="榛戝悕鍗�"> {getFieldDecorator('blacklist', { initialValue: setting.blacklist || [] -- Gitblit v1.8.0