修改component文件夹名称

app/component/chartDesigner/sections/filterBox.jsx → app/components/chartDesigner/sections/filterBox.jsx

@@ -1,9 +1,9 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import { Form, Row, Col, Input, Icon, Button, Select, InputNumber, DatePicker } from 'antd';
 const FormItem = Form.Item;
 const SelectOption = Select.Option;
 import emitter from '../../../eventManger/ev';
-import { isEqual } from '../../../utils/baseUtils.js';
 import OPERATORS from './filterOperators.json';
 import './filterBox.less';
 
@@ -40,6 +40,11 @@ class FilterBox extends React.Component {
         }
     }
 
+    static propTypes = {
+        columns: PropTypes.array,
+        filterData: PropTypes.array
+    }
+
     componentDidMount() {
         // 将原本的过滤条件生成可视化组件
         const { filterData } = this.state;
@@ -80,6 +85,7 @@ class FilterBox extends React.Component {
         const filters = form.getFieldValue('filters');
         const nextFilters = filters.concat(filtes || {
             key: uuid++,
+            using: true
         });
         form.setFieldsValue({
             filters: nextFilters,
@@ -276,10 +282,10 @@ class FilterBox extends React.Component {
                             </FormItem>
                         </Col>
                     </Col>
-                    <Col span={2} className='' >
+                    <Col span={2} className='filter-remove-col' >
                         <Icon
                             className="dynamic-delete-button"
-                            type="close"
+                            type="minus-circle"
                             onClick={() => { this.removeFilter(key) }}
                         />
                     </Col>

app/component/chartDesigner/sections/filterBox.less → app/components/chartDesigner/sections/filterBox.less

@@ -17,4 +17,7 @@
   .ant-input-number, .ant-calendar-picker {
     width: 100%;
   }
+}
+.filter-remove-col {
+  text-align: center;
 }

app/component/chartDesigner/sections/toolbar.jsx → app/components/chartDesigner/sections/toolbar.jsx

@@ -64,7 +64,7 @@ class Toolar extends React.Component {
         }else if(type == 'number') {
             if(operator == 'null') {
                 filterLabel = `${label} ${operatorLabel}`;
-            }else if(operator == 'betwen') {
+            }else if(operator == 'between') {
                 filterLabel = `${label} ${operatorLabel} ${value1} ~ ${value2}`; 
             }else {
                 filterLabel = `${label} ${operatorLabel} ${value1}`; 
@@ -74,16 +74,16 @@ class Toolar extends React.Component {
             value2 = new Date(value2).format('yyyy/MM/dd');
             if(operator == 'null') {
                 filterLabel = `${label} ${operatorLabel}`;
-            }else if(operator == 'betwen') {
-                filterLabel = `${label} ${operatorLabel} ${value1} ~ ${value2}`; 
+            }else if(operator == 'between') {
+                filterLabel = `${label} ${operatorLabel} ${value1} ~ ${value2}`;
             }else {
-                filterLabel = `${label} ${operatorLabel} ${value1}`; 
+                filterLabel = `${label} ${operatorLabel} ${value1}`;
             }
         }else if(type == 'categorical') {
             if(operator == 'null') {
                 filterLabel = `${label} ${operatorLabel}`;
             }else {
-                filterLabel = `${label} ${operatorLabel} ${value1}`; 
+                filterLabel = `${label} ${operatorLabel} ${value1}`;
             }
         }else {
             filterLabel = '错误条件';

package.json

@@ -10,6 +10,7 @@
     "echarts-for-react": "^2.0.12-beta.0",
     "events": "^3.0.0",
     "moment": "^2.19.3",
+    "prop-types": "^15.6.2",
     "react": "^16.2.0",
     "react-dom": "^16.2.0",
     "react-router": "^4.3.1",