@bizdoc/core 1.10.0-next.6 → 1.10.0-next.7

package/fesm2020/bizdoc-core.mjs

@@ -116,7 +116,7 @@ import * as i24 from '@angular/flex-layout/extended';
 import * as i4$1 from '@ctrl/ngx-emoji-mart';
 import { PickerModule } from '@ctrl/ngx-emoji-mart';
 import * as i8$2 from '@syncfusion/ej2-angular-charts';
-import { AccumulationChart, FunnelSeries, AccumulationDataLabel, AccumulationTooltip, AccumulationLegend, Export, PieSeries, ChartModule, AccumulationChartAllModule, SparklineAllModule, LineSeriesService, ScatterSeriesService, ColumnSeriesService, SplineSeriesService, SplineAreaSeriesService, StripLineService, AreaSeriesService, ScrollBarService, StepLineSeriesService, StepAreaSeriesService, StackingColumnSeriesService, StackingLineSeriesService, StackingAreaSeriesService, BarSeriesService, StackingBarSeriesService, RangeColumnSeriesService, BubbleSeriesService, TooltipService, CrosshairService, CategoryService, DateTimeService, LogarithmicService, LegendService, ZoomService, DataLabelService, SelectionService, ChartAnnotationService, WaterfallSeriesService, RangeAreaSeriesService, PolarSeriesService, RadarSeriesService, DateTimeCategoryService, MultiLevelLabelService, ParetoSeriesService, TooltipRenderService, ExportService, AccumulationAnnotationService, AccumulationDataLabelService, AccumulationLegendService, AccumulationSelectionService, AccumulationTooltipService, AccumulationChartComponent, Chart as Chart$1, DateTime as DateTime$1, BarSeries as BarSeries$1, AreaSeries as AreaSeries$1, BubbleSeries as BubbleSeries$1, ColumnSeries as ColumnSeries$1, LineSeries as LineSeries$1, PolarSeries as PolarSeries$1, RadarSeries as RadarSeries$1, SplineSeries as SplineSeries$1, SplineAreaSeries as SplineAreaSeries$1, ScatterSeries as ScatterSeries$1, StackingLineSeries as StackingLineSeries$1, StackingAreaSeries as StackingAreaSeries$1, StackingColumnSeries as StackingColumnSeries$1, StackingBarSeries as StackingBarSeries$1, StepAreaSeries as StepAreaSeries$1, StepLineSeries as StepLineSeries$1, ChartComponent } from '@syncfusion/ej2-angular-charts';
+import { AccumulationChart, FunnelSeries, AccumulationDataLabel, AccumulationTooltip, AccumulationLegend, Export, PieSeries, ChartModule, AccumulationChartAllModule, SparklineAllModule, AccumulationDistributionIndicatorService, FunnelSeriesService, StackingStepAreaSeriesService, PieSeriesService, PyramidSeriesService, LineSeriesService, ScatterSeriesService, ColumnSeriesService, SplineSeriesService, SplineAreaSeriesService, StripLineService, AreaSeriesService, ScrollBarService, StepLineSeriesService, StepAreaSeriesService, StackingColumnSeriesService, StackingLineSeriesService, StackingAreaSeriesService, BarSeriesService, StackingBarSeriesService, RangeColumnSeriesService, BubbleSeriesService, TooltipService, CrosshairService, CategoryService, DateTimeService, LogarithmicService, LegendService, ZoomService, DataLabelService, SelectionService, ChartAnnotationService, WaterfallSeriesService, RangeAreaSeriesService, PolarSeriesService, RadarSeriesService, DateTimeCategoryService, MultiLevelLabelService, ParetoSeriesService, TooltipRenderService, ExportService, AccumulationAnnotationService, AccumulationDataLabelService, AccumulationLegendService, AccumulationSelectionService, AccumulationTooltipService, AccumulationChartComponent, Chart as Chart$1, DateTime as DateTime$1, BarSeries as BarSeries$1, AreaSeries as AreaSeries$1, BubbleSeries as BubbleSeries$1, ColumnSeries as ColumnSeries$1, LineSeries as LineSeries$1, PolarSeries as PolarSeries$1, RadarSeries as RadarSeries$1, SplineSeries as SplineSeries$1, SplineAreaSeries as SplineAreaSeries$1, ScatterSeries as ScatterSeries$1, StackingLineSeries as StackingLineSeries$1, StackingAreaSeries as StackingAreaSeries$1, StackingColumnSeries as StackingColumnSeries$1, StackingBarSeries as StackingBarSeries$1, StepAreaSeries as StepAreaSeries$1, StepLineSeries as StepLineSeries$1, ChartComponent } from '@syncfusion/ej2-angular-charts';
 import * as XLSX from 'xlsx';
 import { Chart, Category, DateTime, Tooltip, Export as Export$1, BarSeries, AreaSeries, StackingStepAreaSeries, BubbleSeries, ColumnSeries, LineSeries, Legend, PolarSeries, RadarSeries, SplineSeries, SplineAreaSeries, ScatterSeries, StackingLineSeries, StackingAreaSeries, StackingColumnSeries, StackingBarSeries, StepAreaSeries, StepLineSeries } from '@syncfusion/ej2-charts';
 import * as i6$5 from '@syncfusion/ej2-angular-grids';
@@ -636,6 +636,9 @@ const IS_MOBILE = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini
 function isMobile() {
     return IS_MOBILE /*|| document.cookie.indexOf('aria=1') > -1*/;
 }
+function isFunction(val) {
+    return typeof val === 'function';
+}
 function isBoolean(val) {
     return typeof val === 'boolean';
 }
@@ -2856,15 +2859,6 @@ class MailboxService {
             // _session.profile.inbox.push(m.model);
         });
     }
