ninegrid2 6.217.0 → 6.218.0

package/dist/bundle.cjs.js

@@ -18058,15 +18058,18 @@ class ngFiltering
 		
 		
 		this.#owner.data.refreshFilter();
-		
-		var colnms = [];
-		for (let key in jsonFilter) {
-			colnms.push(key);
-		}
 		//var colnms = filterData.map(item => item.colnm);
 		
-		ninegrid.querySelectorAll("ng-filter-button").forEach(v => {
-			v.filterOptions = null;
+		//ninegrid.querySelectorAll("ng-filter-button").forEach(v => {
+		this.#owner.shadow.querySelectorAll("ng-filter-button").forEach(el => {
+			//v.filterOptions = null;
+			let options = el.filterOptions;
+
+			options.forEach(opt => {
+				opt.data = [];
+			});
+
+			el.filterOptions = options;
 		});
 		
 		for (let key in jsonFilter) {
@@ -18074,19 +18077,31 @@ class ngFiltering
 			this.#owner.fields.indexOf(key);
 			
 		//console.log(filterData);
-			ninegrid.querySelectorAll("ng-filter-button").forEach(v => {
+			//ninegrid.querySelectorAll("ng-filter-button").forEach(v => {
+			this.#owner.shadow.querySelectorAll("ng-filter-button").forEach(el => {
 				//v.filterData = null;
 				//console.log(v);
 				//var b = v.colnms;
-				v.colnms.forEach(colnm => {
-					
-					console.log(colnms, colnm);
+				let options = el.filterOptions;
+
+				options.forEach(opt => {
+
+					if (opt.hasOwnProperty(key)) {
+						opt.data = arr;
+					}
+					/**
+					//console.log(colnms, colnm);
 					if (colnms.includes(colnm)) {
 						console.log("==================");
 						
 						v.filterOptions = arr;
-					}
+					} */
 				});
+
+
+				console.log(options);
+
+				el.filterOptions = options;
 			});
 		}
 		
@@ -18205,7 +18220,7 @@ class ngFilterButton extends HTMLElement
 	};
 	set filterOptions(v) {
 		this.#filterOptions = v;
-		this.classList.toggle('filtered', v && this.#filterOptions.some(item => item.data.length > 0));
+		this.classList.toggle('filtered', this.#filterOptions.some(item => item.data.length > 0));
 	}
 	
 	#onClick = (e) => {

package/dist/bundle.esm.js

@@ -18056,15 +18056,18 @@ class ngFiltering
 		
 		
 		this.#owner.data.refreshFilter();
-		
-		var colnms = [];
-		for (let key in jsonFilter) {
-			colnms.push(key);
-		}
 		//var colnms = filterData.map(item => item.colnm);
 		
-		ninegrid.querySelectorAll("ng-filter-button").forEach(v => {
-			v.filterOptions = null;
+		//ninegrid.querySelectorAll("ng-filter-button").forEach(v => {
+		this.#owner.shadow.querySelectorAll("ng-filter-button").forEach(el => {
+			//v.filterOptions = null;
+			let options = el.filterOptions;
+
+			options.forEach(opt => {
+				opt.data = [];
+			});
+
+			el.filterOptions = options;
 		});
 		
 		for (let key in jsonFilter) {
@@ -18072,19 +18075,31 @@ class ngFiltering
 			this.#owner.fields.indexOf(key);
 			
 		//console.log(filterData);
-			ninegrid.querySelectorAll("ng-filter-button").forEach(v => {
+			//ninegrid.querySelectorAll("ng-filter-button").forEach(v => {
+			this.#owner.shadow.querySelectorAll("ng-filter-button").forEach(el => {
 				//v.filterData = null;
 				//console.log(v);
 				//var b = v.colnms;
-				v.colnms.forEach(colnm => {
-					
-					console.log(colnms, colnm);
+				let options = el.filterOptions;
+
+				options.forEach(opt => {
+
+					if (opt.hasOwnProperty(key)) {
+						opt.data = arr;
+					}
+					/**
+					//console.log(colnms, colnm);
 					if (colnms.includes(colnm)) {
 						console.log("==================");
 						
 						v.filterOptions = arr;
-					}
+					} */
 				});
+
+
+				console.log(options);
+
+				el.filterOptions = options;
 			});
 		}
 		
@@ -18203,7 +18218,7 @@ class ngFilterButton extends HTMLElement
 	};
 	set filterOptions(v) {
 		this.#filterOptions = v;
-		this.classList.toggle('filtered', v && this.#filterOptions.some(item => item.data.length > 0));
+		this.classList.toggle('filtered', this.#filterOptions.some(item => item.data.length > 0));
 	}
 	
 	#onClick = (e) => {

package/dist/etc/ngFiltering.js

@@ -133,8 +133,16 @@ export class ngFiltering
 		}
 		//var colnms = filterData.map(item => item.colnm);
 		
-		ninegrid.querySelectorAll("ng-filter-button").forEach(v => {
-			v.filterOptions = null;
+		//ninegrid.querySelectorAll("ng-filter-button").forEach(v => {
+		this.#owner.shadow.querySelectorAll("ng-filter-button").forEach(el => {
+			//v.filterOptions = null;
+			let options = el.filterOptions;
+
+			options.forEach(opt => {
+				opt.data = [];
+			});
+
+			el.filterOptions = options;
 		});
 		
 		for (let key in jsonFilter) {
@@ -142,19 +150,31 @@ export class ngFiltering
 			const idx = this.#owner.fields.indexOf(key);
 			
 		//console.log(filterData);
-			ninegrid.querySelectorAll("ng-filter-button").forEach(v => {
+			//ninegrid.querySelectorAll("ng-filter-button").forEach(v => {
+			this.#owner.shadow.querySelectorAll("ng-filter-button").forEach(el => {
 				//v.filterData = null;
 				//console.log(v);
 				//var b = v.colnms;
-				v.colnms.forEach(colnm => {
-					
-					console.log(colnms, colnm);
+				let options = el.filterOptions;
+
+				options.forEach(opt => {
+
+					if (opt.hasOwnProperty(key)) {
+						opt.data = arr;
+					}
+					/**
+					//console.log(colnms, colnm);
 					if (colnms.includes(colnm)) {
 						console.log("==================");
 						
 						v.filterOptions = arr;
-					}
+					} */
 				});
+
+
+				console.log(options);
+
+				el.filterOptions = options;
 			});
 		}
 		
@@ -273,7 +293,7 @@ class ngFilterButton extends HTMLElement
 	};
 	set filterOptions(v) {
 		this.#filterOptions = v;
-		this.classList.toggle('filtered', v && this.#filterOptions.some(item => item.data.length > 0));
+		this.classList.toggle('filtered', this.#filterOptions.some(item => item.data.length > 0));
 	}
 	
 	#onClick = (e) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ninegrid2",
   "type": "module",
-  "version": "6.217.0",
+  "version": "6.218.0",
   "main": "dist/index.js",
   "exports": {
     "import": "./dist/index.js",

package/src/etc/ngFiltering.js

@@ -133,8 +133,16 @@ export class ngFiltering
 		}
 		//var colnms = filterData.map(item => item.colnm);
 		
-		ninegrid.querySelectorAll("ng-filter-button").forEach(v => {
-			v.filterOptions = null;
+		//ninegrid.querySelectorAll("ng-filter-button").forEach(v => {
+		this.#owner.shadow.querySelectorAll("ng-filter-button").forEach(el => {
+			//v.filterOptions = null;
+			let options = el.filterOptions;
+
+			options.forEach(opt => {
+				opt.data = [];
+			});
+
+			el.filterOptions = options;
 		});
 		
 		for (let key in jsonFilter) {
@@ -142,19 +150,31 @@ export class ngFiltering
 			const idx = this.#owner.fields.indexOf(key);
 			
 		//console.log(filterData);
-			ninegrid.querySelectorAll("ng-filter-button").forEach(v => {
+			//ninegrid.querySelectorAll("ng-filter-button").forEach(v => {
+			this.#owner.shadow.querySelectorAll("ng-filter-button").forEach(el => {
 				//v.filterData = null;
 				//console.log(v);
 				//var b = v.colnms;
-				v.colnms.forEach(colnm => {
-					
-					console.log(colnms, colnm);
+				let options = el.filterOptions;
+
+				options.forEach(opt => {
+
+					if (opt.hasOwnProperty(key)) {
+						opt.data = arr;
+					}
+					/**
+					//console.log(colnms, colnm);
 					if (colnms.includes(colnm)) {
 						console.log("==================");
 						
 						v.filterOptions = arr;
-					}
+					} */
 				});
+
+
+				console.log(options);
+
+				el.filterOptions = options;
 			});
 		}
 		
@@ -273,7 +293,7 @@ class ngFilterButton extends HTMLElement
 	};
 	set filterOptions(v) {
 		this.#filterOptions = v;
-		this.classList.toggle('filtered', v && this.#filterOptions.some(item => item.data.length > 0));
+		this.classList.toggle('filtered', this.#filterOptions.some(item => item.data.length > 0));
 	}
 	
 	#onClick = (e) => {