ninegrid2 6.250.0 → 6.251.0

package/dist/bundle.cjs.js

@@ -16036,6 +16036,20 @@ class ngData
 		(this.#parent.rawRecords || []).forEach(v => {
 			v.__ng.height	= this.#defaultHeight.slice();
 		});
+
+		this.#owner.filtering.clear = () => {
+			this.#parent.rawRecords.map(item => { item.__ng.filtered = false; });
+			this.#records = this.#parent.rawRecords.filter(item => { return !item.__ng.deleted && !item.__ng.filtered; } );
+			return this.#records;
+		};
+		
+		this.#owner.filtering.refresh = () => {
+			this.#records = this.#parent.rawRecords.filter(item => { return !item.__ng.deleted && !item.__ng.filtered; } );
+			//this.#records.forEach((o,i) => { o.__ng.rowidx = i; });
+			//this.getValidData().forEach((o,i) => { o.__ng._[ninegrid.ROW.ORDER] = i + 1; });
+			this.#resetOrder();
+			return this.#records;
+		};
 	};
 	
 	
@@ -16163,7 +16177,6 @@ class ngData
 	
 	filter = (fn) => {
 		return this.#records.filter(fn);
-		
 	}
 	
 	max = (colnm, fn) => {
@@ -17849,7 +17862,8 @@ class ngFiltering
 		 * 1. grid attr == filter : on();
 		 */
 		this.#isFiltering = false;
-		this.#owner.data.clearFilter();
+		//this.#owner.data.clearFilter();
+		this.#owner.filtering.clear();
 	};
 	
 	isFiltering = () => {
@@ -17886,6 +17900,25 @@ class ngFiltering
 			el.remove(); // ✅ 요소 삭제
 		});
 	};
+
+	/**
+	clear = () => {
+		console.log(this.#owner.dataManager.rawRecords);
+		this.#owner.dataManager.rawRecords.map(item => { item.__ng.filtered = false; });
+
+
+		this.#records = this.#owner.dataManager.rawRecords.filter(item => { return !item.__ng.deleted && !item.__ng.filtered; } );
+		return this.#records;
+	}
+	
+	refresh = () => {
+		this.#records = this.#owner.dataManager.rawRecords.filter(item => { return !item.__ng.deleted && !item.__ng.filtered; } );
+		//this.#records.forEach((o,i) => { o.__ng.rowidx = i; });
+		//this.getValidData().forEach((o,i) => { o.__ng._[ninegrid.ROW.ORDER] = i + 1; });
+		this.#resetOrder();
+		return this.#records;
+	} */
+	
 	
 	/**
 	 * oFilter : {
@@ -17901,10 +17934,9 @@ class ngFiltering
 		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();
+		//this.#owner.data.clearFilter();
+		this.#owner.filtering.clear();
 		
 		Object.entries(jsonFilter).forEach(([key, arr]) => {
 			const idx = this.#owner.fields.indexOf(key);
@@ -17921,7 +17953,8 @@ class ngFiltering
 		});
 		
 		
-		this.#owner.data.refreshFilter();
+		//this.#owner.data.refreshFilter();
+		this.#owner.filtering.refresh();
 		
 		// ✅ 필터 버튼 초기화
 		this.#owner.shadowRoot.querySelectorAll("ng-filter-button").forEach(el => {
@@ -18180,7 +18213,6 @@ class ngFilterPanel extends HTMLElement
 			}).flat();
 			
 			const grd = this.shadowRoot.querySelector("nine-grid");
-			//grd.dataSource = ds;
 			grd.fields.add(["DATA","DATA2","COLNM"]);
 			grd.data.set(ds);
 			

package/dist/bundle.esm.js

@@ -16034,6 +16034,20 @@ class ngData
 		(this.#parent.rawRecords || []).forEach(v => {
 			v.__ng.height	= this.#defaultHeight.slice();
 		});
+
+		this.#owner.filtering.clear = () => {
+			this.#parent.rawRecords.map(item => { item.__ng.filtered = false; });
+			this.#records = this.#parent.rawRecords.filter(item => { return !item.__ng.deleted && !item.__ng.filtered; } );
+			return this.#records;
+		};
+		
+		this.#owner.filtering.refresh = () => {
+			this.#records = this.#parent.rawRecords.filter(item => { return !item.__ng.deleted && !item.__ng.filtered; } );
+			//this.#records.forEach((o,i) => { o.__ng.rowidx = i; });
+			//this.getValidData().forEach((o,i) => { o.__ng._[ninegrid.ROW.ORDER] = i + 1; });
+			this.#resetOrder();
+			return this.#records;
+		};
 	};
 	
 	
@@ -16161,7 +16175,6 @@ class ngData
 	
 	filter = (fn) => {
 		return this.#records.filter(fn);
-		
 	}
 	
 	max = (colnm, fn) => {
@@ -17847,7 +17860,8 @@ class ngFiltering
 		 * 1. grid attr == filter : on();
 		 */
 		this.#isFiltering = false;
