dattatable 2.10.93 → 2.10.95

package/build/dashboard/accordion.d.ts

@@ -1,6 +1,5 @@
-import { Components } from "gd-sprest-bs";
 export interface IAccordion {
-    filter?: (value: string | string[], item?: Components.ICheckboxGroupItem) => void;
+    filter?: (value: string | string[], useAndOperator?: boolean) => void;
     refresh?: (items: any[]) => void;
     search?: (value: string) => void;
 }
@@ -31,9 +30,10 @@ export declare class Accordion implements IAccordion {
     private _activeSearchValue;
     private _pagination;
     private _props;
+    private _useAndOperator;
     constructor(props: IAccordionProps);
     private clearItem;
-    filter(values: string[]): void;
+    filter(values: string[], useAndOperator?: boolean): void;
     private generateItem;
     refresh(items?: any[]): void;
     private render;

package/build/dashboard/accordion.js

@@ -12,6 +12,7 @@ var Accordion = /** @class */ (function () {
         this._activeFilterValue = null;
         this._activeSearchValue = null;
         this._pagination = null;
+        this._useAndOperator = false;
         // Save the properties
         this._props = props;
         // Render the accordion
@@ -26,8 +27,10 @@ var Accordion = /** @class */ (function () {
         elItem.classList.remove("last-item");
     };
     // Filters the accordion
-    Accordion.prototype.filter = function (values) {
+    Accordion.prototype.filter = function (values, useAndOperator) {
+        if (useAndOperator === void 0) { useAndOperator = false; }
         this._activeFilterValue = values ? values.join('|') : "";
+        this._useAndOperator = useAndOperator;
         // Parse all accordion items
         var items = this._props.el.querySelectorAll(".accordion-item");
         for (var i = 0; i < items.length; i++) {
@@ -182,8 +185,17 @@ var Accordion = /** @class */ (function () {
                 for (var j = 0; j < activeFilters.length; j++) {
                     // See if the item contains the filter value
                     if (filterValues.indexOf(activeFilters[j]) >= 0) {
-                        // Set the flag and break from the loop
+                        // Set the flag
                         showItem = true;
+                        // Break from the loop if we aren't using the and operator
+                        if (!this._useAndOperator) {
+                            break;
+                        }
+                    }
+                    // Else, see if we are using the and operator
+                    else if (this._useAndOperator) {
+                        // Set the flag and break from the loop
+                        showItem = false;
                         break;
                     }
                 }

package/build/dashboard/index.d.ts

@@ -142,9 +142,9 @@ export declare class Dashboard {
      */
     clearFilter(): void;
     filter(idx: number, value?: string, exactMatchFl?: boolean): void;
-    filterAccordion(values?: string | string[]): void;
+    filterAccordion(values?: string | string[], useAndOperator?: boolean): void;
     filterMulti(idx: number, values?: string[]): void;
-    filterTiles(values?: string | string[]): void;
+    filterTiles(values?: string | string[], useAndOperator?: boolean): void;
     getFilter(key: string): Components.ICheckboxGroup;
     getSearchValue(): string;
     hideFilter(): void;

package/build/dashboard/index.js

@@ -126,11 +126,11 @@ var Dashboard = /** @class */ (function () {
                 // See if this is an accordion
                 if (_this.IsAccordion) {
                     // Filter the accordion
-                    _this._accordion.filter(values, item);
+                    _this._accordion.filter(values);
                 }
                 else {
                     // Filter the tiles
-                    _this._tiles.filter(values, item);
+                    _this._tiles.filter(values);
                 }
             } : null
         });
@@ -352,11 +352,12 @@ var Dashboard = /** @class */ (function () {
         }
     };
     // Filter the accordion
-    Dashboard.prototype.filterAccordion = function (values) {
+    Dashboard.prototype.filterAccordion = function (values, useAndOperator) {
+        if (useAndOperator === void 0) { useAndOperator = false; }
         // See if we have an accordion
         if (this.IsAccordion) {
             // Filter the accordion
-            this._accordion.filter(typeof (values) === "string" ? [values] : values);
+            this._accordion.filter(typeof (values) === "string" ? [values] : values, useAndOperator);
         }
     };
     // Filter the table by multiple values
@@ -377,11 +378,12 @@ var Dashboard = /** @class */ (function () {
         }
     };
     // Filter the tiles
-    Dashboard.prototype.filterTiles = function (values) {
+    Dashboard.prototype.filterTiles = function (values, useAndOperator) {
+        if (useAndOperator === void 0) { useAndOperator = false; }
         // See if we have tiles
         if (this.IsTiles) {
             // Filter the tiles
-            this._tiles.filter(typeof (values) === "string" ? [values] : values);
+            this._tiles.filter(typeof (values) === "string" ? [values] : values, useAndOperator);
         }
     };
     // Returns a filter checkbox group by its key

package/build/dashboard/tiles.d.ts

@@ -1,6 +1,6 @@
 import { Components } from "gd-sprest-bs";
 export interface ITiles {
-    filter?: (value: string | string[], item?: Components.ICheckboxGroupItem) => void;
+    filter?: (value: string | string[], useAndOperator?: boolean) => void;
     refresh?: (items: any[]) => void;
     search?: (value: string) => void;
 }
@@ -41,8 +41,9 @@ export declare class Tiles implements ITiles {
     private _activeSearchValue;
     private _pagination;
     private _props;
+    private _useAndOperator;
     constructor(props: ITilesProps);
-    filter(values: string[]): void;
+    filter(values: string[], useAndOperator?: boolean): void;
     private generateCard;
     refresh(items?: any[]): void;
     private render;

package/build/dashboard/tiles.js

@@ -12,14 +12,17 @@ var Tiles = /** @class */ (function () {
         this._activeFilterValue = null;
         this._activeSearchValue = null;
         this._pagination = null;
+        this._useAndOperator = false;
         // Save the properties
         this._props = props;
         // Render the tile
         this.render(this._props.items);
     }
     // Filters the tile
-    Tiles.prototype.filter = function (values) {
+    Tiles.prototype.filter = function (values, useAndOperator) {
+        if (useAndOperator === void 0) { useAndOperator = false; }
         this._activeFilterValue = values ? values.join('|') : "";
+        this._useAndOperator = useAndOperator;
         // Parse all tile
         var tiles = this._props.el.querySelectorAll(".card");
         for (var i = 0; i < tiles.length; i++) {
@@ -221,8 +224,17 @@ var Tiles = /** @class */ (function () {
                 for (var j = 0; j < activeFilters.length; j++) {
                     // See if the item contains the filter value
                     if (filterValues.indexOf(activeFilters[j]) >= 0) {
-                        // Set the flag and break from the loop
+                        // Set the flag
                         showItem = true;
+                        // Break from the loop if we aren't using the and operator
+                        if (!this._useAndOperator) {
+                            break;
+                        }
+                    }
+                    // Else, see if we are using the and operator
+                    else if (this._useAndOperator) {
+                        // Set the flag and break from the loop
+                        showItem = false;
                         break;
                     }
                 }