From 0227c25e4ed573d3095ada3f9c9a4ba5f18b0de5 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期三, 20 一月 2021 10:53:01 +0800 Subject: [PATCH] 2021-01-20 --- src/menu/components/card/cardcomponent/settingform/index.jsx | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/menu/components/card/cardcomponent/settingform/index.jsx b/src/menu/components/card/cardcomponent/settingform/index.jsx index 6899fb0..4045ba3 100644 --- a/src/menu/components/card/cardcomponent/settingform/index.jsx +++ b/src/menu/components/card/cardcomponent/settingform/index.jsx @@ -1,12 +1,11 @@ import React, {Component} from 'react' import PropTypes from 'prop-types' -import { Form, Row, Col, Radio, Tooltip, Icon, Input, InputNumber } from 'antd' +import { Form, Row, Col, Radio, Tooltip, Icon, Input, InputNumber, Select } from 'antd' import './index.scss' class SettingForm extends Component { static propTpyes = { - MenuType: PropTypes.any, // 鑿滃崟绫诲瀷 dict: PropTypes.object, // 瀛楀吀椤� cards: PropTypes.object, // 鍗$墖闆� setting: PropTypes.object, // 鏁版嵁婧愰厤缃� @@ -39,7 +38,7 @@ } render() { - const { setting, cards, MenuType } = this.props + const { setting, cards } = this.props const { getFieldDecorator } = this.props.form const formItemLayout = { @@ -75,7 +74,7 @@ })(<InputNumber min={1} max={24} precision={0} onPressEnter={this.handleSubmit}/>)} </Form.Item> </Col> - {MenuType !== 'billPrint' ? <Col span={12}> + <Col span={12}> <Form.Item label={ <Tooltip placement="topLeft" title="閫夋嫨澶嶅紡鍗℃椂锛屽彲閰嶇疆榧犳爣鎮诞鏃剁殑鏄剧ず淇℃伅銆�"> <Icon type="question-circle" /> @@ -91,8 +90,8 @@ </Radio.Group> )} </Form.Item> - </Col> : null} - {MenuType !== 'billPrint' && this.state.type === 'multi' ? <Col span={12}> + </Col> + {this.state.type === 'multi' ? <Col span={12}> <Form.Item label={ <Tooltip placement="topLeft" title="澶嶅紡鍗$墖榧犳爣鎮诞淇℃伅鐨勫姩鐢绘晥鏋溿��"> <Icon type="question-circle" /> @@ -102,10 +101,16 @@ {getFieldDecorator('transform', { initialValue: setting.transform || 'up' })( - <Radio.Group> - <Radio value="up">鍚戜笂婊戝姩</Radio> - <Radio value="down">鍚戜笅婊戝姩</Radio> - </Radio.Group> + <Select> + <Select.Option value="up">鍚戜笂婊戝姩</Select.Option> + <Select.Option value="down">鍚戜笅婊戝姩</Select.Option> + <Select.Option value="left">鍚戝乏婊戝姩</Select.Option> + <Select.Option value="right">鍚戝彸婊戝姩</Select.Option> + <Select.Option value="scale">缂╂斁</Select.Option> + <Select.Option value="opacity">閫忔槑搴�</Select.Option> + <Select.Option value="rotateX">绾靛悜灞曞紑</Select.Option> + <Select.Option value="rotateY">妯悜灞曞紑</Select.Option> + </Select> )} </Form.Item> </Col> : null} -- Gitblit v1.8.0