ninegrid2 6.234.0 → 6.235.0

package/dist/bundle.cjs.js

@@ -17897,78 +17897,47 @@ 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;
-		}
-		 */
-
+		// ✅ 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);
+		//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;
-				
-				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();
 	};
 	

package/dist/bundle.esm.js

@@ -17895,78 +17895,47 @@ 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;
-		}
-		 */
-
+		// ✅ 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);
+		//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;
-				
-				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();
 	};
 	

package/dist/etc/ngFiltering.js

@@ -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;
-		}
-		 */
-
+		// ✅ 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);
+		//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;
-				
-				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();
 	};
 	

package/package.json

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

package/src/etc/ngFiltering.js

@@ -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;
-		}
-		 */
-
+		// ✅ 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);
+		//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;
-				
-				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();
 	};