@modeltables/fontawesome-vuetify 1.6.0 → 1.8.0

package/components/headerFilters/Date.vue

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

package/components/headerFilters/Filters.vue

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

package/components/table/TableView.vue

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