ninegrid2 6.188.0 → 6.193.0

package/dist/bundle.cjs.js

@@ -18459,7 +18459,7 @@ class ngFilterPanel extends HTMLElement
 	open = (filterButton) => {
 
 		const owner = this.shadow.closest("nine-grid");
-		const colnms = [...new Set(filterButton.filterOptions.map(item => item.colnm))];
+		
 
 		//console.log(this, owner, filterButton.filterOptions, colnms);
 		
@@ -18487,18 +18487,18 @@ class ngFilterPanel extends HTMLElement
 			
 			let data = owner.data.getValidDataNF();
 
-			console.log(data);
+			//console.log(data);
 
 			owner.body.querySelectorAll("ng-filter-button").forEach(el => {
-				console.log(el);
+				//console.log(el);
 				if (el.closest('th,td').dataset.col != col || el.filterOptions) {
 					
-					console.log("================", el.filterOptions);
+					//console.log("================", el.filterOptions);
 
 					el.filterOptions.forEach(filterOption => {
 						var idx = owner.fields.indexOf(filterOption.colnm);
 						
-						console.log(idx);
+						//console.log(idx);
 
 						if (idx >= 0) {
 							data = data.filter(m => { return filterOption.data.nineBinarySearch(m.v[idx] || '') >= 0; });
@@ -18533,54 +18533,54 @@ class ngFilterPanel extends HTMLElement
 			
 			var ds = [];
 			//colnms = [...new Set(colnms)];
-			colnms.forEach((colnm,i) => {
 
-				console.log(colnm);
+			//const colnms = [...new Set(filterButton.filterOptions.map(item => item.colnm))];
+
+			filterButton.filterOptions.forEach((filterOption,i) => {
+
+				//const colnm = filterOption.colnm;
+				console.log(filterOption);
 
 				ds.push({
 					LVL: 1,
 					CHK: 'N',
-					DATA2: '<span class="group">' + $(filterButton).closest('th,td').text() + (colnms.length > 1 ? ` #${i+1} (${colnm})` : '') + '</span>',
+					DATA2: '<span class="group">' + $(filterButton).closest('th,td').text() + (filterButton.filterOptions.length > 1 ? ` #${i+1} (${filterOption.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 cell = $(`[data-col=${col}][data-bind=${filterOption.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 cell = ninegrid.j.querySelectorAll(`[data-col="${col}"][data-bind="${filterOption.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);
+					var idx = owner.fields.indexOf(filterOption.colnm);
 					
 					if (expr) {
 						var o = owner.data.conv(rowData);
-						data2.push({v:o[colnm],v2:exprFunc(o, rowData.__ng.rowidx, owner.data)});
+						data2.push({v:o[filterOption.colnm],v2:exprFunc(o, rowData.__ng.rowidx, owner.data)});
 					}
 					else {
 						data2.push({v:rowData.v[idx],v2:rowData.v[idx]});
 					}
 				}
 
+				console.log(data, data2);
+
 				[...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",
+						COLNM	: filterOption.colnm,
+						CHK		: filterOption.data.length == 0 || filterOption.data.nineBinarySearch(o.v || '') >= 0 ? "Y" : "N",
 					});
 				});
 			});

package/dist/bundle.esm.js

@@ -18457,7 +18457,7 @@ class ngFilterPanel extends HTMLElement
 	open = (filterButton) => {
 
 		const owner = this.shadow.closest("nine-grid");
-		const colnms = [...new Set(filterButton.filterOptions.map(item => item.colnm))];
+		
 
 		//console.log(this, owner, filterButton.filterOptions, colnms);
 		
@@ -18485,18 +18485,18 @@ class ngFilterPanel extends HTMLElement
 			
 			let data = owner.data.getValidDataNF();
 
-			console.log(data);
+			//console.log(data);
 
 			owner.body.querySelectorAll("ng-filter-button").forEach(el => {
-				console.log(el);
+				//console.log(el);
 				if (el.closest('th,td').dataset.col != col || el.filterOptions) {
 					
-					console.log("================", el.filterOptions);
+					//console.log("================", el.filterOptions);
 
 					el.filterOptions.forEach(filterOption => {
 						var idx = owner.fields.indexOf(filterOption.colnm);
 						
-						console.log(idx);
+						//console.log(idx);
 
 						if (idx >= 0) {
 							data = data.filter(m => { return filterOption.data.nineBinarySearch(m.v[idx] || '') >= 0; });
@@ -18531,54 +18531,54 @@ class ngFilterPanel extends HTMLElement
 			
 			var ds = [];
 			//colnms = [...new Set(colnms)];
-			colnms.forEach((colnm,i) => {
 
-				console.log(colnm);
+			//const colnms = [...new Set(filterButton.filterOptions.map(item => item.colnm))];
+
+			filterButton.filterOptions.forEach((filterOption,i) => {
+
+				//const colnm = filterOption.colnm;
+				console.log(filterOption);
 
 				ds.push({
 					LVL: 1,
 					CHK: 'N',
-					DATA2: '<span class="group">' + $(filterButton).closest('th,td').text() + (colnms.length > 1 ? ` #${i+1} (${colnm})` : '') + '</span>',
+					DATA2: '<span class="group">' + $(filterButton).closest('th,td').text() + (filterButton.filterOptions.length > 1 ? ` #${i+1} (${filterOption.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 cell = $(`[data-col=${col}][data-bind=${filterOption.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 cell = ninegrid.j.querySelectorAll(`[data-col="${col}"][data-bind="${filterOption.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);
+					var idx = owner.fields.indexOf(filterOption.colnm);
 					
 					if (expr) {
 						var o = owner.data.conv(rowData);
-						data2.push({v:o[colnm],v2:exprFunc(o, rowData.__ng.rowidx, owner.data)});
+						data2.push({v:o[filterOption.colnm],v2:exprFunc(o, rowData.__ng.rowidx, owner.data)});
 					}
 					else {
 						data2.push({v:rowData.v[idx],v2:rowData.v[idx]});
 					}
 				}
 
+				console.log(data, data2);
+
 				[...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",
+						COLNM	: filterOption.colnm,
+						CHK		: filterOption.data.length == 0 || filterOption.data.nineBinarySearch(o.v || '') >= 0 ? "Y" : "N",
 					});
 				});
 			});

package/dist/etc/ngFiltering.js

@@ -529,7 +529,7 @@ class ngFilterPanel extends HTMLElement
 	open = (filterButton) => {
 
 		const owner = this.shadow.closest("nine-grid");
-		const colnms = [...new Set(filterButton.filterOptions.map(item => item.colnm))];
+		
 
 		//console.log(this, owner, filterButton.filterOptions, colnms);
 		
@@ -557,18 +557,18 @@ class ngFilterPanel extends HTMLElement
 			
 			let data = owner.data.getValidDataNF();
 
-			console.log(data);
+			//console.log(data);
 
 			owner.body.querySelectorAll("ng-filter-button").forEach(el => {
-				console.log(el);
+				//console.log(el);
 				if (el.closest('th,td').dataset.col != col || el.filterOptions) {
 					
-					console.log("================", el.filterOptions);
+					//console.log("================", el.filterOptions);
 
 					el.filterOptions.forEach(filterOption => {
 						var idx = owner.fields.indexOf(filterOption.colnm);
 						
-						console.log(idx);
+						//console.log(idx);
 
 						if (idx >= 0) {
 							data = data.filter(m => { return filterOption.data.nineBinarySearch(m.v[idx] || '') >= 0; });
@@ -603,54 +603,54 @@ class ngFilterPanel extends HTMLElement
 			
 			var ds = [];
 			//colnms = [...new Set(colnms)];
-			colnms.forEach((colnm,i) => {
 
-				console.log(colnm);
+			//const colnms = [...new Set(filterButton.filterOptions.map(item => item.colnm))];
+
+			filterButton.filterOptions.forEach((filterOption,i) => {
+
+				//const colnm = filterOption.colnm;
+				console.log(filterOption);
 
 				ds.push({
 					LVL: 1,
 					CHK: 'N',
-					DATA2: '<span class="group">' + $(filterButton).closest('th,td').text() + (colnms.length > 1 ? ` #${i+1} (${colnm})` : '') + '</span>',
+					DATA2: '<span class="group">' + $(filterButton).closest('th,td').text() + (filterButton.filterOptions.length > 1 ? ` #${i+1} (${filterOption.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 cell = $(`[data-col=${col}][data-bind=${filterOption.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 cell = ninegrid.j.querySelectorAll(`[data-col="${col}"][data-bind="${filterOption.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);
+					var idx = owner.fields.indexOf(filterOption.colnm);
 					
 					if (expr) {
 						var o = owner.data.conv(rowData);
-						data2.push({v:o[colnm],v2:exprFunc(o, rowData.__ng.rowidx, owner.data)});
+						data2.push({v:o[filterOption.colnm],v2:exprFunc(o, rowData.__ng.rowidx, owner.data)});
 					}
 					else {
 						data2.push({v:rowData.v[idx],v2:rowData.v[idx]});
 					}
 				}
 
+				console.log(data, data2);
+
 				[...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",
+						COLNM	: filterOption.colnm,
+						CHK		: filterOption.data.length == 0 || filterOption.data.nineBinarySearch(o.v || '') >= 0 ? "Y" : "N",
 					});
 				});
 			});

package/package.json

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

package/src/etc/ngFiltering.js

@@ -529,7 +529,7 @@ class ngFilterPanel extends HTMLElement
 	open = (filterButton) => {
 
 		const owner = this.shadow.closest("nine-grid");
-		const colnms = [...new Set(filterButton.filterOptions.map(item => item.colnm))];
+		
 
 		//console.log(this, owner, filterButton.filterOptions, colnms);
 		
@@ -557,18 +557,18 @@ class ngFilterPanel extends HTMLElement
 			
 			let data = owner.data.getValidDataNF();
 
-			console.log(data);
+			//console.log(data);
 
 			owner.body.querySelectorAll("ng-filter-button").forEach(el => {
-				console.log(el);
+				//console.log(el);
 				if (el.closest('th,td').dataset.col != col || el.filterOptions) {
 					
-					console.log("================", el.filterOptions);
+					//console.log("================", el.filterOptions);
 
 					el.filterOptions.forEach(filterOption => {
 						var idx = owner.fields.indexOf(filterOption.colnm);
 						
-						console.log(idx);
+						//console.log(idx);
 
 						if (idx >= 0) {
 							data = data.filter(m => { return filterOption.data.nineBinarySearch(m.v[idx] || '') >= 0; });
@@ -603,54 +603,54 @@ class ngFilterPanel extends HTMLElement
 			
 			var ds = [];
 			//colnms = [...new Set(colnms)];
-			colnms.forEach((colnm,i) => {
 
-				console.log(colnm);
+			//const colnms = [...new Set(filterButton.filterOptions.map(item => item.colnm))];
+
+			filterButton.filterOptions.forEach((filterOption,i) => {
+
+				//const colnm = filterOption.colnm;
+				console.log(filterOption);
 
 				ds.push({
 					LVL: 1,
 					CHK: 'N',
-					DATA2: '<span class="group">' + $(filterButton).closest('th,td').text() + (colnms.length > 1 ? ` #${i+1} (${colnm})` : '') + '</span>',
+					DATA2: '<span class="group">' + $(filterButton).closest('th,td').text() + (filterButton.filterOptions.length > 1 ? ` #${i+1} (${filterOption.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 cell = $(`[data-col=${col}][data-bind=${filterOption.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 cell = ninegrid.j.querySelectorAll(`[data-col="${col}"][data-bind="${filterOption.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);
+					var idx = owner.fields.indexOf(filterOption.colnm);
 					
 					if (expr) {
 						var o = owner.data.conv(rowData);
-						data2.push({v:o[colnm],v2:exprFunc(o, rowData.__ng.rowidx, owner.data)});
+						data2.push({v:o[filterOption.colnm],v2:exprFunc(o, rowData.__ng.rowidx, owner.data)});
 					}
 					else {
 						data2.push({v:rowData.v[idx],v2:rowData.v[idx]});
 					}
 				}
 
+				console.log(data, data2);
+
 				[...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",
+						COLNM	: filterOption.colnm,
+						CHK		: filterOption.data.length == 0 || filterOption.data.nineBinarySearch(o.v || '') >= 0 ? "Y" : "N",
 					});
 				});
 			});