ninegrid2 6.178.0 → 6.180.0

package/dist/bundle.cjs.js

@@ -18225,8 +18225,6 @@ class ngFilterButton extends HTMLElement
 		//console.log(panel.isHidden, panel.col, this.closest('th,td').dataset.col);
 
 		if (panel.col === this.closest('th,td').dataset.col) {
-			//panel.col = null;
-			//panel.style.display = 'none';
 			panel.close();
 		}
 		else {
@@ -18465,7 +18463,10 @@ class ngFilterPanel extends HTMLElement
 	open = (filterButton) => {
 
 		const owner = this.shadow.closest("nine-grid");
+		const colnms = [...new Set(filterButton.filterOptions.map(item => item.colnm))];
 
+		console.log(filterButton.filterOptions, colnms);
+		
 		var col = filterButton.closest('th,td').dataset.col;
 		this.col = col;
 
@@ -18482,36 +18483,40 @@ class ngFilterPanel extends HTMLElement
 		
 		this.shadowRoot.querySelector("input[type=text]").value = "";
 
+
 		//$(this.shadowRoot).find("input[type=text]").val("");
 
 		setTimeout(() => {
-		
+
 			
-			var ds = [];
-			var colnms = [];
-			$(owner.template).find(`[data-col=${col}]`).each((index,el) => {
-				if (el.dataset.bind) colnms.push(el.dataset.bind);
-			});
+			const data = owner.data.getValidDataNF();
+
+			console.log(data);
 
-			owner.activeTmpl.querySelectorAll(`[data-col="${col}"]`).forEach(el => {
-				if (el.dataset.bind) colnms.push(el.dataset.bind);
+			owner.body.querySelectorAll(`th[data-col]:not([data-col="${col}"]),td[data-col]:not([data-col="${col}"])`).forEach(td => {
+				const el = td.querySelector("ng-filter-button");
+				console.log(el);
+
+				if (el && el.filterOptions) {
+					el.filterOptions.forEach(filterOption => {
+						var idx = owner.fields.indexOf(filterOption.colnm);
+						
+						console.log(idx);
+
+						if (idx >= 0) {
+							data = data.filter(m => { return filterOption.data.nineBinarySearch(m.v[idx] || '') >= 0; });
+						}
+					});
+				}
 			});
 
-			console.log(colnms);
-			
-			var data = owner.data.getValidDataNF();
+			console.log(data);
+
+			/**
 			$("ng-filter-button", owner.body).each((index,el) => {
 
 				if (el.closest('th,td').dataset.col == col || !el.filterData) return true;
-				/**
-				el.filterData.forEach(o => {
-					var idx = owner.fields.indexOf(o.colnm);
-					
-					if (idx >= 0) {
-						data = data.filter(m => { return o.data.nineBinarySearch(m.v[idx] || '') >= 0; });
-					}
-				});
-				*/
+
 				
 				console.log(el.filterData, el.colnms, el.dataset.bind);
 
@@ -18526,10 +18531,11 @@ class ngFilterPanel extends HTMLElement
 				});
 				
 				//data = data.filter(rowData => { return el.filterData.findIndex(item => (item.DATA || '') == (rowData[item.COLNM] || '') ) >= 0; });
-			});
+			}); */
 			
 			
-			colnms = [...new Set(colnms)];
+			var ds = [];
+			//colnms = [...new Set(colnms)];
 			colnms.forEach((colnm,i) => {
 
 				ds.push({
@@ -18580,7 +18586,7 @@ class ngFilterPanel extends HTMLElement
 				});
 			});
 			
-			var grd = this.shadowRoot.querySelector("nine-grid");
+			const grd = this.shadowRoot.querySelector("nine-grid");
 			//grd.dataSource = ds;
 			grd.fields.add(["DATA","DATA2","COLNM"]);
 			

package/dist/bundle.esm.js

