@nocobase/client-v2 2.1.0-beta.32 → 2.1.0-beta.33

package/src/flow/models/fields/__tests__/ClickableFieldModel.test.ts

@@ -8,9 +8,11 @@
  */
 
 import { describe, expect, it, vi } from 'vitest';
-import { FlowEngine } from '@nocobase/flow-engine';
-import { render, screen } from '@testing-library/react';
+import { FlowEngine, FlowModel } from '@nocobase/flow-engine';
+import React from 'react';
+import { fireEvent, render, screen } from '@testing-library/react';
 import { ClickableFieldModel } from '../ClickableFieldModel';
+import { DisplayTitleFieldModel } from '../DisplayTitleFieldModel';
 import { DisplayTextFieldModel } from '../DisplayTextFieldModel';
 
 function createRolesFieldModel(sourceRecord: Record<string, any>) {
@@ -87,6 +89,133 @@ describe('ClickableFieldModel', () => {
     );
   });
 
+  it('uses the parent association field when the display model is bound to the title field', () => {
+    const engine = new FlowEngine();
+    engine.registerModels({ ClickableFieldModel });
+
+    const usersCollection = {
+      name: 'users',
+      filterTargetKey: 'id',
+    };
+    const rolesCollection = {
+      name: 'roles',
+      filterTargetKey: 'name',
+    };
+    const rolesField = {
+      name: 'roles',
+      target: 'roles',
+      targetKey: 'name',
+      type: 'belongsToMany',
+      interface: 'm2m',
+      collection: usersCollection,
+      targetCollection: rolesCollection,
+      isAssociationField: () => true,
+    };
+    const titleField = {
+      name: 'title',
+      collection: rolesCollection,
+      isAssociationField: () => false,
+    };
+
+    const parent = engine.createModel<FlowModel>({
+      use: FlowModel,
+      uid: 'roles-column',
+    });
+    parent.context.defineProperty('collectionField', { value: rolesField });
+
+    const model = engine.createModel<ClickableFieldModel>({
+      use: ClickableFieldModel,
+      uid: 'roles-title-display',
+    });
+    model.setParent(parent);
+    model.context.defineProperty('collectionField', { value: titleField });
+    model.context.defineProperty('blockModel', { value: { collection: usersCollection } });
+    model.context.defineProperty('record', { value: { id: 1 } });
+    const dispatchEvent = vi.spyOn(model, 'dispatchEvent').mockResolvedValue([]);
+    const event = { type: 'click' };
+
+    model.onClick(event, { name: 'admin', title: 'Admin' });
+
+    expect(dispatchEvent).toHaveBeenCalledWith(
+      'click',
+      {
+        event,
+        filterByTk: 'admin',
+        collectionName: 'users',
+        associationName: 'users.roles',
+        sourceId: 1,
+      },
+      { debounce: true },
+    );
+  });
+
+  it('renders title display values as links when click-to-open is enabled', () => {
+    const engine = new FlowEngine();
+    engine.registerModels({ DisplayTitleFieldModel });
+
+    const usersCollection = {
+      name: 'users',
+      filterTargetKey: 'id',
+    };
+    const rolesCollection = {
+      name: 'roles',
+      filterTargetKey: 'name',
+    };
+    const rolesField = {
+      name: 'roles',
+      target: 'roles',
+      targetKey: 'name',
+      type: 'belongsToMany',
+      interface: 'm2m',
+      collection: usersCollection,
+      targetCollection: rolesCollection,
+      isAssociationField: () => true,
+    };
+    const titleField = {
+      name: 'title',
+      collection: rolesCollection,
+      isAssociationField: () => false,
+    };
+
+    const parent = engine.createModel<FlowModel>({
+      use: FlowModel,
+      uid: 'roles-title-column',
+    });
+    parent.context.defineProperty('collectionField', { value: rolesField });
+
+    const model = engine.createModel<DisplayTitleFieldModel>({
+      use: DisplayTitleFieldModel,
+      uid: 'roles-title-display-link',
+      props: {
+        clickToOpen: true,
+        titleField: 'name',
+        value: { name: 'admin', title: 'Admin' },
+      },
+    });
+    model.setParent(parent);
+    model.context.defineProperty('collectionField', { value: titleField });
+    model.context.defineProperty('blockModel', { value: { collection: usersCollection } });
+    model.context.defineProperty('record', { value: { id: 1 } });
+    const dispatchEvent = vi.spyOn(model, 'dispatchEvent').mockResolvedValue([]);
+
+    render(React.createElement(React.Fragment, null, model.render()));
+    const link = screen.getByText('admin').closest('a');
+    expect(link).toBeTruthy();
+
+    fireEvent.click(link);
+
+    expect(dispatchEvent).toHaveBeenCalledWith(
+      'click',
+      expect.objectContaining({
+        filterByTk: 'admin',
+        collectionName: 'users',
+        associationName: 'users.roles',
+        sourceId: 1,
+      }),
+      { debounce: true },
+    );
+  });
+
   it('renders object title field values by configured target title field', () => {
     const engine = new FlowEngine();
     engine.registerModels({ DisplayTextFieldModel });
@@ -107,4 +236,53 @@ describe('ClickableFieldModel', () => {
     expect(screen.getByText('S-001')).toBeInTheDocument();
     expect(screen.queryByText('Sales')).not.toBeInTheDocument();
   });
+
+  it('refreshes the parent column when title display click-to-open changes', async () => {
+    const engine = new FlowEngine();
+    engine.registerModels({ DisplayTitleFieldModel });
+
+    const rolesField = {
+      name: 'roles',
+      target: 'roles',
+      collection: { name: 'users' },
+      targetCollection: { name: 'roles' },
+      isAssociationField: () => true,
+      getComponentProps: () => ({ titleField: 'name' }),
+    };
+    const titleField = {
+      name: 'title',
+      collection: { name: 'roles' },
+      isAssociationField: () => false,
+    };
+
+    const parent = engine.createModel<FlowModel>({
+      use: FlowModel,
+      uid: 'roles-title-column-refresh',
+    });
+    parent.context.defineProperty('collectionField', { value: rolesField });
+    const parentSetProps = vi.spyOn(parent, 'setProps');
+    const parentRerender = vi.spyOn(parent, 'rerender').mockResolvedValue(undefined);
+
+    const model = engine.createModel<DisplayTitleFieldModel>({
+      use: DisplayTitleFieldModel,
+      uid: 'roles-title-display-refresh',
+    });
+    model.setParent(parent);
+    model.context.defineProperty('collectionField', { value: titleField });
+    const modelRerender = vi.spyOn(model, 'rerender').mockResolvedValue(undefined);
+
+    const clickToOpenStep = model.getFlow('displayFieldSettings').steps.clickToOpen;
+
+    await clickToOpenStep.afterParamsSave(model.context as any, { clickToOpen: true }, { clickToOpen: false });
+
+    expect(model.props).toMatchObject({
+      clickToOpen: true,
+      titleField: 'name',
+    });
+    expect(modelRerender).toHaveBeenCalled();
+    expect(parentSetProps).toHaveBeenCalledWith({
+      __displayFieldRefreshKey: expect.any(String),
+    });
+    expect(parentRerender).toHaveBeenCalled();
+  });
 });

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

