barsa-novin-ray-core 2.3.5 → 2.3.7
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.
|
@@ -1602,7 +1602,7 @@ const measureTextValues = {};
|
|
|
1602
1602
|
function measureText2(text, fontSize, fontName) {
|
|
1603
1603
|
const key = `${text}${fontSize}${fontName}`;
|
|
1604
1604
|
if (measureTextValues[key]) {
|
|
1605
|
-
return measureTextValues[
|
|
1605
|
+
return measureTextValues[key];
|
|
1606
1606
|
}
|
|
1607
1607
|
const measureTextDom = document.getElementById('measureText');
|
|
1608
1608
|
if (!measureTextDom) {
|
|
@@ -3927,6 +3927,7 @@ class PortalService {
|
|
|
3927
3927
|
const portalData = portalSetting;
|
|
3928
3928
|
if (portalData) {
|
|
3929
3929
|
const defaultPage = this._getDefaultPage(portalData.ChildPageList.MoDataList);
|
|
3930
|
+
const isdynamicroute = portalData.IsDynamicRoute === 'True';
|
|
3930
3931
|
this.DefaultPage = defaultPage;
|
|
3931
3932
|
let configRoute = this._router.config;
|
|
3932
3933
|
const removePaged = [];
|
|
@@ -3944,7 +3945,7 @@ class PortalService {
|
|
|
3944
3945
|
});
|
|
3945
3946
|
if (defaultPage != null) {
|
|
3946
3947
|
const defaultPageRoute = defaultPage.Route.replace('/', '');
|
|
3947
|
-
if (
|
|
3948
|
+
if (isdynamicroute) {
|
|
3948
3949
|
const defaultPath = newConfigRoutes.find((c) => c.path === '');
|
|
3949
3950
|
defaultPath && (defaultPath.redirectTo = defaultPageRoute);
|
|
3950
3951
|
newConfigRoutes.push({ path: '**', redirectTo: defaultPageRoute });
|
|
@@ -3956,7 +3957,7 @@ class PortalService {
|
|
|
3956
3957
|
}
|
|
3957
3958
|
// const notFoundPath = configRoute.find((c) => c.path === '**');
|
|
3958
3959
|
// notFoundPath && (notFoundPath.redirectTo = defaultPage.Route.replace('/', ''));
|
|
3959
|
-
this._router.resetConfig(
|
|
3960
|
+
this._router.resetConfig(isdynamicroute ? newConfigRoutes : configRoute);
|
|
3960
3961
|
}
|
|
3961
3962
|
}
|
|
3962
3963
|
this.extractAllPages(portalData);
|