ninegrid2 6.205.0 → 6.207.0

package/dist/bundle.cjs.js

@@ -18066,7 +18066,7 @@ class ngFiltering
 		//var colnms = filterData.map(item => item.colnm);
 		
 		ninegrid.querySelectorAll("ng-filter-button").forEach(v => {
-			v.filterData = null;
+			v.filterOptions = null;
 		});
 		
 		for (let key in jsonFilter) {
@@ -18084,7 +18084,7 @@ class ngFiltering
 					if (colnms.includes(colnm)) {
 						console.log("==================");
 						
-						v.filterData = arr;
+						v.filterOptions = arr;
 					}
 				});
 			});
@@ -18179,7 +18179,7 @@ class ngFiltering
 class ngFilterButton extends HTMLElement
 {
 	#owner;
-	#filterData;
+	#filterOptions;
 	#colnms;
 	
 	constructor () {
@@ -18200,12 +18200,13 @@ class ngFilterButton extends HTMLElement
 		this.#colnms = v;
 	};
 	
-	get filterData() {
-		return this.#filterData;
+	get filterOptions() {
+		return this.#filterOptions;
 	};
-	set filterData(v) {
-		this.#filterData = v;
-		v && v.length > 0 ? ninegrid.j.querySelectorAll(this).addClass('filtered') : ninegrid.j.querySelectorAll(this).removeClass('filtered');
+	set filterOptions(v) {
+		console.log(v);
+		this.#filterOptions = v;
+		v && v.length > 0 ? this.classList.add('filtered') : this.classList.remove('filtered');
 	};
 	
 	#onClick = (e) => {
@@ -18316,22 +18317,20 @@ class ngFilterPanel extends HTMLElement
 			const DATA_IDX	= grd.fields.indexOf("DATA");
 			
 			const checked	= grd.data.getValidDataNF().filter(m => { return m.v[LVL_IDX] == 2 && m.v[CHK_IDX] == "Y"; });
-			const unchecked = grd.data.getValidDataNF().filter(m => { return m.v[LVL_IDX] == 2 && m.v[CHK_IDX] != "Y"; });
-			
-			if (unchecked.length == 0) ;
+			grd.data.getValidDataNF().filter(m => { return m.v[LVL_IDX] == 2 && m.v[CHK_IDX] != "Y"; });
 			
-			var filterData = [];
+			var filterOptions = [];
 			if (checked.length > 0) {
 				
 				[...new Set(checked.map(m => { return m.v[COLNM_IDX] }))].forEach(v => {
-					filterData.push({
+					filterOptions.push({
 						colnm	: v,
 						data	: [...new Set(grd.data.getValidData().filter(m => { return m.v[CHK_IDX] == "Y" && m.v[COLNM_IDX] == v; }).map(m => { return m.v[DATA_IDX] || ''; }))].sort((a,b) => { return a > b ? 1 : -1; }),
 					});
 				});
 			}
 			
-			console.log(filterData);
+			console.log(filterOptions);
 			
 		//console.log(this.#target);
 		
@@ -18355,27 +18354,25 @@ class ngFilterPanel extends HTMLElement
 			this.#target.owner.data.refreshFilter();
 			*/
 			
-			console.log(this.#target, this.#target.button, filterData);
+			console.log(this.#target, this.#target.button, filterOptions);
 			
-			this.#target.button.filterOptions = filterData;
-			this.#target.button.filterData = filterData;
-
-			//this.#target.button.filterData = [...new Set(checked.map(m => { return m.v[DATA_IDX] }))];
+			this.#target.button.filterOptions = filterOptions;
 			
-			console.log(this.#target.button.filterOptions);
+			var oParam = {};
 			
-			$("ng-filter-button", this.#target.owner.body).each((index,el) => {
+			this.#target.owner.body.querySelectorAll("ng-filter-button").each(el => {
 				
-				if (!el.filterData) return true;
+				//if (!el.filterOptions) return true;
 
-				el.colnms.forEach(colnm => {
-					el.filterData;
+				el.filterOptions.forEach(filterOptions => {
+					oParam[filterOptions.colnm] = filterOptions.data;
 				});
 			});
 			
-			//console.log(oParam);
-			
-			//this.#target.owner.filtering.on(oParam);
+			console.log(oParam);
+
+
+			this.#target.owner.filtering.set(oParam);
 
 			this.classList.remove("loading");
 		});

package/dist/bundle.esm.js

@@ -18064,7 +18064,7 @@ class ngFiltering
 		//var colnms = filterData.map(item => item.colnm);
 		
 		ninegrid.querySelectorAll("ng-filter-button").forEach(v => {
-			v.filterData = null;
+			v.filterOptions = null;
 		});
 		
 		for (let key in jsonFilter) {
@@ -18082,7 +18082,7 @@ class ngFiltering
 					if (colnms.includes(colnm)) {
 						console.log("==================");
 						
-						v.filterData = arr;
+						v.filterOptions = arr;
 					}
 				});
 			});
@@ -18177,7 +18177,7 @@ class ngFiltering
 class ngFilterButton extends HTMLElement
 {
 	#owner;
-	#filterData;
+	#filterOptions;
 	#colnms;
 	
 	constructor () {
@@ -18198,12 +18198,13 @@ class ngFilterButton extends HTMLElement
 		this.#colnms = v;
 	};
 	
-	get filterData() {
-		return this.#filterData;
+	get filterOptions() {
+		return this.#filterOptions;
 	};
-	set filterData(v) {
-		this.#filterData = v;
-		v && v.length > 0 ? ninegrid.j.querySelectorAll(this).addClass('filtered') : ninegrid.j.querySelectorAll(this).removeClass('filtered');
+	set filterOptions(v) {
+		console.log(v);
+		this.#filterOptions = v;
+		v && v.length > 0 ? this.classList.add('filtered') : this.classList.remove('filtered');
 	};
 	
 	#onClick = (e) => {
@@ -18314,22 +18315,20 @@ class ngFilterPanel extends HTMLElement
 			const DATA_IDX	= grd.fields.indexOf("DATA");
 			
 			const checked	= grd.data.getValidDataNF().filter(m => { return m.v[LVL_IDX] == 2 && m.v[CHK_IDX] == "Y"; });
-			const unchecked = grd.data.getValidDataNF().filter(m => { return m.v[LVL_IDX] == 2 && m.v[CHK_IDX] != "Y"; });
-			
-			if (unchecked.length == 0) ;
+			grd.data.getValidDataNF().filter(m => { return m.v[LVL_IDX] == 2 && m.v[CHK_IDX] != "Y"; });
 			
-			var filterData = [];
+			var filterOptions = [];
 			if (checked.length > 0) {
 				
 				[...new Set(checked.map(m => { return m.v[COLNM_IDX] }))].forEach(v => {
-					filterData.push({
+					filterOptions.push({
 						colnm	: v,
 						data	: [...new Set(grd.data.getValidData().filter(m => { return m.v[CHK_IDX] == "Y" && m.v[COLNM_IDX] == v; }).map(m => { return m.v[DATA_IDX] || ''; }))].sort((a,b) => { return a > b ? 1 : -1; }),
 					});
 				});
 			}
 			
-			console.log(filterData);
+			console.log(filterOptions);
 			
 		//console.log(this.#target);
 		
@@ -18353,27 +18352,25 @@ class ngFilterPanel extends HTMLElement
 			this.#target.owner.data.refreshFilter();
 			*/
 			
-			console.log(this.#target, this.#target.button, filterData);
+			console.log(this.#target, this.#target.button, filterOptions);
 			
-			this.#target.button.filterOptions = filterData;
-			this.#target.button.filterData = filterData;
-
-			//this.#target.button.filterData = [...new Set(checked.map(m => { return m.v[DATA_IDX] }))];
+			this.#target.button.filterOptions = filterOptions;
 			
-			console.log(this.#target.button.filterOptions);
+			var oParam = {};
 			
-			$("ng-filter-button", this.#target.owner.body).each((index,el) => {
+			this.#target.owner.body.querySelectorAll("ng-filter-button").each(el => {
 				
-				if (!el.filterData) return true;
+				//if (!el.filterOptions) return true;
 
-				el.colnms.forEach(colnm => {
-					el.filterData;
+				el.filterOptions.forEach(filterOptions => {
+					oParam[filterOptions.colnm] = filterOptions.data;
 				});
 			});
 			
-			//console.log(oParam);
-			
-			//this.#target.owner.filtering.on(oParam);
+			console.log(oParam);
+
+
+			this.#target.owner.filtering.set(oParam);
 
 			this.classList.remove("loading");
 		});

package/dist/etc/ngFiltering.js

@@ -134,7 +134,7 @@ export class ngFiltering
 		//var colnms = filterData.map(item => item.colnm);
 		
 		ninegrid.querySelectorAll("ng-filter-button").forEach(v => {
-			v.filterData = null;
+			v.filterOptions = null;
 		});
 		
 		for (let key in jsonFilter) {
@@ -152,7 +152,7 @@ export class ngFiltering
 					if (colnms.includes(colnm)) {
 						console.log("==================");
 						
-						v.filterData = arr;
+						v.filterOptions = arr;
 					}
 				});
 			});
@@ -247,7 +247,7 @@ export class ngFiltering
 class ngFilterButton extends HTMLElement
 {
 	#owner;
-	#filterData;
+	#filterOptions;
 	#colnms;
 	
 	constructor () {
@@ -268,12 +268,13 @@ class ngFilterButton extends HTMLElement
 		this.#colnms = v;
 	};
 	
-	get filterData() {
-		return this.#filterData;
+	get filterOptions() {
+		return this.#filterOptions;
 	};
-	set filterData(v) {
-		this.#filterData = v;
-		v && v.length > 0 ? ninegrid.j.querySelectorAll(this).addClass('filtered') : ninegrid.j.querySelectorAll(this).removeClass('filtered');
+	set filterOptions(v) {
+		console.log(v);
+		this.#filterOptions = v;
+		v && v.length > 0 ? this.classList.add('filtered') : this.classList.remove('filtered');
 	};
 	
 	#onClick = (e) => {
@@ -386,22 +387,18 @@ class ngFilterPanel extends HTMLElement
 			const checked	= grd.data.getValidDataNF().filter(m => { return m.v[LVL_IDX] == 2 && m.v[CHK_IDX] == "Y"; });
 			const unchecked = grd.data.getValidDataNF().filter(m => { return m.v[LVL_IDX] == 2 && m.v[CHK_IDX] != "Y"; });
 			
-			if (unchecked.length == 0) {
-				//this.#target.button.filterData = null;
-			}
-			
-			var filterData = [];
+			var filterOptions = [];
 			if (checked.length > 0) {
 				
 				[...new Set(checked.map(m => { return m.v[COLNM_IDX] }))].forEach(v => {
-					filterData.push({
+					filterOptions.push({
 						colnm	: v,
 						data	: [...new Set(grd.data.getValidData().filter(m => { return m.v[CHK_IDX] == "Y" && m.v[COLNM_IDX] == v; }).map(m => { return m.v[DATA_IDX] || ''; }))].sort((a,b) => { return a > b ? 1 : -1; }),
 					});
 				});
 			}
 			
-			console.log(filterData);
+			console.log(filterOptions);
 			
 		//console.log(this.#target);
 		
@@ -425,29 +422,25 @@ class ngFilterPanel extends HTMLElement
 			this.#target.owner.data.refreshFilter();
 			*/
 			
-			console.log(this.#target, this.#target.button, filterData)
-			
-			this.#target.button.filterOptions = filterData;
-			this.#target.button.filterData = filterData;
-
-			//this.#target.button.filterData = [...new Set(checked.map(m => { return m.v[DATA_IDX] }))];
+			console.log(this.#target, this.#target.button, filterOptions)
 			
-			console.log(this.#target.button.filterOptions)
+			this.#target.button.filterOptions = filterOptions;
 			
 			var oParam = {};
 			
-			$("ng-filter-button", this.#target.owner.body).each((index,el) => {
+			this.#target.owner.body.querySelectorAll("ng-filter-button").each(el => {
 				
-				if (!el.filterData) return true;
+				//if (!el.filterOptions) return true;
 
-				el.colnms.forEach(colnm => {
-					oParam[colnm] = el.filterData;
+				el.filterOptions.forEach(filterOptions => {
+					oParam[filterOptions.colnm] = filterOptions.data;
 				});
 			});
 			
-			//console.log(oParam);
-			
-			//this.#target.owner.filtering.on(oParam);
+			console.log(oParam);
+
+
+			this.#target.owner.filtering.set(oParam);
 
 			this.classList.remove("loading");
 		});

package/package.json

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

package/src/etc/ngFiltering.js

@@ -134,7 +134,7 @@ export class ngFiltering
 		//var colnms = filterData.map(item => item.colnm);
 		
 		ninegrid.querySelectorAll("ng-filter-button").forEach(v => {
-			v.filterData = null;
+			v.filterOptions = null;
 		});
 		
 		for (let key in jsonFilter) {
@@ -152,7 +152,7 @@ export class ngFiltering
 					if (colnms.includes(colnm)) {
 						console.log("==================");
 						
-						v.filterData = arr;
+						v.filterOptions = arr;
 					}
 				});
 			});
@@ -247,7 +247,7 @@ export class ngFiltering
 class ngFilterButton extends HTMLElement
 {
 	#owner;
-	#filterData;
+	#filterOptions;
 	#colnms;
 	
 	constructor () {
@@ -268,12 +268,13 @@ class ngFilterButton extends HTMLElement
 		this.#colnms = v;
 	};
 	
-	get filterData() {
-		return this.#filterData;
+	get filterOptions() {
+		return this.#filterOptions;
 	};
-	set filterData(v) {
-		this.#filterData = v;
-		v && v.length > 0 ? ninegrid.j.querySelectorAll(this).addClass('filtered') : ninegrid.j.querySelectorAll(this).removeClass('filtered');
+	set filterOptions(v) {
+		console.log(v);
+		this.#filterOptions = v;
+		v && v.length > 0 ? this.classList.add('filtered') : this.classList.remove('filtered');
 	};
 	
 	#onClick = (e) => {
@@ -386,22 +387,18 @@ class ngFilterPanel extends HTMLElement
 			const checked	= grd.data.getValidDataNF().filter(m => { return m.v[LVL_IDX] == 2 && m.v[CHK_IDX] == "Y"; });
 			const unchecked = grd.data.getValidDataNF().filter(m => { return m.v[LVL_IDX] == 2 && m.v[CHK_IDX] != "Y"; });
 			
-			if (unchecked.length == 0) {
-				//this.#target.button.filterData = null;
-			}
-			
-			var filterData = [];
+			var filterOptions = [];
 			if (checked.length > 0) {
 				
 				[...new Set(checked.map(m => { return m.v[COLNM_IDX] }))].forEach(v => {
-					filterData.push({
+					filterOptions.push({
 						colnm	: v,
 						data	: [...new Set(grd.data.getValidData().filter(m => { return m.v[CHK_IDX] == "Y" && m.v[COLNM_IDX] == v; }).map(m => { return m.v[DATA_IDX] || ''; }))].sort((a,b) => { return a > b ? 1 : -1; }),
 					});
 				});
 			}
 			
-			console.log(filterData);
+			console.log(filterOptions);
 			
 		//console.log(this.#target);
 		
@@ -425,29 +422,25 @@ class ngFilterPanel extends HTMLElement
 			this.#target.owner.data.refreshFilter();
 			*/
 			
-			console.log(this.#target, this.#target.button, filterData)
-			
-			this.#target.button.filterOptions = filterData;
-			this.#target.button.filterData = filterData;
-
-			//this.#target.button.filterData = [...new Set(checked.map(m => { return m.v[DATA_IDX] }))];
+			console.log(this.#target, this.#target.button, filterOptions)
 			
-			console.log(this.#target.button.filterOptions)
+			this.#target.button.filterOptions = filterOptions;
 			
 			var oParam = {};
 			
-			$("ng-filter-button", this.#target.owner.body).each((index,el) => {
+			this.#target.owner.body.querySelectorAll("ng-filter-button").each(el => {
 				
-				if (!el.filterData) return true;
+				//if (!el.filterOptions) return true;
 
-				el.colnms.forEach(colnm => {
-					oParam[colnm] = el.filterData;
+				el.filterOptions.forEach(filterOptions => {
+					oParam[filterOptions.colnm] = filterOptions.data;
 				});
 			});
 			
-			//console.log(oParam);
-			
-			//this.#target.owner.filtering.on(oParam);
+			console.log(oParam);
+
+
+			this.#target.owner.filtering.set(oParam);
 
 			this.classList.remove("loading");
 		});