Merge branch 'develop'

king

2022-08-02 8d66ff34fae5b048a6b7923cc75d34f13a08be9d

 src/templates/sharecomponent/columncomponent/gridbtnform/index.jsx

@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import { Form, Row, Col, Input, Select, InputNumber, Radio } from 'antd'
import { formRule } from '@/utils/option.js'
import './index.scss'
// import './index.scss'

class MainSearch extends Component {
  static propTpyes = {
@@ -16,61 +16,47 @@
      {
        type: 'text',
        key: 'label',
        label: this.props.dict['header.form.name'],
        label: this.props.dict['model.name'],
        initVal: this.props.card.label,
        required: true
      },
      {
        type: 'select',
        type: 'radio',
        key: 'Align',
        label: this.props.dict['header.form.align'],
        label: this.props.dict['model.form.align'],
        initVal: this.props.card.Align,
        required: true,
        options: [{
          MenuID: 'left',
          text: this.props.dict['header.form.alignLeft']
          text: this.props.dict['model.form.alignLeft']
        }, {
          MenuID: 'right',
          text: this.props.dict['header.form.alignRight']
          text: this.props.dict['model.form.alignRight']
        }, {
          MenuID: 'center',
          text: this.props.dict['header.form.alignCenter']
          text: this.props.dict['model.form.alignCenter']
        }]
      },
      {
        type: 'number',
        key: 'Width',
        decimal: 0,
        label: this.props.dict['header.form.columnWidth'],
        label: this.props.dict['model.form.columnWidth'],
        initVal: this.props.card.Width,
        required: true
      },
      {
        type: 'select',
        key: 'style',
        label: this.props.dict['header.form.style'],
        initVal: this.props.card.style,
        type: 'radio',
        key: 'position',
        label: '显示位置',
        initVal: this.props.card.position || 'right',
        required: true,
        options: [{
          MenuID: 'button',
          text: this.props.dict['header.form.button']
          MenuID: 'left',
          text: '左侧'
        }, {
          MenuID: 'text',
          text: this.props.dict['model.form.text']
        }]
      },
      {
        type: 'select',
        key: 'show',
        label: this.props.dict['header.form.order'],
        initVal: this.props.card.show,
        required: true,
        options: [{
          MenuID: 'horizontal',
          text: this.props.dict['header.form.horizontal']
        }, {
          MenuID: 'vertical',
          text: this.props.dict['header.form.vertical']
          MenuID: 'right',
          text: '右侧'
        }]
      }
    ]
@@ -88,7 +74,7 @@
    const { getFieldDecorator } = this.props.form
    const fields = []
    this.state.formlist.forEach((item, index) => {
      if (item.type === 'text') { // 文本搜索
      if (item.type === 'text') {
        fields.push(
          <Col span={12} key={index}>
            <Form.Item label={item.label}>
@@ -108,7 +94,7 @@
            </Form.Item>
          </Col>
        )
      } else if (item.type === 'number') { // 文本搜索
      } else if (item.type === 'number') {
        fields.push(
          <Col span={12} key={index}>
            <Form.Item label={item.label}>
@@ -208,7 +194,7 @@
      }
    }
    return (
      <Form {...formItemLayout} className="commontable-gridbtn-column-form" id="gridbtncolumnwinter">
      <Form {...formItemLayout} style={{minHeight: '190px'}} id="gridbtncolumnwinter">
        <Row gutter={24}>{this.getFields()}</Row>
      </Form>
    )