bways-grid 0.0.24 → 0.0.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/fesm2022/bways-grid.mjs +47 -6
- package/fesm2022/bways-grid.mjs.map +1 -1
- package/lib/components/ultra-grid/ultra-grid.component.d.ts +7 -2
- package/lib/models/grid-config.model.d.ts +3 -0
- package/lib/workers/generated/sorting.worker.code.d.ts +1 -1
- package/package.json +1 -1
- package/src/lib/workers/generated/sorting.worker.code.ts +1 -1
- package/src/lib/workers/sorting.worker.ts +30 -4
|
@@ -18,10 +18,15 @@ export declare class UltraGridComponent implements OnInit, OnDestroy, OnChanges
|
|
|
18
18
|
private _workerInitialized;
|
|
19
19
|
headerElement?: ElementRef;
|
|
20
20
|
viewport?: CdkVirtualScrollViewport;
|
|
21
|
-
|
|
21
|
+
private _columns;
|
|
22
|
+
private _config;
|
|
23
|
+
set columns(val: UltraGridColumn[]);
|
|
24
|
+
get columns(): UltraGridColumn[];
|
|
22
25
|
rowData: any[];
|
|
23
26
|
serverDataSource?: ServerDataSource;
|
|
24
|
-
config: UltraGridConfig;
|
|
27
|
+
set config(val: UltraGridConfig);
|
|
28
|
+
get config(): UltraGridConfig;
|
|
29
|
+
private processColumnsWithDefaults;
|
|
25
30
|
pagination: boolean;
|
|
26
31
|
pageSize: number;
|
|
27
32
|
rowClicked: EventEmitter<UltraGridRow>;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { UltraGridColumn } from './column.model';
|
|
1
2
|
export interface UltraGridConfig {
|
|
2
3
|
rowHeight?: number;
|
|
3
4
|
headerHeight?: number;
|
|
@@ -15,4 +16,6 @@ export interface UltraGridConfig {
|
|
|
15
16
|
customHeaders?: any[][];
|
|
16
17
|
};
|
|
17
18
|
sideBarToolPanels?: ('columns' | 'filters')[];
|
|
19
|
+
defaultColDef?: Partial<UltraGridColumn>;
|
|
20
|
+
defaultNumberFormat?: 'comma' | 'no-comma' | 'currency' | 'integer';
|
|
18
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const SORTING_WORKER_CODE = "\"use strict\";(()=>{var
|
|
1
|
+
export declare const SORTING_WORKER_CODE = "\"use strict\";(()=>{var v=[],m=[];addEventListener(\"message\",t=>{let{action:o,rows:a,sortModel:r,filterModel:i,conditionFilters:e,groupModel:n,aggregations:l,groupStateMap:d}=t.data;if(o===\"INIT\"){v=(a||[]).map(f=>({...f,type:\"leaf\",level:0})),postMessage({action:\"INIT_DONE\"});return}if(o===\"FLATTEN_ONLY\"){let s=L(m,d||{},t.data.groupIncludeFooter);postMessage({flatList:s});return}if(o===\"EXECUTE\"){let s=v,{pivotMode:f,pivotColumns:u}=t.data;if(i&&Object.keys(i).length>0){let g={};for(let p of Object.keys(i))g[p]=new Set(i[p]);s=s.filter(p=>{for(let y of Object.keys(g)){let h=g[y],S=p.data?p.data[y]:null;if(!h.has(S))return!1}return!0})}e&&Object.keys(e).length>0&&(s=$(s,e));let c={...l||{}},G=[];if(f&&u&&u.length>0){if(Object.keys(c).length===0){let g=new Set;s.slice(0,20).forEach(p=>{p.data&&Object.keys(p.data).forEach(y=>{let h=p.data[y];(typeof h==\"number\"||typeof h==\"string\"&&h.trim()!==\"\"&&!isNaN(Number(h)))&&g.add(y)})}),u.forEach(p=>g.delete(p)),n&&n.forEach(p=>g.delete(p)),g.forEach(p=>{c[p]=\"sum\"})}if(Object.keys(c).length>0){let{virtualAggrs:g,dynamicColumns:p}=D(s,u,c);c=g,G=p}}let N=s;if(n&&n.length>0?N=M(s,n,c):f&&u&&u.length>0&&Object.keys(c).length>0?N=[{id:\"pivot-root\",type:\"leaf\",level:0,data:U(s,c)}]:s.forEach(g=>g.level=0),r&&r.length>0&&F(N,r),m=N,n&&n.length>0&&t.data.groupIncludeFooter&&Object.keys(c).length>0){let p={id:\"grand-total-footer\",type:\"group-footer\",level:0,groupField:\"Grand Total\",groupKey:\"Grand Total\",data:U(s,c)};m.push(p)}let b=L(m,d||{},t.data.groupIncludeFooter),O=E(m);postMessage({flatList:b,resultTree:O,pivotColumns:G})}});function E(t){return t.map(o=>{if(o.type===\"leaf\")return{id:o.id,type:\"leaf\",level:o.level,data:o.id===\"pivot-root\"?o.data:void 0};if(o.type===\"group\"){let a=o;return{...a,children:a.children?E(a.children):void 0}}return o})}function L(t,o,a=!1){let r=[],i=[];for(let e=t.length-1;e>=0;e--)i.push(t[e]);for(;i.length>0;){let e=i.pop();if(e.type===\"group\"){let n=e;if(r.push({id:n.id,type:\"group\",level:n.level,groupField:n.groupField,groupKey:n.groupKey,data:n.data,childCount:n.children?n.children.length:0}),!!o[n.id]&&(a&&i.push({id:`${n.id}-footer`,type:\"group-footer\",level:n.level,groupField:n.groupField,groupKey:n.groupKey,data:{...n.data}}),n.children))for(let d=n.children.length-1;d>=0;d--)i.push(n.children[d])}else e.type===\"group-footer\"?r.push({id:e.id,type:\"group-footer\",level:e.level,groupField:e.groupField,groupKey:e.groupKey,data:e.data}):r.push({id:e.id,type:\"leaf\",level:e.level,data:e.id===\"pivot-root\"?e.data:void 0})}return r}function j(t){let o=[],a=[...t];for(;a.length>0;){let r=a.pop();if(C(r))o.push(r);else if(I(r)&&r.children)for(let i=r.children.length-1;i>=0;i--)a.push(r.children[i])}return o}function C(t){return t.type===\"leaf\"}function I(t){return t.type===\"group\"}function A(t){if(typeof t==\"number\")return t;if(typeof t!=\"string\")return t==null?0:Number(t);let o=t.trim();if(!o)return 0;let a=o.startsWith(\"(\")&&o.endsWith(\")\"),r=o.replace(/[\\u2212\\u2013\\u2014]/g,\"-\");r.includes(\"-\")&&(a=!0),r=r.replace(/[^0-9.]/g,\"\");let i=r?Number(r):0;return isNaN(i)?0:a?-i:i}function M(t,o,a){return k(t,o,0,a,\"root\")}function k(t,o,a,r,i){let e=o[a],n=a===o.length-1,l=new Map;for(let s of t){let f=s.data?s.data[e]:null;l.has(f)||l.set(f,[]),l.get(f).push(s)}let d=[];for(let[s,f]of l.entries()){let u=`${i}-${e}-${s}`,c={id:u,type:\"group\",level:a,groupField:e,groupKey:s,data:{[e]:s},children:[]},G=j(f),N=U(G,r);Object.assign(c.data,N),n?(f.forEach(b=>b.level=a+1),c.children=f):c.children=k(f,o,a+1,r,u),d.push(c)}return d}function U(t,o){let a={};for(let r of Object.keys(o)){let i=o[r],e=0;if(i===\"count\")e=t.length;else{let n=!0,l=0,d=0;for(let s of t){let f=s.data?s.data[r]:null,u=A(f);i===\"sum\"?e=Number(e)+u:i===\"min\"?n?e=u:e=Math.min(e,u):i===\"max\"?n?e=u:e=Math.max(e,u):i===\"avg\"&&(l=Number(l)+u,d++),n=!1}i===\"avg\"&&(e=d>0?l/d:0)}a[r]=e}return a}function F(t,o){t.sort((a,r)=>{for(let i of o){let{field:e,direction:n}=i,l=a.data?a.data[e]:null,d=r.data?r.data[e]:null;if(l===d)continue;let s=l>d?1:-1;return n===\"asc\"?s:-s}return 0});for(let a of t)a.type===\"group\"&&a.children&&F(a.children,o)}function $(t,o){let a=Object.keys(o);return a.length===0?t:t.filter(r=>{for(let i of a){let e=o[i];if(!e||!e.condition1)continue;let n=r.data?r.data[i]:null,l=T(n,e.condition1);if(e.condition2&&e.condition2.type){let d=T(n,e.condition2);if(!(e.operator===\"OR\"?l||d:l&&d))return!1}else if(!l)return!1}return!0})}function T(t,o){let{type:a,value:r,valueTo:i}=o;if(a===\"blank\")return t==null||t===\"\";if(a===\"notBlank\")return t!=null&&t!==\"\";if(r==null||r===\"\")return!0;let e=String(t??\"\").toLowerCase(),n=String(r).toLowerCase();switch(a){case\"contains\":return e.includes(n);case\"notContains\":return!e.includes(n);case\"equals\":return!isNaN(Number(t))&&!isNaN(Number(r))?Number(t)===Number(r):e===n;case\"notEqual\":return!isNaN(Number(t))&&!isNaN(Number(r))?Number(t)!==Number(r):e!==n;case\"startsWith\":return e.startsWith(n);case\"endsWith\":return e.endsWith(n);case\"greaterThan\":return Number(t)>Number(r);case\"greaterThanOrEqual\":return Number(t)>=Number(r);case\"lessThan\":return Number(t)<Number(r);case\"lessThanOrEqual\":return Number(t)<=Number(r);case\"inRange\":if(i==null||i===\"\")return!0;let l=Number(t);return l>=Number(r)&&l<=Number(i);default:return!0}}function D(t,o,a){let r={};o.forEach(d=>r[d]=new Set),t.forEach(d=>{o.forEach(s=>{let f=d.data[s];f!=null&&r[s].add(f)})});let i={},e=[],n=o[0];return Array.from(r[n]).sort().forEach(d=>{Object.keys(a).forEach(s=>{let f=a[s],u=`pivot_${n}_${d}_${s}`;i[u]=f,e.push({field:u,headerName:`${d} (${s})`,pivotValue:d,originalField:s,isPivotColumn:!0}),t.forEach(c=>{String(c.data[n])===String(d)?c.data[u]=c.data[s]:c.data[u]=null})})}),{virtualAggrs:i,dynamicColumns:e}}})();\n";
|
package/package.json
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
// AUTO-GENERATED FILE. DO NOT EDIT.
|
|
2
2
|
// Built from src/lib/workers/sorting.worker.ts
|
|
3
|
-
export const SORTING_WORKER_CODE = `"use strict";(()=>{var
|
|
3
|
+
export const SORTING_WORKER_CODE = `"use strict";(()=>{var v=[],m=[];addEventListener("message",t=>{let{action:o,rows:a,sortModel:r,filterModel:i,conditionFilters:e,groupModel:n,aggregations:l,groupStateMap:d}=t.data;if(o==="INIT"){v=(a||[]).map(f=>({...f,type:"leaf",level:0})),postMessage({action:"INIT_DONE"});return}if(o==="FLATTEN_ONLY"){let s=L(m,d||{},t.data.groupIncludeFooter);postMessage({flatList:s});return}if(o==="EXECUTE"){let s=v,{pivotMode:f,pivotColumns:u}=t.data;if(i&&Object.keys(i).length>0){let g={};for(let p of Object.keys(i))g[p]=new Set(i[p]);s=s.filter(p=>{for(let y of Object.keys(g)){let h=g[y],S=p.data?p.data[y]:null;if(!h.has(S))return!1}return!0})}e&&Object.keys(e).length>0&&(s=\$(s,e));let c={...l||{}},G=[];if(f&&u&&u.length>0){if(Object.keys(c).length===0){let g=new Set;s.slice(0,20).forEach(p=>{p.data&&Object.keys(p.data).forEach(y=>{let h=p.data[y];(typeof h=="number"||typeof h=="string"&&h.trim()!==""&&!isNaN(Number(h)))&&g.add(y)})}),u.forEach(p=>g.delete(p)),n&&n.forEach(p=>g.delete(p)),g.forEach(p=>{c[p]="sum"})}if(Object.keys(c).length>0){let{virtualAggrs:g,dynamicColumns:p}=D(s,u,c);c=g,G=p}}let N=s;if(n&&n.length>0?N=M(s,n,c):f&&u&&u.length>0&&Object.keys(c).length>0?N=[{id:"pivot-root",type:"leaf",level:0,data:U(s,c)}]:s.forEach(g=>g.level=0),r&&r.length>0&&F(N,r),m=N,n&&n.length>0&&t.data.groupIncludeFooter&&Object.keys(c).length>0){let p={id:"grand-total-footer",type:"group-footer",level:0,groupField:"Grand Total",groupKey:"Grand Total",data:U(s,c)};m.push(p)}let b=L(m,d||{},t.data.groupIncludeFooter),O=E(m);postMessage({flatList:b,resultTree:O,pivotColumns:G})}});function E(t){return t.map(o=>{if(o.type==="leaf")return{id:o.id,type:"leaf",level:o.level,data:o.id==="pivot-root"?o.data:void 0};if(o.type==="group"){let a=o;return{...a,children:a.children?E(a.children):void 0}}return o})}function L(t,o,a=!1){let r=[],i=[];for(let e=t.length-1;e>=0;e--)i.push(t[e]);for(;i.length>0;){let e=i.pop();if(e.type==="group"){let n=e;if(r.push({id:n.id,type:"group",level:n.level,groupField:n.groupField,groupKey:n.groupKey,data:n.data,childCount:n.children?n.children.length:0}),!!o[n.id]&&(a&&i.push({id:\`\${n.id}-footer\`,type:"group-footer",level:n.level,groupField:n.groupField,groupKey:n.groupKey,data:{...n.data}}),n.children))for(let d=n.children.length-1;d>=0;d--)i.push(n.children[d])}else e.type==="group-footer"?r.push({id:e.id,type:"group-footer",level:e.level,groupField:e.groupField,groupKey:e.groupKey,data:e.data}):r.push({id:e.id,type:"leaf",level:e.level,data:e.id==="pivot-root"?e.data:void 0})}return r}function j(t){let o=[],a=[...t];for(;a.length>0;){let r=a.pop();if(C(r))o.push(r);else if(I(r)&&r.children)for(let i=r.children.length-1;i>=0;i--)a.push(r.children[i])}return o}function C(t){return t.type==="leaf"}function I(t){return t.type==="group"}function A(t){if(typeof t=="number")return t;if(typeof t!="string")return t==null?0:Number(t);let o=t.trim();if(!o)return 0;let a=o.startsWith("(")&&o.endsWith(")"),r=o.replace(/[\\u2212\\u2013\\u2014]/g,"-");r.includes("-")&&(a=!0),r=r.replace(/[^0-9.]/g,"");let i=r?Number(r):0;return isNaN(i)?0:a?-i:i}function M(t,o,a){return k(t,o,0,a,"root")}function k(t,o,a,r,i){let e=o[a],n=a===o.length-1,l=new Map;for(let s of t){let f=s.data?s.data[e]:null;l.has(f)||l.set(f,[]),l.get(f).push(s)}let d=[];for(let[s,f]of l.entries()){let u=\`\${i}-\${e}-\${s}\`,c={id:u,type:"group",level:a,groupField:e,groupKey:s,data:{[e]:s},children:[]},G=j(f),N=U(G,r);Object.assign(c.data,N),n?(f.forEach(b=>b.level=a+1),c.children=f):c.children=k(f,o,a+1,r,u),d.push(c)}return d}function U(t,o){let a={};for(let r of Object.keys(o)){let i=o[r],e=0;if(i==="count")e=t.length;else{let n=!0,l=0,d=0;for(let s of t){let f=s.data?s.data[r]:null,u=A(f);i==="sum"?e=Number(e)+u:i==="min"?n?e=u:e=Math.min(e,u):i==="max"?n?e=u:e=Math.max(e,u):i==="avg"&&(l=Number(l)+u,d++),n=!1}i==="avg"&&(e=d>0?l/d:0)}a[r]=e}return a}function F(t,o){t.sort((a,r)=>{for(let i of o){let{field:e,direction:n}=i,l=a.data?a.data[e]:null,d=r.data?r.data[e]:null;if(l===d)continue;let s=l>d?1:-1;return n==="asc"?s:-s}return 0});for(let a of t)a.type==="group"&&a.children&&F(a.children,o)}function \$(t,o){let a=Object.keys(o);return a.length===0?t:t.filter(r=>{for(let i of a){let e=o[i];if(!e||!e.condition1)continue;let n=r.data?r.data[i]:null,l=T(n,e.condition1);if(e.condition2&&e.condition2.type){let d=T(n,e.condition2);if(!(e.operator==="OR"?l||d:l&&d))return!1}else if(!l)return!1}return!0})}function T(t,o){let{type:a,value:r,valueTo:i}=o;if(a==="blank")return t==null||t==="";if(a==="notBlank")return t!=null&&t!=="";if(r==null||r==="")return!0;let e=String(t??"").toLowerCase(),n=String(r).toLowerCase();switch(a){case"contains":return e.includes(n);case"notContains":return!e.includes(n);case"equals":return!isNaN(Number(t))&&!isNaN(Number(r))?Number(t)===Number(r):e===n;case"notEqual":return!isNaN(Number(t))&&!isNaN(Number(r))?Number(t)!==Number(r):e!==n;case"startsWith":return e.startsWith(n);case"endsWith":return e.endsWith(n);case"greaterThan":return Number(t)>Number(r);case"greaterThanOrEqual":return Number(t)>=Number(r);case"lessThan":return Number(t)<Number(r);case"lessThanOrEqual":return Number(t)<=Number(r);case"inRange":if(i==null||i==="")return!0;let l=Number(t);return l>=Number(r)&&l<=Number(i);default:return!0}}function D(t,o,a){let r={};o.forEach(d=>r[d]=new Set),t.forEach(d=>{o.forEach(s=>{let f=d.data[s];f!=null&&r[s].add(f)})});let i={},e=[],n=o[0];return Array.from(r[n]).sort().forEach(d=>{Object.keys(a).forEach(s=>{let f=a[s],u=\`pivot_\${n}_\${d}_\${s}\`;i[u]=f,e.push({field:u,headerName:\`\${d} (\${s})\`,pivotValue:d,originalField:s,isPivotColumn:!0}),t.forEach(c=>{String(c.data[n])===String(d)?c.data[u]=c.data[s]:c.data[u]=null})})}),{virtualAggrs:i,dynamicColumns:e}}})();
|
|
4
4
|
`;
|
|
@@ -55,10 +55,36 @@ addEventListener('message', (event: MessageEvent) => {
|
|
|
55
55
|
let resultAggregations = { ...(aggregations || {}) };
|
|
56
56
|
let pivotResultColumns: any[] = [];
|
|
57
57
|
|
|
58
|
-
if (pivotMode && pivotColumns && pivotColumns.length > 0
|
|
59
|
-
|
|
60
|
-
resultAggregations
|
|
61
|
-
|
|
58
|
+
if (pivotMode && pivotColumns && pivotColumns.length > 0) {
|
|
59
|
+
// Fallback: if no aggregations are specified, default to aggregating all numeric fields
|
|
60
|
+
if (Object.keys(resultAggregations).length === 0) {
|
|
61
|
+
const numericFields = new Set<string>();
|
|
62
|
+
processed.slice(0, 20).forEach(row => {
|
|
63
|
+
if (row.data) {
|
|
64
|
+
Object.keys(row.data).forEach(field => {
|
|
65
|
+
const val = row.data[field];
|
|
66
|
+
if (typeof val === 'number' || (typeof val === 'string' && val.trim() !== '' && !isNaN(Number(val)))) {
|
|
67
|
+
numericFields.add(field);
|
|
68
|
+
}
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
});
|
|
72
|
+
// Exclude pivot and group columns from aggregation
|
|
73
|
+
pivotColumns.forEach((col: string) => numericFields.delete(col));
|
|
74
|
+
if (groupModel) {
|
|
75
|
+
groupModel.forEach((col: string) => numericFields.delete(col));
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
numericFields.forEach(field => {
|
|
79
|
+
resultAggregations[field] = 'sum';
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
if (Object.keys(resultAggregations).length > 0) {
|
|
84
|
+
const { virtualAggrs, dynamicColumns } = handlePivoting(processed, pivotColumns, resultAggregations);
|
|
85
|
+
resultAggregations = virtualAggrs;
|
|
86
|
+
pivotResultColumns = dynamicColumns;
|
|
87
|
+
}
|
|
62
88
|
}
|
|
63
89
|
|
|
64
90
|
// 3. Apply Grouping and Aggregation if present
|