ninegrid2 6.217.0 → 6.219.0

package/dist/bundle.cjs.js

@@ -18036,37 +18036,24 @@ class ngFiltering
 					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.#owner.data.getValidData().filter(m => { return arr.nineBinarySearch(m.v[idx] || '') < 0; }).map(m => { m.__ng.filtered = true; });
-			
-			
-			//break;
-			
-			
 		}
 		
 		
 		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 +18061,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 +18204,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) => {
@@ -18439,24 +18438,8 @@ class ngFilterPanel extends HTMLElement
 
 	open = (filterButton) => {
 
-		/**
 		const owner = this.shadow.closest("nine-grid");
 
-		var cell = filterButton.closest("th,td");
-			
-		var l = $(filterButton).offset().left - $(owner).offset().left;// - $(this).width() + $(e.target).width() + 1;
-		if (l < 0) l = 0;
-		if (l + $(this).width() > $(owner).width()) l = $(owner).width() - $(this).width() - 5;
-
-		var t = $(cell).offset().top + $(cell).height()- $(owner).offset().top;//$(e.target).offset().top + $(e.target).height() + 2;
-		
-		//$(this).offset({left: l, top: t});
-		$(this).css({left: l, top: t});
-		*/
-
-		const owner = this.shadow.closest("nine-grid");
-
-
 		/** 위치 */
 		const cell = filterButton.closest("th,td");
 
@@ -18504,6 +18487,7 @@ class ngFilterPanel extends HTMLElement
 
 			//console.log(data);
 
+			/**
 			owner.body.querySelectorAll("ng-filter-button").forEach(el => {
 				//console.log(el);
 				if (el.closest('th,td').dataset.col != col && el.filterOptions) {
@@ -18520,50 +18504,17 @@ class ngFilterPanel extends HTMLElement
 						}
 					});
 				}
-			});
-
-			//console.log(data);
-
-			/**
-			$("ng-filter-button", owner.body).each((index,el) => {
-
-				if (el.closest('th,td').dataset.col == col || !el.filterData) return true;
-
-				
-				console.log(el.filterData, el.colnms, el.dataset.bind);
-
-				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; });
 			}); */
 			
-			
 			var ds = [];
-			//colnms = [...new Set(colnms)];
-
-			//const colnms = [...new Set(filterButton.filterOptions.map(item => item.colnm))];
-
 			filterButton.filterOptions.forEach((filterOption,i) => {
 
-				//const colnm = filterOption.colnm;
-				//console.log(filterOption);
-
 				ds.push({
 					LVL: 1,
 					CHK: 'N',
 					DATA2: '<span class="group">' + $(filterButton).closest('th,td').text() + (filterButton.filterOptions.length > 1 ? ` #${i+1} (${filterOption.colnm})` : '') + '</span>',
 				});
 
-				
-
 				/**
 				var cell = $(`[data-col=${col}][data-bind=${filterOption.colnm}]`, owner.template);
 				var expr = cell.attr("data-expr");

package/dist/bundle.esm.js

@@ -18034,37 +18034,24 @@ class ngFiltering
 					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.#owner.data.getValidData().filter(m => { return arr.nineBinarySearch(m.v[idx] || '') < 0; }).map(m => { m.__ng.filtered = true; });
-			
-			
-			//break;
-			
-			
 		}
 		
 		
 		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 +18059,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 +18202,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) => {
@@ -18437,24 +18436,8 @@ class ngFilterPanel extends HTMLElement
 
 	open = (filterButton) => {
 
-		/**
 		const owner = this.shadow.closest("nine-grid");
 
-		var cell = filterButton.closest("th,td");
-			
-		var l = $(filterButton).offset().left - $(owner).offset().left;// - $(this).width() + $(e.target).width() + 1;
-		if (l < 0) l = 0;
-		if (l + $(this).width() > $(owner).width()) l = $(owner).width() - $(this).width() - 5;
-
-		var t = $(cell).offset().top + $(cell).height()- $(owner).offset().top;//$(e.target).offset().top + $(e.target).height() + 2;
-		
-		//$(this).offset({left: l, top: t});
-		$(this).css({left: l, top: t});
-		*/
-
-		const owner = this.shadow.closest("nine-grid");
-
-
 		/** 위치 */
 		const cell = filterButton.closest("th,td");
 
@@ -18502,6 +18485,7 @@ class ngFilterPanel extends HTMLElement
 
 			//console.log(data);
 
+			/**
 			owner.body.querySelectorAll("ng-filter-button").forEach(el => {
 				//console.log(el);
 				if (el.closest('th,td').dataset.col != col && el.filterOptions) {
@@ -18518,50 +18502,17 @@ class ngFilterPanel extends HTMLElement
 						}
 					});
 				}
-			});
-
-			//console.log(data);
-
-			/**
-			$("ng-filter-button", owner.body).each((index,el) => {
-
-				if (el.closest('th,td').dataset.col == col || !el.filterData) return true;
-
-				
-				console.log(el.filterData, el.colnms, el.dataset.bind);
-
-				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; });
 			}); */
 			
-			
 			var ds = [];
-			//colnms = [...new Set(colnms)];
-
-			//const colnms = [...new Set(filterButton.filterOptions.map(item => item.colnm))];
-
 			filterButton.filterOptions.forEach((filterOption,i) => {
 
-				//const colnm = filterOption.colnm;
-				//console.log(filterOption);
-
 				ds.push({
 					LVL: 1,
 					CHK: 'N',
 					DATA2: '<span class="group">' + $(filterButton).closest('th,td').text() + (filterButton.filterOptions.length > 1 ? ` #${i+1} (${filterOption.colnm})` : '') + '</span>',
 				});
 
-				
-
 				/**
 				var cell = $(`[data-col=${col}][data-bind=${filterOption.colnm}]`, owner.template);
 				var expr = cell.attr("data-expr");

package/dist/etc/ngFiltering.js

@@ -104,24 +104,8 @@ export class ngFiltering
 					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.#owner.data.getValidData().filter(m => { return arr.nineBinarySearch(m.v[idx] || '') < 0; }).map(m => { m.__ng.filtered = true; });
-			
-			
-			//break;
-			
-			
 		}
 		
 		
@@ -133,8 +117,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 +134,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 +277,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) => {
@@ -507,24 +511,8 @@ class ngFilterPanel extends HTMLElement
 
 	open = (filterButton) => {
 
-		/**
 		const owner = this.shadow.closest("nine-grid");
 
-		var cell = filterButton.closest("th,td");
-			
-		var l = $(filterButton).offset().left - $(owner).offset().left;// - $(this).width() + $(e.target).width() + 1;
-		if (l < 0) l = 0;
-		if (l + $(this).width() > $(owner).width()) l = $(owner).width() - $(this).width() - 5;
-
-		var t = $(cell).offset().top + $(cell).height()- $(owner).offset().top;//$(e.target).offset().top + $(e.target).height() + 2;
-		
-		//$(this).offset({left: l, top: t});
-		$(this).css({left: l, top: t});
-		*/
-
-		const owner = this.shadow.closest("nine-grid");
-
-
 		/** 위치 */
 		const cell = filterButton.closest("th,td");
 
@@ -572,6 +560,7 @@ class ngFilterPanel extends HTMLElement
 
 			//console.log(data);
 
+			/**
 			owner.body.querySelectorAll("ng-filter-button").forEach(el => {
 				//console.log(el);
 				if (el.closest('th,td').dataset.col != col && el.filterOptions) {
@@ -588,50 +577,17 @@ class ngFilterPanel extends HTMLElement
 						}
 					});
 				}
-			});
-
-			//console.log(data);
-
-			/**
-			$("ng-filter-button", owner.body).each((index,el) => {
-
-				if (el.closest('th,td').dataset.col == col || !el.filterData) return true;
-
-				
-				console.log(el.filterData, el.colnms, el.dataset.bind);
-
-				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; });
 			}); */
 			
-			
 			var ds = [];
-			//colnms = [...new Set(colnms)];
-
-			//const colnms = [...new Set(filterButton.filterOptions.map(item => item.colnm))];
-
 			filterButton.filterOptions.forEach((filterOption,i) => {
 
-				//const colnm = filterOption.colnm;
-				//console.log(filterOption);
-
 				ds.push({
 					LVL: 1,
 					CHK: 'N',
 					DATA2: '<span class="group">' + $(filterButton).closest('th,td').text() + (filterButton.filterOptions.length > 1 ? ` #${i+1} (${filterOption.colnm})` : '') + '</span>',
 				});
 
-				
-
 				/**
 				var cell = $(`[data-col=${col}][data-bind=${filterOption.colnm}]`, owner.template);
 				var expr = cell.attr("data-expr");

package/package.json

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

package/src/etc/ngFiltering.js

@@ -104,24 +104,8 @@ export class ngFiltering
 					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.#owner.data.getValidData().filter(m => { return arr.nineBinarySearch(m.v[idx] || '') < 0; }).map(m => { m.__ng.filtered = true; });
-			
-			
-			//break;
-			
-			
 		}
 		
 		
@@ -133,8 +117,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 +134,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 +277,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) => {
@@ -507,24 +511,8 @@ class ngFilterPanel extends HTMLElement
 
 	open = (filterButton) => {
 
-		/**
 		const owner = this.shadow.closest("nine-grid");
 
-		var cell = filterButton.closest("th,td");
-			
-		var l = $(filterButton).offset().left - $(owner).offset().left;// - $(this).width() + $(e.target).width() + 1;
-		if (l < 0) l = 0;
-		if (l + $(this).width() > $(owner).width()) l = $(owner).width() - $(this).width() - 5;
-
-		var t = $(cell).offset().top + $(cell).height()- $(owner).offset().top;//$(e.target).offset().top + $(e.target).height() + 2;
-		
-		//$(this).offset({left: l, top: t});
-		$(this).css({left: l, top: t});
-		*/
-
-		const owner = this.shadow.closest("nine-grid");
-
-
 		/** 위치 */
 		const cell = filterButton.closest("th,td");
 
@@ -572,6 +560,7 @@ class ngFilterPanel extends HTMLElement
 
 			//console.log(data);
 
+			/**
 			owner.body.querySelectorAll("ng-filter-button").forEach(el => {
 				//console.log(el);
 				if (el.closest('th,td').dataset.col != col && el.filterOptions) {
@@ -588,50 +577,17 @@ class ngFilterPanel extends HTMLElement
 						}
 					});
 				}
-			});
-
-			//console.log(data);
-
-			/**
-			$("ng-filter-button", owner.body).each((index,el) => {
-
-				if (el.closest('th,td').dataset.col == col || !el.filterData) return true;
-
-				
-				console.log(el.filterData, el.colnms, el.dataset.bind);
-
-				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; });
 			}); */
 			
-			
 			var ds = [];
-			//colnms = [...new Set(colnms)];
-
-			//const colnms = [...new Set(filterButton.filterOptions.map(item => item.colnm))];
-
 			filterButton.filterOptions.forEach((filterOption,i) => {
 
-				//const colnm = filterOption.colnm;
-				//console.log(filterOption);
-
 				ds.push({
 					LVL: 1,
 					CHK: 'N',
 					DATA2: '<span class="group">' + $(filterButton).closest('th,td').text() + (filterButton.filterOptions.length > 1 ? ` #${i+1} (${filterOption.colnm})` : '') + '</span>',
 				});
 
-				
-
 				/**
 				var cell = $(`[data-col=${col}][data-bind=${filterOption.colnm}]`, owner.template);
 				var expr = cell.attr("data-expr");