@nettyapps/ntybase 0.1.11 → 0.1.13
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.
|
@@ -1240,6 +1240,7 @@ class NettyAgGridBase {
|
|
|
1240
1240
|
alertService = inject(AlertService);
|
|
1241
1241
|
dialog = inject(MatDialog);
|
|
1242
1242
|
sysFunctionProxy = inject(SysfunctionProxy);
|
|
1243
|
+
environment = inject(EnvironmentProxy);
|
|
1243
1244
|
initAgGrid_extension() {
|
|
1244
1245
|
if (this.allowEdit() == false && (this.popupValid() ?? false) == false) {
|
|
1245
1246
|
this.columnDefs().pop();
|
|
@@ -1459,6 +1460,7 @@ class NettyAgGridBase {
|
|
|
1459
1460
|
this.commonService.goBack();
|
|
1460
1461
|
}
|
|
1461
1462
|
gotoURL(routePrefix, rightSidenav = [], parameters, type, dialogComponent = null, isNewTab = false, isPopup = this.isEmbedded()) {
|
|
1463
|
+
let prefix = this.environment.getBaseHref();
|
|
1462
1464
|
const navigationExtras = {
|
|
1463
1465
|
queryParams: {
|
|
1464
1466
|
parameters: JSON.stringify(parameters),
|
|
@@ -1469,7 +1471,7 @@ class NettyAgGridBase {
|
|
|
1469
1471
|
};
|
|
1470
1472
|
if (isNewTab) {
|
|
1471
1473
|
const fullUrl = this.router
|
|
1472
|
-
.createUrlTree([...routePrefix, ...rightSidenav], navigationExtras)
|
|
1474
|
+
.createUrlTree([...prefix, ...routePrefix, ...rightSidenav], navigationExtras)
|
|
1473
1475
|
.toString();
|
|
1474
1476
|
window.open(fullUrl, '_blank');
|
|
1475
1477
|
return;
|
|
@@ -1494,8 +1496,8 @@ class NettyAgGridBase {
|
|
|
1494
1496
|
return;
|
|
1495
1497
|
}
|
|
1496
1498
|
// Log control
|
|
1497
|
-
if (rightSidenav[0] === 'log') {
|
|
1498
|
-
this.router.navigate([...routePrefix, ...rightSidenav], navigationExtras);
|
|
1499
|
+
if (rightSidenav.length == 0 || rightSidenav[0] === 'log') {
|
|
1500
|
+
this.router.navigate([...prefix, ...routePrefix, ...rightSidenav], navigationExtras);
|
|
1499
1501
|
return;
|
|
1500
1502
|
}
|
|
1501
1503
|
// In all other cases, open the side menu
|
|
@@ -1514,10 +1516,11 @@ class NettyAgGridBase {
|
|
|
1514
1516
|
});
|
|
1515
1517
|
}
|
|
1516
1518
|
popupGotoURL(urlSegments) {
|
|
1519
|
+
let prefix = this.environment.getBaseHref();
|
|
1517
1520
|
this.router.navigate([
|
|
1518
1521
|
{
|
|
1519
1522
|
outlets: {
|
|
1520
|
-
primary: urlSegments,
|
|
1523
|
+
primary: [...prefix, ...urlSegments],
|
|
1521
1524
|
rightSidenav: null,
|
|
1522
1525
|
},
|
|
1523
1526
|
},
|