@blocklet/meta 1.16.44-beta-20250524-065731-c62fd374 → 1.16.44-beta-20250526-130644-5e05dc90

package/lib/parse-navigation-from-blocklet.js

@@ -13,6 +13,7 @@ exports.cleanOrphanNavigation = cleanOrphanNavigation;
 exports.joinLink = joinLink;
 exports.flattenNavigation = flattenNavigation;
 exports.splitNavigationBySection = splitNavigationBySection;
+const constant_1 = require("@abtnode/constant");
 const unionWith_1 = __importDefault(require("lodash/unionWith"));
 const isEqual_1 = __importDefault(require("lodash/isEqual"));
 const pick_1 = __importDefault(require("lodash/pick"));
@@ -191,6 +192,26 @@ function flattenNavigation(list = [], { depth = 1, transform = (v) => v } = {})
     }, { key: 'items', order: 'last' });
     return finalList;
 }
+/**
+ * 将 bottomNavigation 导航项中的国际化字段标准化为 { locale: value } 格式
+ * @param item 导航项
+ * @returns 标准化后的导航项
+ */
+function normalizeI18nFields(item) {
+    // 如果不是 bottomNavigation，直接返回原对象
+    if (item.section !== 'bottomNavigation') {
+        return item;
+    }
+    const result = { ...item };
+    constant_1.NAVIGATION_I18N_FIELDS.forEach((field) => {
+        const value = result[field];
+        if (typeof value === 'string') {
+            // 如果是字符串，转换为 { en: value } 格式
+            result[field] = { en: value };
+        }
+    });
+    return result;
+}
 /**
  * 将 blocklet 中的数据进行处理，获得当前应用的导航数据及组件数据
  * @param {object} blocklet blocklet 应用实例对象
@@ -525,7 +546,7 @@ function parseNavigation(blocklet = {}, options = {}) {
             blocklet.settings.navigations = [...blocklet.settings.navigations].filter((item) => !(item?.parent === '/team' && item.from === 'team-tmpl'));
         }
     }
-    const customNavigationList = cleanOldNavigationHistory(blocklet?.settings?.navigations || []);
+    const customNavigationList = normalizeNavigationList(cleanOldNavigationHistory(blocklet?.settings?.navigations || [])).map(normalizeI18nFields);
     const compactedNavigation = compactNavigation(beforeProcess(builtinNavigation));
     const patchedNavigation = patchBuiltinNavigation(compactedNavigation);
     const splitNavigation = splitNavigationBySection(patchedNavigation);
@@ -553,10 +574,10 @@ function parseNavigation(blocklet = {}, options = {}) {
             if (parent?.component) {
                 component = [parent.component, item.component].filter(Boolean).join('.');
             }
-            return { ...item, component };
+            return normalizeI18nFields({ ...item, component });
         },
     });
-    const rawNavigation = (0, unionWith_1.default)(normalizeNavigationList(customNavigationList), flatNavigation, (prev, next) => {
+    const rawNavigation = (0, unionWith_1.default)(customNavigationList, flatNavigation, (prev, next) => {
         const keys = ['id', 'section'];
         return (0, isEqual_1.default)((0, pick_1.default)(prev, keys), (0, pick_1.default)(next, keys));
     });

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.44-beta-20250524-065731-c62fd374",
+  "version": "1.16.44-beta-20250526-130644-5e05dc90",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -25,13 +25,13 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.44-beta-20250524-065731-c62fd374",
-    "@abtnode/docker-utils": "1.16.44-beta-20250524-065731-c62fd374",
+    "@abtnode/constant": "1.16.44-beta-20250526-130644-5e05dc90",
+    "@abtnode/docker-utils": "1.16.44-beta-20250526-130644-5e05dc90",
     "@arcblock/did": "1.20.11",
     "@arcblock/did-ext": "1.20.11",
     "@arcblock/did-util": "1.20.11",
     "@arcblock/jwt": "1.20.11",
-    "@blocklet/constant": "1.16.44-beta-20250524-065731-c62fd374",
+    "@blocklet/constant": "1.16.44-beta-20250526-130644-5e05dc90",
     "@ocap/asset": "1.20.11",
     "@ocap/mcrypto": "1.20.11",
     "@ocap/types": "1.20.11",
@@ -81,5 +81,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.6.3"
   },
-  "gitHead": "812c62f29aefa6760946a0c3e8c3e3181b6d2f3f"
+  "gitHead": "9309b29c0ae0ed55c5ec272aede5dcdd45ae88f2"
 }