@nocobase/client-v2 2.1.0-beta.45 → 2.1.0-beta.47

package/src/flow/internal/utils/__tests__/enumOptionsUtils.test.ts

@@ -24,27 +24,28 @@ function mockT(input: string) {
 }
 
 describe('enumOptions utils', () => {
-  it('enumToOptions: converts primitive enum and translates labels', () => {
+  it('enumToOptions: converts primitive enum and translates explicit template labels', () => {
     const uiEnum = ['{{t("Yes")}}', '{{t("No")}}'];
-    const options = enumToOptions(uiEnum as any, mockT)!;
-    expect(options).toHaveLength(2);
-    expect(options[0]).toEqual({ label: '是', value: '{{t("Yes")}}' });
-    expect(options[1]).toEqual({ label: '否', value: '{{t("No")}}' });
+    const options = enumToOptions(uiEnum as any, mockT);
+    expect(options).toEqual([
+      { label: '是', value: '{{t("Yes")}}' },
+      { label: '否', value: '{{t("No")}}' },
+    ]);
   });
 
-  it('enumToOptions: keeps object value and translates object label', () => {
+  it('enumToOptions: keeps object value and translates explicit template object label', () => {
     const uiEnum = [
       { label: '{{t("Yes")}}', value: true },
       { label: '{{t("No")}}', value: false },
     ];
-    const options = enumToOptions(uiEnum as any, mockT)!;
+    const options = enumToOptions(uiEnum as any, mockT);
     expect(options).toEqual([
       { label: '是', value: true },
       { label: '否', value: false },
     ]);
   });
 
-  it('translateOptions: maps given options labels through t()', () => {
+  it('translateOptions: maps only explicit template labels through t()', () => {
     const options = [
       { label: '{{t("Draft")}}', value: 'draft' },
       { label: 'No', value: false },
@@ -52,7 +53,7 @@ describe('enumOptions utils', () => {
     const out = translateOptions(options as any, mockT);
     expect(out).toEqual([
       { label: '草稿', value: 'draft' },
-      { label: '否', value: false },
+      { label: 'No', value: false },
     ]);
   });
 

package/src/flow/internal/utils/enumOptionsUtils.ts

@@ -33,13 +33,21 @@ function normalizeUiSchemaEnumToOptions(uiEnum: UiSchemaEnumItem[] = []): Option
   });
 }
 
-// Map option labels through t() (supports {{t('key')}} template and plain strings)
+export function isTranslationTemplate(value: unknown): value is string {
+  return typeof value === 'string' && /\{\{\s*t\s*\(/.test(value);
+}
+
+export function translateOptionLabel(label: any, t: (s: string) => string): any {
+  return isTranslationTemplate(label) ? t(label) : label;
+}
+
+// Map option labels through t() only when labels explicitly use {{t(...)}} templates.
 export function translateOptions(options: Option[] = [], t: (s: string) => string): Option[] {
   if (!Array.isArray(options)) return [] as Option[];
-  return options.map((opt) => (typeof opt?.label === 'string' ? { ...opt, label: t(opt.label) } : opt));
+  return options.map((opt) => ({ ...opt, label: translateOptionLabel(opt?.label, t) }));
 }
 
-// Build options from uiSchema.enum with translated labels
+// Build options from uiSchema.enum with explicitly translated labels
 export function enumToOptions(uiEnum: UiSchemaEnumItem[] | undefined, t: (s: string) => string): Option[] | undefined {
   if (!uiEnum || !Array.isArray(uiEnum) || uiEnum.length === 0) return undefined;
   const normalized = normalizeUiSchemaEnumToOptions(uiEnum);

package/src/flow/models/base/CollectionBlockModel.tsx

@@ -541,19 +541,23 @@ export class CollectionBlockModel<T = DefaultStructure> extends DataBlockModel<T
 
   protected defaultBlockTitle() {
     const blockLabel = this.translate(this.constructor['meta']?.label || this.constructor.name);
-    const dsName = this.dataSource?.displayName || this.dataSource?.key;
+    const params = this.getResourceSettingsInitParams();
+    const dataSource = this.dataSource;
+    const collection = this.collection;
+    const dsName = dataSource?.displayName || dataSource?.key || params?.dataSourceKey;
     const dsCount = this.context?.dataSourceManager?.getDataSources?.().length || 0;
-    const colTitle = this.collection?.title;
-    if (this.association) {
+    const colTitle = collection?.title || collection?.name || params?.collectionName || '';
+    const association = dataSource ? this.association : undefined;
+    if (association) {
       const resourceName = this.resource.getResourceName();
-      const sourceCollection = this.dataSource.getCollection(resourceName.split('.')[0]);
+      const sourceCollection = dataSource.getCollection(resourceName.split('.')[0]);
       return createDefaultCollectionBlockTitle({
         blockLabel,
         dsName,
         dsCount,
         collectionTitle: colTitle,
-        sourceCollectionTitle: sourceCollection.title,
-        associationTitle: this.association.title,
+        sourceCollectionTitle: sourceCollection?.title,
+        associationTitle: association.title,
       });
     }
     return createDefaultCollectionBlockTitle({ blockLabel, dsName, dsCount, collectionTitle: colTitle });

package/src/flow/models/base/__tests__/CollectionBlockModel.title.test.ts

@@ -7,8 +7,17 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { DataSource, FlowEngine } from '@nocobase/flow-engine';
+import { DataSource, FlowEngine, MultiRecordResource } from '@nocobase/flow-engine';
 import { createDefaultCollectionBlockTitle } from '../../../utils/blockUtils';
+import { CollectionBlockModel } from '../CollectionBlockModel';
+
+class MissingCollectionTitleBlockModel extends CollectionBlockModel {
+  static meta = { label: 'Table' };
+
+  createResource(ctx: any, _params: any) {
+    return ctx.createResource(MultiRecordResource);
+  }
+}
 
 function normalizeTitle(s: string) {
   return (s || '').replace(/\s+/g, ' ').trim();
@@ -92,4 +101,27 @@ describe('CollectionBlockModel default title rule', () => {
     expect(t).toContain('Table:');
     expect(t).toContain('Main > Users > Tags (Tags)');
   });
+
+  it('uses resource settings as title fallback when the configured data source is unavailable', () => {
+    const engine = new FlowEngine();
+    engine.registerModels({ MissingCollectionTitleBlockModel });
+    const model = engine.createModel<MissingCollectionTitleBlockModel>({
+      uid: 'missing-data-source-title-block',
+      use: 'MissingCollectionTitleBlockModel',
+      stepParams: {
+        resourceSettings: {
+          init: {
+            dataSourceKey: 'mysql',
+            collectionName: 'orders',
+          },
+        },
+      },
+    });
+
+    const title = normalizeTitle(model.title);
+
+    expect(title).toContain('Table:');
+    expect(title).toContain('orders');
+    expect(title).not.toContain('undefined');
+  });
 });

package/src/flow/models/fields/DisplayEnumFieldModel.tsx

@@ -13,6 +13,7 @@ import { Tag } from 'antd';
 import React from 'react';
 import { castArray } from 'lodash';
 import { ClickableFieldModel } from './ClickableFieldModel';
+import { translateOptionLabel } from '../../internal/utils/enumOptionsUtils';
 
 interface FieldNames {
   value: string;
@@ -70,7 +71,7 @@ export class DisplayEnumFieldModel extends ClickableFieldModel {
     }
     return currentOptions.map((option) => (
       <Tag key={option[fieldNames.value]} color={option[fieldNames.color]} icon={<Icon type={option['icon']} />}>
-        {this.translate(option[fieldNames.label])}
+        {translateOptionLabel(option[fieldNames.label], this.translate)}
       </Tag>
     ));
   }

package/src/flow/models/fields/DisplayJSONFieldModel.tsx

@@ -9,7 +9,8 @@
 
 import { css, cx } from '@emotion/css';
 import { DisplayItemModel } from '@nocobase/flow-engine';
-import React, { useRef, useState, useEffect } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
+import type { CSSProperties } from 'react';
 import { Tooltip } from 'antd';
 import { DisplayTitleFieldModel } from './DisplayTitleFieldModel';
 
@@ -21,8 +22,14 @@ const JSONClassName = css`
   border: none !important;
 `;
 
-const EllipsisJSON = ({ content, style, className }) => {
-  const ref = useRef(null);
+interface EllipsisJSONProps {
+  content: string;
+  style?: CSSProperties;
+  className?: string;
+}
+
+const EllipsisJSON = ({ content, style, className }: EllipsisJSONProps) => {
+  const ref = useRef<HTMLDivElement>(null);
   const [overflow, setOverflow] = useState(false);
 
   useEffect(() => {
@@ -75,7 +82,7 @@ const EllipsisJSON = ({ content, style, className }) => {
 };
 
 export class DisplayJSONFieldModel extends DisplayTitleFieldModel {
-  public renderComponent(value) {
+  public renderComponent(value: unknown) {
     const { space, style, className, overflowMode } = this.props;
     let content = '';
     if (value !== undefined && value !== null) {
@@ -96,6 +103,10 @@ export class DisplayJSONFieldModel extends DisplayTitleFieldModel {
       </pre>
     );
   }
+
+  public render() {
+    return this.renderComponent(this.props.value);
+  }
 }
 
 DisplayItemModel.bindModelToInterface('DisplayJSONFieldModel', ['json'], {

package/src/flow/models/fields/SelectFieldModel.tsx

@@ -12,7 +12,7 @@ import { Select, Tag, Tooltip } from 'antd';
 import React from 'react';
 import { FieldModel } from '../base/FieldModel';
 import { MobileSelect } from './mobile-components/MobileSelect';
-import { enumToOptions, getSelectedEnumLabels } from '../../internal/utils/enumOptionsUtils';
+import { enumToOptions, getSelectedEnumLabels, translateOptionLabel } from '../../internal/utils/enumOptionsUtils';
 
 const getOriginalEnumOptions = (model: SelectFieldModel) => {
   const fromEnum = enumToOptions(model.context.collectionField?.uiSchema?.enum, (text) => text) || [];
@@ -29,12 +29,12 @@ export class SelectFieldModel extends FieldModel {
     const options = this.props.options?.map((v) => {
       return {
         ...v,
-        label: this.translate(v.label),
+        label: translateOptionLabel(v.label, this.translate),
       };
     });
     const selectedLabels = getSelectedEnumLabels(this.props.value, fallbackOptions).map((item) => ({
       ...item,
-      label: this.translate(item.label),
+      label: translateOptionLabel(item.label, this.translate),
     }));
     const value = Array.isArray(this.props.value)
       ? selectedLabels

package/src/flow/models/fields/__tests__/DisplayJSONFieldModel.test.tsx

@@ -0,0 +1,36 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { FlowEngine } from '@nocobase/flow-engine';
+import { render } from '@testing-library/react';
+import { describe, expect, it } from 'vitest';
+import { DisplayJSONFieldModel } from '../DisplayJSONFieldModel';
+
+describe('DisplayJSONFieldModel', () => {
+  it('renders object field values as formatted JSON', () => {
+    const engine = new FlowEngine();
+    engine.registerModels({ DisplayJSONFieldModel });
+
+    const model = engine.createModel<DisplayJSONFieldModel>({
+      use: DisplayJSONFieldModel,
+      uid: 'display-json-object-value',
+      props: {
+        value: {
+          enabled: true,
+          name: 'NocoBase',
+        },
+      },
+    });
+
+    const { container } = render(model.render());
+
+    expect(container.textContent).toContain('"enabled": true');
+    expect(container.textContent).toContain('"name": "NocoBase"');
+  });
+});