图表筛选添加条件【不为空】

src/components/chartDesigner/sections/filterBox.jsx

@@ -240,7 +240,7 @@ class FilterBox extends React.Component {
                                 )}
                             </FormItem>
                         </Col>
-                        <Col span={(operator&&operator!=='null')?(operator==='between'?6:12):'0'}>
+                        <Col span={(operator&&operator!=='null'&&operator!=='notNull')?(operator==='between'?6:12):'0'}>
                             <FormItem
                                 key={key}
                                 className='filterValueOne'

src/components/chartDesigner/sections/filterOperators.json

@@ -20,6 +20,9 @@
     }, {
         "value": "null",
         "label": "为空"
+    }, {
+        "value": "notNull",
+        "label": "不为空"
     }],
     "string": [{
         "value": "contain",
@@ -42,6 +45,9 @@
     }, {
         "value": "null",
         "label": "为空"
+    }, {
+        "value": "notNull",
+        "label": "不为空"
     }],
     "scale": [{
         "value": ">",
@@ -67,6 +73,9 @@
     }, {
         "value": "null",
         "label": "为空"
+    }, {
+        "value": "notNull",
+        "label": "不为空"
     }],
     "time": [{
         "value": "equals",
@@ -83,6 +92,9 @@
     }, {
         "value": "null",
         "label": "为空"
+    }, {
+        "value": "notNull",
+        "label": "不为空"
     }],
     "categorical": [{
         "value": "=",
@@ -99,6 +111,9 @@
     }, {
         "value": "null",
         "label": "为空"
+    }, {
+        "value": "notNull",
+        "label": "不为空"
     }],
     "ordinal": [{
         "value": ">",
@@ -124,6 +139,9 @@
     }, {
         "value": "null",
         "label": "为空"
+    }, {
+        "value": "notNull",
+        "label": "不为空"
     }],
     "undefined": [{
         "value": "null",

src/components/chartDesigner/sections/toolbar.jsx

@@ -53,13 +53,13 @@ class Toolbar extends React.Component {
         let filterLabel;
 
         if(type === 'string' || type === 'index') {
-            if(operator === 'null') {
+            if(operator === 'null' || operator === 'notNull') {
                 filterLabel = `${label} ${operatorLabel}`;
             }else {
                 filterLabel = `${label} ${operatorLabel} ${value1}`;
             }
         }else if(type === 'scale') {
-            if(operator === 'null') {
+            if(operator === 'null' || operator === 'notNull') {
                 filterLabel = `${label} ${operatorLabel}`;
             }else if(operator === 'between') {
                 filterLabel = `${label} ${operatorLabel} ${value1} ~ ${value2}`; 
@@ -69,7 +69,7 @@ class Toolbar extends React.Component {
         }else if(type === 'time') {
             value1 = dateFormat(new Date(value1), 'yyyy/MM/dd');
             value2 = dateFormat(new Date(value2), 'yyyy/MM/dd');
-            if(operator === 'null') {
+            if(operator === 'null' || operator === 'notNull') {
                 filterLabel = `${label} ${operatorLabel}`;
             }else if(operator === 'between') {
                 filterLabel = `${label} ${operatorLabel} ${value1} ~ ${value2}`;
@@ -77,7 +77,7 @@ class Toolbar extends React.Component {
                 filterLabel = `${label} ${operatorLabel} ${value1}`;
             }
         }else if(type === 'categorical') {
-            if(operator === 'null') {
+            if(operator === 'null' || operator === 'notNull') {
                 filterLabel = `${label} ${operatorLabel}`;
             }else {
                 filterLabel = `${label} ${operatorLabel} ${value1}`;