@modelforms/fontawesome-vuetify 3.0.0 → 3.1.1

package/components/form/Form.vue

@@ -116,17 +116,19 @@ export default{
     },
     props: {
         form: {
-            type: Object as () => GridModel<any>,
-            required: true
+            type: GridModel<Object>,
+            readonly: false,
+            default: () => new GridModel<Object>(),
         },
         validation: {
-            type: Object as () => Validation<any>,
-            default: () => new Validation<any>
+            type: Object as () => Validation<Object>,
+            default: () => new Validation<Object>
         }
     },
     data() {
         return {
             model: {} as any,
+            form: this.form,
             Button: button,
             validation: this.validation,
             valid: false,
@@ -134,15 +136,6 @@ export default{
         }
     },
     emits: [event],
-    watch: {
-        form(newValue, oldValue){
-            this.form = newValue;
-            this.initForm(newValue);
-        },
-        model(newValue, oldValue){
-            this.model = newValue;
-        }
-    },
     methods: {
         submit(e: any) {
             this.$emit(event, this.model)

package/components/form/area/Area.vue

@@ -41,18 +41,12 @@ export default{
   setup(data){
     initComponent(data, name);
   },
-  watch:{
-    value(newValue, oldValue){
-      this.value = newValue;
-    },
-    model(newValue, oldValue){
-      this.model = newValue;
-    }
-  },
   data() {
     return {
       rule: this.rules.rules!,
-      isValid: true
+      isValid: true,
+      value: this.value,
+      model: this.model,
     }
   },
   methods: {

package/components/form/complete/Complete.vue

@@ -2,7 +2,7 @@
 <v-container fluid>
     <v-autocomplete
       :v-model="model"
-      :items="listItems"
+      :items="items"
       :item-title="title"
       :label="label"
       :rules="rule"
@@ -74,8 +74,8 @@
             label: {
                 type: String
             },
-            rules: {
-                type: Object,
+            rule: {
+                type: Rule,
                 default: () => []
             },
             filterKeys: {
@@ -100,37 +100,32 @@
                 selected: [] as Object[],
                 unSelected: [] as Object[],
                 rows: [] as RowItem[],
-                rule: this.rules.rules!,
+                rule: this.rule.rules,
                 value: this.value,
                 arrowDown: faArrowAltCircleDown,
                 square: faSquare,
                 check: faCheck,
+                items: this.items,
                 search: empty,
                 defaultIcon: defaultIcon,
                 controlKeys: this.getFilterKeys(this.filterKeys),
                 title: this.filterKeys.title,
-                isValid: true,
-                listItems: [] as Object[]
+                isValid: true
             }
         },
         methods: {
             select(event) {
                 if(event.length!) {
                     this.value = event;
-                    if(!this.multiple)
-                        this.$emit(valueEvent, this.items.find(item => item[this.title!] == event));
-                    else    
-                        this.$emit(valueEvent, this.selected)
+                    this.$emit(valueEvent, this.items.find(item => item[this.title!] == event));
                 }
             },
             blur(event) {
                 if(this.isValid){
-                    if(!this.multiple)
-                        this.$emit(valueEvent, this.items.find(item => item[this.title!] == event));
-                    else    
-                        this.$emit(valueEvent, this.selected)
+                    this.$emit(valueEvent, this.selected);
+                }else{
+                    this.$emit(validationEvent, this.isValid)
                 }
-                this.$emit(validationEvent, this.isValid);
             },
             multiSelect(value: Object) {
                 this.unSelected = [];
@@ -153,7 +148,6 @@
             },
             initAriaRows(){
                 this.value = empty;
-                this.listItems = this.items;
                 this.ariaRows(this.items);
 
                 if(this.itemValue.length){
@@ -244,11 +238,6 @@
                 return value[this.filterKeys.title];
             },
             keyup(event){
-                this.listItems = this.listItems.filter((item) => {
-                    if(this.controlKeys.find(key => item[key].indexOf(event) != -1)){
-                        return item;
-                    }
-                })
             }
             
         }

package/components/form/date/Date.vue

@@ -54,17 +54,11 @@ export default {
         rule: this.rules.rules!,
         faCalendar: faCalendar,
         defaultIcon: defaultIcon,
-        isValid: true
+        isValid: true,
+        value: this.value,
+        model: this.model
     }
     },
-    watch:{
-        value(newValue, oldValue){
-            this.value = newValue;
-        },
-        model(newValue, oldValue){
-            this.model = newValue;
-        }
-    },
     methods: {
         select(event: any) {
             if(this.isValid){

package/components/form/file/File.vue

@@ -53,6 +53,11 @@
                 isValid: true
             }
         },
+        watch:{
+            value(newValue, oldValue){
+                this.isValid = newValue;
+            },
+        },
         methods: {
             blur(event: any) {
                 if(this.isValid){

package/components/form/helpers/parsers.ts

@@ -19,6 +19,19 @@ export class GridModelHelper<T> {
         return gridModel;
    }
 
+   clearGrid(gridModel: GridModel<T>) {
+        for(let row of gridModel.rows){
+            for(let col of row.cols){
+                if(col.type == 'complete' && col.complete != undefined){
+                    col.complete.itemValue = [];
+                    continue;
+                }
+
+                col.value = null;
+            }
+        }
+   }
+
    populateCompletes<T, U>(gridModel: GridModel<T>, completeModel: CompleteModels<U>) {
         for(let row of gridModel.rows){
             var col = row.cols.find(col => col.type == 'complete' && col.name == completeModel.name);

package/components/form/number/Number.vue

@@ -46,15 +46,10 @@ export default {
     return {
       rule: this.rules.rules!,
       controlVariant: controlVariant,
-      isValid: true
-    }
-  },
-  watch:{
-    value(newValue, oldValue){
-      this.value = newValue;
-    },
-    model(newValue, oldValue){
-      this.model = newValue;
+      isValid: true,
+      value: this.value,
+      model: this.model,
+
     }
   },
   methods: {

package/components/form/text/Text.vue

@@ -65,14 +65,8 @@ export default {
       typo: this.type,
       text: faLock,
       hashed: faUnlock,
-    }
-  },
-  watch:{
-    value(newValue, oldValue){
-      this.value = newValue;
-    },
-    model(newValue, oldValue){
-      this.model = newValue;
+      value: this.value,
+      model: this.model
     }
   },
   methods: {