Merge pull request #4317 from easyops-cn/williamcai/easyops-runtime_activeIncludes_and_activeExcludes_support_MatchOptions

feat(menu): activeIncludes and activeExcludes of SidebarMenuSimpleIte…

Author: weareoutman

etc/runtime.api.md

@@ -262,6 +262,14 @@ function loadEditors(editors: string[] | Set<string>, brickPackages?: BrickPacka
 // @public @deprecated (undocumented)
 export function logout(): unknown;
 
+// @public (undocumented)
+export interface MatchOptions {
+    // (undocumented)
+    exact?: boolean;
+    // (undocumented)
+    path: string | string[];
+}
+
 // Warning: (ae-forgotten-export) The symbol "MatchPathOptions" needs to be exported by the entry point index.d.ts
 // Warning: (ae-forgotten-export) The symbol "MatchResult" needs to be exported by the entry point index.d.ts
 //

packages/easyops-runtime/src/menu/interfaces.ts

@@ -2,6 +2,7 @@ import type { MetaI18n, MicroApp, ResolveConf } from "@next-core/types";
 import type {
   RuntimeHooksMenuHelpers,
   __secret_internals,
+  MatchOptions,
 } from "@next-core/runtime";
 import {
   symbolAppId,
@@ -79,10 +80,10 @@ export interface SidebarMenuSimpleItem {
   exact?: boolean;
 
   /** 设置额外包含的匹配高亮菜单项的地址列表。 */
-  activeIncludes?: string[];
+  activeIncludes?: (string | MatchOptions)[];
 
   /** 设置需要被排除的匹配高亮菜单项的地址列表。 */
-  activeExcludes?: string[];
+  activeExcludes?: (string | MatchOptions)[];
 
   /** 设置匹配高亮菜单项时是否还对 search 参数进行比较。 */
   activeMatchSearch?: boolean;

packages/runtime/src/index.ts

@@ -35,7 +35,7 @@ export {
 export { registerWidgetFunctions } from "./internal/compute/WidgetFunctions.js";
 export { registerWidgetI18n } from "./internal/compute/WidgetI18n.js";
 export { StoryboardFunctionRegistryFactory } from "./StoryboardFunctionRegistry.js";
-export { matchPath } from "./internal/matchPath.js";
+export { matchPath, type MatchOptions } from "./internal/matchPath.js";
 export { Notification, type NotificationOptions } from "./Notification.js";
 export { Dialog, type DialogOptions } from "./Dialog.js";
 export * from "./getV2RuntimeFromDll.js";

packages/runtime/src/internal/matchPath.ts

@@ -96,7 +96,7 @@ interface CompileResult {
   keys: Key[];
 }
 
-interface MatchOptions {
+export interface MatchOptions {
   path: string | string[];
   exact?: boolean;
 }