-		this.#owner.data.clearFilter();
+		//this.#owner.data.clearFilter();
+		this.#owner.filtering.clear();
 	};
 	
 	isFiltering = () => {
@@ -17884,6 +17898,25 @@ class ngFiltering
 			el.remove(); // ✅ 요소 삭제
 		});
 	};
+
+	/**
+	clear = () => {
+		console.log(this.#owner.dataManager.rawRecords);
+		this.#owner.dataManager.rawRecords.map(item => { item.__ng.filtered = false; });
+
+
+		this.#records = this.#owner.dataManager.rawRecords.filter(item => { return !item.__ng.deleted && !item.__ng.filtered; } );
+		return this.#records;
+	}
+	
+	refresh = () => {
+		this.#records = this.#owner.dataManager.rawRecords.filter(item => { return !item.__ng.deleted && !item.__ng.filtered; } );
+		//this.#records.forEach((o,i) => { o.__ng.rowidx = i; });
+		//this.getValidData().forEach((o,i) => { o.__ng._[ninegrid.ROW.ORDER] = i + 1; });
+		this.#resetOrder();
+		return this.#records;
+	} */
+	
 	
 	/**
 	 * oFilter : {
@@ -17899,10 +17932,9 @@ class ngFiltering
 		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();
+		//this.#owner.data.clearFilter();
+		this.#owner.filtering.clear();
 		
 		Object.entries(jsonFilter).forEach(([key, arr]) => {
 			const idx = this.#owner.fields.indexOf(key);
@@ -17919,7 +17951,8 @@ class ngFiltering
 		});
 		
 		
-		this.#owner.data.refreshFilter();
+		//this.#owner.data.refreshFilter();
+		this.#owner.filtering.refresh();
 		
 		// ✅ 필터 버튼 초기화
 		this.#owner.shadowRoot.querySelectorAll("ng-filter-button").forEach(el => {
@@ -18178,7 +18211,6 @@ class ngFilterPanel extends HTMLElement
 			}).flat();
 			
 			const grd = this.shadowRoot.querySelector("nine-grid");
-			//grd.dataSource = ds;
 			grd.fields.add(["DATA","DATA2","COLNM"]);
 			grd.data.set(ds);
 			

package/dist/etc/ngData.js

@@ -117,6 +117,20 @@ export class ngData
 		(this.#parent.rawRecords || []).forEach(v => {
 			v.__ng.height	= this.#defaultHeight.slice();
 		});
+
+		this.#owner.filtering.clear = () => {
+			this.#parent.rawRecords.map(item => { item.__ng.filtered = false; });
+			this.#records = this.#parent.rawRecords.filter(item => { return !item.__ng.deleted && !item.__ng.filtered; } );
+			return this.#records;
+		}
+		
+		this.#owner.filtering.refresh = () => {
+			this.#records = this.#parent.rawRecords.filter(item => { return !item.__ng.deleted && !item.__ng.filtered; } );
+			//this.#records.forEach((o,i) => { o.__ng.rowidx = i; });
+			//this.getValidData().forEach((o,i) => { o.__ng._[ninegrid.ROW.ORDER] = i + 1; });
+			this.#resetOrder();
+			return this.#records;
+		}
 	};
 	
 	
@@ -244,7 +258,6 @@ export class ngData
 	
 	filter = (fn) => {
 		return this.#records.filter(fn);
-		
 	}
 	
 	max = (colnm, fn) => {

package/dist/etc/ngFiltering.js

@@ -26,7 +26,8 @@ export class ngFiltering
 		 * 1. grid attr == filter : on();
 		 */
 		this.#isFiltering = false;
-		this.#owner.data.clearFilter();
+		//this.#owner.data.clearFilter();
+		this.#owner.filtering.clear();
 	};
 	
 	isFiltering = () => {
@@ -63,6 +64,25 @@ export class ngFiltering
 			el.remove(); // ✅ 요소 삭제
 		});
 	};
