ninegrid2 6.172.0 → 6.174.0

package/dist/bundle.cjs.js

@@ -10730,14 +10730,14 @@ class ninegrid {
 		if (!("shadow" in Element.prototype)) {
 			Object.defineProperty(Element.prototype, "shadow", {
 				get: function () {
-					const self = this;
+					let currentElement = this;
                     return {
 						closest: function (selector) {
-							let currentElement = self;
+							//let currentElement = self;
 
 							while (currentElement) {
 
-								console.log(currentElement);
+								//console.log(currentElement);
 								if (currentElement.matches(selector)) return currentElement;
 
 								// ✅ Shadow Root를 가지고 있는 경우 내부에서 탐색
@@ -10751,6 +10751,35 @@ class ninegrid {
 
 							return null;
 						},
+						querySelectorAll: (selector) => {
+							let elements = [];
+
+							if (currentElement instanceof NodeList) {
+								currentElement.forEach(ctx => {
+									if (selector instanceof NodeList) {
+										selector.forEach(sel => {
+										elements.push(...ctx.querySelectorAll(sel));
+										});
+									} else if (selector instanceof HTMLElement) {
+										elements.push(...ctx.querySelectorAll(selector));
+									} else {
+										elements.push(...ctx.querySelectorAll(selector));
+									}
+								});
+							} else {
+								if (selector instanceof HTMLElement) {
+									elements = [selector];
+								} else if (selector instanceof NodeList) {
+									selector.forEach(sel => {
+										elements.push(...currentElement.querySelectorAll(sel));
+									});
+								} else {
+									elements = currentElement.querySelectorAll(selector);
+								}
+							}
+
+							return elements;
+						},
 					};
                 }
 			});
@@ -18193,11 +18222,11 @@ class ngFilterButton extends HTMLElement
 		//console.log(panel.isHidden);
 
 		//panel.style.display = 'flex' : 'none';
-		console.log(panel.isHidden, panel.col, this.closest('th,td').dataset.col);
+		//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.col = null;
+			//panel.style.display = 'none';
 			panel.close();
 		}
 		else {
@@ -18435,8 +18464,6 @@ class ngFilterPanel extends HTMLElement
 
 	open = (owner, filterButton) => {
 
-		
-
 		var col = filterButton.closest('th,td').dataset.col;
 		this.col = col;
 
@@ -18450,113 +18477,14 @@ class ngFilterPanel extends HTMLElement
 			col		: col,
 		};
 		
-		$(this).show();
-
-		ninegrid.j.querySelectorAll(this).addClass("loading");
-		
-		$(this.shadowRoot).find("input[type=text]").val("");
+		this.style.display = 'flex';
+		//$(this).show();
 
-		setTimeout(() => {
+		//console.log(document.shadow.querySelectorAll(this), ninegrid.j.querySelectorAll(this));
+		//ninegrid.j.querySelectorAll(this).addClass("loading");
+		this.classList.add("loading");
 		
-			var ds = [];
-			var colnms = [];
-			$(owner.template).find(`[data-col=${col}]`).each((index,el) => {
-				if (el.dataset.bind) colnms.push(el.dataset.bind);
-			});
-			
-			var data = owner.data.getValidDataNF();
-			$("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);
-
-				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; });
-			});
-			
-			
-			colnms = [...new Set(colnms)];
-			colnms.forEach((colnm,i) => {
-
-				ds.push({
-					LVL: 1,
-					CHK: 'N',
-					DATA2: '<span class="group">' + $(filterButton).closest('th,td').text() + (colnms.length > 1 ? ` #${i+1} (${colnm})` : '') + '</span>',
-				});
-
-				var filterData = [];
-				if (filterButton.filterData) {
-					var idx = filterButton.filterData.findIndex(item => item.colnm == colnm);
-					if (idx >= 0) {
-						filterData = filterButton.filterData[idx].data;
-					}
-				}
-
-				/**
-				var cell = $(`[data-col=${col}][data-bind=${colnm}]`, owner.template);
-				var expr = cell.attr("data-expr");
-				var exprFunc = (expr) ? owner.exprFunction(expr) : null;
-				*/
-				
-				const cell = ninegrid.j.querySelectorAll(`[data-col="${col}"][data-bind="${colnm}"]`, owner.tmpl).elem();
-				const expr = cell.getAttribute("data-expr");
-				const exprFunc = (expr) ? owner.exprFunction(expr) : null;
-
-				var data2 = [];
-				for (var rowData of data) {
-					var idx = owner.fields.indexOf(colnm);
-					
-					if (expr) {
-						var o = owner.data.conv(rowData);
-						data2.push({v:o[colnm],v2:exprFunc(o, rowData.__ng.rowidx, owner.data)});
-					}
-					else {
-						data2.push({v:rowData.v[idx],v2:rowData.v[idx]});
-					}
-				}
-
-				[...new Set(data2.sort( (a,b) => { return (a.v2||'') > (b.v2||'') ? 1 : ((a.v2||'') < (b.v2||'') ? -1 : 0); } ).map((m) => JSON.stringify(m)))].map((m) => JSON.parse(m)).forEach(o => {
-					ds.push({
-						LVL		: 2,
-						DATA	: o.v,
-						DATA2	: o.v2 || ` <span class="empty">(empty)</span> ${o.v}`,
-						COLNM	: colnm,
-						CHK		: filterData.length == 0 || filterData.nineBinarySearch(o.v || '') >= 0 ? "Y" : "N",
-					});
-				});
-			});
-			
-			var grd = this.shadowRoot.querySelector("nine-grid");
-			//grd.dataSource = ds;
-			grd.fields.add(["DATA","DATA2","COLNM"]);
-			
-			grd.data.set(ds);
-			
-			$(this.shadowRoot).find("input[type=checkbox]").prop("checked", grd.data.getValidData().filter(item => { return item.LVL == 2 && item.CHK != "Y"; }).length == 0 ? true : false);
-			
-			this.shadowRoot.querySelector("input").focus();
-			
-			ninegrid.j.querySelectorAll(this).removeClass("loading");
-		});
+		return;
 	};
 }
 

