筛选器添加空校验

src/components/chart/distributeBox.jsx

@@ -85,8 +85,8 @@ class DistributeBox extends React.Component {
                 filterLabel = `${label} ${operatorLabel} ${value1}`; 
             }
         }else if(type === 'time') {
-            value1 = moment(value1).format('yyyy/MM/dd');
-            value2 = moment(value2).format('yyyy/MM/dd');
+            value1 = moment(value1).format('YYYY/MM/DD');
+            value2 = moment(value2).format('YYYY/MM/DD');
             if(operator === 'null' || operator === 'notNull') {
                 filterLabel = `${label} ${operatorLabel}`;
             }else if(operator === 'between') {
@@ -207,7 +207,7 @@ class DistributeBox extends React.Component {
         }, {
             title: '开放对象',
             dataIndex: 'targets',
-            render: targets => <div>
+            render: (targets, record, index) => <div key={index}>
                 {
                     targets.map((item, index) => <Tag key={index}>{item.isGroup ? <Icon type='group' /> : <Icon type='geren' />}{item.name}</Tag>)
                 }
@@ -245,7 +245,6 @@ class DistributeBox extends React.Component {
                                     />
                                     <Button className='add-btn' onClick={() => {
                                         dispatch({ type: 'chartPolicy/remoteAdd', policy: {
-                                            code: Math.random(),
                                             anabled: false,
                                             name: '新策略',
                                             targets: [],

src/components/chartDesigner/sections/filterBox.jsx

@@ -165,9 +165,9 @@ class FilterBox extends React.Component {
                     filterLabel: this.createFilterLabel(f)
                 }));
                 createFilters(filters);
+                hideFilterBox();
             }
         })
-        hideFilterBox();
     }
 
     fetchColumnData = (column) => {
@@ -297,7 +297,8 @@ class FilterBox extends React.Component {
                         <Col span={7}>
                             <FormItem key={key}>
                                 {getFieldDecorator(`filterName${key}`, {
-                                    initialValue: name?{key: name}:undefined
+                                    initialValue: name?{key: name}:undefined,
+                                    rules: [{ required: true, message: '列名不能为空' }]
                                 })(
                                     <Select
                                         showSearch={true}
@@ -322,7 +323,8 @@ class FilterBox extends React.Component {
                         <Col span={5}>
                             <FormItem key={key} className='filterOperator'>
                                 {getFieldDecorator(`filterOperator${key}`, {
-                                    initialValue: operator?{key: operator}:undefined
+                                    initialValue: operator?{key: operator}:undefined,
+                                    rules: [{ required: true, message: '操作类型不能为空' }]
                                 })(
                                     <Select
                                         labelInValue={true}
@@ -341,7 +343,8 @@ class FilterBox extends React.Component {
                                 className='filterValueOne'
                             >
                                 {getFieldDecorator(`filterValueOne${key}`, {
-                                    initialValue: type==='time' ? ( value1 ? moment(value1) : null) : value1
+                                    initialValue: type==='time' ? ( value1 ? moment(value1) : null) : value1,
+                                    rules: [{ required: true, message: '该值不能为空' }]
                                 })(this.getFilterValueField(key, type, operator, 1))}
                             </FormItem>
                         </Col>
@@ -351,7 +354,8 @@ class FilterBox extends React.Component {
                                 className='filterValueTwo'
                             >
                                 {getFieldDecorator(`filterValueTwo${key}`, {
-                                    initialValue: type==='time' ? ( value2 ? moment(value2) : null) : value2
+                                    initialValue: type==='time' ? ( value2 ? moment(value2) : null) : value2,
+                                    rules: [{ required: operator==='between', message: '该值不能为空' }]
                                 })(this.getFilterValueField(key, type, operator, 2))}
                             </FormItem>
                         </Col>