@@ -0,0 +1,39 @@
+/**
+ * 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 { describe, expect, it } from 'vitest';
+import { FlowEngine } from '@nocobase/flow-engine';
+import { render, screen } from '@testing-library/react';
+import { DisplayEnumFieldModel } from '../DisplayEnumFieldModel';
+
+describe('DisplayEnumFieldModel', () => {
+  it('renders labels for multiple values (multipleSelect/checkboxGroup)', () => {
+    const engine = new FlowEngine();
+    engine.registerModels({ DisplayEnumFieldModel });
+
+    const model = engine.createModel<DisplayEnumFieldModel>({
+      use: DisplayEnumFieldModel,
+      uid: 'display-enum-multiple-values',
+    });
+
+    model.setProps({
+      value: ['a', 'b'],
+      options: [
+        { label: 'Option A', value: 'a' },
+        { label: 'Option B', value: 'b' },
+      ],
+    });
+
+    render(model.render());
+
+    expect(screen.getByText('Option A')).toBeInTheDocument();
+    expect(screen.getByText('Option B')).toBeInTheDocument();
+    expect(screen.queryByText('a, b')).not.toBeInTheDocument();
+  });
+});

package/src/utils/globalDeps.ts

@@ -9,16 +9,20 @@
 
 import * as antdCssinjs from '@ant-design/cssinjs';
 import * as antdIcons from '@ant-design/icons';
+import * as antdStyle from 'antd-style';
 import * as emotionCss from '@emotion/css';
+import * as formilyAntdV5 from '@formily/antd-v5';
 import * as formilyCore from '@formily/core';
 import * as formilyReact from '@formily/react';
 import * as formilyReactive from '@formily/reactive';
 import * as formilyShared from '@formily/shared';
+import * as nocobaseEvaluators from '@nocobase/evaluators/client';
 import * as nocobaseClientUtils from '@nocobase/utils/client';
 import { dayjs } from '@nocobase/utils/client';
 import * as nocobaseFlowEngine from '@nocobase/flow-engine';
 import * as ahooks from 'ahooks';
 import * as antd from 'antd';
+import * as FileSaver from 'file-saver';
 import axios from 'axios';
 import * as i18next from 'i18next';
 import lodash from 'lodash';
@@ -49,12 +53,14 @@ export function defineGlobalDeps(requirejs: RequireJS) {
   requirejs.define('antd', () => antd);
   requirejs.define('@ant-design/icons', () => antdIcons);
   requirejs.define('@ant-design/cssinjs', () => antdCssinjs);
+  requirejs.define('antd-style', () => antdStyle);
 
   // i18next
   requirejs.define('i18next', () => i18next);
   requirejs.define('react-i18next', () => reactI18next);
 
   // formily
+  requirejs.define('@formily/antd-v5', () => formilyAntdV5);
   requirejs.define('@formily/core', () => formilyCore);
   requirejs.define('@formily/react', () => formilyReact);
   requirejs.define('@formily/reactive', () => formilyReactive);
@@ -66,6 +72,8 @@ export function defineGlobalDeps(requirejs: RequireJS) {
   requirejs.define('@nocobase/client-v2', () => nocobaseClientV2);
   requirejs.define('@nocobase/client-v2/client-v2', () => nocobaseClientV2);
   requirejs.define('@nocobase/flow-engine', () => nocobaseFlowEngine);
+  requirejs.define('@nocobase/evaluators', () => nocobaseEvaluators);
+  requirejs.define('@nocobase/evaluators/client', () => nocobaseEvaluators);
 
   // utils
   requirejs.define('ahooks', () => ahooks);
@@ -73,4 +81,5 @@ export function defineGlobalDeps(requirejs: RequireJS) {
   requirejs.define('dayjs', () => dayjs);
   requirejs.define('lodash', () => lodash);
   requirejs.define('@emotion/css', () => emotionCss);
+  requirejs.define('file-saver', () => FileSaver);
 }