package/dist/bundle.esm.js

@@ -10728,14 +10728,14 @@ class ninegrid {
 		if (!("shadow" in Element.prototype)) {
 			Object.defineProperty(Element.prototype, "shadow", {
 				get: function () {
-					const self = this;
+					let currentElement = this;
                     return {
 						closest: function (selector) {
-							let currentElement = self;
+							//let currentElement = self;
 
 							while (currentElement) {
 
-								console.log(currentElement);
+								//console.log(currentElement);
 								if (currentElement.matches(selector)) return currentElement;
 
 								// ✅ Shadow Root를 가지고 있는 경우 내부에서 탐색
@@ -10749,6 +10749,35 @@ class ninegrid {
 
 							return null;
 						},
+						querySelectorAll: (selector) => {
+							let elements = [];
+
+							if (currentElement instanceof NodeList) {
+								currentElement.forEach(ctx => {
+									if (selector instanceof NodeList) {
+										selector.forEach(sel => {
+										elements.push(...ctx.querySelectorAll(sel));
+										});
+									} else if (selector instanceof HTMLElement) {
+										elements.push(...ctx.querySelectorAll(selector));
+									} else {
+										elements.push(...ctx.querySelectorAll(selector));
+									}
+								});
+							} else {
+								if (selector instanceof HTMLElement) {
+									elements = [selector];
+								} else if (selector instanceof NodeList) {
+									selector.forEach(sel => {
+										elements.push(...currentElement.querySelectorAll(sel));
+									});
+								} else {
+									elements = currentElement.querySelectorAll(selector);
+								}
+							}
+
+							return elements;
+						},
 					};
                 }
 			});
@@ -18191,11 +18220,11 @@ class ngFilterButton extends HTMLElement
 		//console.log(panel.isHidden);
 
 		//panel.style.display = 'flex' : 'none';
-		console.log(panel.isHidden, panel.col, this.closest('th,td').dataset.col);
+		//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.col = null;
+			//panel.style.display = 'none';
 			panel.close();
 		}
 		else {
@@ -18433,8 +18462,6 @@ class ngFilterPanel extends HTMLElement
 
 	open = (owner, filterButton) => {
 
-		
-
 		var col = filterButton.closest('th,td').dataset.col;
 		this.col = col;
 
@@ -18448,113 +18475,14 @@ class ngFilterPanel extends HTMLElement
 			col		: col,
 		};
 		
-		$(this).show();
-
-		ninegrid.j.querySelectorAll(this).addClass("loading");
-		
-		$(this.shadowRoot).find("input[type=text]").val("");
+		this.style.display = 'flex';
+		//$(this).show();
 
-		setTimeout(() => {
+		//console.log(document.shadow.querySelectorAll(this), ninegrid.j.querySelectorAll(this));
+		//ninegrid.j.querySelectorAll(this).addClass("loading");
+		this.classList.add("loading");
 		
-			var ds = [];
-			var colnms = [];
-			$(owner.template).find(`[data-col=${col}]`).each((index,el) => {
-				if (el.dataset.bind) colnms.push(el.dataset.bind);
-			});
-			
-			var data = owner.data.getValidDataNF();
-			$("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);
-
-				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; });
-			});
-			
-			
-			colnms = [...new Set(colnms)];
-			colnms.forEach((colnm,i) => {
-
-				ds.push({
-					LVL: 1,
-					CHK: 'N',
-					DATA2: '<span class="group">' + $(filterButton).closest('th,td').text() + (colnms.length > 1 ? ` #${i+1} (${colnm})` : '') + '</span>',
-				});
-
-				var filterData = [];
-				if (filterButton.filterData) {
-					var idx = filterButton.filterData.findIndex(item => item.colnm == colnm);
-					if (idx >= 0) {
-						filterData = filterButton.filterData[idx].data;
-					}
-				}
-
-				/**
-				var cell = $(`[data-col=${col}][data-bind=${colnm}]`, owner.template);
-				var expr = cell.attr("data-expr");
-				var exprFunc = (expr) ? owner.exprFunction(expr) : null;
-				*/
-				
-				const cell = ninegrid.j.querySelectorAll(`[data-col="${col}"][data-bind="${colnm}"]`, owner.tmpl).elem();
-				const expr = cell.getAttribute("data-expr");
-				const exprFunc = (expr) ? owner.exprFunction(expr) : null;
-
-				var data2 = [];
-				for (var rowData of data) {
-					var idx = owner.fields.indexOf(colnm);
-					
-					if (expr) {
-						var o = owner.data.conv(rowData);
-						data2.push({v:o[colnm],v2:exprFunc(o, rowData.__ng.rowidx, owner.data)});
-					}
-					else {
-						data2.push({v:rowData.v[idx],v2:rowData.v[idx]});
-					}
-				}
-
-				[...new Set(data2.sort( (a,b) => { return (a.v2||'') > (b.v2||'') ? 1 : ((a.v2||'') < (b.v2||'') ? -1 : 0); } ).map((m) => JSON.stringify(m)))].map((m) => JSON.parse(m)).forEach(o => {
-					ds.push({
-						LVL		: 2,
-						DATA	: o.v,
-						DATA2	: o.v2 || ` <span class="empty">(empty)</span> ${o.v}`,
-						COLNM	: colnm,
-						CHK		: filterData.length == 0 || filterData.nineBinarySearch(o.v || '') >= 0 ? "Y" : "N",
-					});
-				});
-			});
-			
-			var grd = this.shadowRoot.querySelector("nine-grid");
-			//grd.dataSource = ds;
-			grd.fields.add(["DATA","DATA2","COLNM"]);
-			
-			grd.data.set(ds);
-			
-			$(this.shadowRoot).find("input[type=checkbox]").prop("checked", grd.data.getValidData().filter(item => { return item.LVL == 2 && item.CHK != "Y"; }).length == 0 ? true : false);
-			
-			this.shadowRoot.querySelector("input").focus();
-			
-			ninegrid.j.querySelectorAll(this).removeClass("loading");
-		});
+		return;
 	};
 }
 

