barsa-novin-ray-core 2.3.3 → 2.3.6

package/fesm2022/barsa-novin-ray-core.mjs

@@ -1600,7 +1600,8 @@ function throwIfAlreadyLoaded(parentModule, moduleName) {
 }
 const measureTextValues = {};
 function measureText2(text, fontSize, fontName) {
-    if (measureTextValues[text]) {
+    const key = `${text}${fontSize}${fontName}`;
+    if (measureTextValues[key]) {
         return measureTextValues[text];
     }
     const measureTextDom = document.getElementById('measureText');
@@ -1612,7 +1613,7 @@ function measureText2(text, fontSize, fontName) {
     fontName = fontName ? fontName : 'B-Font';
     ctx.font = `normal ${fontSize} ${fontName}`;
     const x = ctx.measureText(text).width;
-    measureTextValues[text] = x;
+    measureTextValues[key] = x;
     return x;
 }
 function measureText(text, fontSize) {
@@ -3926,6 +3927,7 @@ class PortalService {
         const portalData = portalSetting;
         if (portalData) {
             const defaultPage = this._getDefaultPage(portalData.ChildPageList.MoDataList);
+            const isdynamicroute = portalData.IsDynamicRoute === 'True';
             this.DefaultPage = defaultPage;
             let configRoute = this._router.config;
             const removePaged = [];
@@ -3943,7 +3945,7 @@ class PortalService {
             });
             if (defaultPage != null) {
                 const defaultPageRoute = defaultPage.Route.replace('/', '');
-                if (portalData.IsDynamicRoute) {
+                if (isdynamicroute) {
                     const defaultPath = newConfigRoutes.find((c) => c.path === '');
                     defaultPath && (defaultPath.redirectTo = defaultPageRoute);
                     newConfigRoutes.push({ path: '**', redirectTo: defaultPageRoute });
@@ -3955,7 +3957,7 @@ class PortalService {
                 }
                 // const notFoundPath = configRoute.find((c) => c.path === '**');
                 // notFoundPath && (notFoundPath.redirectTo = defaultPage.Route.replace('/', ''));
-                this._router.resetConfig(portalData.IsDynamicRoute === 'True' ? newConfigRoutes : configRoute);
+                this._router.resetConfig(isdynamicroute ? newConfigRoutes : configRoute);
             }
         }
         this.extractAllPages(portalData);