ninegrid2 6.201.0 → 6.203.0

package/dist/bundle.cjs.js

@@ -18302,11 +18302,11 @@ class ngFilterPanel extends HTMLElement
 
 	#onOk = (e) => {
 
-		var grd = this.shadowRoot.querySelector("nine-grid");
+		const grd = this.shadowRoot.querySelector("nine-grid");
 
 		//ninegrid.j.querySelectorAll(grd).addClass("loading");
-		ninegrid.j.querySelectorAll(this.#target.owner).addClass("loading");
-		
+		//ninegrid.j.querySelectorAll(this.#target.owner).addClass("loading");
+		this.classList.add("loading");
 		
 		setTimeout(() => {
 
@@ -18357,47 +18357,26 @@ class ngFilterPanel extends HTMLElement
 			
 			console.log(this.#target, this.#target.button);
 			
-			this.#target.button.filterData = [...new Set(checked.map(m => { return m.v[DATA_IDX] }))];
+			this.#target.button.filterOptions = filterData;
+
+			//this.#target.button.filterData = [...new Set(checked.map(m => { return m.v[DATA_IDX] }))];
 			
 			console.log(this.#target.button.filterData);
 			
-			var oParam = {};
-			
 			$("ng-filter-button", this.#target.owner.body).each((index,el) => {
 				
-				//console.log(el, el.filterData);
-				
 				if (!el.filterData) return true;
-				
-				//console.log(el, el.filterData);
 
 				el.colnms.forEach(colnm => {
-					oParam[colnm] = el.filterData;
+					el.filterData;
 				});
-				
-				/**
-				el.filterData.forEach(o => {
-					
-					oParam[o.colnm] = o.data;
-					
-					//const idx = this.#target.owner.fields.indexOf(o.colnm);
-					//this.#target.owner.data.getValidData().filter(m => { return o.data.nineBinarySearch(m.v[idx] || '') < 0; }).map(m => { m.__ng.filtered = true; });
-				}); */
 			});
 			
-			console.log(oParam);
-			
-			//this.#target.owner.data.setFilter(oParam);
-			this.#target.owner.filtering.on(oParam);
-			
-			
-			//this.#target.owner.data.getValidDataNF().filter(rowData => { return this.#target.button.filterData.findIndex(item => (item.DATA || '') == (rowData[item.COLNM] || '') ) < 0; }).map(item => { item.__ng.filtered = true; });
-			//this.#target.owner.scrollTo_V1(0);
-			
-			//this.#target.owner.paging.reset();
-			
-			ninegrid.j.querySelectorAll(this.#target.owner).removeClass("loading");
+			//console.log(oParam);
 			
+			//this.#target.owner.filtering.on(oParam);
+
+			this.classList.remove("loading");
 		});
 		
 		$(this).hide();
@@ -18459,6 +18438,7 @@ class ngFilterPanel extends HTMLElement
 
 	open = (filterButton) => {
 
+		/**
 		const owner = this.shadow.closest("nine-grid");
 
 		var cell = filterButton.closest("th,td");
@@ -18471,6 +18451,28 @@ class ngFilterPanel extends HTMLElement
 		
 		//$(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");
+
+		const filterButtonRect = filterButton.getBoundingClientRect();
+		const ownerRect = owner.getBoundingClientRect();
+		const cellRect = cell.getBoundingClientRect();
+		const targetRect = this.getBoundingClientRect();
+
+		let l = filterButtonRect.left - ownerRect.left;
+		if (l < 0) l = 0;
+		if (l + targetRect.width > ownerRect.width) l = ownerRect.width - targetRect.width - 5;
+
+		const t = cellRect.top + cellRect.height - ownerRect.top;
+
+		this.style.left = `${l}px`; // ✅ 위치 설정
+		this.style.top = `${t}px`;
+
 		
 
 		//console.log(this, owner, filterButton.filterOptions, colnms);
@@ -18603,11 +18605,14 @@ class ngFilterPanel extends HTMLElement
 			
 			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);
-			
+			// ✅ 데이터 필터링 및 체크 상태 결정
+			const checkbox = this.shadowRoot.querySelector("input[type=checkbox]");
+			checkbox.checked = grd.data.getValidData().filter(item => item.LVL == 2 && item.CHK != "Y").length === 0; // ✅ 체크 상태 설정
+
 			this.shadowRoot.querySelector("input").focus();
 			
-			ninegrid.j.querySelectorAll(this).removeClass("loading");
+			this.classList.remove("loading");
+			//ninegrid.j.querySelectorAll(this).removeClass("loading");
 		});
 	};
 }

package/dist/bundle.esm.js

@@ -18300,11 +18300,11 @@ class ngFilterPanel extends HTMLElement
 
 	#onOk = (e) => {
 
-		var grd = this.shadowRoot.querySelector("nine-grid");
+		const grd = this.shadowRoot.querySelector("nine-grid");
 
 		//ninegrid.j.querySelectorAll(grd).addClass("loading");
-		ninegrid.j.querySelectorAll(this.#target.owner).addClass("loading");
-		
+		//ninegrid.j.querySelectorAll(this.#target.owner).addClass("loading");
+		this.classList.add("loading");
 		
 		setTimeout(() => {
 
@@ -18355,47 +18355,26 @@ class ngFilterPanel extends HTMLElement
 			
 			console.log(this.#target, this.#target.button);
 			
-			this.#target.button.filterData = [...new Set(checked.map(m => { return m.v[DATA_IDX] }))];
+			this.#target.button.filterOptions = filterData;
+
+			//this.#target.button.filterData = [...new Set(checked.map(m => { return m.v[DATA_IDX] }))];
 			
 			console.log(this.#target.button.filterData);
 			
-			var oParam = {};
-			
 			$("ng-filter-button", this.#target.owner.body).each((index,el) => {
 				
-				//console.log(el, el.filterData);
-				
 				if (!el.filterData) return true;
-				
-				//console.log(el, el.filterData);
 
 				el.colnms.forEach(colnm => {
-					oParam[colnm] = el.filterData;
+					el.filterData;
 				});
-				
-				/**
-				el.filterData.forEach(o => {
-					
-					oParam[o.colnm] = o.data;
-					
-					//const idx = this.#target.owner.fields.indexOf(o.colnm);
-					//this.#target.owner.data.getValidData().filter(m => { return o.data.nineBinarySearch(m.v[idx] || '') < 0; }).map(m => { m.__ng.filtered = true; });
-				}); */
 			});
 			
-			console.log(oParam);
-			
-			//this.#target.owner.data.setFilter(oParam);
-			this.#target.owner.filtering.on(oParam);
-			
-			
-			//this.#target.owner.data.getValidDataNF().filter(rowData => { return this.#target.button.filterData.findIndex(item => (item.DATA || '') == (rowData[item.COLNM] || '') ) < 0; }).map(item => { item.__ng.filtered = true; });
-			//this.#target.owner.scrollTo_V1(0);
-			
-			//this.#target.owner.paging.reset();
-			
-			ninegrid.j.querySelectorAll(this.#target.owner).removeClass("loading");
+			//console.log(oParam);
 			
+			//this.#target.owner.filtering.on(oParam);
+
+			this.classList.remove("loading");
 		});
 		
 		$(this).hide();
@@ -18457,6 +18436,7 @@ class ngFilterPanel extends HTMLElement
 
 	open = (filterButton) => {
 
+		/**
 		const owner = this.shadow.closest("nine-grid");
 
 		var cell = filterButton.closest("th,td");
@@ -18469,6 +18449,28 @@ class ngFilterPanel extends HTMLElement
 		
 		//$(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");
+
+		const filterButtonRect = filterButton.getBoundingClientRect();
+		const ownerRect = owner.getBoundingClientRect();
+		const cellRect = cell.getBoundingClientRect();
+		const targetRect = this.getBoundingClientRect();
+
+		let l = filterButtonRect.left - ownerRect.left;
+		if (l < 0) l = 0;
+		if (l + targetRect.width > ownerRect.width) l = ownerRect.width - targetRect.width - 5;
+
+		const t = cellRect.top + cellRect.height - ownerRect.top;
+
+		this.style.left = `${l}px`; // ✅ 위치 설정
+		this.style.top = `${t}px`;
+
 		
 
 		//console.log(this, owner, filterButton.filterOptions, colnms);
@@ -18601,11 +18603,14 @@ class ngFilterPanel extends HTMLElement
 			
 			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);
-			
+			// ✅ 데이터 필터링 및 체크 상태 결정
+			const checkbox = this.shadowRoot.querySelector("input[type=checkbox]");
+			checkbox.checked = grd.data.getValidData().filter(item => item.LVL == 2 && item.CHK != "Y").length === 0; // ✅ 체크 상태 설정
+
 			this.shadowRoot.querySelector("input").focus();
 			
-			ninegrid.j.querySelectorAll(this).removeClass("loading");
+			this.classList.remove("loading");
+			//ninegrid.j.querySelectorAll(this).removeClass("loading");
 		});
 	};
 }

package/dist/etc/ngFiltering.js

@@ -370,11 +370,11 @@ class ngFilterPanel extends HTMLElement
 
 	#onOk = (e) => {
 
-		var grd = this.shadowRoot.querySelector("nine-grid");
+		const grd = this.shadowRoot.querySelector("nine-grid");
 
 		//ninegrid.j.querySelectorAll(grd).addClass("loading");
-		ninegrid.j.querySelectorAll(this.#target.owner).addClass("loading");
-		
+		//ninegrid.j.querySelectorAll(this.#target.owner).addClass("loading");
+		this.classList.add("loading");
 		
 		setTimeout(() => {
 
@@ -427,7 +427,9 @@ class ngFilterPanel extends HTMLElement
 			
 			console.log(this.#target, this.#target.button)
 			
-			this.#target.button.filterData = [...new Set(checked.map(m => { return m.v[DATA_IDX] }))];
+			this.#target.button.filterOptions = filterData;
+
+			//this.#target.button.filterData = [...new Set(checked.map(m => { return m.v[DATA_IDX] }))];
 			
 			console.log(this.#target.button.filterData)
 			
@@ -435,39 +437,18 @@ class ngFilterPanel extends HTMLElement
 			
 			$("ng-filter-button", this.#target.owner.body).each((index,el) => {
 				
-				//console.log(el, el.filterData);
-				
 				if (!el.filterData) return true;
-				
-				//console.log(el, el.filterData);
 
 				el.colnms.forEach(colnm => {
 					oParam[colnm] = el.filterData;
 				});
-				
-				/**
-				el.filterData.forEach(o => {
-					
-					oParam[o.colnm] = o.data;
-					
-					//const idx = this.#target.owner.fields.indexOf(o.colnm);
-					//this.#target.owner.data.getValidData().filter(m => { return o.data.nineBinarySearch(m.v[idx] || '') < 0; }).map(m => { m.__ng.filtered = true; });
-				}); */
 			});
 			