package/dist/etc/ngFiltering.js

@@ -286,11 +286,11 @@ class ngFilterButton extends HTMLElement
 		//console.log(panel.isHidden);
 
 		//panel.style.display = 'flex' : 'none';
-		console.log(panel.isHidden, panel.col, this.closest('th,td').dataset.col);
+		//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.col = null;
+			//panel.style.display = 'none';
 			panel.close();
 		}
 		else {
@@ -530,8 +530,6 @@ class ngFilterPanel extends HTMLElement
 
 	open = (owner, filterButton) => {
 
-		
-
 		var col = filterButton.closest('th,td').dataset.col;
 		this.col = col;
 
@@ -548,10 +546,15 @@ class ngFilterPanel extends HTMLElement
 			col		: col,
 		}
 		
-		$(this).show();
+		this.style.display = 'flex';
+		//$(this).show();
 
-		ninegrid.j.querySelectorAll(this).addClass("loading");
+		//console.log(document.shadow.querySelectorAll(this), ninegrid.j.querySelectorAll(this));
+		//ninegrid.j.querySelectorAll(this).addClass("loading");
+		this.classList.add("loading");
 		
+		return;
+
 		$(this.shadowRoot).find("input[type=text]").val("");
 
 		setTimeout(() => {

package/dist/utils/ninegrid.js

@@ -24,14 +24,14 @@ export class ninegrid {
 		if (!("shadow" in Element.prototype)) {
 			Object.defineProperty(Element.prototype, "shadow", {
 				get: function () {
-					const self = this;
+					let currentElement = this;
                     return {
 						closest: function (selector) {
-							let currentElement = self;
+							//let currentElement = self;
 
 							while (currentElement) {
 
-								console.log(currentElement);
+								//console.log(currentElement);
 								if (currentElement.matches(selector)) return currentElement;
 
 								// ✅ Shadow Root를 가지고 있는 경우 내부에서 탐색
@@ -45,6 +45,35 @@ export class ninegrid {
 
 							return null;
 						},
+						querySelectorAll: (selector) => {
+							let elements = [];
+
+							if (currentElement instanceof NodeList) {
+								currentElement.forEach(ctx => {
+									if (selector instanceof NodeList) {
+										selector.forEach(sel => {
+										elements.push(...ctx.querySelectorAll(sel));
+										});
+									} else if (selector instanceof HTMLElement) {
+										elements.push(...ctx.querySelectorAll(selector));
+									} else {
+										elements.push(...ctx.querySelectorAll(selector));
+									}
+								});
+							} else {
+								if (selector instanceof HTMLElement) {
+									elements = [selector];
+								} else if (selector instanceof NodeList) {
+									selector.forEach(sel => {
+										elements.push(...currentElement.querySelectorAll(sel));
+									});
+								} else {
+									elements = currentElement.querySelectorAll(selector);
+								}
+							}
+
+							return elements;
+						},
 					};
                 }
 			});

package/package.json

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

package/src/etc/ngFiltering.js

@@ -286,11 +286,11 @@ class ngFilterButton extends HTMLElement
 		//console.log(panel.isHidden);
 
 		//panel.style.display = 'flex' : 'none';
-		console.log(panel.isHidden, panel.col, this.closest('th,td').dataset.col);
+		//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.col = null;
+			//panel.style.display = 'none';
 			panel.close();
 		}
 		else {
@@ -530,8 +530,6 @@ class ngFilterPanel extends HTMLElement
 
 	open = (owner, filterButton) => {
 
-		
-
 		var col = filterButton.closest('th,td').dataset.col;
 		this.col = col;
 
@@ -548,10 +546,15 @@ class ngFilterPanel extends HTMLElement
 			col		: col,
 		}
 		
-		$(this).show();
+		this.style.display = 'flex';
+		//$(this).show();
 
-		ninegrid.j.querySelectorAll(this).addClass("loading");
+		//console.log(document.shadow.querySelectorAll(this), ninegrid.j.querySelectorAll(this));
+		//ninegrid.j.querySelectorAll(this).addClass("loading");
+		this.classList.add("loading");
 		
+		return;
+
 		$(this.shadowRoot).find("input[type=text]").val("");
 
 		setTimeout(() => {

package/src/utils/ninegrid.js

@@ -24,14 +24,14 @@ export class ninegrid {
 		if (!("shadow" in Element.prototype)) {
 			Object.defineProperty(Element.prototype, "shadow", {
 				get: function () {
-					const self = this;
+					let currentElement = this;
                     return {
 						closest: function (selector) {
-							let currentElement = self;
+							//let currentElement = self;
 
 							while (currentElement) {
 
-								console.log(currentElement);
+								//console.log(currentElement);
 								if (currentElement.matches(selector)) return currentElement;
 
 								// ✅ Shadow Root를 가지고 있는 경우 내부에서 탐색
@@ -45,6 +45,35 @@ export class ninegrid {
 
 							return null;
 						},
+						querySelectorAll: (selector) => {
+							let elements = [];
+
+							if (currentElement instanceof NodeList) {
+								currentElement.forEach(ctx => {
+									if (selector instanceof NodeList) {
+										selector.forEach(sel => {
+										elements.push(...ctx.querySelectorAll(sel));
+										});
+									} else if (selector instanceof HTMLElement) {
+										elements.push(...ctx.querySelectorAll(selector));
+									} else {
+										elements.push(...ctx.querySelectorAll(selector));
+									}
+								});
+							} else {
+								if (selector instanceof HTMLElement) {
+									elements = [selector];
+								} else if (selector instanceof NodeList) {
+									selector.forEach(sel => {
+										elements.push(...currentElement.querySelectorAll(sel));
+									});
+								} else {
+									elements = currentElement.querySelectorAll(selector);
+								}
+							}
+
+							return elements;
+						},
 					};
                 }
 			});