@@ -18223,8 +18223,6 @@ class ngFilterButton extends HTMLElement
 		//console.log(panel.isHidden, panel.col, this.closest('th,td').dataset.col);
 
 		if (panel.col === this.closest('th,td').dataset.col) {
-			//panel.col = null;
-			//panel.style.display = 'none';
 			panel.close();
 		}
 		else {
@@ -18463,7 +18461,10 @@ class ngFilterPanel extends HTMLElement
 	open = (filterButton) => {
 
 		const owner = this.shadow.closest("nine-grid");
+		const colnms = [...new Set(filterButton.filterOptions.map(item => item.colnm))];
 
+		console.log(filterButton.filterOptions, colnms);
+		
 		var col = filterButton.closest('th,td').dataset.col;
 		this.col = col;
 
@@ -18480,36 +18481,40 @@ class ngFilterPanel extends HTMLElement
 		
 		this.shadowRoot.querySelector("input[type=text]").value = "";
 
+
 		//$(this.shadowRoot).find("input[type=text]").val("");
 
 		setTimeout(() => {
-		
+
 			
-			var ds = [];
-			var colnms = [];
-			$(owner.template).find(`[data-col=${col}]`).each((index,el) => {
-				if (el.dataset.bind) colnms.push(el.dataset.bind);
-			});
+			const data = owner.data.getValidDataNF();
+
+			console.log(data);
 
-			owner.activeTmpl.querySelectorAll(`[data-col="${col}"]`).forEach(el => {
-				if (el.dataset.bind) colnms.push(el.dataset.bind);
+			owner.body.querySelectorAll(`th[data-col]:not([data-col="${col}"]),td[data-col]:not([data-col="${col}"])`).forEach(td => {
+				const el = td.querySelector("ng-filter-button");
+				console.log(el);
+
+				if (el && el.filterOptions) {
+					el.filterOptions.forEach(filterOption => {
+						var idx = owner.fields.indexOf(filterOption.colnm);
+						
+						console.log(idx);
+
+						if (idx >= 0) {
+							data = data.filter(m => { return filterOption.data.nineBinarySearch(m.v[idx] || '') >= 0; });
+						}
+					});
+				}
 			});
 
-			console.log(colnms);
-			
-			var data = owner.data.getValidDataNF();
+			console.log(data);
+
+			/**
 			$("ng-filter-button", owner.body).each((index,el) => {
 
 				if (el.closest('th,td').dataset.col == col || !el.filterData) return true;
-				/**
-				el.filterData.forEach(o => {
-					var idx = owner.fields.indexOf(o.colnm);
-					
-					if (idx >= 0) {
-						data = data.filter(m => { return o.data.nineBinarySearch(m.v[idx] || '') >= 0; });
-					}
-				});
-				*/
+
 				
 				console.log(el.filterData, el.colnms, el.dataset.bind);
 
@@ -18524,10 +18529,11 @@ class ngFilterPanel extends HTMLElement
 				});
 				
 				//data = data.filter(rowData => { return el.filterData.findIndex(item => (item.DATA || '') == (rowData[item.COLNM] || '') ) >= 0; });
-			});
+			}); */
 			
 			
-			colnms = [...new Set(colnms)];
+			var ds = [];
+			//colnms = [...new Set(colnms)];
 			colnms.forEach((colnm,i) => {
 
 				ds.push({
@@ -18578,7 +18584,7 @@ class ngFilterPanel extends HTMLElement
 				});
 			});
 			
-			var grd = this.shadowRoot.querySelector("nine-grid");
+			const grd = this.shadowRoot.querySelector("nine-grid");
 			//grd.dataSource = ds;
 			grd.fields.add(["DATA","DATA2","COLNM"]);
 			

package/dist/etc/ngFiltering.js

@@ -289,8 +289,6 @@ class ngFilterButton extends HTMLElement
 		//console.log(panel.isHidden, panel.col, this.closest('th,td').dataset.col);
 
 		if (panel.col === this.closest('th,td').dataset.col) {
-			//panel.col = null;
-			//panel.style.display = 'none';
 			panel.close();
 		}
 		else {
@@ -531,7 +529,10 @@ class ngFilterPanel extends HTMLElement
 	open = (filterButton) => {
 
 		const owner = this.shadow.closest("nine-grid");
+		const colnms = [...new Set(filterButton.filterOptions.map(item => item.colnm))];
 
+		console.log(filterButton.filterOptions, colnms);
+		
 		var col = filterButton.closest('th,td').dataset.col;
 		this.col = col;
 
@@ -548,36 +549,40 @@ class ngFilterPanel extends HTMLElement
 		
 		this.shadowRoot.querySelector("input[type=text]").value = "";
 
+
 		//$(this.shadowRoot).find("input[type=text]").val("");
 
 		setTimeout(() => {
-		
+
 			
-			var ds = [];
-			var colnms = [];
-			$(owner.template).find(`[data-col=${col}]`).each((index,el) => {
-				if (el.dataset.bind) colnms.push(el.dataset.bind);
-			});
+			const data = owner.data.getValidDataNF();
+
+			console.log(data);
 
-			owner.activeTmpl.querySelectorAll(`[data-col="${col}"]`).forEach(el => {
-				if (el.dataset.bind) colnms.push(el.dataset.bind);
+			owner.body.querySelectorAll(`th[data-col]:not([data-col="${col}"]),td[data-col]:not([data-col="${col}"])`).forEach(td => {
+				const el = td.querySelector("ng-filter-button");
+				console.log(el);
+
+				if (el && el.filterOptions) {
+					el.filterOptions.forEach(filterOption => {
+						var idx = owner.fields.indexOf(filterOption.colnm);
+						
+						console.log(idx);
+
+						if (idx >= 0) {
+							data = data.filter(m => { return filterOption.data.nineBinarySearch(m.v[idx] || '') >= 0; });
+						}
+					});
+				}
 			});
 
-			console.log(colnms);
-			
-			var data = owner.data.getValidDataNF();
+			console.log(data);
+
+			/**
 			$("ng-filter-button", owner.body).each((index,el) => {
 
 				if (el.closest('th,td').dataset.col == col || !el.filterData) return true;
-				/**
-				el.filterData.forEach(o => {
-					var idx = owner.fields.indexOf(o.colnm);
-					
-					if (idx >= 0) {
-						data = data.filter(m => { return o.data.nineBinarySearch(m.v[idx] || '') >= 0; });
-					}
-				});
-				*/
+
 				
 				console.log(el.filterData, el.colnms, el.dataset.bind);
 
@@ -592,10 +597,11 @@ class ngFilterPanel extends HTMLElement
 				});
 				
 				//data = data.filter(rowData => { return el.filterData.findIndex(item => (item.DATA || '') == (rowData[item.COLNM] || '') ) >= 0; });
-			});
+			}); */
 			
 			
-			colnms = [...new Set(colnms)];
+			var ds = [];
+			//colnms = [...new Set(colnms)];
 			colnms.forEach((colnm,i) => {
 
 				ds.push({
@@ -646,7 +652,7 @@ class ngFilterPanel extends HTMLElement
 				});
 			});
 			
