Merge pull request #1460 from easyops-cn/steve/menu-title-expr

fix(): evaluate simple placeholders as menu title
easyops-cn · Dec 27, 2024 · 3ac341f · 3ac341f
2 parents 24971fc + 022c1e1
commit 3ac341f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/bricks/nav/src/data-providers/get-menu-config-options.spec.ts b/bricks/nav/src/data-providers/get-menu-config-options.spec.ts
@@ -61,6 +61,16 @@ describe("getMenuConfigOptions", () => {
         app: [{ appId: "app-a" }],
         instanceId: "i-a",
       },
+      {
+        menuId: "menu-g",
+        title: "${APP.localeName}",
+        type: "main",
+        app: [{ appId: "app-a" }],
+        instanceId: "i-a",
+        overrideApp: {
+          name: "App A",
+        } as MicroApp,
+      },
     ];
     expect(await getMenuConfigOptions(menuList)).toEqual([
       {
@@ -87,6 +97,10 @@ describe("getMenuConfigOptions", () => {
         label: "<% `${CTX.name} - ${I18n('')}` %> (menu-f)",
         value: "menu-f",
       },
+      {
+        label: "App A (menu-g)",
+        value: "menu-g",
+      },
     ]);
   });
 

diff --git a/bricks/nav/src/data-providers/shared/smartDisplayForMenuTitle.ts b/bricks/nav/src/data-providers/shared/smartDisplayForMenuTitle.ts
@@ -104,6 +104,12 @@ export function smartDisplayForMenuTitle(
         }
       }
     }
+  } else if (overrideApp) {
+    // 处理简单的占位符替换： ${APP.name} 和 ${APP.localeName}
+    return title.replace(
+      /\$\{\s*APP\s*\.\s*(?:name|localeName)\s*\}/g,
+      () => overrideApp.name
+    );
   }
   return title;
 }