@abp/ng.theme.shared 8.1.1 → 8.1.3
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.
|
@@ -1,7 +1,13 @@
|
|
|
1
1
|
import { BehaviorSubject } from 'rxjs';
|
|
2
|
+
import { inject } from '@angular/core';
|
|
3
|
+
import { SORT_COMPARE_FUNC } from '@abp/ng.core';
|
|
2
4
|
export class AbstractMenuService {
|
|
3
5
|
constructor() {
|
|
6
|
+
this.sortFn = inject(SORT_COMPARE_FUNC);
|
|
4
7
|
this._items$ = new BehaviorSubject([]);
|
|
8
|
+
this.sortItems = (a, b) => {
|
|
9
|
+
return this.sortFn(a, b);
|
|
10
|
+
};
|
|
5
11
|
}
|
|
6
12
|
get items() {
|
|
7
13
|
return this._items$.value;
|
|
@@ -39,12 +45,5 @@ export class AbstractMenuService {
|
|
|
39
45
|
items.sort(this.sortItems);
|
|
40
46
|
this._items$.next(items);
|
|
41
47
|
}
|
|
42
|
-
sortItems(a, b) {
|
|
43
|
-
if (!a.order)
|
|
44
|
-
return 1;
|
|
45
|
-
if (!b.order)
|
|
46
|
-
return -1;
|
|
47
|
-
return a.order - b.order;
|
|
48
|
-
}
|
|
49
48
|
}
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWJzdHJhY3QtbWVudS5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvdGhlbWUtc2hhcmVkL3NyYy9saWIvc2VydmljZXMvYWJzdHJhY3QtbWVudS5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxlQUFlLEVBQWMsTUFBTSxNQUFNLENBQUM7QUFFbkQsT0FBTyxFQUFFLE1BQU0sRUFBUSxNQUFNLGVBQWUsQ0FBQztBQUM3QyxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFakQsTUFBTSxPQUFnQixtQkFBbUI7SUFBekM7UUFHcUIsV0FBTSxHQUFHLE1BQU0sQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO1FBRTVDLFlBQU8sR0FBRyxJQUFJLGVBQWUsQ0FBTSxFQUFFLENBQUMsQ0FBQztRQStDakQsY0FBUyxHQUFHLENBQUMsQ0FBSSxFQUFFLENBQUksRUFBRSxFQUFFO1lBQ3pCLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFDM0IsQ0FBQyxDQUFDO0lBQ0osQ0FBQztJQWhEQyxJQUFJLEtBQUs7UUFDUCxPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDO0lBQzVCLENBQUM7SUFFRCxJQUFJLE1BQU07UUFDUixPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsWUFBWSxFQUFFLENBQUM7SUFDckMsQ0FBQztJQUVELFFBQVEsQ0FBQyxRQUFhO1FBQ3BCLE1BQU0sS0FBSyxHQUFHLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDOUIsUUFBUSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUN0QixNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsS0FBSyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7WUFDckQsTUFBTSxJQUFJLEdBQUcsSUFBSSxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDO1lBRXRDLElBQUksS0FBSyxHQUFHLENBQUMsQ0FBQyxFQUFFLENBQUM7Z0JBQ2YsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFHLElBQUksQ0FBQztnQkFDcEIsT0FBTztZQUNULENBQUM7WUFFRCxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ25CLENBQUMsQ0FBQyxDQUFDO1FBQ0gsS0FBSyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDM0IsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDM0IsQ0FBQztJQUVELFVBQVUsQ0FBQyxFQUFtQjtRQUM1QixNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUM7UUFFM0QsSUFBSSxLQUFLLEdBQUcsQ0FBQztZQUFFLE9BQU87UUFFdEIsTUFBTSxLQUFLLEdBQUcsQ0FBQyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxLQUFLLENBQUMsRUFBRSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEtBQUssR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzlFLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQzNCLENBQUM7SUFFRCxTQUFTLENBQUMsRUFBbUIsRUFBRSxJQUE0QjtRQUN6RCxNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUM7UUFFckQsSUFBSSxLQUFLLEdBQUcsQ0FBQztZQUFFLE9BQU87UUFFdEIsTUFBTSxLQUFLLEdBQUcsQ0FBQyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUM5QixLQUFLLENBQUMsS0FBSyxDQUFDLEdBQUcsSUFBSSxJQUFJLENBQUMsU0FBUyxDQUFDLEVBQUUsR0FBRyxLQUFLLENBQUMsS0FBSyxDQUFDLEVBQUUsR0FBRyxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQ2hFLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQzNCLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQzNCLENBQUM7Q0FLRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEJlaGF2aW9yU3ViamVjdCwgT2JzZXJ2YWJsZSB9IGZyb20gJ3J4anMnO1xyXG5pbXBvcnQgeyBOYXZJdGVtIH0gZnJvbSAnLi4vbW9kZWxzL25hdi1pdGVtJztcclxuaW1wb3J0IHsgaW5qZWN0LCBUeXBlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XHJcbmltcG9ydCB7IFNPUlRfQ09NUEFSRV9GVU5DIH0gZnJvbSAnQGFicC9uZy5jb3JlJztcclxuXHJcbmV4cG9ydCBhYnN0cmFjdCBjbGFzcyBBYnN0cmFjdE1lbnVTZXJ2aWNlPFQgZXh0ZW5kcyBOYXZJdGVtPiB7XHJcbiAgcHJvdGVjdGVkIGFic3RyYWN0IGJhc2VDbGFzczogVHlwZTxhbnk+O1xyXG5cclxuICBwcm90ZWN0ZWQgcmVhZG9ubHkgc29ydEZuID0gaW5qZWN0KFNPUlRfQ09NUEFSRV9GVU5DKTtcclxuXHJcbiAgcHJvdGVjdGVkIF9pdGVtcyQgPSBuZXcgQmVoYXZpb3JTdWJqZWN0PFRbXT4oW10pO1xyXG5cclxuICBnZXQgaXRlbXMoKTogVFtdIHtcclxuICAgIHJldHVybiB0aGlzLl9pdGVtcyQudmFsdWU7XHJcbiAgfVxyXG5cclxuICBnZXQgaXRlbXMkKCk6IE9ic2VydmFibGU8VFtdPiB7XHJcbiAgICByZXR1cm4gdGhpcy5faXRlbXMkLmFzT2JzZXJ2YWJsZSgpO1xyXG4gIH1cclxuXHJcbiAgYWRkSXRlbXMobmV3SXRlbXM6IFRbXSkge1xyXG4gICAgY29uc3QgaXRlbXMgPSBbLi4udGhpcy5pdGVtc107XHJcbiAgICBuZXdJdGVtcy5mb3JFYWNoKGl0ZW0gPT4ge1xyXG4gICAgICBjb25zdCBpbmRleCA9IGl0ZW1zLmZpbmRJbmRleChpID0+IGkuaWQgPT09IGl0ZW0uaWQpO1xyXG4gICAgICBjb25zdCBkYXRhID0gbmV3IHRoaXMuYmFzZUNsYXNzKGl0ZW0pO1xyXG5cclxuICAgICAgaWYgKGluZGV4ID4gLTEpIHtcclxuICAgICAgICBpdGVtc1tpbmRleF0gPSBkYXRhO1xyXG4gICAgICAgIHJldHVybjtcclxuICAgICAgfVxyXG5cclxuICAgICAgaXRlbXMucHVzaChkYXRhKTtcclxuICAgIH0pO1xyXG4gICAgaXRlbXMuc29ydCh0aGlzLnNvcnRJdGVtcyk7XHJcbiAgICB0aGlzLl9pdGVtcyQubmV4dChpdGVtcyk7XHJcbiAgfVxyXG5cclxuICByZW1vdmVJdGVtKGlkOiBzdHJpbmcgfCBudW1iZXIpIHtcclxuICAgIGNvbnN0IGluZGV4ID0gdGhpcy5pdGVtcy5maW5kSW5kZXgoaXRlbSA9PiBpdGVtLmlkID09PSBpZCk7XHJcblxyXG4gICAgaWYgKGluZGV4IDwgMCkgcmV0dXJuO1xyXG5cclxuICAgIGNvbnN0IGl0ZW1zID0gWy4uLnRoaXMuaXRlbXMuc2xpY2UoMCwgaW5kZXgpLCAuLi50aGlzLml0ZW1zLnNsaWNlKGluZGV4ICsgMSldO1xyXG4gICAgdGhpcy5faXRlbXMkLm5leHQoaXRlbXMpO1xyXG4gIH1cclxuXHJcbiAgcGF0Y2hJdGVtKGlkOiBzdHJpbmcgfCBudW1iZXIsIGl0ZW06IFBhcnRpYWw8T21pdDxULCAnaWQnPj4pIHtcclxuICAgIGNvbnN0IGluZGV4ID0gdGhpcy5pdGVtcy5maW5kSW5kZXgoaSA9PiBpLmlkID09PSBpZCk7XHJcblxyXG4gICAgaWYgKGluZGV4IDwgMCkgcmV0dXJuO1xyXG5cclxuICAgIGNvbnN0IGl0ZW1zID0gWy4uLnRoaXMuaXRlbXNdO1xyXG4gICAgaXRlbXNbaW5kZXhdID0gbmV3IHRoaXMuYmFzZUNsYXNzKHsgLi4uaXRlbXNbaW5kZXhdLCAuLi5pdGVtIH0pO1xyXG4gICAgaXRlbXMuc29ydCh0aGlzLnNvcnRJdGVtcyk7XHJcbiAgICB0aGlzLl9pdGVtcyQubmV4dChpdGVtcyk7XHJcbiAgfVxyXG5cclxuICBzb3J0SXRlbXMgPSAoYTogVCwgYjogVCkgPT4ge1xyXG4gICAgcmV0dXJuIHRoaXMuc29ydEZuKGEsIGIpO1xyXG4gIH07XHJcbn1cclxuIl19
|
|
@@ -8,7 +8,7 @@ import { animation, style, animate, keyframes, trigger, state, transition, useAn
|
|
|
8
8
|
import * as i1$1 from '@angular/router';
|
|
9
9
|
import { Router, ResolveEnd } from '@angular/router';
|
|
10
10
|
import * as i2 from '@abp/ng.core';
|
|
11
|
-
import { getRoutePath, SubscriptionService, PROJECTION_STRATEGY, uuid, AbstractNgModelComponent, InternetConnectionService, LocalizationModule, LocalizationService, getLocaleDirection, DomInsertionService, CONTENT_STRATEGY, InternalStore, RouterEvents, AuthService, SessionStateService, HttpErrorReporterService, RoutesService, TENANT_NOT_FOUND_BY_NAME, CoreModule, noop, ConfigStateService } from '@abp/ng.core';
|
|
11
|
+
import { getRoutePath, SubscriptionService, PROJECTION_STRATEGY, uuid, AbstractNgModelComponent, InternetConnectionService, LocalizationModule, LocalizationService, getLocaleDirection, DomInsertionService, CONTENT_STRATEGY, SORT_COMPARE_FUNC, InternalStore, RouterEvents, AuthService, SessionStateService, HttpErrorReporterService, RoutesService, TENANT_NOT_FOUND_BY_NAME, CoreModule, noop, ConfigStateService } from '@abp/ng.core';
|
|
12
12
|
import { startWith, map, debounceTime, filter, takeUntil, distinctUntilChanged, take, switchMap } from 'rxjs/operators';
|
|
13
13
|
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
|
|
14
14
|
import { fromEvent, Subscription, combineLatest, timer, ReplaySubject, Subject, of, from, Observable, EMPTY, BehaviorSubject } from 'rxjs';
|
|
@@ -2197,7 +2197,11 @@ class NavItem {
|
|
|
2197
2197
|
|
|
2198
2198
|
class AbstractMenuService {
|
|
2199
2199
|
constructor() {
|
|
2200
|
+
this.sortFn = inject(SORT_COMPARE_FUNC);
|
|
2200
2201
|
this._items$ = new BehaviorSubject([]);
|
|
2202
|
+
this.sortItems = (a, b) => {
|
|
2203
|
+
return this.sortFn(a, b);
|
|
2204
|
+
};
|
|
2201
2205
|
}
|
|
2202
2206
|
get items() {
|
|
2203
2207
|
return this._items$.value;
|
|
@@ -2235,13 +2239,6 @@ class AbstractMenuService {
|
|
|
2235
2239
|
items.sort(this.sortItems);
|
|
2236
2240
|
this._items$.next(items);
|
|
2237
2241
|
}
|
|
2238
|
-
sortItems(a, b) {
|
|
2239
|
-
if (!a.order)
|
|
2240
|
-
return 1;
|
|
2241
|
-
if (!b.order)
|
|
2242
|
-
return -1;
|
|
2243
|
-
return a.order - b.order;
|
|
2244
|
-
}
|
|
2245
2242
|
}
|
|
2246
2243
|
|
|
2247
2244
|
class NavItemsService extends AbstractMenuService {
|