-			var grd = this.shadowRoot.querySelector("nine-grid");
+			const grd = this.shadowRoot.querySelector("nine-grid");
 			//grd.dataSource = ds;
 			grd.fields.add(["DATA","DATA2","COLNM"]);
 			

package/package.json

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

package/src/etc/ngFiltering.js

@@ -289,8 +289,6 @@ class ngFilterButton extends HTMLElement
 		//console.log(panel.isHidden, panel.col, this.closest('th,td').dataset.col);
 
 		if (panel.col === this.closest('th,td').dataset.col) {
-			//panel.col = null;
-			//panel.style.display = 'none';
 			panel.close();
 		}
 		else {
@@ -531,7 +529,10 @@ class ngFilterPanel extends HTMLElement
 	open = (filterButton) => {
 
 		const owner = this.shadow.closest("nine-grid");
+		const colnms = [...new Set(filterButton.filterOptions.map(item => item.colnm))];
 
+		console.log(filterButton.filterOptions, colnms);
+		
 		var col = filterButton.closest('th,td').dataset.col;
 		this.col = col;
 
@@ -548,36 +549,40 @@ class ngFilterPanel extends HTMLElement
 		
 		this.shadowRoot.querySelector("input[type=text]").value = "";
 
+
 		//$(this.shadowRoot).find("input[type=text]").val("");
 
 		setTimeout(() => {
-		
+
 			
-			var ds = [];
-			var colnms = [];
-			$(owner.template).find(`[data-col=${col}]`).each((index,el) => {
-				if (el.dataset.bind) colnms.push(el.dataset.bind);
-			});
+			const data = owner.data.getValidDataNF();
+
+			console.log(data);
 
-			owner.activeTmpl.querySelectorAll(`[data-col="${col}"]`).forEach(el => {
-				if (el.dataset.bind) colnms.push(el.dataset.bind);
+			owner.body.querySelectorAll(`th[data-col]:not([data-col="${col}"]),td[data-col]:not([data-col="${col}"])`).forEach(td => {
+				const el = td.querySelector("ng-filter-button");
+				console.log(el);
+
+				if (el && el.filterOptions) {
+					el.filterOptions.forEach(filterOption => {
+						var idx = owner.fields.indexOf(filterOption.colnm);
+						
+						console.log(idx);
+
+						if (idx >= 0) {
+							data = data.filter(m => { return filterOption.data.nineBinarySearch(m.v[idx] || '') >= 0; });
+						}
+					});
+				}
 			});
 
-			console.log(colnms);
-			
-			var data = owner.data.getValidDataNF();
+			console.log(data);
+
+			/**
 			$("ng-filter-button", owner.body).each((index,el) => {
 
 				if (el.closest('th,td').dataset.col == col || !el.filterData) return true;
-				/**
-				el.filterData.forEach(o => {
-					var idx = owner.fields.indexOf(o.colnm);
-					
-					if (idx >= 0) {
-						data = data.filter(m => { return o.data.nineBinarySearch(m.v[idx] || '') >= 0; });
-					}
-				});
-				*/
+
 				
 				console.log(el.filterData, el.colnms, el.dataset.bind);
 
@@ -592,10 +597,11 @@ class ngFilterPanel extends HTMLElement
 				});
 				
 				//data = data.filter(rowData => { return el.filterData.findIndex(item => (item.DATA || '') == (rowData[item.COLNM] || '') ) >= 0; });
-			});
+			}); */
 			
 			
-			colnms = [...new Set(colnms)];
+			var ds = [];
+			//colnms = [...new Set(colnms)];
 			colnms.forEach((colnm,i) => {
 
 				ds.push({
@@ -646,7 +652,7 @@ class ngFilterPanel extends HTMLElement
 				});
 			});
 			
-			var grd = this.shadowRoot.querySelector("nine-grid");
+			const grd = this.shadowRoot.querySelector("nine-grid");
 			//grd.dataSource = ds;
 			grd.fields.add(["DATA","DATA2","COLNM"]);