Fix check list validatkion

ref #24
nsftx · Jun 29, 2018 · 2729adf · 2729adf
1 parent e1e4b92
commit 2729adf
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/dev/data/page.json b/dev/data/page.json
@@ -533,8 +533,8 @@
                           "hint": null,
                           "persistentHint": false,
                           "hideDetails": false,
-                          "color": "red",
-                          "theme": "light",
+                          "color": "",
+                          "theme": "",
                           "disabled": false,
                           "value": [],
                           "validateOn": "blur",

diff --git a/src/components/CCheckList/CCheckList.js b/src/components/CCheckList/CCheckList.js
@@ -1,5 +1,6 @@
 import { isNil, map, filter } from 'lodash';
 import { fieldable, validatable } from '@mixins';
+import { validator } from '@validators';
 import Element from '../Element';
 
 const createErrorMessage = (createElement, context) => {
@@ -40,6 +41,14 @@ const getItemListeners = (context) => {
   return listeners;
 };
 
+const getPropRequired = (config) => {
+  if (config.validation) {
+    return !!config.validation.required;
+  }
+
+  return false;
+};
+
 const getItemProps = (context, item) => {
   const config = context.config;
 
@@ -57,6 +66,8 @@ const getItemProps = (context, item) => {
     hint: config.hint,
     disabled: config.disabled,
     color: config.color,
+    required: getPropRequired(config),
+    rules: validator.getRules(config, context.validators),
     value,
   };
 
@@ -110,7 +121,7 @@ export default {
         item => createElement('v-checkbox',
           {
             attrs: getItemAttrs(this),
-            staticlass: 'mt-0',
+            staticClass: 'mt-0',
             props: getItemProps(this, item),
             on: getItemListeners(this, item),
           },

diff --git a/src/components/CRating/CRating.js b/src/components/CRating/CRating.js
@@ -120,7 +120,7 @@ export default {
             input(e) {
               if (isNil(e)) {
                 self.value = null;
-                self.setRating(0, true);
+                self.setRating(0, false);
               }
             },
           },