@modeltables/fontawesome-vuetify 1.9.0 → 2.1.0

package/components/dataSets/dataSetHeader.ts

@@ -1,7 +1,7 @@
-export class DataSetItems {
+import { HeaderModel } from "../models/tablemodels";
+
+export class DataSetHeader {
     id: number = 0;
     startPosition: boolean = false;
-    selected: boolean = false;
-    rowClass: string = '';
-    dataItem: Object = Object.assign({});
+    dataHeader: HeaderModel = new HeaderModel();
 }

package/components/dataSets/dataSetItems.ts

@@ -1,7 +1,7 @@
-import { HeaderModel } from "../models/tablemodels";
-
-export class DataSetHeader {
+export class DataSetItems {
     id: number = 0;
     startPosition: boolean = false;
-    dataHeader: HeaderModel = new HeaderModel();
+    selected: boolean = false;
+    rowClass: string = '';
+    dataItem: Object = Object.assign({});
 }

package/components/helpers/resources.ts

@@ -5,5 +5,6 @@ export const search = 'search';
 export const itemSelection = 'itemSelection';
 export const multiSelection = 'multiSelection';
 export const selectedRow = 'selected-row';
+export const unSelectedRow = 'unselected-row';
 export const rowClass = 'row-class';
 export const Id = 'Id';

package/components/table/TableView.vue

@@ -5,7 +5,7 @@ import { faRefresh, faSearch, faIndent, faCheck } from '@fortawesome/free-solid-
 import { faSquare } from '@fortawesome/free-regular-svg-icons';
 import { HeaderModel, Options } from '@/components/models/tablemodels';
 import { PaginatonModel } from '@/components/models/tablemodels';
-import { change, itemSelection, load, multiSelection, rowClass, rowClick, search, selectedRow } from '@/components/helpers/resources';
+import { change, itemSelection, load, multiSelection, rowClass, rowClick, search, selectedRow, unSelectedRow } from '@/components/helpers/resources';
 import Date from '@/components/headerFilters/Date.vue';
 import Search from '@/components/search/SearchView.vue';
 import Text from '@/components/headerFilters/Text.vue';
@@ -15,8 +15,8 @@ import SortView from '@/components/sort/SortView.vue';
 import PaginationView from '@/components/pagination/PaginationView.vue';
 import DataItem from '@/components/table/data/ItemView.vue';
 import { isEqual } from '../helpers/instances';
-import { DataSetItems } from '../dataSets/dataSetHeader';
-import { DataSetHeader } from '../dataSets/dataSetItems';
+import { DataSetHeader } from '../dataSets/dataSetHeader';
+import { DataSetItems } from '../dataSets/dataSetItems';
 
 export default {
   props: {
@@ -154,6 +154,7 @@ export default {
       faIndent: faIndent,
       faCheck: faCheck,
       faSquare: faSquare,
+      multiSelectionItems: [] as Object[],
       lastItem: {},
       completes: this.completes,
       filters: { CurrentPage: 1, PerPage: 10, SortColumn: '', SortDirection: 1 } as any,
@@ -256,13 +257,18 @@ export default {
       if(this.multiSelect){
         item.selected = !item.selected;
 
-        if(item.rowClass == selectedRow){
-          item.rowClass = '';
-        }else{
+        if(!this.multiSelectionItems.length){
+          item.rowClass = selectedRow;
+          this.multiSelectionItems = [item.dataItem];
+        }else if(item.selected){
           item.rowClass = selectedRow;
+          this.multiSelectionItems = [...this.multiSelectionItems, item.dataItem]
+        }else{
+          item.rowClass = unSelectedRow;
+          this.multiSelectionItems = this.multiSelectionItems.filter(element => !isEqual(element, item.dataItem));
         }
 
-        this.$emit(multiSelection, this.dataSetItems.filter(dataSet => dataSet.selected).map(dataSet => { return dataSet.dataItem } ));
+        this.$emit(multiSelection, this.multiSelectionItems);
       }
     },
     filterValue(event: any, dataItem: any){
@@ -338,9 +344,10 @@ export default {
           value.rowClass = selectedRow;
         }else{
           value.selected = false;
-          value.rowClass = '';
+          value.rowClass = unSelectedRow;
         }
       }
+
       this.multiSelected = !this.multiSelected;
     }
   }