fix: never validate empty cells (except zero)

popstas · Aug 25, 2020 · e07b95a · e07b95a
1 parent 6c5f594
commit e07b95a
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 21 deletions.
diff --git a/pages/index.vue b/pages/index.vue
@@ -210,7 +210,7 @@ export default {
         }
         else {
           // align left for text
-          if (field.type == 'string') {
+          if (field.type === 'string') {
             rules.push({
               class: 'align-left',
               condition: () => true
@@ -238,13 +238,13 @@ export default {
             }
           }
 
-          // fix validateRules: test rules
-          /* if (columnName == 'cron'){
+          // for debug
+          /*if (columnName == 'status'){
             validateRules = {
-              warning: '> 1',
-              error: '< 1'
+              error: '!= 200'
             };
-          } */
+            console.log()
+          }*/
 
           // warning
           for (let errType of ['warning', 'error']) {
@@ -254,14 +254,16 @@ export default {
               condition: row => {
                 const val = row[columnName];
                 const func = this.getValidateFunc(validateRules[errType]);
-                if(columnName == 'cron') {
 
-                  // console.log('errType: ', errType);
-                  // console.log('rules: ', validateRules[errType]);
-                  // console.log('val: ', val);
-                  // console.log('valid: ', func(val));
-                  // console.log('');
-                }
+                // for debug
+                /*if(columnName == 'status') {
+                  console.log('errType: ', errType);
+                  console.log('rules: ', validateRules[errType]);
+                  console.log('val: ', val);
+                  console.log('valid: ', func(val));
+                  console.log('');
+                }*/
+
                 return func(val);
               }
             });

diff --git a/store/index.js b/store/index.js
@@ -175,17 +175,23 @@ export const getters = {
         let expected = res[2];
         if(!['==', '==='].includes(operator)) expected = parseFloat(expected);
 
+        // always not match for empty values (except 0)
+        const funcReturn = (val, condition) => {
+          if ([null, undefined, ''].includes(val)) return false;
+          return condition;
+        }
+
         // console.log('operator: ', operator);
         // console.log('expected: ', expected);
         const funcs = {
-          '==': (v) => v == expected,
-          '===': (v) => v === expected,
-          '!=': (v) => v != expected,
-          '!==': (v) => v !== expected,
-          '>': (v) => v > expected,
-          '>=': (v) => v >= expected,
-          '<': (v) => v < expected,
-          '<=': (v) => v <= expected,
+          '==': (v) => funcReturn(v, v == expected),
+          '===': (v) => funcReturn(v, v === expected),
+          '!=': (v) => funcReturn(v, v != expected),
+          '!==': (v) => funcReturn(v, v !== expected),
+          '>': (v) => funcReturn(v, v > expected),
+          '>=': (v) => funcReturn(v, v >= expected),
+          '<': (v) => funcReturn(v, v < expected),
+          '<=': (v) => funcReturn(v, v <= expected),
         };
         if (funcs[operator]) return funcs[operator];
       }