-    /**
-     *
-     * @param date
-     */
-    _isAboveWatermark(date) {
-        return !this._session.isImpersonating &&
-            this._session.profile.options.inboxView &&
-            this._session.profile.options.inboxView < date;
-    }
     download(documentId, fileId) {
         return this._http.get(AttachmentInfo.formatUrl(documentId, fileId), {
             responseType: 'arraybuffer'
@@ -2873,8 +2867,8 @@ class MailboxService {
     removeattachment(id, fileId) {
         return this._http.delete(`/api/mailbox/attachment/${id}`, { params: { fileId: fileId.toString() } });
     }
-    read(id, read) {
-        return this._http.put(`/api/mailbox/read/${id}`, undefined, { params: { read } });
+    read(id, read, folderId, received) {
+        return this._http.put(`/api/mailbox/read/${id}`, undefined, { params: { read } }).pipe(tap(() => folderId && this._updateunreadcounter(received, folderId, read ? 1 : -1)));
     }
     comments(id, before) {
         return this._http.get(`/api/comments/${id}`, { params: { before: new Date(before).toJSON() } });
@@ -3014,14 +3008,20 @@ class MailboxService {
         })), this._notify());
     }
     get(id, read) {
-        return this._http.get(`/api/mail/${id}`).pipe(tap(m => {
-            if (read !== undefined && m.read !== read) {
-                if (this._isAboveWatermark(m.received))
-                    this._session.profile.inboxCount -= read ? -1 : 1;
-                const folder = this._session.profile.folders.find(f => f.name === m.folderId);
-                folder.count -= read ? -1 : 1;
-            }
-        }));
+        return this._http.get(`/api/mail/${id}`).pipe(tap(m => read === false && m.read === true &&
+            this._updateunreadcounter(m.received, m.folderId, -1)));
+    }
+    _updateunreadcounter(date, folderId, val) {
+        if (
+        // date is above watermark
+        !this._session.isImpersonating &&
+            this._session.profile.options.inboxView &&
+            this._session.profile.options.inboxView < date)
+            this._session.profile.inboxCount -= val;
+        // decrease
+        const folder = this._session.profile.folders.
+            find(f => f.name === folderId);
+        folder.count -= val;
     }
     save(id, version, form, model) {
         return this._withGeoLocation(form).pipe(switchMap(params => this._http.put(`/api/mail/${id}?version=${version}`, model, { params })), this._notify());
@@ -3032,11 +3032,11 @@ class MailboxService {
     removecomment(id) {
         return this._http.delete(`/api/comments/${id}`).pipe(tap(() => { }));
     }
-    submit(id, version, form, model) {
+    submit(id, version, form, model, read, folderId, received) {
         return this._withGeoLocation(form).pipe(switchMap(params => this._http.put(`/api/mail/${id}?version=${version}&go=true`, model, { params }))).pipe(this._notify());
     }
-    send(id, version, form, model, action, actionArgs) {
-        return this._withGeoLocation(form).pipe(switchMap(params => this._http.put(`/api/mail/${id}?version=${version}&action=${action}`, model, { params: Object.assign(params, actionArgs) }))).pipe(this._notify());
+    send(id, version, form, model, action, actionArgs, read, folderId, received) {
+        return this._withGeoLocation(form).pipe(switchMap(params => this._http.put(`/api/mail/${id}?version=${version}&action=${action}`, model, { params: Object.assign(params, actionArgs) }))).pipe(tap(() => read === false && this._updateunreadcounter(received, folderId, -1)), this._notify());
     }
     events(starting, ending, contains) {
         return this._http.get(`/api/events`, {
@@ -7025,7 +7025,7 @@ class BrowseItemsComponent {
     dragStarted(event) {
     }
     toggleRead(item) {
-        this._mailbox.read(item.id, !item.read).
+        this._mailbox.read(item.id, !item.read, item.folderId, item.received).
             subscribe(() => item.read = !item.read);
     }
     select(id) {
@@ -7270,7 +7270,7 @@ class BrowseItemsComponent {
     }
     sendAll(action, args) {
         const params = queryParams(args);
-        this._forEach(i => this._mailbox.send(i.id, i.version, i.formId, null, action, params).
+        this._forEach(i => this._mailbox.send(i.id, i.version, i.formId, null, action, params, i.read, i.folderId, i.received).
             pipe(tap(() => {
             if (i.folderId !== this.folderId)
                 this.dataSource.data.remove(i);
@@ -14068,32 +14068,30 @@ class CubeMatrixComponent {
         this.onExplore = new EventEmitter();
         this.loadingChange = new EventEmitter();
     }
-    get indices() {
-        return this._indices;
-    }
-    set indices(value) {
-        if (value)
-            this._indices = isArray(value) ? value : [value];
-    }
     set sum(val) {
-        function translate(axis) {
-            switch (axis) {
-                case '$month':
-                    return 'M' + ('0' + new Date().getMonth().toString()).slice(-2);
-                case '$year':
-                    return new Date().getFullYear().toString();
-                case '$quarter':
-                    return Math.ceil(new Date().getMonth() / 3).toString();
-                default:
-                    return axis ? axis.toString() : null;
-            }
-        }
-        this._sum = {
-            //fn: val.fn,
-            title: val.title,
-            xAxis: translate(val.xAxis),
-            series: translate(val.series)
-        };
+        if (val)
+            this._sum = (isArray(val) ? val : [val]).
+                map(sum => {
+                let value;
+                if (sum.value)
+                    value = sum.value.toString();
+                else if (sum.calculate)
+                    switch (sum.calculate) {
+                        case 'month':
+                            value = 'M' + ('0' + new Date().getMonth().toString()).slice(-2);
+                            break;
+                        case 'year':
+                            value = new Date().getFullYear().toString();
+                            break;
+                        case 'quarter':
+                            value = Math.ceil(new Date().getMonth() / 3).toString();
+                            break;
+                    }
+                return {
+                    value,
+                    ...sum
+                };
+            });
     }
     get interactive() {
         return this._interactive;
@@ -14103,70 +14101,69 @@ class CubeMatrixComponent {
     }
     ngOnChanges(changes) {
         if (changes['_cube']) {
-            this.cube = this.cube ? this._session.profile.cubes.find(c => c.name === this._cube) :
-                this._session.profile.cubes[0];
+            this.cube = this._session.profile.cubes.find(c => c.name === this._cube);
             this.CURRENCY = this.cube.currencyCode /*|| this._service.currencyCode*/;
         }
-        if (this._indices)
-            this.indexes = this.cube.indices.filter(i => this._indices.indexOf(i.name) > -1);
-        else {
-            this.indexes = this.cube.indices;
-            this._indices = this.indexes.map(i => i.name);
+        if (!this.cube) {
+            this.cube = this._session.profile.cubes[0];
+            this.CURRENCY = this.cube.currencyCode /*|| this._service.currencyCode*/;
         }
+        if (changes['_indices'])
+            this.indices = this.cube.indices.filter(i => isArray(this._indices) ? this._indices.indexOf(i.name) > -1 : this._indices === i.name);
         if (changes['_xAxis'] || changes['_series']) {
-            this.xAxis = this.cube.axes.find(a => a.name === this._xAxis) || this.cube.axes[0];
-            this.series = this.cube.axes.find(a => a.name === this._series) || this.cube.axes[1];
+            this.xAxis = this.cube.axes.find(a => a.name === this._xAxis);
+            this.series = this.cube.axes.find(a => a.name === this._series);
             this._prepare = forkJoin(this._ds.all(this.series.dataType).pipe(tap(r => this.rows = r)), this._ds.all(this.xAxis.dataType).pipe(tap(c => this.columns = c))).toPromise().then(() => this._sum &&
                 this._addsum());
         }
         if (changes['filters'])
             this.refresh();
     }
-    /** */
     _addsum() {
-        let { xAxis, series } = this._sum;
-        if (xAxis) {
-            let i = 0;
-            while (i < this.columns.length - 1) {
-                if (this.columns[i].key === xAxis.toString()) {
-                    this.columns.splice(i + 1, 0, {
-                        key: '_sum',
-                        value: this._sum.title
-                    });
-                    break;
+        this._sum.forEach((s, i) => {
+            let { value, axis } = s;
+            const element = {
+                key: '_sum_' + i,
+                value: s.title
+            };
+            let j = 0;
+            if (axis === 'xAxis') {
+                while (j < this.columns.length) {
+                    if (this.columns[j].key === value) {
+                        this.columns.splice(j + 1, 0, element);
+                        break;
+                    }
+                    j++;
                 }
-                i++;
+                if (j === this.columns.length)
+                    this.columns.push(element);
             }
-        }
-        if (series) {
-            let i = 0;
-            const row = {
-                key: '_sum',
-                value: this._sum.title
-            };
-            while (i < this.rows.length - 1) {
-                if (this.rows[i].key === series.toString()) {
-                    this.rows.splice(i + 1, 0, row);
-                    break;
+            else {
+                while (j < this.rows.length) {
+                    if (this.rows[j].key === value) {
+                        this.rows.splice(j + 1, 0, element);
+                        break;
+                    }
+                    j++;
                 }
-                i++;
+                if (j === this.rows.length)
+                    this.rows.push(element);
             }
-            if (i === this.rows.length - 1)
-                this.rows.push(row);
-        }
+        });
     }
     refresh() {
         const progressTask = setTimeout(() => this.loadingChange.next(this.loading = true), LOADING_DELAY);
-        this._prepare.then(() => this._service.series(this.cube.name, this.xAxis.name, {
-            series: this.series.name,
+        this._prepare.then(() => this._service.series(this.cube.name, this._xAxis, {
+            series: this._series,
             indices: this._indices,
             filters: this.filters,
             scope: this.scope
-        }).pipe(modelize(), first$1(), tap(d => {
-            this._totals(d);
+        }).pipe(modelize(), first$1()).subscribe(d => {
             this._sum &&
                 this._calculatesum(d);
-        })).subscribe(d => this.data = d, (e) => {
+            this._totals(d);
+            this.data = d;
+        }, (e) => {
             this._sb.error(e.status === 401 ? 'Unauthorized' : null);
         }, () => {
             clearTimeout(progressTask);
@@ -14174,8 +14171,9 @@ class CubeMatrixComponent {
         }));
     }
     _totals(data) {
+        this.totals = {};
         let grand = 0;
-        this.indexes.forEach(i => {
+        this.indices && this.indices.forEach(i => {
             const index = data[i.name];
             if (!index)
                 data[i.name] = {};
@@ -14198,8 +14196,7 @@ class CubeMatrixComponent {
             data[r.key]['_total'] = sum;
             grand -= sum;
         });
-        this.totals = {};
-        this.columns.forEach(c => {
+        this._indices && this.columns.forEach(c => {
             let sum = 0, key;
             for (key in data) {
                 const val = data[key][c.key];
@@ -14211,74 +14208,136 @@ class CubeMatrixComponent {
         this.totals['_total'] = grand;
     }
     _calculatesum(data) {
-        let { xAxis, series } = this._sum;
-        if (xAxis) {
-            let total = 0;
-            this.rows.forEach(r => {
-                const row = data[r.key];
-                if (!row)
-                    return;
-                let sum = 0, i = 0;
-                while (i < this.columns.length) {
-                    let key = this.columns[i].key, val = row[key];
-                    if (val !== undefined)
-                        sum += val;
-                    if (key === xAxis)
-                        break;
-                    i++;
-                }
-                data[r.key]['_sum'] = sum;
-                total += sum;
-            });
-            this.totals['_sum'] = total;
-        }
-        if (series) {
-            let total = 0;
-            this.columns.forEach(c => {
-                let sum = 0, i = 0;
-                while (i < this.rows.length) {
-                    let key = this.rows[i].key, row = data[key];
-                    if (row) {
-                        let val = row[c.key];
-                        if (val !== undefined)
-                            sum += val;
-                        if (key === series)
-                            break;
+        this._sum.forEach((s, i) => {
+            const { axis, value, calculate } = s, name = '_sum_' + i;
+            if (axis === 'xAxis') {
+                let total = 0;
+                this.rows.forEach(r => {
+                    const row = data[r.key];
+                    if (!row)
+                        return;
+                    let sum = 0, j = 0;
+                    while (j < this.columns.length) {
+                        let key = this.columns[j].key;
+                        if (isFunction(calculate)) {
+                            let val = calculate(key, this.data);
+                            if (val !== undefined)
+                                sum += val;
+                        }
+                        else {
+                            let val = row[key];
+                            if (val !== undefined)
+                                sum += val;
+                            if (key === value)
+                                break;
+                        }
+                        j++;
                     }
-                    i++;
-                }
-                data['_sum'][c.key] = sum;
-                total += sum;
-            });
-            data['_sum']['_total'] = total;
-        }
+                    row[name] = sum;
+                    total += sum;
+                });
+                this.indices && this.indices.forEach(i => {
+                    const row = data[i.name];
+                    if (!row)
+                        return;
+                    let sum = 0, j = 0;
+                    while (j < this.columns.length) {
+                        let key = this.columns[j].key;
+                        if (isFunction(calculate)) {
+                            let val = calculate(key, this.data);
+                            if (val !== undefined)
+                                sum += val;
+                        }
+                        else {
+                            let val = row[key];
+                            if (val !== undefined)
+                                sum += val;
+                            if (key === value)
+                                break;
+                        }
+                        j++;
+                    }
+                    row[name] = sum;
+                });
+                this.totals[name] = total;
+            }
+            else {
+                let total = 0;
+                this.columns.forEach(c => {
+                    let sum = 0, j = 0;
+                    while (j < this.rows.length) {
+                        let key = this.rows[j].key;
+                        if (isFunction(calculate)) {
+                            let val = calculate(key, this.data);
+                            if (val !== undefined)
+                                sum += val;
+                        }
+                        else {
+                            let row = data[key];
+                            if (row) {
+                                let val = row[c.key];
+                                if (val !== undefined)
+                                    sum += val;
+                                if (key === value)
+                                    break;
+                            }
+                        }
+                        j++;
+                    }
+                    data[name][c.key] = sum;
+                    total += sum;
+                });
+                data[name]['_total'] = total;
+            }
+        });
     }
-    explore(x, serie) {
+    explore(x, series) {
         if (!this.interactive)
             return;
-        if (this.sum) {
-            if (x === '_sum') {
-                x = [];
-                for (let i = 0; i < this.columns.length; i++) {
-                    let key = this.columns[i].key;
-                    x.push(key);
-                    if (key === this._sum.xAxis)
-                        break;
+        const axes = { ...this.filters };
+        if (this._sum) {
+            let i = 0;
+            while (i < this._sum.length) {
+                let { value, calculate } = this._sum[i], name = '_sum_' + i;
+                if (x === name) {
+                    x = [];
+                    for (let i = 0; i < this.columns.length; i++) {
+                        let key = this.columns[i].key;
+                        if (isFunction(calculate)) {
+                            let val = calculate(key, this.data);
+                            if (val !== undefined)
+                                x.push(key);
+                        }
+                        else {
+                            x.push(key);
+                            if (key === value)
+                                break;
+                        }
+                    }
+                    break;
                 }
-            }
-            if (serie === '_sum') {
-                serie = [];
-                for (let i = 0; i < this.rows.length; i++) {
-                    let key = this.rows[i].key;
-                    serie.push(key);
-                    if (key === this._sum.series)
-                        break;
+                else if (series === name) {
+                    series = [];
+                    for (let i = 0; i < this.rows.length; i++) {
+                        let key = this.rows[i].key;
+                        if (isFunction(calculate)) {
+                            let val = calculate(key, this.data);
+                            if (val !== undefined)
+                                series.push(key);
+                        }
+                        else {
+                            series.push(key);
+                            if (key === value)
+                                break;
+                        }
+                    }
+                    break;
                 }
+                i++;
             }
         }
-        const axes = { ...this.filters };
         axes[this.xAxis.name] = x;
-        axes[this.series.name] = serie;
+        axes[this.series.name] = series;
         this.onExplore.emit(axes);
     }
     move(x, y) {
@@ -14312,10 +14371,10 @@ class CubeMatrixComponent {
     }
 }
 CubeMatrixComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.3", ngImport: i0, type: CubeMatrixComponent, deps: [{ token: PromptService }, { token: CubeService }, { token: SessionService }, { token: DatasourceService }], target: i0.ɵɵFactoryTarget.Component });
-CubeMatrixComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.0.3", type: CubeMatrixComponent, selector: "bizdoc-cube-matrix", inputs: { _cube: ["cube", "_cube"], _xAxis: ["xAxis", "_xAxis"], _series: ["series", "_series"], indices: "indices", scope: "scope", sum: "sum", filters: "filters", loading: "loading", interactive: "interactive" }, outputs: { onExplore: "explore", loadingChange: "loadingChange" }, viewQueries: [{ propertyName: "tableElement", first: true, predicate: ["table"], descendants: true }], usesOnChanges: true, ngImport: i0, template: "<table #table class=\"mat-table cube-table\" (mouseleave)=\"move(-1, -1)\" *ngIf=\"data\">\r\n  <thead>\r\n    <!-- headers -->\r\n    <tr class=\"mat-row\">\r\n      <th></th>\r\n      <th *ngFor=\"let column of columns; let x = index\" (mouseenter)=\"move(x + 1, -2)\" class=\"mat-header-cell\">\r\n        {{ column.value }}\r\n      </th>\r\n      <th></th>\r\n    </tr>\r\n  </thead>\r\n  <tbody>\r\n    <!-- indices -->\r\n    <tr class=\"mat-row cube-index\" *ngFor=\"let index of indexes; let y = index\">\r\n      <th class=\"mat-header-cell\" (mouseenter)=\"move(0, y)\">{{index.title}}</th>\r\n      <td *ngFor=\"let column of columns; let x = index\" class=\"mat-cell figure\" (mouseenter)=\"move(x + 1, y)\">\r\n        <span *ngIf=\"data[index.name] && data[index.name][column.key]; else zero\">{{ data[index.name][column.key] | number : PRECISION }}</span>\r\n      </td>\r\n      <th class=\"mat-cell figure\" (mouseenter)=\"move(0, y)\" [ngSwitch]=\"!CURRENCY\">\r\n        <ng-container *ngSwitchCase=\"true\">\r\n          {{ data[index.name]['_total'] | number : PRECISION }}\r\n        </ng-container>\r\n        <ng-container *ngSwitchDefault>\r\n          {{ data[index.name]['_total'] | currency : CURRENCY: 'symbol' : PRECISION }}\r\n        </ng-container>\r\n      </th>\r\n    </tr>\r\n  </tbody>\r\n  <tbody>\r\n    <!-- rows -->\r\n    <tr *ngFor=\"let row of rows; let y = index\" class=\"mat-row\">\r\n      <th class=\"mat-header-cell\" (mouseenter)=\"move(-2, y + indices.length)\">{{ row.value }}</th>\r\n      <td *ngFor=\"let column of columns; let x = index\" class=\"mat-cell figure\" (mouseenter)=\"move(x + 1, y + indices.length)\">\r\n        <ng-container *ngIf=\"data[row.key] && data[row.key][column.key] !== undefined; else zero\">\r\n          <span [class.clickable]=\"interactive\" (click)=\"explore(column.key, row.key)\">\r\n            {{data[row.key][column.key] | number : PRECISION }}\r\n          </span>\r\n        </ng-container>\r\n      </td>\r\n      <th class=\"mat-cell figure\" (mouseenter)=\"move(-1, y + indices.length)\" [ngSwitch]=\"!CURRENCY\">\r\n        <ng-container *ngSwitchCase=\"true\">\r\n          {{ data[row.key]['_total'] | number : PRECISION }}\r\n        </ng-container>\r\n        <ng-container *ngSwitchDefault>\r\n          {{ data[row.key]['_total'] | currency : CURRENCY: 'symbol' : PRECISION }}\r\n        </ng-container>\r\n      </th>\r\n    </tr>\r\n  </tbody>\r\n  <tfoot>\r\n    <!-- available -->\r\n    <tr>\r\n      <th></th>\r\n      <td *ngFor=\"let column of columns; let x = index\" class=\"mat-cell figure\" (mouseenter)=\"move(x + 1, -2)\"\r\n          [class.negative-figure]=\"totals[column.key] < 0\">\r\n        {{totals[column.key] | currency : CURRENCY: 'symbol' : PRECISION }}\r\n      </td>\r\n      <th class=\"mat-cell figure\">{{totals['_total'] | currency : CURRENCY: 'symbol' : PRECISION }}</th>\r\n    </tr>\r\n  </tfoot>\r\n</table>\r\n<ng-template #zero>\r\n  0\r\n</ng-template>\r\n", styles: [".clickable{cursor:pointer}.cube-table{width:100%;display:inline-table;border-collapse:collapse}.cube-table th{cursor:default}.cube-table th.figure{font-weight:500}.cube-table td{padding-right:4px}\n"], directives: [{ type: i10$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { type: i10$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { type: i10$1.NgSwitch, selector: "[ngSwitch]", inputs: ["ngSwitch"] }, { type: i10$1.NgSwitchCase, selector: "[ngSwitchCase]", inputs: ["ngSwitchCase"] }, { type: i10$1.NgSwitchDefault, selector: "[ngSwitchDefault]" }], pipes: { "number": i10$1.DecimalPipe, "currency": i10$1.CurrencyPipe }, animations: [matrixAnimation] });
+CubeMatrixComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.0.3", type: CubeMatrixComponent, selector: "bizdoc-cube-matrix", inputs: { _cube: ["cube", "_cube"], _xAxis: ["xAxis", "_xAxis"], _series: ["series", "_series"], _indices: ["indices", "_indices"], scope: "scope", sum: "sum", filters: "filters", loading: "loading", interactive: "interactive" }, outputs: { onExplore: "explore", loadingChange: "loadingChange" }, viewQueries: [{ propertyName: "tableElement", first: true, predicate: ["table"], descendants: true }], usesOnChanges: true, ngImport: i0, template: "<table #table class=\"mat-table cube-table\" (mouseleave)=\"move(-1, -1)\" *ngIf=\"data\">\r\n  <thead>\r\n    <!-- headers -->\r\n    <tr class=\"mat-row\">\r\n      <th></th>\r\n      <th *ngFor=\"let column of columns; let x = index\" (mouseenter)=\"move(x + 1, -2)\" class=\"mat-header-cell\">\r\n        {{ column.value }}\r\n      </th>\r\n      <th></th>\r\n    </tr>\r\n  </thead>\r\n  <tbody>\r\n    <!-- indices -->\r\n    <tr class=\"mat-row cube-index\" *ngFor=\"let index of indices; let y = index\">\r\n      <th class=\"mat-header-cell\" (mouseenter)=\"move(0, y)\">{{index.title}}</th>\r\n      <td *ngFor=\"let column of columns; let x = index\" class=\"mat-cell figure\" (mouseenter)=\"move(x + 1, y)\">\r\n        <span *ngIf=\"data[index.name] && data[index.name][column.key]; else zero\">{{ data[index.name][column.key] | number : PRECISION }}</span>\r\n      </td>\r\n      <th class=\"mat-cell figure\" (mouseenter)=\"move(0, y)\" [ngSwitch]=\"!CURRENCY\">\r\n        <ng-container *ngSwitchCase=\"true\">\r\n          {{ data[index.name]['_total'] | number : PRECISION }}\r\n        </ng-container>\r\n        <ng-container *ngSwitchDefault>\r\n          {{ data[index.name]['_total'] | currency : CURRENCY: 'symbol' : PRECISION }}\r\n        </ng-container>\r\n      </th>\r\n    </tr>\r\n  </tbody>\r\n  <tbody>\r\n    <!-- rows -->\r\n    <tr *ngFor=\"let row of rows; let y = index\" class=\"mat-row\">\r\n      <th class=\"mat-header-cell\" (mouseenter)=\"move(-2, y + indices.length)\">{{ row.value }}</th>\r\n      <td *ngFor=\"let column of columns; let x = index\" class=\"mat-cell figure\" (mouseenter)=\"move(x + 1, y + indices.length)\">\r\n        <ng-container *ngIf=\"data[row.key] && data[row.key][column.key] !== undefined; else zero\">\r\n          <span [class.clickable]=\"interactive\" (click)=\"explore(column.key, row.key)\">\r\n            {{data[row.key][column.key] | number : PRECISION }}\r\n          </span>\r\n        </ng-container>\r\n      </td>\r\n      <th class=\"mat-cell figure\" (mouseenter)=\"move(-1, y + indices.length)\" [ngSwitch]=\"!CURRENCY\">\r\n        <ng-container *ngSwitchCase=\"true\">\r\n          {{ data[row.key]['_total'] | number : PRECISION }}\r\n        </ng-container>\r\n        <ng-container *ngSwitchDefault>\r\n          {{ data[row.key]['_total'] | currency : CURRENCY: 'symbol' : PRECISION }}\r\n        </ng-container>\r\n      </th>\r\n    </tr>\r\n  </tbody>\r\n  <tfoot>\r\n    <!-- available -->\r\n    <tr>\r\n      <th></th>\r\n      <td *ngFor=\"let column of columns; let x = index\" class=\"mat-cell figure\" (mouseenter)=\"move(x + 1, -2)\"\r\n          [class.negative-figure]=\"totals[column.key] < 0\">\r\n        {{totals[column.key] | currency : CURRENCY: 'symbol' : PRECISION }}\r\n      </td>\r\n      <th class=\"mat-cell figure\">{{totals['_total'] | currency : CURRENCY: 'symbol' : PRECISION }}</th>\r\n    </tr>\r\n  </tfoot>\r\n</table>\r\n<ng-template #zero>\r\n  0\r\n</ng-template>\r\n", styles: [".clickable{cursor:pointer}.cube-table{width:100%;display:inline-table;border-collapse:collapse}.cube-table th{cursor:default}.cube-table th.figure{font-weight:500}.cube-table td{padding-right:4px}\n"], directives: [{ type: i10$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { type: i10$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { type: i10$1.NgSwitch, selector: "[ngSwitch]", inputs: ["ngSwitch"] }, { type: i10$1.NgSwitchCase, selector: "[ngSwitchCase]", inputs: ["ngSwitchCase"] }, { type: i10$1.NgSwitchDefault, selector: "[ngSwitchDefault]" }], pipes: { "number": i10$1.DecimalPipe, "currency": i10$1.CurrencyPipe }, animations: [matrixAnimation] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.3", ngImport: i0, type: CubeMatrixComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'bizdoc-cube-matrix', animations: [matrixAnimation], template: "<table #table class=\"mat-table cube-table\" (mouseleave)=\"move(-1, -1)\" *ngIf=\"data\">\r\n  <thead>\r\n    <!-- headers -->\r\n    <tr class=\"mat-row\">\r\n      <th></th>\r\n      <th *ngFor=\"let column of columns; let x = index\" (mouseenter)=\"move(x + 1, -2)\" class=\"mat-header-cell\">\r\n        {{ column.value }}\r\n      </th>\r\n      <th></th>\r\n    </tr>\r\n  </thead>\r\n  <tbody>\r\n    <!-- indices -->\r\n    <tr class=\"mat-row cube-index\" *ngFor=\"let index of indexes; let y = index\">\r\n      <th class=\"mat-header-cell\" (mouseenter)=\"move(0, y)\">{{index.title}}</th>\r\n      <td *ngFor=\"let column of columns; let x = index\" class=\"mat-cell figure\" (mouseenter)=\"move(x + 1, y)\">\r\n        <span *ngIf=\"data[index.name] && data[index.name][column.key]; else zero\">{{ data[index.name][column.key] | number : PRECISION }}</span>\r\n      </td>\r\n      <th class=\"mat-cell figure\" (mouseenter)=\"move(0, y)\" [ngSwitch]=\"!CURRENCY\">\r\n        <ng-container *ngSwitchCase=\"true\">\r\n          {{ data[index.name]['_total'] | number : PRECISION }}\r\n        </ng-container>\r\n        <ng-container *ngSwitchDefault>\r\n          {{ data[index.name]['_total'] | currency : CURRENCY: 'symbol' : PRECISION }}\r\n        </ng-container>\r\n      </th>\r\n    </tr>\r\n  </tbody>\r\n  <tbody>\r\n    <!-- rows -->\r\n    <tr *ngFor=\"let row of rows; let y = index\" class=\"mat-row\">\r\n      <th class=\"mat-header-cell\" (mouseenter)=\"move(-2, y + indices.length)\">{{ row.value }}</th>\r\n      <td *ngFor=\"let column of columns; let x = index\" class=\"mat-cell figure\" (mouseenter)=\"move(x + 1, y + indices.length)\">\r\n        <ng-container *ngIf=\"data[row.key] && data[row.key][column.key] !== undefined; else zero\">\r\n          <span [class.clickable]=\"interactive\" (click)=\"explore(column.key, row.key)\">\r\n            {{data[row.key][column.key] | number : PRECISION }}\r\n          </span>\r\n        </ng-container>\r\n      </td>\r\n      <th class=\"mat-cell figure\" (mouseenter)=\"move(-1, y + indices.length)\" [ngSwitch]=\"!CURRENCY\">\r\n        <ng-container *ngSwitchCase=\"true\">\r\n          {{ data[row.key]['_total'] | number : PRECISION }}\r\n        </ng-container>\r\n        <ng-container *ngSwitchDefault>\r\n          {{ data[row.key]['_total'] | currency : CURRENCY: 'symbol' : PRECISION }}\r\n        </ng-container>\r\n      </th>\r\n    </tr>\r\n  </tbody>\r\n  <tfoot>\r\n    <!-- available -->\r\n    <tr>\r\n      <th></th>\r\n      <td *ngFor=\"let column of columns; let x = index\" class=\"mat-cell figure\" (mouseenter)=\"move(x + 1, -2)\"\r\n          [class.negative-figure]=\"totals[column.key] < 0\">\r\n        {{totals[column.key] | currency : CURRENCY: 'symbol' : PRECISION }}\r\n      </td>\r\n      <th class=\"mat-cell figure\">{{totals['_total'] | currency : CURRENCY: 'symbol' : PRECISION }}</th>\r\n    </tr>\r\n  </tfoot>\r\n</table>\r\n<ng-template #zero>\r\n  0\r\n</ng-template>\r\n", styles: [".clickable{cursor:pointer}.cube-table{width:100%;display:inline-table;border-collapse:collapse}.cube-table th{cursor:default}.cube-table th.figure{font-weight:500}.cube-table td{padding-right:4px}\n"] }]
+            args: [{ selector: 'bizdoc-cube-matrix', animations: [matrixAnimation], template: "<table #table class=\"mat-table cube-table\" (mouseleave)=\"move(-1, -1)\" *ngIf=\"data\">\r\n  <thead>\r\n    <!-- headers -->\r\n    <tr class=\"mat-row\">\r\n      <th></th>\r\n      <th *ngFor=\"let column of columns; let x = index\" (mouseenter)=\"move(x + 1, -2)\" class=\"mat-header-cell\">\r\n        {{ column.value }}\r\n      </th>\r\n      <th></th>\r\n    </tr>\r\n  </thead>\r\n  <tbody>\r\n    <!-- indices -->\r\n    <tr class=\"mat-row cube-index\" *ngFor=\"let index of indices; let y = index\">\r\n      <th class=\"mat-header-cell\" (mouseenter)=\"move(0, y)\">{{index.title}}</th>\r\n      <td *ngFor=\"let column of columns; let x = index\" class=\"mat-cell figure\" (mouseenter)=\"move(x + 1, y)\">\r\n        <span *ngIf=\"data[index.name] && data[index.name][column.key]; else zero\">{{ data[index.name][column.key] | number : PRECISION }}</span>\r\n      </td>\r\n      <th class=\"mat-cell figure\" (mouseenter)=\"move(0, y)\" [ngSwitch]=\"!CURRENCY\">\r\n        <ng-container *ngSwitchCase=\"true\">\r\n          {{ data[index.name]['_total'] | number : PRECISION }}\r\n        </ng-container>\r\n        <ng-container *ngSwitchDefault>\r\n          {{ data[index.name]['_total'] | currency : CURRENCY: 'symbol' : PRECISION }}\r\n        </ng-container>\r\n      </th>\r\n    </tr>\r\n  </tbody>\r\n  <tbody>\r\n    <!-- rows -->\r\n    <tr *ngFor=\"let row of rows; let y = index\" class=\"mat-row\">\r\n      <th class=\"mat-header-cell\" (mouseenter)=\"move(-2, y + indices.length)\">{{ row.value }}</th>\r\n      <td *ngFor=\"let column of columns; let x = index\" class=\"mat-cell figure\" (mouseenter)=\"move(x + 1, y + indices.length)\">\r\n        <ng-container *ngIf=\"data[row.key] && data[row.key][column.key] !== undefined; else zero\">\r\n          <span [class.clickable]=\"interactive\" (click)=\"explore(column.key, row.key)\">\r\n            {{data[row.key][column.key] | number : PRECISION }}\r\n          </span>\r\n        </ng-container>\r\n      </td>\r\n      <th class=\"mat-cell figure\" (mouseenter)=\"move(-1, y + indices.length)\" [ngSwitch]=\"!CURRENCY\">\r\n        <ng-container *ngSwitchCase=\"true\">\r\n          {{ data[row.key]['_total'] | number : PRECISION }}\r\n        </ng-container>\r\n        <ng-container *ngSwitchDefault>\r\n          {{ data[row.key]['_total'] | currency : CURRENCY: 'symbol' : PRECISION }}\r\n        </ng-container>\r\n      </th>\r\n    </tr>\r\n  </tbody>\r\n  <tfoot>\r\n    <!-- available -->\r\n    <tr>\r\n      <th></th>\r\n      <td *ngFor=\"let column of columns; let x = index\" class=\"mat-cell figure\" (mouseenter)=\"move(x + 1, -2)\"\r\n          [class.negative-figure]=\"totals[column.key] < 0\">\r\n        {{totals[column.key] | currency : CURRENCY: 'symbol' : PRECISION }}\r\n      </td>\r\n      <th class=\"mat-cell figure\">{{totals['_total'] | currency : CURRENCY: 'symbol' : PRECISION }}</th>\r\n    </tr>\r\n  </tfoot>\r\n</table>\r\n<ng-template #zero>\r\n  0\r\n</ng-template>\r\n", styles: [".clickable{cursor:pointer}.cube-table{width:100%;display:inline-table;border-collapse:collapse}.cube-table th{cursor:default}.cube-table th.figure{font-weight:500}.cube-table td{padding-right:4px}\n"] }]
         }], ctorParameters: function () { return [{ type: PromptService }, { type: CubeService }, { type: SessionService }, { type: DatasourceService }]; }, propDecorators: { tableElement: [{
                 type: ViewChild,
                 args: ['table']
@@ -14328,8 +14387,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.3", ngImpor
             }], _series: [{
                 type: Input,
                 args: ['series']
-            }], indices: [{
-                type: Input
+            }], _indices: [{
+                type: Input,
+                args: ['indices']
             }], scope: [{
                 type: Input
             }], sum: [{
@@ -14345,11 +14405,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.3", ngImpor
                 args: ['explore']
             }], loadingChange: [{
                 type: Output
-            }] } });
-class CubeInfoCellArgs {
-    get value() { return this._value; }
-    get summary() { return this._summary; }
-}
+            }] } });
 
 class CubeMatrixBase {
     constructor(_service, _ds, _session) {
@@ -19134,7 +19190,7 @@ class SyncfusionChartModule {
 }
 SyncfusionChartModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.3", ngImport: i0, type: SyncfusionChartModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
 SyncfusionChartModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.0.3", ngImport: i0, type: SyncfusionChartModule, imports: [ChartModule, AccumulationChartAllModule, SparklineAllModule], exports: [ChartModule, AccumulationChartAllModule, SparklineAllModule] });
-SyncfusionChartModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.0.3", ngImport: i0, type: SyncfusionChartModule, providers: [LineSeriesService, ScatterSeriesService, ColumnSeriesService, SplineSeriesService,
+SyncfusionChartModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.0.3", ngImport: i0, type: SyncfusionChartModule, providers: [AccumulationDistributionIndicatorService, FunnelSeriesService, StackingStepAreaSeriesService, PieSeriesService, PyramidSeriesService, LineSeriesService, ScatterSeriesService, ColumnSeriesService, SplineSeriesService,
         SplineAreaSeriesService, StripLineService, AreaSeriesService, ScrollBarService, StepLineSeriesService,
         StepAreaSeriesService, StackingColumnSeriesService, StackingLineSeriesService, StackingAreaSeriesService,
         BarSeriesService, StackingBarSeriesService, RangeColumnSeriesService, BubbleSeriesService, TooltipService,
@@ -19149,7 +19205,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.3", ngImpor
             args: [{
                     imports: [ChartModule, AccumulationChartAllModule, SparklineAllModule],
                     exports: [ChartModule, AccumulationChartAllModule, SparklineAllModule],
-                    providers: [LineSeriesService, ScatterSeriesService, ColumnSeriesService, SplineSeriesService,
+                    providers: [AccumulationDistributionIndicatorService, FunnelSeriesService, StackingStepAreaSeriesService, PieSeriesService, PyramidSeriesService, LineSeriesService, ScatterSeriesService, ColumnSeriesService, SplineSeriesService,
                         SplineAreaSeriesService, StripLineService, AreaSeriesService, ScrollBarService, StepLineSeriesService,
                         StepAreaSeriesService, StackingColumnSeriesService, StackingLineSeriesService, StackingAreaSeriesService,
                         BarSeriesService, StackingBarSeriesService, RangeColumnSeriesService, BubbleSeriesService, TooltipService,
@@ -19566,7 +19622,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.3", ngImpor
             }] } });
 
 /** cube matrix component*/
-class CubeMatrixPageComponent extends CubeMatrixBase {
+class CubeMatrixPopupComponent extends CubeMatrixBase {
     /** filters */
     /** cube-info ctor */
     constructor(_ref, data, service, ds, session, _sb) {
@@ -19576,9 +19632,9 @@ class CubeMatrixPageComponent extends CubeMatrixBase {
         this.preloading = true;
         if (!data.options)
             throw 'no data options';
-        const { axes: base, options: { indices, xAxis, serie, filters, cube, sum } } = data;
+        const { axes: base, options: { indices, xAxis, series, filters, cube, sum } } = data;
         this.cube = cube;
-        this.series = serie;
+        this.series = series;
         this.xAxis = xAxis;
         this.sum = sum;
         this.indices = indices;
@@ -19594,9 +19650,9 @@ class CubeMatrixPageComponent extends CubeMatrixBase {
         });
     }
 }
-CubeMatrixPageComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.3", ngImport: i0, type: CubeMatrixPageComponent, deps: [{ token: PopupRef }, { token: POPUP_DATA }, { token: CubeService }, { token: DatasourceService }, { token: SessionService }, { token: PromptService }], target: i0.ɵɵFactoryTarget.Component });
-CubeMatrixPageComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.0.3", type: CubeMatrixPageComponent, selector: "ng-component", viewQueries: [{ propertyName: "table", first: true, predicate: CubeMatrixComponent, descendants: true, static: true }], usesInheritance: true, ngImport: i0, template: "<mat-progress-bar mode=\"query\" [style.visibility]=\"loading ? 'visible':'hidden'\"></mat-progress-bar>\r\n<div class=\"container\">\r\n  <div class=\"row\" *ngIf=\"!preloading\">\r\n    <span class=\"divider\"></span>\r\n    <!-- title -->\r\n    <button mat-icon-button [matMenuTriggerFor]=\"options\" *ngIf=\"patterns && patterns.length\"><mat-icon [class.filled]=\"pattern\">filter_alt</mat-icon></button>\r\n    <mat-menu #options xPosition=\"before\">\r\n      <!-- patterns -->\r\n      <button mat-menu-item *ngFor=\"let p of patterns\" (click)=\"aggregate(p)\">{{p.title}}</button>\r\n    </mat-menu>\r\n    <button mat-icon-button (click)=\"reset()\" [disabled]=\"!pattern\" [bizdocTooltip]=\"'Clear' | translate\">\r\n      <mat-icon>clear_all</mat-icon>\r\n    </button>\r\n    <!-- filters -->\r\n    <ng-container *ngFor=\"let f of filters\">\r\n      <button mat-button [matMenuTriggerFor]=\"fmenu\">{{values[f.name]| typeValue : f.dataType | async}} <mat-icon>arrow_drop_down</mat-icon></button>\r\n      <mat-menu #fmenu xPosition=\"before\">\r\n        <button mat-menu-item *ngFor=\"let kv of sources[f.name] | async\"\r\n                (click)=\"filter(f.name, kv.key, kv.value)\">\r\n          {{kv.value}}\r\n        </button>\r\n      </mat-menu>\r\n    </ng-container>\r\n  </div>\r\n  <bizdoc-cube-matrix [cube]=\"cube\" [xAxis]=\"xAxis\" [series]=\"series\" [indices]=\"indices\" [sum]=sum [interactive]=\"false\"\r\n                            [filters]=\"axes\" [(loading)]=\"loading\"></bizdoc-cube-matrix>\r\n</div>\r\n", styles: [".container{padding:8px}\n"], components: [{ type: i11$1.MatProgressBar, selector: "mat-progress-bar", inputs: ["color", "value", "bufferValue", "mode"], outputs: ["animationEnd"], exportAs: ["matProgressBar"] }, { type: i7$1.MatButton, selector: "button[mat-button], button[mat-raised-button], button[mat-icon-button],             button[mat-fab], button[mat-mini-fab], button[mat-stroked-button],             button[mat-flat-button]", inputs: ["disabled", "disableRipple", "color"], exportAs: ["matButton"] }, { type: i7$2.MatIcon, selector: "mat-icon", inputs: ["color", "inline", "svgIcon", "fontSet", "fontIcon"], exportAs: ["matIcon"] }, { type: i8$1.MatMenu, selector: "mat-menu", exportAs: ["matMenu"] }, { type: i8$1.MatMenuItem, selector: "[mat-menu-item]", inputs: ["disabled", "disableRipple", "role"], exportAs: ["matMenuItem"] }, { type: CubeMatrixComponent, selector: "bizdoc-cube-matrix", inputs: ["cube", "xAxis", "series", "indices", "scope", "sum", "filters", "loading", "interactive"], outputs: ["explore", "loadingChange"] }], directives: [{ type: i10$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { type: i8$1.MatMenuTrigger, selector: "[mat-menu-trigger-for], [matMenuTriggerFor]", exportAs: ["matMenuTrigger"] }, { type: i10$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { type: TooltipDirective, selector: "[bizdocTooltip]", inputs: ["bizdocTooltip", "bizdocTooltipTemplate", "bizdocTooltipContext", "bizdocTooltipPosition", "bizdocTooltipDuration", "bizdocTooltipDisabled"] }], pipes: { "translate": TranslatePipe, "async": i10$1.AsyncPipe, "typeValue": TypeValuePipe } });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.3", ngImport: i0, type: CubeMatrixPageComponent, decorators: [{
+CubeMatrixPopupComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.3", ngImport: i0, type: CubeMatrixPopupComponent, deps: [{ token: PopupRef }, { token: POPUP_DATA }, { token: CubeService }, { token: DatasourceService }, { token: SessionService }, { token: PromptService }], target: i0.ɵɵFactoryTarget.Component });
+CubeMatrixPopupComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.0.3", type: CubeMatrixPopupComponent, selector: "ng-component", viewQueries: [{ propertyName: "table", first: true, predicate: CubeMatrixComponent, descendants: true, static: true }], usesInheritance: true, ngImport: i0, template: "<mat-progress-bar mode=\"query\" [style.visibility]=\"loading ? 'visible':'hidden'\"></mat-progress-bar>\r\n<div class=\"container\">\r\n  <div class=\"row\" *ngIf=\"!preloading\">\r\n    <span class=\"divider\"></span>\r\n    <!-- title -->\r\n    <button mat-icon-button [matMenuTriggerFor]=\"options\" *ngIf=\"patterns && patterns.length\"><mat-icon [class.filled]=\"pattern\">filter_alt</mat-icon></button>\r\n    <mat-menu #options xPosition=\"before\">\r\n      <!-- patterns -->\r\n      <button mat-menu-item *ngFor=\"let p of patterns\" (click)=\"aggregate(p)\">{{p.title}}</button>\r\n    </mat-menu>\r\n    <button mat-icon-button (click)=\"reset()\" [disabled]=\"!pattern\" [bizdocTooltip]=\"'Clear' | translate\">\r\n      <mat-icon>clear_all</mat-icon>\r\n    </button>\r\n    <!-- filters -->\r\n    <ng-container *ngFor=\"let f of filters\">\r\n      <button mat-button [matMenuTriggerFor]=\"fmenu\">{{values[f.name]| typeValue : f.dataType | async}} <mat-icon>arrow_drop_down</mat-icon></button>\r\n      <mat-menu #fmenu xPosition=\"before\">\r\n        <button mat-menu-item *ngFor=\"let kv of sources[f.name] | async\"\r\n                (click)=\"filter(f.name, kv.key, kv.value)\">\r\n          {{kv.value}}\r\n        </button>\r\n      </mat-menu>\r\n    </ng-container>\r\n  </div>\r\n  <bizdoc-cube-matrix [cube]=\"cube\" [xAxis]=\"xAxis\" [series]=\"series\" [indices]=\"indices\" [sum]=sum [interactive]=\"false\"\r\n                            [filters]=\"axes\" [(loading)]=\"loading\"></bizdoc-cube-matrix>\r\n</div>\r\n", styles: [".container{padding:8px}\n"], components: [{ type: i11$1.MatProgressBar, selector: "mat-progress-bar", inputs: ["color", "value", "bufferValue", "mode"], outputs: ["animationEnd"], exportAs: ["matProgressBar"] }, { type: i7$1.MatButton, selector: "button[mat-button], button[mat-raised-button], button[mat-icon-button],             button[mat-fab], button[mat-mini-fab], button[mat-stroked-button],             button[mat-flat-button]", inputs: ["disabled", "disableRipple", "color"], exportAs: ["matButton"] }, { type: i7$2.MatIcon, selector: "mat-icon", inputs: ["color", "inline", "svgIcon", "fontSet", "fontIcon"], exportAs: ["matIcon"] }, { type: i8$1.MatMenu, selector: "mat-menu", exportAs: ["matMenu"] }, { type: i8$1.MatMenuItem, selector: "[mat-menu-item]", inputs: ["disabled", "disableRipple", "role"], exportAs: ["matMenuItem"] }, { type: CubeMatrixComponent, selector: "bizdoc-cube-matrix", inputs: ["cube", "xAxis", "series", "indices", "scope", "sum", "filters", "loading", "interactive"], outputs: ["explore", "loadingChange"] }], directives: [{ type: i10$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { type: i8$1.MatMenuTrigger, selector: "[mat-menu-trigger-for], [matMenuTriggerFor]", exportAs: ["matMenuTrigger"] }, { type: i10$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { type: TooltipDirective, selector: "[bizdocTooltip]", inputs: ["bizdocTooltip", "bizdocTooltipTemplate", "bizdocTooltipContext", "bizdocTooltipPosition", "bizdocTooltipDuration", "bizdocTooltipDisabled"] }], pipes: { "translate": TranslatePipe, "async": i10$1.AsyncPipe, "typeValue": TypeValuePipe } });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.3", ngImport: i0, type: CubeMatrixPopupComponent, decorators: [{
             type: Component,
             args: [{ template: "<mat-progress-bar mode=\"query\" [style.visibility]=\"loading ? 'visible':'hidden'\"></mat-progress-bar>\r\n<div class=\"container\">\r\n  <div class=\"row\" *ngIf=\"!preloading\">\r\n    <span class=\"divider\"></span>\r\n    <!-- title -->\r\n    <button mat-icon-button [matMenuTriggerFor]=\"options\" *ngIf=\"patterns && patterns.length\"><mat-icon [class.filled]=\"pattern\">filter_alt</mat-icon></button>\r\n    <mat-menu #options xPosition=\"before\">\r\n      <!-- patterns -->\r\n      <button mat-menu-item *ngFor=\"let p of patterns\" (click)=\"aggregate(p)\">{{p.title}}</button>\r\n    </mat-menu>\r\n    <button mat-icon-button (click)=\"reset()\" [disabled]=\"!pattern\" [bizdocTooltip]=\"'Clear' | translate\">\r\n      <mat-icon>clear_all</mat-icon>\r\n    </button>\r\n    <!-- filters -->\r\n    <ng-container *ngFor=\"let f of filters\">\r\n      <button mat-button [matMenuTriggerFor]=\"fmenu\">{{values[f.name]| typeValue : f.dataType | async}} <mat-icon>arrow_drop_down</mat-icon></button>\r\n      <mat-menu #fmenu xPosition=\"before\">\r\n        <button mat-menu-item *ngFor=\"let kv of sources[f.name] | async\"\r\n                (click)=\"filter(f.name, kv.key, kv.value)\">\r\n          {{kv.value}}\r\n        </button>\r\n      </mat-menu>\r\n    </ng-container>\r\n  </div>\r\n  <bizdoc-cube-matrix [cube]=\"cube\" [xAxis]=\"xAxis\" [series]=\"series\" [indices]=\"indices\" [sum]=sum [interactive]=\"false\"\r\n                            [filters]=\"axes\" [(loading)]=\"loading\"></bizdoc-cube-matrix>\r\n</div>\r\n", styles: [".container{padding:8px}\n"] }]
         }], ctorParameters: function () { return [{ type: PopupRef, decorators: [{
@@ -19734,7 +19790,7 @@ class CubeInfo {
         this._cf = _cf;
     }
     navigate(axes, options) {
-        const { cube, view, serie, xAxis, filters, aggregate, indices, sum } = options || {};
+        const { cube, view, series, xAxis, filters, aggregate, indices, sum } = options || {};
         const ccube = cube ? this._session.profile.cubes.find(c => c.name === cube) : this._session.profile.cubes[0];
         if (isArray(axes))
             axes = this._mapAxes(ccube, axes);
@@ -19743,7 +19799,7 @@ class CubeInfo {
                 queryParams: axes
             });
         else {
-            this._router.navigate(['cube', ccube.name, 'i', xAxis, serie], {
+            this._router.navigate(['cube', ccube.name, 'i', xAxis, series], {
                 queryParams: axes,
                 state: { indices, aggregate, filters, sum }
             });
@@ -19769,7 +19825,7 @@ class CubeInfo {
         else {
             if (!options)
                 throw 'no options';
-            this._open(CubeMatrixPageComponent, element, {
+            this._open(CubeMatrixPopupComponent, element, {
                 axes,
                 options
             });
@@ -20175,6 +20231,8 @@ let CubeAnalysisWidget = class CubeAnalysisWidget {
             case 'Doughnut':
             case 'HalfDoughnut':
             case 'Pie':
+            case 'Funnel':
+            case 'Pyramid':
                 comp = CubeAccumAnalysisWidget;
                 break;
             default:
@@ -20259,13 +20317,17 @@ let CubeWidgetFilterComponent = class CubeWidgetFilterComponent {
         this._session = _session;
         this._fb = _fb;
         this.exclude = [];
-        const { xAxis, exclude, cube: name } = this._widgetRef.options;
+        const { xAxis, series, exclude, cube: name } = this._widgetRef.options;
         this.cube = name;
-        if (xAxis) {
-            if (isArray(xAxis))
-                this.exclude = [...xAxis];
+        if (isArray(xAxis))
+            this.exclude = [...xAxis];
+        else
+            this.exclude.push(xAxis);
+        if (series) {
+            if (isArray(series))
+                this.exclude = this.exclude.concat(series);
             else
-                this.exclude.push(xAxis);
+                this.exclude.push(series);
         }
         if (exclude) {
             if (isArray(exclude))
@@ -22706,7 +22768,10 @@ class CombinationPickerBody {
             ...defaults
         };
         codes.slice(0, this._axes.length).forEach((a, i) => axes[this._axes[i].name] = a);
-        this._accountInfo.popup(axes, evt.srcElement, { ...this._data.exploreSettings, cube: this._cube.name });
+        this._accountInfo.popup(axes, evt.srcElement, {
+            ...this._data.exploreSettings,
+            cube: this._cube.name
+        });
         evt.cancelBubble = true;
         evt.preventDefault();
         evt.stopPropagation();
@@ -25099,7 +25164,7 @@ SharedModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "
         DashboardComponent, WidgetItemComponent, CubeWidgetFilterComponent, CubeAccumAnalysisWidget, CubeAnalysisWidget, CubeChartAnalysisWidget, ActionsWidget, RecentsWidget,
         AskDialog, AboutDialog, ActionDialog,
         ImpersonateDialog,
-        ConversationComponent, CubeMatrixPageComponent,
+        ConversationComponent, CubeMatrixPopupComponent,
         VersionCompareComponent, ExploreDocumentComponent, TasksComponent,
         PendingResultsWidget, CompareDepartmentsWidget, CubeDocumentsComponent, CubeDocumentsWidget,
         PersonalScoreWidget, PersonalActivityWidget, PeersPerformanceWidget, UsagePivotComponent, UsageChartComponent, UsageReportArgs,
@@ -25236,7 +25301,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.3", ngImpor
                         DashboardComponent, WidgetItemComponent, CubeWidgetFilterComponent, CubeAccumAnalysisWidget, CubeAnalysisWidget, CubeChartAnalysisWidget, ActionsWidget, RecentsWidget,
                         AskDialog, AboutDialog, ActionDialog,
                         ImpersonateDialog,
-                        ConversationComponent, CubeMatrixPageComponent,
+                        ConversationComponent, CubeMatrixPopupComponent,
                         VersionCompareComponent, ExploreDocumentComponent, TasksComponent,
                         PendingResultsWidget, CompareDepartmentsWidget, CubeDocumentsComponent, CubeDocumentsWidget,
                         PersonalScoreWidget, PersonalActivityWidget, PeersPerformanceWidget, UsagePivotComponent, UsageChartComponent, UsageReportArgs,