ninegrid2 6.132.0 → 6.133.0

package/dist/bundle.cjs.js

@@ -17865,6 +17865,13 @@ class ngFields
 	};
 }
 
+/**
+ * button.filterDatas = [{
+ * 	colnm: "userId",
+ *  data: [],
+ * }]
+ * button.
+ */
 class ngFiltering
 {
 	#owner;
@@ -17893,11 +17900,116 @@ class ngFiltering
 		
 		this.#on();
 		
-		if (v) this.#set(v);
+		//if (v) this.#init(v);
+	};
+	
+	set = (oFilter) => {
+	
+		this.on();
+
+		let jsonFilter = {};
+		if (Array.isArray(oFilter)) {
+			for (let key in oFilter[0]) {
+				jsonFilter[key] = Array.from(new Set(oFilter.map(item => item[key])));//oFilter.map(item => item[key]);
+			}
+		}
+		else {
+			jsonFilter = oFilter;
+		}
+		
+		//jsonFilter.doc_id = [2, 18, 20, 28, 36, 45, 46, 48, 56, 64, 73, 81, 83, 90];
+
+		//let filterData = [];
+		
+		console.log("==================", jsonFilter);
+		
+		this.clearFilter();
+		
+		for (let key in jsonFilter) {
+			const arr = jsonFilter[key];
+			const idx = this.#parent.owner.fields.indexOf(key);
+			
+			let isNum = false;
+			for (let o of this.getValidData()) {
+				if (o.v[idx] == null) continue;
+				
+				//console.log(o.v[idx], typeof o.v[idx])
+				
+				isNum = (typeof o.v[idx] === "number") ? true : false;
+				
+				break;
+			}
+			
+			if (isNum) {
+				for (var i = 0; i < arr.length; i++) {
+					arr[i] = Number(arr[i]);
+				}
+			}
+			
+			/** filtering button 용 데이타 */
+			/**
+			filterData.push({
+				"colnm" : key,
+				"data" : arr,
+			}); */
+			//console.log(arr);
+			
+			
+			//console.log(arr, idx, arr.nineBinarySearch(m.v[idx]));
+		
+			this.getValidData().filter(m => { return arr.nineBinarySearch(m.v[idx] || '') < 0; }).map(m => { m.__ng.filtered = true; });
+			
+			
+			//break;
+			
+			
+		}
+		
+		
+		this.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.filterData = null;
+		});
+		
+		for (let key in jsonFilter) {
+			const arr = jsonFilter[key];
+			this.#parent.owner.fields.indexOf(key);
+			
+		//console.log(filterData);
+			ninegrid.querySelectorAll("ng-filter-button").forEach(v => {
+				//v.filterData = null;
+				//console.log(v);
+				//var b = v.colnms;
+				v.colnms.forEach(colnm => {
+					
+					console.log(colnms, colnm);
+					if (colnms.includes(colnm)) {
+						console.log("==================");
+						
+						v.filterData = arr;
+					}
+				});
+			});
+		}
+		
+		
+		this.#parent.owner.scrollTo_V1(0);
+		
+		this.#parent.owner.paging.reset();
 	};
 	
+	
 	#on = () => {
 
+		console.log("onnnnnnn");
+		
 		this.#isFiltering = true;
 		
 		var lastRowIndex = 0;
@@ -17928,11 +18040,10 @@ class ngFiltering
 		$(".ng-table ng-filter-button", this.#owner.body).remove();
 	};
 	
-	#set = (option) => {
+	#init = (option) => {
 	
 		let jsonOption = {};
 		if (Array.isArray(option)) {
-			
 			for (let key in option[0]) {
 				jsonOption[key] = Array.from(new Set(oFilter.map(item => item[key])));//oFilter.map(item => item[key]);
 			}
@@ -18310,15 +18421,15 @@ class ngFilterPanel extends HTMLElement
 				
 				console.log(el.filterData, el.colnms, el.dataset.bind);
 
-				//colnms.forEach(colnm => {
-					var idx = owner.fields.indexOf(el.colnms[0]);
+				el.colnms.forEach(colnm => {
+					var idx = owner.fields.indexOf(colnm);
 					
 					console.log(idx);
 
 					if (idx >= 0) {
 						data = data.filter(m => { return el.filterData.nineBinarySearch(m.v[idx] || '') >= 0; });
 					}
-				//});
+				});
 				
 				//data = data.filter(rowData => { return el.filterData.findIndex(item => (item.DATA || '') == (rowData[item.COLNM] || '') ) >= 0; });
 			});

