From 25b1262a25df82f32296afe3802836e768f2143f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 15 五月 2020 14:15:30 +0800
Subject: [PATCH] 2020-05-15
---
src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx | 41 ++++++++++++++++++++---------------------
1 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx b/src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx
index fa1f32e..84ceeb4 100644
--- a/src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx
@@ -326,7 +326,6 @@
}
handleConfirm = () => {
- // const { columns } = this.props
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
@@ -403,6 +402,26 @@
)}
</Form.Item>
</Col>
+ <Col span={6}>
+ <Form.Item label={'瀵规瘮鏂瑰紡'}>
+ {getFieldDecorator('match', {
+ initialValue: '=',
+ rules: [
+ {
+ required: true,
+ message: this.props.dict['form.required.select'] + '瀵规瘮鏂瑰紡!'
+ }
+ ]
+ })(
+ <Select>
+ <Select.Option value="="> = </Select.Option>
+ {originField.type === 'number' ? <Select.Option value=">"> > </Select.Option> : null}
+ {originField.type === 'number' ? <Select.Option value="<"> < </Select.Option> : null}
+ {originField.type === 'text' ? <Select.Option value="like"> like </Select.Option> : null}
+ </Select>
+ )}
+ </Form.Item>
+ </Col>
{contrastType === 'static' ? <Col span={6}>
<Form.Item label={'瀵规瘮鍊�'}>
{getFieldDecorator('contrastValue', {
@@ -438,26 +457,6 @@
)}
</Form.Item>
</Col> : null}
- <Col span={6}>
- <Form.Item label={'瀵规瘮鏂瑰紡'}>
- {getFieldDecorator('match', {
- initialValue: '=',
- rules: [
- {
- required: true,
- message: this.props.dict['form.required.select'] + '瀵规瘮鏂瑰紡!'
- }
- ]
- })(
- <Select>
- <Select.Option value="="> = </Select.Option>
- {originField.type === 'number' ? <Select.Option value=">"> > </Select.Option> : null}
- {originField.type === 'number' ? <Select.Option value="<"> < </Select.Option> : null}
- {originField.type === 'text' ? <Select.Option value="like"> like </Select.Option> : null}
- </Select>
- )}
- </Form.Item>
- </Col>
<Col span={6}>
<Form.Item label={'鏍囪鏂瑰紡'}>
{getFieldDecorator('signType', {
--
Gitblit v1.8.0