@nocobase/flow-engine 2.1.0-beta.46 → 2.1.0-beta.47

package/lib/data-source/index.js

@@ -306,6 +306,14 @@ function getCollectionFieldInterface(interfaceName, ...dataSourceManagers) {
   return void 0;
 }
 __name(getCollectionFieldInterface, "getCollectionFieldInterface");
+function shouldTranslateOptionLabel(label) {
+  return typeof label === "string" && /\{\{\s*t\s*\(/.test(label);
+}
+__name(shouldTranslateOptionLabel, "shouldTranslateOptionLabel");
+function translateOptionLabel(flowEngine, label, options) {
+  return shouldTranslateOptionLabel(label) ? flowEngine.translate(label, options) : label;
+}
+__name(translateOptionLabel, "translateOptionLabel");
 const _DataSource = class _DataSource {
   dataSourceManager;
   collectionManager;
@@ -948,7 +956,7 @@ const _CollectionField = class _CollectionField {
         }
         return {
           ...v,
-          label: v.label ? this.flowEngine.translate(v.label, { ns: "lm-collections" }) : v.label,
+          label: translateOptionLabel(this.flowEngine, v.label, { ns: "lm-collections" }),
           value: Number(v.value)
         };
       });
@@ -956,7 +964,7 @@ const _CollectionField = class _CollectionField {
     return options.map((v) => {
       return {
         ...v,
-        label: this.flowEngine.translate(v.label, { ns: "lm-collections" })
+        label: translateOptionLabel(this.flowEngine, v.label, { ns: "lm-collections" })
       };
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/flow-engine",
-  "version": "2.1.0-beta.46",
+  "version": "2.1.0-beta.47",
   "private": false,
   "description": "A standalone flow engine for NocoBase, managing workflows, models, and actions.",
   "main": "lib/index.js",
@@ -8,8 +8,8 @@
   "dependencies": {
     "@formily/antd-v5": "1.x",
     "@formily/reactive": "2.x",
-    "@nocobase/sdk": "2.1.0-beta.46",
-    "@nocobase/shared": "2.1.0-beta.46",
+    "@nocobase/sdk": "2.1.0-beta.47",
+    "@nocobase/shared": "2.1.0-beta.47",
     "ahooks": "^3.7.2",
     "axios": "^1.7.0",
     "dayjs": "^1.11.9",
@@ -37,5 +37,5 @@
   ],
   "author": "NocoBase Team",
   "license": "Apache-2.0",
-  "gitHead": "91fd3ab238a5ff58735bbfca04a8cb05d233b0af"
+  "gitHead": "bf8fc3790e3494c901b4d22861c5471a0d27c464"
 }

package/src/data-source/__tests__/index.test.ts

@@ -50,7 +50,7 @@ describe('DataSource & Collection APIs', () => {
         { name: 'body', type: 'string', interface: 'text' },
       ],
     });
-    const bodyField = ds.getCollection('posts')!.getField('body');
+    const bodyField = ds.getCollection('posts')?.getField('body');
     expect(bodyField?.name).toBe('body');
 
     // remove collection
@@ -109,7 +109,7 @@ describe('DataSource & Collection APIs', () => {
       ],
     });
 
-    const rules = ds.getCollection('posts')!.getField('title')!.getComponentProps().rules;
+    const rules = ds.getCollection('posts')?.getField('title')?.getComponentProps().rules || [];
 
     await expect(rules[0].validator({}, '123')).rejects.toBe('单行文本 长度必须为 18 个字符');
   });

package/src/data-source/index.ts

@@ -336,6 +336,14 @@ export function getCollectionFieldInterface(
   return undefined;
 }
 
+function shouldTranslateOptionLabel(label: unknown): label is string {
+  return typeof label === 'string' && /\{\{\s*t\s*\(/.test(label);
+}
+
+function translateOptionLabel(flowEngine: FlowEngine, label: unknown, options?: Record<string, any>) {
+  return shouldTranslateOptionLabel(label) ? flowEngine.translate(label, options) : label;
+}
+
 export class DataSource {
   dataSourceManager: DataSourceManager;
   collectionManager: CollectionManager;
@@ -1086,7 +1094,7 @@ export class CollectionField {
         }
         return {
           ...v,
-          label: v.label ? this.flowEngine.translate(v.label, { ns: 'lm-collections' }) : v.label,
+          label: translateOptionLabel(this.flowEngine, v.label, { ns: 'lm-collections' }),
           value: Number(v.value),
         };
       });
@@ -1094,7 +1102,7 @@ export class CollectionField {
     return options.map((v) => {
       return {
         ...v,
-        label: this.flowEngine.translate(v.label, { ns: 'lm-collections' }),
+        label: translateOptionLabel(this.flowEngine, v.label, { ns: 'lm-collections' }),
       };
     });
   }