-			console.log(oParam);
-			
-			//this.#target.owner.data.setFilter(oParam);
-			this.#target.owner.filtering.on(oParam);
-			
-			
-			//this.#target.owner.data.getValidDataNF().filter(rowData => { return this.#target.button.filterData.findIndex(item => (item.DATA || '') == (rowData[item.COLNM] || '') ) < 0; }).map(item => { item.__ng.filtered = true; });
-			//this.#target.owner.scrollTo_V1(0);
-			
-			//this.#target.owner.paging.reset();
-			
-			ninegrid.j.querySelectorAll(this.#target.owner).removeClass("loading");
+			//console.log(oParam);
 			
+			//this.#target.owner.filtering.on(oParam);
+
+			this.classList.remove("loading");
 		});
 		
 		$(this).hide();
@@ -529,6 +510,7 @@ class ngFilterPanel extends HTMLElement
 
 	open = (filterButton) => {
 
+		/**
 		const owner = this.shadow.closest("nine-grid");
 
 		var cell = filterButton.closest("th,td");
@@ -541,6 +523,28 @@ class ngFilterPanel extends HTMLElement
 		
 		//$(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");
+
+		const filterButtonRect = filterButton.getBoundingClientRect();
+		const ownerRect = owner.getBoundingClientRect();
+		const cellRect = cell.getBoundingClientRect();
+		const targetRect = this.getBoundingClientRect();
+
+		let l = filterButtonRect.left - ownerRect.left;
+		if (l < 0) l = 0;
+		if (l + targetRect.width > ownerRect.width) l = ownerRect.width - targetRect.width - 5;
+
+		const t = cellRect.top + cellRect.height - ownerRect.top;
+
+		this.style.left = `${l}px`; // ✅ 위치 설정
+		this.style.top = `${t}px`;
+
 		
 
 		//console.log(this, owner, filterButton.filterOptions, colnms);
@@ -673,11 +677,14 @@ class ngFilterPanel extends HTMLElement
 			
 			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);
-			
+			// ✅ 데이터 필터링 및 체크 상태 결정
+			const checkbox = this.shadowRoot.querySelector("input[type=checkbox]");
+			checkbox.checked = grd.data.getValidData().filter(item => item.LVL == 2 && item.CHK != "Y").length === 0; // ✅ 체크 상태 설정
+
 			this.shadowRoot.querySelector("input").focus();
 			
-			ninegrid.j.querySelectorAll(this).removeClass("loading");
+			this.classList.remove("loading");
+			//ninegrid.j.querySelectorAll(this).removeClass("loading");
 		});
 	};
 }

package/package.json

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

package/src/etc/ngFiltering.js

@@ -370,11 +370,11 @@ class ngFilterPanel extends HTMLElement
 
 	#onOk = (e) => {
 
-		var grd = this.shadowRoot.querySelector("nine-grid");
+		const grd = this.shadowRoot.querySelector("nine-grid");
 
 		//ninegrid.j.querySelectorAll(grd).addClass("loading");
-		ninegrid.j.querySelectorAll(this.#target.owner).addClass("loading");
-		
+		//ninegrid.j.querySelectorAll(this.#target.owner).addClass("loading");
+		this.classList.add("loading");
 		
 		setTimeout(() => {
 
@@ -427,7 +427,9 @@ class ngFilterPanel extends HTMLElement
 			
 			console.log(this.#target, this.#target.button)
 			
-			this.#target.button.filterData = [...new Set(checked.map(m => { return m.v[DATA_IDX] }))];
+			this.#target.button.filterOptions = filterData;
+
+			//this.#target.button.filterData = [...new Set(checked.map(m => { return m.v[DATA_IDX] }))];
 			
 			console.log(this.#target.button.filterData)
 			
@@ -435,39 +437,18 @@ class ngFilterPanel extends HTMLElement
 			
 			$("ng-filter-button", this.#target.owner.body).each((index,el) => {
 				
-				//console.log(el, el.filterData);
-				
 				if (!el.filterData) return true;
-				
-				//console.log(el, el.filterData);
 
 				el.colnms.forEach(colnm => {
 					oParam[colnm] = el.filterData;
 				});
-				
-				/**
-				el.filterData.forEach(o => {
-					
-					oParam[o.colnm] = o.data;
-					
-					//const idx = this.#target.owner.fields.indexOf(o.colnm);
-					//this.#target.owner.data.getValidData().filter(m => { return o.data.nineBinarySearch(m.v[idx] || '') < 0; }).map(m => { m.__ng.filtered = true; });
-				}); */
 			});
 			
