@modeltables/fontawesome-vuetify 1.4.0 → 1.6.0

package/components/headerFilters/Date.vue

@@ -25,8 +25,8 @@
         },
         methods: {
             filterDate(event: any){
-                this.data[this.prop] = event.target.value;
-                this.$emit('filterValue', event);
+                this.data[this.prop] = event;
+                this.$emit('filterDate', event);
             }
         }
     }

package/components/headerFilters/Filters.vue

@@ -60,7 +60,7 @@ export default {
             this.$emit('filterValue', event, filter);
         },
         filterDate(event: any, filter: any){
-            this.$emit('filterValue', event, filter);
+            this.$emit('filterDate', event, filter);
         }
     }
 }
@@ -69,7 +69,7 @@ export default {
     <span v-if="prop == options.Key! && options.Active">
         <FontAwesomeIcon :icon="hashTag"></FontAwesomeIcon>
     </span>
-    <span v-else>
+    <span v-else-if="prop">
         <div v-if="isNumber(item[prop])">
             <Number 
                 :filter="filters[prop]" 
@@ -82,7 +82,7 @@ export default {
                 :data="filters" 
                 :filter="filters[prop]" 
                 :prop="prop" 
-                @filterValue="filterDate($event, filters[prop])">
+                @filterDate="filterDate($event, filters[prop])">
             </Date>
         </div>
         <div v-else-if="isString(item[prop])">

package/components/table/TableView.vue

@@ -173,25 +173,27 @@ export default {
         this.$emit(change, item);
       }
     },
-    filterValue(event: any, dataItem: any){
+    filterDate(event: any, dataItem: any){
       let item = dataItem;
-      let value = event.target.value;
       if(item != null){
-        dataItem = value == '' ? null : value;
+        dataItem = event == '' ? null : new window.Date(event);
       }else{
-        dataItem = value;
+        dataItem = new window.Date(event);
       }
     },
-    filterDate(event: any, dataItem: any){
+    filterValue(event: any, dataItem: any){
       let item = dataItem;
+      let value = event.target.value;
       if(item != null){
-        dataItem = event == '' ? null : new window.Date(event);
+        dataItem = value == '' ? null : value;
       }else{
-        dataItem = new window.Date(event);
+        dataItem = value;
       }
     },
-    isNumber(n: any) { 
-      return !isNaN(parseFloat(n)) && !isNaN(n - 0) 
+    isActive(index){
+      if(!this.options.Active && !this.options.ShowKey){
+        return index > 0;
+      }
     },
     optionschange(event: any){
       this.page = event!.page;
@@ -272,7 +274,8 @@ export default {
           return-object> 
           <template v-slot:item="{ item, index }" >
             <tr v-if="index == 0 && showFilters" class="filter-items" >
-              <td v-for="(prop, index) in dataheader">
+              <td v-for="(prop, index) in dataheader" 
+                  v-if="isActive(index)">
                 <SortView 
                   :prop="prop" 
                   :index="index" 
@@ -281,20 +284,23 @@ export default {
               </td>
             </tr>
             <tr v-if="index == 0 && showFilters" class="filter-items" >
-              <td v-for="(prop, index) in Object.keys(item)">
-                <Filters 
+              <td v-for="(prop, index) in Object.keys(item)" 
+                  v-if="isActive(index)">
+                <Filters
                   :item="item" 
                   :filters="filters" 
                   :showFilters="showFilters" 
                   :options="options"
                   :prop="prop"
+                  @filterDate="filterDate($event, filters[prop])"
                   @filterValue="filterValue($event, filters[prop])">
                 </Filters>
               </td>
             </tr>
             <tr @dblclick="updateItem(item, $event)">
-              <td v-for="(prop) in Object.keys(item)">
-                <DataItem 
+              <td v-for="(prop, index) in Object.keys(item)"  
+                  v-if="isActive(index)">
+                <DataItem
                   :item="item" 
                   :prop="prop" 
                   :options="options"

package/components/table/data/ItemView.vue

@@ -47,14 +47,11 @@
 
 </script>
 <template>
-    <span v-if="prop == options.Key!">
-        <template v-if="options.ShowKey">
-            {{ item[prop] }}
-
-        </template>
-        <template v-else>
-            {{ index + 1 }}
-        </template>
+    <span v-if="prop == options.Key! && options.ShowKey">
+        {{ item[prop] }}
+    </span>
+    <span v-else-if="prop == options.Key! && options.Active">
+        {{ index + 1 }}
     </span>
     <span v-else-if="isDateTime(item[prop])">
         {{ toDate(item[prop]) }}