package/dist/bundle.esm.js

@@ -17863,6 +17863,13 @@ class ngFields
 	};
 }
 
+/**
+ * button.filterDatas = [{
+ * 	colnm: "userId",
+ *  data: [],
+ * }]
+ * button.
+ */
 class ngFiltering
 {
 	#owner;
@@ -17891,11 +17898,116 @@ class ngFiltering
 		
 		this.#on();
 		
-		if (v) this.#set(v);
+		//if (v) this.#init(v);
+	};
+	
+	set = (oFilter) => {
+	
+		this.on();
+
+		let jsonFilter = {};
+		if (Array.isArray(oFilter)) {
+			for (let key in oFilter[0]) {
+				jsonFilter[key] = Array.from(new Set(oFilter.map(item => item[key])));//oFilter.map(item => item[key]);
+			}
+		}
+		else {
+			jsonFilter = oFilter;
+		}
+		
+		//jsonFilter.doc_id = [2, 18, 20, 28, 36, 45, 46, 48, 56, 64, 73, 81, 83, 90];
+
+		//let filterData = [];
+		
+		console.log("==================", jsonFilter);
+		
+		this.clearFilter();
+		
+		for (let key in jsonFilter) {
+			const arr = jsonFilter[key];
+			const idx = this.#parent.owner.fields.indexOf(key);
+			
+			let isNum = false;
+			for (let o of this.getValidData()) {
+				if (o.v[idx] == null) continue;
+				
+				//console.log(o.v[idx], typeof o.v[idx])
+				
+				isNum = (typeof o.v[idx] === "number") ? true : false;
+				
+				break;
+			}
+			
+			if (isNum) {
+				for (var i = 0; i < arr.length; i++) {
+					arr[i] = Number(arr[i]);
+				}
+			}
+			
+			/** filtering button 용 데이타 */
+			/**
+			filterData.push({
+				"colnm" : key,
+				"data" : arr,
+			}); */
+			//console.log(arr);
+			
+			
+			//console.log(arr, idx, arr.nineBinarySearch(m.v[idx]));
+		
+			this.getValidData().filter(m => { return arr.nineBinarySearch(m.v[idx] || '') < 0; }).map(m => { m.__ng.filtered = true; });
+			
+			
+			//break;
+			
+			
+		}
+		
+		
+		this.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.filterData = null;
+		});
+		
+		for (let key in jsonFilter) {
+			const arr = jsonFilter[key];
+			this.#parent.owner.fields.indexOf(key);
+			
+		//console.log(filterData);
+			ninegrid.querySelectorAll("ng-filter-button").forEach(v => {
+				//v.filterData = null;
+				//console.log(v);
+				//var b = v.colnms;
+				v.colnms.forEach(colnm => {
+					
+					console.log(colnms, colnm);
+					if (colnms.includes(colnm)) {
+						console.log("==================");
+						
+						v.filterData = arr;
+					}
+				});
+			});
+		}
+		
+		
+		this.#parent.owner.scrollTo_V1(0);
+		
+		this.#parent.owner.paging.reset();
 	};
 	
+	
 	#on = () => {
 
+		console.log("onnnnnnn");
+		
 		this.#isFiltering = true;
 		
 		var lastRowIndex = 0;
@@ -17926,11 +18038,10 @@ class ngFiltering
 		$(".ng-table ng-filter-button", this.#owner.body).remove();
 	};
 	
-	#set = (option) => {
+	#init = (option) => {
 	
 		let jsonOption = {};
 		if (Array.isArray(option)) {
-			
 			for (let key in option[0]) {
 				jsonOption[key] = Array.from(new Set(oFilter.map(item => item[key])));//oFilter.map(item => item[key]);
 			}
@@ -18308,15 +18419,15 @@ class ngFilterPanel extends HTMLElement
 				
 				console.log(el.filterData, el.colnms, el.dataset.bind);
 
-				//colnms.forEach(colnm => {
-					var idx = owner.fields.indexOf(el.colnms[0]);
+				el.colnms.forEach(colnm => {
+					var idx = owner.fields.indexOf(colnm);
 					
 					console.log(idx);
 
 					if (idx >= 0) {
 						data = data.filter(m => { return el.filterData.nineBinarySearch(m.v[idx] || '') >= 0; });
 					}
-				//});
+				});
 				
 				//data = data.filter(rowData => { return el.filterData.findIndex(item => (item.DATA || '') == (rowData[item.COLNM] || '') ) >= 0; });
 			});

