Merge branch 'master' into bms

king

2021-10-27 bbcb3f45ad0ef4c808bf5a68ec10c0464c094e2f

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

@@ -19,7 +19,7 @@
      if (_form && _form.select) {
        _form.select()
      }
    } catch {
    } catch (e) {
      console.warn('表单focus失败！')
    }
  }
@@ -138,7 +138,7 @@
                    message: this.props.dict['form.required.input'] + this.props.dict['model.form.columnWidth'] + '!'
                  }
                ]
              })(<InputNumber min={1} max={1000} precision={0} />)}
              })(<InputNumber min={1} max={1000} precision={0} onPressEnter={this.handleSubmit} />)}
            </Form.Item>
          </Col>
          <Col span={12}>
@@ -187,9 +187,7 @@
                  }
                ]
              })(
                <Select
                  getPopupContainer={() => document.getElementById('columncolspan')}
                >
                <Select getPopupContainer={() => document.getElementById('columncolspan')} >
                  <Select.Option value="vertical">{this.props.dict['header.form.vertical']}</Select.Option>
                  <Select.Option value="horizontal">{this.props.dict['header.form.horizontal']}</Select.Option>
                  <Select.Option value="vertical2">{this.props.dict['header.form.vertical2']}</Select.Option>