ontimize-web-ngx 15.6.0-next.9 → 15.6.0
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/esm2020/lib/components/table/column/o-table-column.component.mjs +2 -1
- package/esm2020/lib/components/table/extensions/dialog/filter-by-column/o-table-filter-by-column.service.mjs +3 -2
- package/esm2020/lib/services/jsonapi/jsonapi.service.mjs +4 -4
- package/fesm2015/ontimize-web-ngx.mjs +7 -4
- package/fesm2015/ontimize-web-ngx.mjs.map +1 -1
- package/fesm2020/ontimize-web-ngx.mjs +6 -4
- package/fesm2020/ontimize-web-ngx.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as i0 from '@angular/core';
|
|
2
|
-
import { InjectionToken, Pipe, EventEmitter, Directive, Host, Self, Optional, Input, HostListener, forwardRef, Output, Injectable, Injector, Component, ContentChildren, ChangeDetectorRef, NgModule, ViewChild, ElementRef, ViewEncapsulation,
|
|
2
|
+
import { InjectionToken, Pipe, EventEmitter, Directive, Host, Self, Optional, Input, HostListener, forwardRef, Output, Injectable, Injector, Component, ContentChildren, ChangeDetectorRef, NgModule, ViewChild, ElementRef, ViewEncapsulation, ViewContainerRef, Inject, NgZone, HostBinding, ViewChildren, ChangeDetectionStrategy, inject, CUSTOM_ELEMENTS_SCHEMA, TemplateRef, SkipSelf, isDevMode, ContentChild, Renderer2, APP_INITIALIZER } from '@angular/core';
|
|
3
3
|
import moment from 'moment';
|
|
4
4
|
import { isObservable, from, of, Subscription, Observable, Subject, share as share$1, timer, combineLatest, BehaviorSubject, ReplaySubject, concatMap, delay, merge, fromEvent, map as map$1 } from 'rxjs';
|
|
5
5
|
export { Observable, Subject } from 'rxjs';
|
|
@@ -4379,8 +4379,8 @@ class JSONAPIService extends BaseDataService {
|
|
|
4379
4379
|
this.injector = injector;
|
|
4380
4380
|
this.DEFAULT_DELIMITER = '_';
|
|
4381
4381
|
this.config = this.injector.get(AppConfig);
|
|
4382
|
-
const
|
|
4383
|
-
this.delimiter =
|
|
4382
|
+
const jsonApiConfig = this.injector.get(O_JSON_API_CONFIG);
|
|
4383
|
+
this.delimiter = jsonApiConfig?.multipleKeyDelimiter || this.DEFAULT_DELIMITER;
|
|
4384
4384
|
}
|
|
4385
4385
|
startsession(user, password) {
|
|
4386
4386
|
const url = this.urlBase + this._startSessionPath;
|
|
@@ -28806,7 +28806,8 @@ class OTableFilterByColumnService {
|
|
|
28806
28806
|
parseListData(filter, column, tableData, isPageable, sourceData) {
|
|
28807
28807
|
const columnData = [];
|
|
28808
28808
|
const colRenderedValues = this.getColumnDataUsingRenderer(column, tableData);
|
|
28809
|
-
const
|
|
28809
|
+
const valueColumn = column.valueColumn ?? column.attr;
|
|
28810
|
+
const colValues = tableData.map((elem) => Util.getValueFromPath(elem, valueColumn));
|
|
28810
28811
|
if (Util.isDefined(filter?.availableValues)) {
|
|
28811
28812
|
return filter.availableValues;
|
|
28812
28813
|
}
|
|
@@ -38362,6 +38363,7 @@ class OTableColumnComponent {
|
|
|
38362
38363
|
break;
|
|
38363
38364
|
case 'percentage':
|
|
38364
38365
|
newRenderer.valueBase = this.valueBase;
|
|
38366
|
+
break;
|
|
38365
38367
|
case 'real':
|
|
38366
38368
|
newRenderer.decimalSeparator = this.decimalSeparator;
|
|
38367
38369
|
newRenderer.minDecimalDigits = this.minDecimalDigits;
|