@ts-core/angular 15.0.45 → 15.0.46
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/list/select/RouterSelectListItems.mjs +15 -11
- package/fesm2015/ts-core-angular.mjs +13 -9
- package/fesm2015/ts-core-angular.mjs.map +1 -1
- package/fesm2020/ts-core-angular.mjs +13 -9
- package/fesm2020/ts-core-angular.mjs.map +1 -1
- package/list/select/RouterSelectListItems.d.ts +2 -1
- package/package.json +1 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { SelectListItems } from './SelectListItems';
|
|
2
|
-
import { takeUntil } from 'rxjs';
|
|
2
|
+
import { filter, takeUntil } from 'rxjs';
|
|
3
3
|
import * as _ from 'lodash';
|
|
4
4
|
export class RouterSelectListItems extends SelectListItems {
|
|
5
5
|
//--------------------------------------------------------------------------
|
|
@@ -16,17 +16,21 @@ export class RouterSelectListItems extends SelectListItems {
|
|
|
16
16
|
//
|
|
17
17
|
//--------------------------------------------------------------------------
|
|
18
18
|
this.setData = () => {
|
|
19
|
-
this.
|
|
19
|
+
this.selectedItem = this.getRouterSelectedItem();
|
|
20
20
|
};
|
|
21
21
|
this.setFragment = (item) => {
|
|
22
|
-
this.
|
|
22
|
+
let index = _.indexOf(this.collection, item);
|
|
23
|
+
this.router.setFragment(index > 0 ? item.data.toString() : null);
|
|
23
24
|
};
|
|
24
|
-
this.changed
|
|
25
|
-
|
|
25
|
+
this.changed
|
|
26
|
+
.pipe(filter(() => !this.isDisabled), takeUntil(this.destroyed))
|
|
27
|
+
.subscribe(this.setFragment);
|
|
28
|
+
this.router.completed
|
|
29
|
+
.pipe(filter(() => !this.isDisabled), takeUntil(this.destroyed))
|
|
30
|
+
.subscribe(this.setData);
|
|
26
31
|
}
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
return !_.isNil(item) ? item.data : null;
|
|
32
|
+
getRouterSelectedItem() {
|
|
33
|
+
return _.find(this.collection, { data: this.router.getFragment() });
|
|
30
34
|
}
|
|
31
35
|
//--------------------------------------------------------------------------
|
|
32
36
|
//
|
|
@@ -34,8 +38,8 @@ export class RouterSelectListItems extends SelectListItems {
|
|
|
34
38
|
//
|
|
35
39
|
//--------------------------------------------------------------------------
|
|
36
40
|
complete() {
|
|
37
|
-
let item = this.
|
|
38
|
-
super.complete(_.isNil(item) ?
|
|
41
|
+
let item = this.getRouterSelectedItem();
|
|
42
|
+
super.complete(!_.isNil(item) ? item.data : 0);
|
|
39
43
|
}
|
|
40
44
|
destroy() {
|
|
41
45
|
if (this.isDestroyed) {
|
|
@@ -45,4 +49,4 @@ export class RouterSelectListItems extends SelectListItems {
|
|
|
45
49
|
this.router = null;
|
|
46
50
|
}
|
|
47
51
|
}
|
|
48
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
52
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUm91dGVyU2VsZWN0TGlzdEl0ZW1zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2xpc3Qvc2VsZWN0L1JvdXRlclNlbGVjdExpc3RJdGVtcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFHcEQsT0FBTyxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDekMsT0FBTyxLQUFLLENBQUMsTUFBTSxRQUFRLENBQUM7QUFFNUIsTUFBTSxPQUFPLHFCQUFrQyxTQUFRLGVBQXNDO0lBU3pGLDRFQUE0RTtJQUM1RSxFQUFFO0lBQ0YsZUFBZTtJQUNmLEVBQUU7SUFDRiw0RUFBNEU7SUFFNUUsWUFBc0IsTUFBeUIsRUFBRSxRQUF5QjtRQUN0RSxLQUFLLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBREosV0FBTSxHQUFOLE1BQU0sQ0FBbUI7UUFnQi9DLDRFQUE0RTtRQUM1RSxFQUFFO1FBQ0YscUJBQXFCO1FBQ3JCLEVBQUU7UUFDRiw0RUFBNEU7UUFFbEUsWUFBTyxHQUFHLEdBQVMsRUFBRTtZQUMzQixJQUFJLENBQUMsWUFBWSxHQUFHLElBQUksQ0FBQyxxQkFBcUIsRUFBRSxDQUFDO1FBQ3JELENBQUMsQ0FBQztRQUVRLGdCQUFXLEdBQUcsQ0FBQyxJQUF3QixFQUFRLEVBQUU7WUFDdkQsSUFBSSxLQUFLLEdBQUcsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxDQUFDO1lBQzdDLElBQUksQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLEtBQUssR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3JFLENBQUMsQ0FBQztRQTNCRSxJQUFJLENBQUMsT0FBTzthQUNQLElBQUksQ0FDRCxNQUFNLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEVBQzlCLFNBQVMsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQzVCO2FBQ0EsU0FBUyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUNqQyxJQUFJLENBQUMsTUFBTSxDQUFDLFNBQVM7YUFDaEIsSUFBSSxDQUNELE1BQU0sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsRUFDOUIsU0FBUyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FDNUI7YUFDQSxTQUFTLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ2pDLENBQUM7SUFpQlMscUJBQXFCO1FBQzNCLE9BQU8sQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsV0FBVyxFQUFFLEVBQUUsQ0FBdUIsQ0FBQztJQUM5RixDQUFDO0lBRUQsNEVBQTRFO0lBQzVFLEVBQUU7SUFDRixrQkFBa0I7SUFDbEIsRUFBRTtJQUNGLDRFQUE0RTtJQUVyRSxRQUFRO1FBQ1gsSUFBSSxJQUFJLEdBQUcsSUFBSSxDQUFDLHFCQUFxQixFQUFFLENBQUM7UUFDeEMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ25ELENBQUM7SUFFTSxPQUFPO1FBQ1YsSUFBSSxJQUFJLENBQUMsV0FBVyxFQUFFO1lBQ2xCLE9BQU87U0FDVjtRQUNELEtBQUssQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNoQixJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksQ0FBQztJQUN2QixDQUFDO0NBQ0oiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBMYW5ndWFnZVNlcnZpY2UgfSBmcm9tICdAdHMtY29yZS9mcm9udGVuZCc7XG5pbXBvcnQgeyBTZWxlY3RMaXN0SXRlbXMgfSBmcm9tICcuL1NlbGVjdExpc3RJdGVtcyc7XG5pbXBvcnQgeyBJU2VsZWN0TGlzdEl0ZW0gfSBmcm9tICcuL0lTZWxlY3RMaXN0SXRlbSc7XG5pbXBvcnQgeyBSb3V0ZXJCYXNlU2VydmljZSB9IGZyb20gJy4uLy4uL3NlcnZpY2UvUm91dGVyQmFzZVNlcnZpY2UnO1xuaW1wb3J0IHsgZmlsdGVyLCB0YWtlVW50aWwgfSBmcm9tICdyeGpzJztcbmltcG9ydCAqIGFzIF8gZnJvbSAnbG9kYXNoJztcblxuZXhwb3J0IGNsYXNzIFJvdXRlclNlbGVjdExpc3RJdGVtczxVID0gc3RyaW5nPiBleHRlbmRzIFNlbGVjdExpc3RJdGVtczxJU2VsZWN0TGlzdEl0ZW08VT4sIFU+IHtcbiAgICAvLy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG4gICAgLy9cbiAgICAvLyBcdFB1YmxpYyBQcm9wZXJ0aWVzXG4gICAgLy9cbiAgICAvLy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5cbiAgICBwdWJsaWMgaXNEaXNhYmxlZDogYm9vbGVhbjtcblxuICAgIC8vLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbiAgICAvL1xuICAgIC8vIFx0Q29uc3RydWN0b3JcbiAgICAvL1xuICAgIC8vLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cblxuICAgIGNvbnN0cnVjdG9yKHByb3RlY3RlZCByb3V0ZXI6IFJvdXRlckJhc2VTZXJ2aWNlLCBsYW5ndWFnZTogTGFuZ3VhZ2VTZXJ2aWNlKSB7XG4gICAgICAgIHN1cGVyKGxhbmd1YWdlLCB0cnVlKTtcbiAgICAgICAgdGhpcy5jaGFuZ2VkXG4gICAgICAgICAgICAucGlwZShcbiAgICAgICAgICAgICAgICBmaWx0ZXIoKCkgPT4gIXRoaXMuaXNEaXNhYmxlZCksXG4gICAgICAgICAgICAgICAgdGFrZVVudGlsKHRoaXMuZGVzdHJveWVkKVxuICAgICAgICAgICAgKVxuICAgICAgICAgICAgLnN1YnNjcmliZSh0aGlzLnNldEZyYWdtZW50KTtcbiAgICAgICAgdGhpcy5yb3V0ZXIuY29tcGxldGVkXG4gICAgICAgICAgICAucGlwZShcbiAgICAgICAgICAgICAgICBmaWx0ZXIoKCkgPT4gIXRoaXMuaXNEaXNhYmxlZCksXG4gICAgICAgICAgICAgICAgdGFrZVVudGlsKHRoaXMuZGVzdHJveWVkKVxuICAgICAgICAgICAgKVxuICAgICAgICAgICAgLnN1YnNjcmliZSh0aGlzLnNldERhdGEpO1xuICAgIH1cblxuICAgIC8vLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbiAgICAvL1xuICAgIC8vIFx0UHJvdGVjdGVkIE1ldGhvZHNcbiAgICAvL1xuICAgIC8vLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cblxuICAgIHByb3RlY3RlZCBzZXREYXRhID0gKCk6IHZvaWQgPT4ge1xuICAgICAgICB0aGlzLnNlbGVjdGVkSXRlbSA9IHRoaXMuZ2V0Um91dGVyU2VsZWN0ZWRJdGVtKCk7XG4gICAgfTtcblxuICAgIHByb3RlY3RlZCBzZXRGcmFnbWVudCA9IChpdGVtOiBJU2VsZWN0TGlzdEl0ZW08VT4pOiB2b2lkID0+IHtcbiAgICAgICAgbGV0IGluZGV4ID0gXy5pbmRleE9mKHRoaXMuY29sbGVjdGlvbiwgaXRlbSk7XG4gICAgICAgIHRoaXMucm91dGVyLnNldEZyYWdtZW50KGluZGV4ID4gMCA/IGl0ZW0uZGF0YS50b1N0cmluZygpIDogbnVsbCk7XG4gICAgfTtcblxuICAgIHByb3RlY3RlZCBnZXRSb3V0ZXJTZWxlY3RlZEl0ZW0oKTogSVNlbGVjdExpc3RJdGVtPFU+IHtcbiAgICAgICAgcmV0dXJuIF8uZmluZCh0aGlzLmNvbGxlY3Rpb24sIHsgZGF0YTogdGhpcy5yb3V0ZXIuZ2V0RnJhZ21lbnQoKSB9KSBhcyBJU2VsZWN0TGlzdEl0ZW08VT47XG4gICAgfVxuXG4gICAgLy8tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuICAgIC8vXG4gICAgLy8gXHRQdWJsaWMgTWV0aG9kc1xuICAgIC8vXG4gICAgLy8tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuXG4gICAgcHVibGljIGNvbXBsZXRlKCk6IHZvaWQge1xuICAgICAgICBsZXQgaXRlbSA9IHRoaXMuZ2V0Um91dGVyU2VsZWN0ZWRJdGVtKCk7XG4gICAgICAgIHN1cGVyLmNvbXBsZXRlKCFfLmlzTmlsKGl0ZW0pID8gaXRlbS5kYXRhIDogMCk7XG4gICAgfVxuXG4gICAgcHVibGljIGRlc3Ryb3koKTogdm9pZCB7XG4gICAgICAgIGlmICh0aGlzLmlzRGVzdHJveWVkKSB7XG4gICAgICAgICAgICByZXR1cm47XG4gICAgICAgIH1cbiAgICAgICAgc3VwZXIuZGVzdHJveSgpO1xuICAgICAgICB0aGlzLnJvdXRlciA9IG51bGw7XG4gICAgfVxufVxuIl19
|
|
@@ -4039,17 +4039,21 @@ class RouterSelectListItems extends SelectListItems {
|
|
|
4039
4039
|
//
|
|
4040
4040
|
//--------------------------------------------------------------------------
|
|
4041
4041
|
this.setData = () => {
|
|
4042
|
-
this.
|
|
4042
|
+
this.selectedItem = this.getRouterSelectedItem();
|
|
4043
4043
|
};
|
|
4044
4044
|
this.setFragment = (item) => {
|
|
4045
|
-
this.
|
|
4045
|
+
let index = _.indexOf(this.collection, item);
|
|
4046
|
+
this.router.setFragment(index > 0 ? item.data.toString() : null);
|
|
4046
4047
|
};
|
|
4047
|
-
this.changed
|
|
4048
|
-
|
|
4048
|
+
this.changed
|
|
4049
|
+
.pipe(filter(() => !this.isDisabled), takeUntil(this.destroyed))
|
|
4050
|
+
.subscribe(this.setFragment);
|
|
4051
|
+
this.router.completed
|
|
4052
|
+
.pipe(filter(() => !this.isDisabled), takeUntil(this.destroyed))
|
|
4053
|
+
.subscribe(this.setData);
|
|
4049
4054
|
}
|
|
4050
|
-
|
|
4051
|
-
|
|
4052
|
-
return !_.isNil(item) ? item.data : null;
|
|
4055
|
+
getRouterSelectedItem() {
|
|
4056
|
+
return _.find(this.collection, { data: this.router.getFragment() });
|
|
4053
4057
|
}
|
|
4054
4058
|
//--------------------------------------------------------------------------
|
|
4055
4059
|
//
|
|
@@ -4057,8 +4061,8 @@ class RouterSelectListItems extends SelectListItems {
|
|
|
4057
4061
|
//
|
|
4058
4062
|
//--------------------------------------------------------------------------
|
|
4059
4063
|
complete() {
|
|
4060
|
-
let item = this.
|
|
4061
|
-
super.complete(_.isNil(item) ?
|
|
4064
|
+
let item = this.getRouterSelectedItem();
|
|
4065
|
+
super.complete(!_.isNil(item) ? item.data : 0);
|
|
4062
4066
|
}
|
|
4063
4067
|
destroy() {
|
|
4064
4068
|
if (this.isDestroyed) {
|