From a06655e10f4242c350a3450c6c21e77f33302e2e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 27 十一月 2020 22:09:04 +0800
Subject: [PATCH] 2020-11-27
---
src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx | 22 +++++++---------------
1 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx b/src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx
index 07d195f..de77471 100644
--- a/src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/markcolumn/markform/index.jsx
@@ -1,6 +1,6 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Select, Button, Input, InputNumber, Radio, Icon, Cascader, Tooltip } from 'antd'
+import { Form, Row, Col, Select, Button, Input, Radio, Icon, Cascader, Tooltip } from 'antd'
import { minkeColorSystem, minkeIconSystem } from '@/utils/option.js'
import './index.scss'
@@ -183,8 +183,6 @@
}
}
- let contFields = columns.filter(col => originField.field !== col.field && originField.type === col.type)
-
return (
<Form {...formItemLayout} id="model-mark-form-box" className="mingke-table">
<Row gutter={24}>
@@ -237,9 +235,9 @@
<Select>
<Select.Option value="="> = </Select.Option>
<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.Option value=">"> > </Select.Option>
+ <Select.Option value="<"> < </Select.Option>
+ <Select.Option value="like"> like </Select.Option>
</Select>
)}
</Form.Item>
@@ -247,14 +245,8 @@
{contrastType === 'static' ? <Col span={6}>
<Form.Item label={'瀵规瘮鍊�'}>
{getFieldDecorator('contrastValue', {
- initialValue: '',
- rules: [
- {
- required: true,
- message: this.props.dict['form.required.input'] + '瀵规瘮鍊�!'
- }
- ]
- })(originField.type === 'number' ? <InputNumber /> : <Input placeholder="" autoComplete="off" />)}
+ initialValue: ''
+ })(<Input placeholder="" autoComplete="off" />)}
</Form.Item>
</Col> : null}
{contrastType === 'dynamic' ? <Col span={6}>
@@ -272,7 +264,7 @@
showSearch
filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
>
- {contFields.map(item => (
+ {columns.map(item => (
<Select.Option key={item.uuid} title={item.label + '(' + item.field + ')'} value={item.field}>{item.label + '(' + item.field + ')'}</Select.Option>
))}
</Select>
--
Gitblit v1.8.0