-			console.log(oParam);
-			
-			//this.#target.owner.data.setFilter(oParam);
-			this.#target.owner.filtering.on(oParam);
-			
-			
-			//this.#target.owner.data.getValidDataNF().filter(rowData => { return this.#target.button.filterData.findIndex(item => (item.DATA || '') == (rowData[item.COLNM] || '') ) < 0; }).map(item => { item.__ng.filtered = true; });
-			//this.#target.owner.scrollTo_V1(0);
-			
-			//this.#target.owner.paging.reset();
-			
-			ninegrid.j.querySelectorAll(this.#target.owner).removeClass("loading");
+			//console.log(oParam);
 			
+			//this.#target.owner.filtering.on(oParam);
+
+			this.classList.remove("loading");
 		});
 		
 		$(this).hide();
@@ -529,6 +510,7 @@ class ngFilterPanel extends HTMLElement
 
 	open = (filterButton) => {
 
+		/**
 		const owner = this.shadow.closest("nine-grid");
 
 		var cell = filterButton.closest("th,td");
@@ -541,6 +523,28 @@ class ngFilterPanel extends HTMLElement
 		
 		//$(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");
+
+		const filterButtonRect = filterButton.getBoundingClientRect();
+		const ownerRect = owner.getBoundingClientRect();
+		const cellRect = cell.getBoundingClientRect();
+		const targetRect = this.getBoundingClientRect();
+
+		let l = filterButtonRect.left - ownerRect.left;
+		if (l < 0) l = 0;
+		if (l + targetRect.width > ownerRect.width) l = ownerRect.width - targetRect.width - 5;
+
+		const t = cellRect.top + cellRect.height - ownerRect.top;
+
+		this.style.left = `${l}px`; // ✅ 위치 설정
+		this.style.top = `${t}px`;
+
 		
 
 		//console.log(this, owner, filterButton.filterOptions, colnms);
@@ -673,11 +677,14 @@ class ngFilterPanel extends HTMLElement
 			
 			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);
-			
+			// ✅ 데이터 필터링 및 체크 상태 결정
+			const checkbox = this.shadowRoot.querySelector("input[type=checkbox]");
+			checkbox.checked = grd.data.getValidData().filter(item => item.LVL == 2 && item.CHK != "Y").length === 0; // ✅ 체크 상태 설정
+
 			this.shadowRoot.querySelector("input").focus();
 			
-			ninegrid.j.querySelectorAll(this).removeClass("loading");
+			this.classList.remove("loading");
+			//ninegrid.j.querySelectorAll(this).removeClass("loading");
 		});
 	};
 }