@rxdrag/website-lib-core 0.0.130 → 0.0.132

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rxdrag/website-lib-core",
-  "version": "0.0.130",
+  "version": "0.0.132",
   "type": "module",
   "exports": {
     ".": "./index.ts"
@@ -24,8 +24,8 @@
     "eslint": "^9.39.2",
     "typescript": "^5",
     "@rxdrag/eslint-config-custom": "0.2.13",
-    "@rxdrag/tiptap-preview": "0.0.3",
-    "@rxdrag/tsconfig": "0.2.1"
+    "@rxdrag/tsconfig": "0.2.1",
+    "@rxdrag/tiptap-preview": "0.0.3"
   },
   "dependencies": {
     "@iconify/utils": "^3.0.2",
@@ -33,8 +33,8 @@
     "gsap": "^3.12.7",
     "hls.js": "^1.6.13",
     "lodash-es": "^4.17.21",
-    "@rxdrag/entify-lib": "0.0.24",
-    "@rxdrag/rxcms-models": "0.3.110"
+    "@rxdrag/rxcms-models": "0.3.111",
+    "@rxdrag/entify-lib": "0.0.24"
   },
   "peerDependencies": {
     "astro": "^5.16.6",

package/src/component-logic/link-client.ts

@@ -1,3 +1,10 @@
+// 判断路径是否为根路径（/ 或 /zh/ 等语言前缀根路径）
+const isRootPath = (path: string): boolean => {
+  if (path === "/") return true;
+  // 匹配 /xx/ 或 /xx-xx/ 格式的语言前缀根路径
+  return /^\/[a-z]{2}(-[a-z]{2})?\/?$/.test(path);
+};
+
 export const initLinks = () => {
   // 获取当前URL的路径部分（去除域名）
   const currentPath = window.location.pathname;
@@ -15,11 +22,14 @@ export const initLinks = () => {
         anchorLink.dataset.activedPath === "true"
           ? linkUrl?.pathname
           : anchorLink.dataset.activedPath;
-      // 检查当前路径是否与链接路径匹配或是其子路径
-      if (
-        currentPath === linkPath ||
-        (linkPath !== "/" && linkPath && currentPath.startsWith(linkPath))
-      ) {
+      
+      // 根路径使用精确匹配，其他路径使用前缀匹配
+      const isRoot = linkPath ? isRootPath(linkPath) : false;
+      const isMatch = isRoot
+        ? currentPath === linkPath || currentPath === linkPath?.replace(/\/$/, "")
+        : currentPath === linkPath || (linkPath && currentPath.startsWith(linkPath));
+      
+      if (isMatch) {
         anchorLink.classList.add("actived");
       } else {
         anchorLink.classList.remove("actived");

package/src/entify/Entify.ts

@@ -103,6 +103,15 @@ export class Entify implements IEntify {
     return this.ensureLangAbbr();
   }
 
+  /**
+   * 获取当前语言对象（包含 dir 等完整信息）
+   */
+  public async getCurrentLang() {
+    const langAbbr = this.ensureLangAbbr();
+    const langs = await this.getLangs();
+    return langs?.find((l) => l.abbr === langAbbr);
+  }
+
   /**
    * 获取当前语言，如果未设置则抛出异常
    */

package/src/entify/IEntify.ts

@@ -71,6 +71,11 @@ export interface IEntify {
    */
   getLang(): string;
 
+  /**
+   * 获取当前语言对象（包含 dir 等完整信息）
+   */
+  getCurrentLang(): Promise<Lang | undefined>;
+
   getBaseLang(): Promise<Lang | undefined>;
 
   getMedia(ref: string | undefined | null, fileField?: FileFieldType, resize?: ImageResize): Promise<Media | undefined>;

package/src/entify/lib/langFields.ts

@@ -9,6 +9,7 @@ export const langFields = [
   LangFields.localName,
   LangFields.icon,
   LangFields.htmlLang,
+  LangFields.dir,
   //TODO 用枚举有时会出空值
   "urlFragment" as LangFields.urlFragment,
 ];