+
+	/**
+	clear = () => {
+		console.log(this.#owner.dataManager.rawRecords);
+		this.#owner.dataManager.rawRecords.map(item => { item.__ng.filtered = false; });
+
+
+		this.#records = this.#owner.dataManager.rawRecords.filter(item => { return !item.__ng.deleted && !item.__ng.filtered; } );
+		return this.#records;
+	}
+	
+	refresh = () => {
+		this.#records = this.#owner.dataManager.rawRecords.filter(item => { return !item.__ng.deleted && !item.__ng.filtered; } );
+		//this.#records.forEach((o,i) => { o.__ng.rowidx = i; });
+		//this.getValidData().forEach((o,i) => { o.__ng._[ninegrid.ROW.ORDER] = i + 1; });
+		this.#resetOrder();
+		return this.#records;
+	} */
+	
 	
 	/**
 	 * oFilter : {
@@ -78,10 +98,9 @@ export class ngFiltering
 		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();
+		//this.#owner.data.clearFilter();
+		this.#owner.filtering.clear();
 		
 		Object.entries(jsonFilter).forEach(([key, arr]) => {
 			const idx = this.#owner.fields.indexOf(key);
@@ -98,7 +117,8 @@ export class ngFiltering
 		});
 		
 		
-		this.#owner.data.refreshFilter();
+		//this.#owner.data.refreshFilter();
+		this.#owner.filtering.refresh();
 		
 		// ✅ 필터 버튼 초기화
 		this.#owner.shadowRoot.querySelectorAll("ng-filter-button").forEach(el => {
@@ -357,7 +377,6 @@ class ngFilterPanel extends HTMLElement
 			}).flat();
 			
 			const grd = this.shadowRoot.querySelector("nine-grid");
-			//grd.dataSource = ds;
 			grd.fields.add(["DATA","DATA2","COLNM"]);
 			grd.data.set(ds);
 			

package/package.json

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

package/src/etc/ngData.js

@@ -117,6 +117,20 @@ export class ngData
 		(this.#parent.rawRecords || []).forEach(v => {
 			v.__ng.height	= this.#defaultHeight.slice();
 		});
+
+		this.#owner.filtering.clear = () => {
+			this.#parent.rawRecords.map(item => { item.__ng.filtered = false; });
+			this.#records = this.#parent.rawRecords.filter(item => { return !item.__ng.deleted && !item.__ng.filtered; } );
+			return this.#records;
+		}
+		
+		this.#owner.filtering.refresh = () => {
+			this.#records = this.#parent.rawRecords.filter(item => { return !item.__ng.deleted && !item.__ng.filtered; } );
+			//this.#records.forEach((o,i) => { o.__ng.rowidx = i; });
+			//this.getValidData().forEach((o,i) => { o.__ng._[ninegrid.ROW.ORDER] = i + 1; });
+			this.#resetOrder();
+			return this.#records;
+		}
 	};
 	
 	
@@ -244,7 +258,6 @@ export class ngData
 	
 	filter = (fn) => {
 		return this.#records.filter(fn);
-		
 	}
 	
 	max = (colnm, fn) => {

package/src/etc/ngFiltering.js

@@ -26,7 +26,8 @@ export class ngFiltering
 		 * 1. grid attr == filter : on();
 		 */
 		this.#isFiltering = false;
-		this.#owner.data.clearFilter();
+		//this.#owner.data.clearFilter();
+		this.#owner.filtering.clear();
 	};
 	
 	isFiltering = () => {
@@ -63,6 +64,25 @@ export class ngFiltering
 			el.remove(); // ✅ 요소 삭제
 		});
 	};
+
+	/**
+	clear = () => {
+		console.log(this.#owner.dataManager.rawRecords);
+		this.#owner.dataManager.rawRecords.map(item => { item.__ng.filtered = false; });
+
+
+		this.#records = this.#owner.dataManager.rawRecords.filter(item => { return !item.__ng.deleted && !item.__ng.filtered; } );
+		return this.#records;
+	}
+	
+	refresh = () => {
+		this.#records = this.#owner.dataManager.rawRecords.filter(item => { return !item.__ng.deleted && !item.__ng.filtered; } );
+		//this.#records.forEach((o,i) => { o.__ng.rowidx = i; });
+		//this.getValidData().forEach((o,i) => { o.__ng._[ninegrid.ROW.ORDER] = i + 1; });
+		this.#resetOrder();
+		return this.#records;
+	} */
+	
 	
 	/**
 	 * oFilter : {
@@ -78,10 +98,9 @@ export class ngFiltering
 		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();
+		//this.#owner.data.clearFilter();
+		this.#owner.filtering.clear();
 		
 		Object.entries(jsonFilter).forEach(([key, arr]) => {
 			const idx = this.#owner.fields.indexOf(key);
@@ -98,7 +117,8 @@ export class ngFiltering
 		});
 		
 		
-		this.#owner.data.refreshFilter();
+		//this.#owner.data.refreshFilter();
+		this.#owner.filtering.refresh();
 		
 		// ✅ 필터 버튼 초기화
 		this.#owner.shadowRoot.querySelectorAll("ng-filter-button").forEach(el => {
@@ -357,7 +377,6 @@ class ngFilterPanel extends HTMLElement
 			}).flat();
 			
 			const grd = this.shadowRoot.querySelector("nine-grid");
-			//grd.dataSource = ds;
 			grd.fields.add(["DATA","DATA2","COLNM"]);
 			grd.data.set(ds);