Merge branch 'develop'

king

3 天以前 729fb5e7f41f45c6962993d86c3a4eb81c2c784b

 src/menu/components/share/colsControl/markform/index.jsx

@@ -96,6 +96,7 @@
                  <Select.Option value="!="> != </Select.Option>
                  <Select.Option value=">"> &gt; </Select.Option>
                  <Select.Option value="<"> &lt; </Select.Option>
                  <Select.Option value="regexp"> 正则表达式 </Select.Option>
                </Select>
              )}
            </Form.Item>
@@ -115,7 +116,7 @@
              取消
            </Button> : null}
          </Col>
          {targetKeys ? <Col span={18}>
          {targetKeys ? <Col span={18} style={{clear: 'left'}}>
            <Form.Item label="显示列">
              {getFieldDecorator('cols', {
                initialValue: [],