ninegrid2 6.233.0 → 6.235.0

package/dist/etc/ngFiltering.js

@@ -12,12 +12,14 @@ export class ngFiltering
 	#owner;
 	#isFiltering;
 	
-	constructor (owner) {
-		this.#owner = owner;
-		this.#isFiltering = false;
-
-		$(this.#owner.shadowRoot).append($('<ng-filter-panel></ng-filter-panel>').hide());
-	}
+	constructor(owner) {
+        this.#owner = owner;
+        this.#isFiltering = false;
+
+        const filterPanel = document.createElement("ng-filter-panel"); // ✅ 필터 패널 생성
+        filterPanel.style.display = "none"; // ✅ 숨김 처리
+        this.#owner.shadowRoot.appendChild(filterPanel); // ✅ Shadow DOM 내부에 추가
+    }
 	
 	initialize = () => {
 		/**
@@ -25,8 +27,6 @@ export class ngFiltering
 		 */
 		this.#isFiltering = false;
 		this.#owner.data.clearFilter();
-
-		//this.#on();
 	};
 	
 	isFiltering = () => {
@@ -74,78 +74,47 @@ export class ngFiltering
 
 		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);
+		// ✅ JSON 변환 (배열 → 객체)
+		let jsonFilter = Array.isArray(oFilter)
+			? Object.fromEntries(Object.keys(oFilter[0]).map(key => [key, [...new Set(oFilter.map(item => item[key]))]]))
+			: oFilter;
+	
+		//console.log(oFilter, jsonFilter);
 		
 		this.#owner.data.clearFilter();
 		
-		for (let key in jsonFilter) {
-			const arr = jsonFilter[key];
+		Object.entries(jsonFilter).forEach(([key, arr]) => {
 			const idx = this.#owner.fields.indexOf(key);
-			
-			let isNum = false;
-			for (let o of this.#owner.data.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]);
-				}
+
+			// ✅ 숫자 판별 및 변환
+			if (this.#owner.data.getValidData().some(o => typeof o.v[idx] === "number")) {
+				arr = arr.map(Number);
 			}
-		
-			this.#owner.data.getValidData().filter(m => { return arr.nineBinarySearch(m.v[idx] || '') < 0; }).map(m => { m.__ng.filtered = true; });
-		}
+
+			// ✅ 필터 적용
+			this.#owner.data.getValidData()
+				.filter(m => arr.nineBinarySearch(m.v[idx] || '') < 0)
+				.forEach(m => { m.__ng.filtered = true; });
+		});
 		
 		
 		this.#owner.data.refreshFilter();
 		
+		// ✅ 필터 버튼 초기화
 		this.#owner.shadowRoot.querySelectorAll("ng-filter-button").forEach(el => {
-			let options = el.filterOptions;
-
-			options.forEach(opt => {
-				opt.data = [];
-			});
-
-			el.filterOptions = options;
+			el.filterOptions.forEach(opt => { opt.data = []; });
 		});
 		
-		for (let key in jsonFilter) {
+		// ✅ 필터 데이터 적용
+		Object.entries(jsonFilter).forEach(([key, arr]) => {
 			this.#owner.shadowRoot.querySelectorAll("ng-filter-button").forEach(el => {
-				let options = el.filterOptions;
-
-				options.forEach(opt => {
-					if (opt.colnm === key) {
-						opt.data = jsonFilter[key];
-					}
+				el.filterOptions.forEach(opt => {
+					if (opt.colnm === key) opt.data = arr;
 				});
-
-				el.filterOptions = options;
 			});
-		}
-		
+		});
 		
 		this.#owner.scrollTo_V1(0);
-		
 		this.#owner.paging.reset();
 	};
 	
@@ -158,82 +127,12 @@ export class ngFiltering
 
 		return index;
 	};