package/dist/etc/ngFiltering.js

@@ -1,5 +1,12 @@
 import ninegrid from "../index.js";
 
+/**
+ * button.filterDatas = [{
+ * 	colnm: "userId",
+ *  data: [],
+ * }]
+ * button.
+ */
 export class ngFiltering
 {
 	#owner;
@@ -28,11 +35,116 @@ export class ngFiltering
 		
 		this.#on();
 		
-		if (v) this.#set(v);
+		//if (v) this.#init(v);
 	};
 	
+	set = (oFilter) => {
+	
+		this.on();
+
+		let jsonFilter = {};
+		if (Array.isArray(oFilter)) {
+			for (let key in oFilter[0]) {
+				jsonFilter[key] = Array.from(new Set(oFilter.map(item => item[key])));//oFilter.map(item => item[key]);
+			}
+		}
+		else {
+			jsonFilter = oFilter;
+		}
+		
+		//jsonFilter.doc_id = [2, 18, 20, 28, 36, 45, 46, 48, 56, 64, 73, 81, 83, 90];
+
+		//let filterData = [];
+		
+		console.log("==================", jsonFilter);
+		
+		this.clearFilter();
+		
+		for (let key in jsonFilter) {
+			const arr = jsonFilter[key];
+			const idx = this.#parent.owner.fields.indexOf(key);
+			
+			let isNum = false;
+			for (let o of this.getValidData()) {
+				if (o.v[idx] == null) continue;
+				
+				//console.log(o.v[idx], typeof o.v[idx])
+				
+				isNum = (typeof o.v[idx] === "number") ? true : false;
+				
+				break;
+			}
+			
+			if (isNum) {
+				for (var i = 0; i < arr.length; i++) {
+					arr[i] = Number(arr[i]);
+				}
+			}
+			
+			/** filtering button 용 데이타 */
+			/**
+			filterData.push({
+				"colnm" : key,
+				"data" : arr,
+			}); */
+			//console.log(arr);
+			
+			
+			//console.log(arr, idx, arr.nineBinarySearch(m.v[idx]));
+		
+			this.getValidData().filter(m => { return arr.nineBinarySearch(m.v[idx] || '') < 0; }).map(m => { m.__ng.filtered = true; });
+			
+			
+			//break;
+			
+			
+		}
+		
+		
+		this.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.filterData = null;
+		});
+		
+		for (let key in jsonFilter) {
+			const arr = jsonFilter[key];
+			const idx = this.#parent.owner.fields.indexOf(key);
+			
+		//console.log(filterData);
+			ninegrid.querySelectorAll("ng-filter-button").forEach(v => {
+				//v.filterData = null;
+				//console.log(v);
+				//var b = v.colnms;
+				v.colnms.forEach(colnm => {
+					
+					console.log(colnms, colnm);
+					if (colnms.includes(colnm)) {
+						console.log("==================");
+						
+						v.filterData = arr;
+					}
+				});
+			});
+		}
+		
+		
+		this.#parent.owner.scrollTo_V1(0);
+		
+		this.#parent.owner.paging.reset();
+	};
+	
+	
 	#on = () => {
 
+		console.log("onnnnnnn");
+		
 		this.#isFiltering = true;
 		
 		var lastRowIndex = 0;
@@ -63,11 +175,10 @@ export class ngFiltering
 		$(".ng-table ng-filter-button", this.#owner.body).remove();
 	};
 	
-	#set = (option) => {
+	#init = (option) => {
 	
 		let jsonOption = {};
 		if (Array.isArray(option)) {
-			
 			for (let key in option[0]) {
 				jsonOption[key] = Array.from(new Set(oFilter.map(item => item[key])));//oFilter.map(item => item[key]);
 			}
@@ -447,15 +558,15 @@ class ngFilterPanel extends HTMLElement
 				
 				console.log(el.filterData, el.colnms, el.dataset.bind);
 
-				//colnms.forEach(colnm => {
-					var idx = owner.fields.indexOf(el.colnms[0]);
+				el.colnms.forEach(colnm => {
+					var idx = owner.fields.indexOf(colnm);
 					
 					console.log(idx);
 
 					if (idx >= 0) {
 						data = data.filter(m => { return el.filterData.nineBinarySearch(m.v[idx] || '') >= 0; });
 					}
-				//});
+				});
 				
 				//data = data.filter(rowData => { return el.filterData.findIndex(item => (item.DATA || '') == (rowData[item.COLNM] || '') ) >= 0; });
 			});