@morozeckiy/dd-lib 0.7.113 → 0.7.117
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.
|
@@ -4397,8 +4397,12 @@ class LibTabsFragmentComponent {
|
|
|
4397
4397
|
if (this.rout && !this.noFragment) {
|
|
4398
4398
|
this.router.navigate([this.rout], { fragment: tab.fragment });
|
|
4399
4399
|
}
|
|
4400
|
-
else if (this.rout && this.noFragment
|
|
4401
|
-
|
|
4400
|
+
else if (this.rout && this.noFragment) {
|
|
4401
|
+
const route = tab.path ? [this.rout, tab.path] : [this.rout];
|
|
4402
|
+
this.router.navigate(route);
|
|
4403
|
+
}
|
|
4404
|
+
else if (!this.rout && tab.path) {
|
|
4405
|
+
this.router.navigate([tab.path || '']);
|
|
4402
4406
|
}
|
|
4403
4407
|
else if (!this.rout && !this.noFragment) {
|
|
4404
4408
|
const currentUrl = this.location.path(); // Получаем текущий URL без фрагмента
|
|
@@ -4407,7 +4411,7 @@ class LibTabsFragmentComponent {
|
|
|
4407
4411
|
}
|
|
4408
4412
|
if (callEvent) {
|
|
4409
4413
|
this.setActiveTab.emit(this.activeFragment);
|
|
4410
|
-
this.onChange(tab);
|
|
4414
|
+
this.onChange(tab);
|
|
4411
4415
|
this.onTouched();
|
|
4412
4416
|
}
|
|
4413
4417
|
}
|
|
@@ -4453,8 +4457,8 @@ class LibTabsFragmentComponent {
|
|
|
4453
4457
|
}
|
|
4454
4458
|
}
|
|
4455
4459
|
else if (this.needInitEvent) {
|
|
4456
|
-
if (this.noFragment && this.tabs?.[0].path) {
|
|
4457
|
-
this.activeFragment = this.tabs?.length ? this.tabs.find(f => (this.rout ? this.rout + '/' : '
|
|
4460
|
+
if (this.noFragment && typeof this.tabs?.[0].path === 'string') {
|
|
4461
|
+
this.activeFragment = this.tabs?.length ? (this.tabs.find(f => '/' + (this.rout ? this.rout + '/' : '') + f.path === this.location.path())?.id || 0) : 0;
|
|
4458
4462
|
}
|
|
4459
4463
|
}
|
|
4460
4464
|
this.setActiveTab.emit(this.activeFragment);
|