-
-
-
-	
-	
-	#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]);
-			}
-		}
-		else {
-			jsonOption = option;
-		}
-
-		this.#owner.data.clearFilter();
-		
-		for (let key in jsonOption) {
-			const arr = jsonOption[key];
-			const idx = this.#owner.fields.indexOf(key);
-			
-			for (let o of this.#owner.data.getValidData()) {
-				if (o.v[idx] != null) {
-					if (typeof o.v[idx] === "number") {
-						for (var i = 0; i < arr.length; i++) {
-							arr[i] = Number(arr[i]);
-						}
-					}
-					break;
-				}
-			}
-
-			this.#owner.data.getValidData().filter(m => { return arr.nineBinarySearch(m.v[idx] || '') < 0; }).map(m => { m.__ng.filtered = true; });
-		}
-		
-		
-		this.#owner.data.refreshFilter();
-		
-		var colnms = [];
-		for (let key in jsonOption) {
-			colnms.push(key);
-		}
-		//var colnms = filterData.map(item => item.colnm);
-		
-		this.#owner.shadowRoot.querySelectorAll("ng-filter-button").forEach(v => {
-			v.filterData = null;
-		});
-		
-		for (let key in jsonOption) {
-			const arr = jsonOption[key];
-			
-			this.#owner.shadowRoot.querySelectorAll("ng-filter-button").forEach(v => {
-				//console.log(v.colnms);
-			
-				v.colnms.forEach(colnm => {
-					if (colnms.includes(colnm)) {
-						v.filterData = arr;
-					}
-				});
-			});
-		}
-		
-		
-		this.#owner.scrollTo_V1(0);
-		
-		this.#owner.paging.reset();
-	};
 }
 
 class ngFilterButton extends HTMLElement
 {
 	#owner;
 	#filterOptions;
-	#colnms;
 	
 	constructor () {
 		super();
@@ -242,15 +141,8 @@ class ngFilterButton extends HTMLElement
 	connectedCallback() {
 		this.#owner = this.getRootNode().host;//this.closest("nine-grid");
 		
-		$(this).off("click", this.#onClick);
-		$(this).on("click", this.#onClick);
-	};
-	
-	get colnms() {
-		return this.#colnms || [];
-	};
-	set colnms(v) {
-		this.#colnms = v;
+		this.removeEventListener("click", this.#onClick);
+		this.addEventListener("click", this.#onClick);
 	};
 	
 	get filterOptions() {
@@ -267,32 +159,8 @@ class ngFilterButton extends HTMLElement
 		e.stopPropagation();
 		
 		const panel = this.#owner.shadowRoot.querySelector('ng-filter-panel');
-		
-		//console.log(panel.isHidden);
-
-		//panel.style.display = 'flex' : 'none';
-		//console.log(panel.isHidden, panel.col, this.closest('th,td').dataset.col);
-
-		if (panel.col === this.closest('th,td').dataset.col) {
-			panel.close();
-		}
-		else {
-			/**
-			var cell = e.target.closest("th,td");
-			
-			var l = $(e.target).offset().left - $(this.#owner).offset().left;// - $(panel).width() + $(e.target).width() + 1;
-			if (l < 0) l = 0;
-			if (l + $(panel).width() > $(this.#owner).width()) l = $(this.#owner).width() - $(panel).width() - 5;
-			
-			
-
-			var t = $(cell).offset().top + $(cell).height()- $(this.#owner).offset().top;//$(e.target).offset().top + $(e.target).height() + 2;
-			
-			//$(panel).offset({left: l, top: t});
-			$(panel).css({left: l, top: t});
- */
-			panel.open(this);
-		}
+	
+		(panel.col === this.closest('th,td').dataset.col) ? panel.close() : panel.open(this);
 	};
 }
 

package/package.json

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

package/src/etc/ngData.js

@@ -219,115 +219,6 @@ export class ngData
 	}
 	
 	
-	/**
-	 * { "key1": [1,2,...], "key2": [1,2,...], ... }
-	 */
-	setFilter = (oFilter) => {
-
-		this.#owner.filtering.on();
-	
-	
-		let jsonFilter = {};
-		if (Array.isArray(oFilter)) {
-			
-			for (let key in oFilter[0]) {
-				//console.log(`::::::${key}::::::`)
-				//key = key.trim();
-				//console.log(key);
-				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();
-	};
 	
 	/**
 	 * 

package/src/etc/ngFiltering.js

@@ -12,12 +12,14 @@ export class ngFiltering
 	#owner;
 	#isFiltering;
 	
-	constructor (owner) {
-		this.#owner = owner;
-		this.#isFiltering = false;
-
-		$(this.#owner.shadowRoot).append($('<ng-filter-panel></ng-filter-panel>').hide());
-	}
+	constructor(owner) {
+        this.#owner = owner;
+        this.#isFiltering = false;
+
+        const filterPanel = document.createElement("ng-filter-panel"); // ✅ 필터 패널 생성
+        filterPanel.style.display = "none"; // ✅ 숨김 처리
+        this.#owner.shadowRoot.appendChild(filterPanel); // ✅ Shadow DOM 내부에 추가
+    }
 	
 	initialize = () => {
 		/**
@@ -25,8 +27,6 @@ export class ngFiltering
 		 */
 		this.#isFiltering = false;
 		this.#owner.data.clearFilter();
-
-		//this.#on();
 	};
 	
 	isFiltering = () => {
@@ -74,78 +74,47 @@ export class ngFiltering
 
 		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);
+		// ✅ JSON 변환 (배열 → 객체)
+		let jsonFilter = Array.isArray(oFilter)
+			? Object.fromEntries(Object.keys(oFilter[0]).map(key => [key, [...new Set(oFilter.map(item => item[key]))]]))
+			: oFilter;
+	
+		//console.log(oFilter, jsonFilter);
 		
 		this.#owner.data.clearFilter();
 		
-		for (let key in jsonFilter) {
-			const arr = jsonFilter[key];
+		Object.entries(jsonFilter).forEach(([key, arr]) => {
 			const idx = this.#owner.fields.indexOf(key);
-			
-			let isNum = false;
-			for (let o of this.#owner.data.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]);
-				}
+
+			// ✅ 숫자 판별 및 변환
+			if (this.#owner.data.getValidData().some(o => typeof o.v[idx] === "number")) {
+				arr = arr.map(Number);
 			}
-		
-			this.#owner.data.getValidData().filter(m => { return arr.nineBinarySearch(m.v[idx] || '') < 0; }).map(m => { m.__ng.filtered = true; });
-		}
+
+			// ✅ 필터 적용
+			this.#owner.data.getValidData()
+				.filter(m => arr.nineBinarySearch(m.v[idx] || '') < 0)
+				.forEach(m => { m.__ng.filtered = true; });
+		});
 		
 		
 		this.#owner.data.refreshFilter();
 		
+		// ✅ 필터 버튼 초기화
 		this.#owner.shadowRoot.querySelectorAll("ng-filter-button").forEach(el => {
-			let options = el.filterOptions;
-
-			options.forEach(opt => {
-				opt.data = [];
-			});
-
-			el.filterOptions = options;
+			el.filterOptions.forEach(opt => { opt.data = []; });
 		});
 		
-		for (let key in jsonFilter) {
+		// ✅ 필터 데이터 적용
+		Object.entries(jsonFilter).forEach(([key, arr]) => {
 			this.#owner.shadowRoot.querySelectorAll("ng-filter-button").forEach(el => {
-				let options = el.filterOptions;
-
-				options.forEach(opt => {
-					if (opt.colnm === key) {
-						opt.data = jsonFilter[key];
-					}
+				el.filterOptions.forEach(opt => {
+					if (opt.colnm === key) opt.data = arr;
 				});
-
-				el.filterOptions = options;
 			});
-		}
-		
+		});
 		
 		this.#owner.scrollTo_V1(0);
-		
 		this.#owner.paging.reset();
 	};
 	
@@ -158,82 +127,12 @@ export class ngFiltering
 
 		return index;
 	};
-
-
-
-	
-	
-	#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]);
-			}
-		}
-		else {
-			jsonOption = option;
-		}
-
-		this.#owner.data.clearFilter();
-		
-		for (let key in jsonOption) {
-			const arr = jsonOption[key];
-			const idx = this.#owner.fields.indexOf(key);
-			
-			for (let o of this.#owner.data.getValidData()) {
-				if (o.v[idx] != null) {
-					if (typeof o.v[idx] === "number") {
-						for (var i = 0; i < arr.length; i++) {
-							arr[i] = Number(arr[i]);
-						}
-					}
-					break;
-				}
-			}
-
-			this.#owner.data.getValidData().filter(m => { return arr.nineBinarySearch(m.v[idx] || '') < 0; }).map(m => { m.__ng.filtered = true; });
-		}
-		
-		
-		this.#owner.data.refreshFilter();
-		
-		var colnms = [];
-		for (let key in jsonOption) {
-			colnms.push(key);
-		}
-		//var colnms = filterData.map(item => item.colnm);
-		
-		this.#owner.shadowRoot.querySelectorAll("ng-filter-button").forEach(v => {
-			v.filterData = null;
-		});
-		
-		for (let key in jsonOption) {
-			const arr = jsonOption[key];
-			
-			this.#owner.shadowRoot.querySelectorAll("ng-filter-button").forEach(v => {
-				//console.log(v.colnms);
-			
-				v.colnms.forEach(colnm => {
-					if (colnms.includes(colnm)) {
-						v.filterData = arr;
-					}
-				});
-			});
-		}
-		
-		
-		this.#owner.scrollTo_V1(0);
-		
-		this.#owner.paging.reset();
-	};
 }
 
 class ngFilterButton extends HTMLElement
 {
 	#owner;
 	#filterOptions;
-	#colnms;
 	
 	constructor () {
 		super();
@@ -242,15 +141,8 @@ class ngFilterButton extends HTMLElement
 	connectedCallback() {
 		this.#owner = this.getRootNode().host;//this.closest("nine-grid");
 		
-		$(this).off("click", this.#onClick);
-		$(this).on("click", this.#onClick);
-	};
-	
-	get colnms() {
-		return this.#colnms || [];
-	};
-	set colnms(v) {
-		this.#colnms = v;
+		this.removeEventListener("click", this.#onClick);
+		this.addEventListener("click", this.#onClick);
 	};
 	
 	get filterOptions() {
@@ -267,32 +159,8 @@ class ngFilterButton extends HTMLElement
 		e.stopPropagation();
 		
 		const panel = this.#owner.shadowRoot.querySelector('ng-filter-panel');
-		
-		//console.log(panel.isHidden);
-
-		//panel.style.display = 'flex' : 'none';
-		//console.log(panel.isHidden, panel.col, this.closest('th,td').dataset.col);
-
-		if (panel.col === this.closest('th,td').dataset.col) {
-			panel.close();
-		}
-		else {
-			/**
-			var cell = e.target.closest("th,td");
-			
-			var l = $(e.target).offset().left - $(this.#owner).offset().left;// - $(panel).width() + $(e.target).width() + 1;
-			if (l < 0) l = 0;
-			if (l + $(panel).width() > $(this.#owner).width()) l = $(this.#owner).width() - $(panel).width() - 5;
-			
-			
-
-			var t = $(cell).offset().top + $(cell).height()- $(this.#owner).offset().top;//$(e.target).offset().top + $(e.target).height() + 2;
-			
-			//$(panel).offset({left: l, top: t});
-			$(panel).css({left: l, top: t});
- */
-			panel.open(this);
-		}
+	
+		(panel.col === this.closest('th,td').dataset.col) ? panel.close() : panel.open(this);
 	};
 }