update evaluate method

Author: Steffan

.gitignore

@@ -1,4 +1,5 @@
 /node_modules
 yarn-error.log
 .DS_Store
+.history
 .idea

src/field.js

@@ -46,7 +46,7 @@ export default {
 
             get() {
 
-                if (this.enable && !this.Fields.evaluate(this.enable)) {
+                if (!this.Fields.evaluate(this.enable)) {
                     return assign({disabled: 'true'}, this.attrs);
                 }
 

src/fields.vue

@@ -18,7 +18,7 @@
     import FieldSelect from './components/Select.vue';
     import FieldRange from './components/Range.vue';
     import FieldNumber from './components/Number.vue';
-    import {assign, each, get, parse, isArray, isString, isUndefined, set, warn} from './util';
+    import {assign, each, get, parse, isArray, isString, isFunction, isUndefined, set, warn} from './util';
 
     export default {
 
@@ -72,29 +72,6 @@
                 this.$emit('change', value, field);
             },
 
-            evaluate(expression, values = this.values) {
-
-                try {
-
-                    if (isUndefined(expression)) {
-                        return true;
-                    }
-
-                    if (isString(expression)) {
-                        expression = parse(expression);
-                    }
-
-                    return expression.call(this, values, {
-                        $match, $get: key => get(values, key)
-                    });
-
-                } catch (e) {
-                    warn(e);
-                }
-
-                return true;
-            },
-
             prepare(config = this.config, prefix = this.prefix) {
 
                 const arr = isArray(config), fields = [];
@@ -126,6 +103,31 @@
                 });
 
                 return fields;
+            },
+
+            evaluate(expression, values = this.values) {
+
+                try {
+
+                    if (isUndefined(expression)) {
+                        return true;
+                    }
+
+                    if (isString(expression)) {
+                        expression = parse(expression);
+                    }
+
+                    if (isFunction(expression)) {
+                        return expression.call(this, values, {$match, $get: key => get(values, key)});
+                    }
+
+                    return expression;
+
+                } catch (e) {
+                    warn(e);
+                }
+
+                return true;
             }
 
         }

src/util.js

@@ -23,12 +23,16 @@ export function warn(message, color = '#DB6B00') {
     log(message, color);
 }
 
+export function isObject(obj) {
+    return obj !== null && typeof obj === 'object';
+}
+
 export function isString(val) {
     return typeof val === 'string';
 }
 
-export function isObject(obj) {
-    return obj !== null && typeof obj === 'object';
+export function isFunction(val) {
+    return typeof val === 'function';
 }
 
 export function isUndefined(val) {