@nocobase/client-v2 2.3.0-beta.14 → 2.3.0-beta.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client-v2",
-  "version": "2.3.0-beta.14",
+  "version": "2.3.0-beta.16",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.mjs",
@@ -27,11 +27,11 @@
     "@formily/antd-v5": "1.2.3",
     "@formily/react": "^2.2.27",
     "@formily/shared": "^2.2.27",
-    "@nocobase/evaluators": "2.3.0-beta.14",
-    "@nocobase/flow-engine": "2.3.0-beta.14",
-    "@nocobase/sdk": "2.3.0-beta.14",
-    "@nocobase/shared": "2.3.0-beta.14",
-    "@nocobase/utils": "2.3.0-beta.14",
+    "@nocobase/evaluators": "2.3.0-beta.16",
+    "@nocobase/flow-engine": "2.3.0-beta.16",
+    "@nocobase/sdk": "2.3.0-beta.16",
+    "@nocobase/shared": "2.3.0-beta.16",
+    "@nocobase/utils": "2.3.0-beta.16",
     "ahooks": "^3.7.2",
     "antd": "5.24.2",
     "antd-style": "3.7.1",
@@ -49,5 +49,5 @@
     "react-router-dom": "^6.30.1",
     "zxing-wasm": "^3.1.3"
   },
-  "gitHead": "2e19a2924cd2452eaacb99c5ca3419e656ed89bc"
+  "gitHead": "b5fbabe2b7466c04f89621345d2270201a9f0fcf"
 }

package/src/flow/models/actions/LinkActionModel.tsx

@@ -46,21 +46,23 @@ LinkActionModel.registerFlow({
 
         if (link) {
           const isExternalLink = isURL(link);
+          // embed 是页面容器，不应销毁；仅弹窗视图在站内同窗口跳转后销毁。
+          const shouldDestroyView =
+            !!ctx.view &&
+            shouldDestroyViewAfterLinkNavigation({
+              openInNewWindow,
+              isExternalLink,
+              viewType: ctx.view.type,
+            });
           handleLinkNavigation({
             link,
             openInNewWindow,
             router: ctx.router,
             isExternalLink,
+            // 弹窗会被销毁，用 replace 丢弃弹窗路由；页面（含移动端 embed）跳转需保留历史，以便逐级返回。
+            replace: shouldDestroyView,
           });
-          // embed 是页面容器，不应销毁；仅弹窗视图在站内同窗口跳转后销毁。
-          if (
-            ctx.view &&
-            shouldDestroyViewAfterLinkNavigation({
-              openInNewWindow,
-              isExternalLink,
-              viewType: ctx.view.type,
-            })
-          ) {
+          if (shouldDestroyView) {
             ctx.view.destroy();
           }
         } else {

package/src/flow/models/actions/LinkActionUtils.ts

@@ -25,10 +25,11 @@ export function handleLinkNavigation(options: {
   openInNewWindow?: boolean;
   router: { navigate: (to: string, options?: { replace?: boolean }) => void };
   isExternalLink: boolean;
+  replace?: boolean;
   setLocationHref?: (url: string) => void;
   openWindow?: (url?: string, target?: string) => Window | null;
 }) {
-  const { link, openInNewWindow, router, isExternalLink } = options;
+  const { link, openInNewWindow, router, isExternalLink, replace = false } = options;
   const setLocationHref = options.setLocationHref ?? ((url: string) => (window.location.href = url));
   const openWindow = options.openWindow ?? ((url?: string, target?: string) => window.open(url, target));
 
@@ -44,7 +45,8 @@ export function handleLinkNavigation(options: {
 
   // 该辅助方法仅负责导航，是否关闭弹窗由调用方按场景决定；
   // 在弹窗上下文中，错误的关闭时机会把新路由回滚为原页面。
-  router.navigate(link, { replace: true });
+  // 默认 push 新的历史记录，保证浏览器/手机右滑返回能逐级回退；仅在需要丢弃当前弹窗路由时由调用方传 replace。
+  router.navigate(link, { replace });
 }
 
 /**

package/src/flow/models/actions/__tests__/LinkActionModel.test.ts

@@ -22,6 +22,20 @@ describe('handleLinkNavigation', () => {
       isExternalLink: false,
     });
 
+    expect(navigate).toHaveBeenCalledWith('/target-page', { replace: false });
+  });
+
+  it('should replace history entry when caller requests replace', () => {
+    const navigate = vi.fn();
+
+    handleLinkNavigation({
+      link: '/target-page',
+      openInNewWindow: false,
+      router: { navigate },
+      isExternalLink: false,
+      replace: true,
+    });
+
     expect(navigate).toHaveBeenCalledWith('/target-page', { replace: true });
   });
 

package/src/flow/models/fields/AssociationFieldModel/SubTableFieldModel/SubTableColumnModel.tsx

@@ -94,6 +94,10 @@ export function FieldWithoutPermissionPlaceholder({ targetModel }) {
   );
 }
 
+const LARGE_FIELD_TEXT_INTERFACES = ['textarea', 'richText', 'json', 'markdown', 'vditor'];
+
+const LARGE_FIELD_INTERACTIVE_SELECTOR = 'a, button, input, textarea, select, [role="button"], [role="link"]';
+
 const LargeFieldEdit = observer(({ model, params: { fieldPath, index }, defaultValue, disabled, ...others }: any) => {
   const flowEngine = useFlowEngine();
   const ref = useRef(null);
@@ -116,17 +120,32 @@ const LargeFieldEdit = observer(({ model, params: { fieldPath, index }, defaultV
 
     return <FieldModelRenderer model={model} {...rest} onChange={handleChange} />;
   };
-  const handleClick = async (e) => {
+  const handleClick = async (e: React.MouseEvent<HTMLDivElement>) => {
     if (disabled) {
       return;
     }
+    const target = e.target as HTMLElement;
+    // 预览弹窗等通过 portal 渲染的内容，其点击事件也会沿 React 树冒泡到这里，不应触发编辑
+    if (!ref.current?.contains(target)) {
+      return;
+    }
+    // 只读组件自身可交互的部分（如附件缩略图点击预览）交给只读组件处理，不打开编辑弹窗
+    if (target.closest(LARGE_FIELD_INTERACTIVE_SELECTOR)) {
+      return;
+    }
     e.preventDefault();
     e.stopPropagation();
+    // 默认挂在 #nocobase-app-container 上，它带 transform 会形成独立层叠上下文；当子表格位于挂在 body 上的弹窗（如审批处理弹窗）里时，
+    // 编辑弹层会被弹窗遮住无法操作，此时改挂到 body
+    const appContainer = document.querySelector('#nocobase-app-container');
+    const getLargeFieldPopupContainer = () =>
+      appContainer && appContainer.contains(ref.current) ? (appContainer as HTMLElement) : document.body;
     try {
       await flowEngine.context.viewer.open({
         type: 'popover',
-        target: e.target,
+        target,
         placement: 'rightTop',
+        getPopupContainer: getLargeFieldPopupContainer,
         styles: {
           body: {
             minWidth: 400,
@@ -141,9 +160,10 @@ const LargeFieldEdit = observer(({ model, params: { fieldPath, index }, defaultV
     }
   };
   const collectionField = model.context.collectionField;
+  const isTextLike = LARGE_FIELD_TEXT_INTERFACES.includes(collectionField.interface);
 
   const content = useMemo(() => {
-    if (['textarea', 'richText', 'json', 'markdown', 'vditor'].includes(collectionField.interface)) {
+    if (isTextLike) {
       const inputValue =
         collectionField.interface === 'json' && defaultValue
           ? JSON.stringify(defaultValue, null, 2)
@@ -151,13 +171,15 @@ const LargeFieldEdit = observer(({ model, params: { fieldPath, index }, defaultV
 
       return <Input value={inputValue} disabled={disabled} style={{ width: '100%' }} />;
     } else {
+      // 只读组件保持可交互：禁用时仍可点击附件缩略图预览，与 client v1 一致
       return (
         <Space>
-          <FlowModelRenderer model={fieldModel} uid={fieldModel?.uid} /> <EditOutlined className="edit-icon" />
+          <FlowModelRenderer model={fieldModel} uid={fieldModel?.uid} />
+          {disabled ? null : <EditOutlined className="edit-icon" />}
         </Space>
       );
     }
-  }, [collectionField.interface, defaultValue, disabled, fieldModel]);
+  }, [collectionField.interface, defaultValue, disabled, fieldModel, isTextLike]);
   return (
     <div
       ref={ref}
@@ -170,11 +192,12 @@ const LargeFieldEdit = observer(({ model, params: { fieldPath, index }, defaultV
         width: '100%',
         maxHeight: 300,
         overflowY: 'auto',
-        cursor: 'pointer',
+        cursor: disabled ? 'default' : 'pointer',
       }}
     >
       <span
-        style={{ pointerEvents: 'none', display: 'block', width: '100%' }} // 不拦截点击
+        // 文本类大字段只是占位展示，不拦截点击，由外层统一打开编辑弹窗
+        style={{ pointerEvents: isTextLike ? 'none' : undefined, display: 'block', width: '100%' }}
       >
         {content}
       </span>

package/src/flow/models/fields/AssociationFieldModel/SubTableFieldModel/__tests__/SubTableColumnModel.largeField.test.tsx

@@ -0,0 +1,178 @@
+/**
+ * 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 React from 'react';
+import { createPortal } from 'react-dom';
+import { describe, expect, it, vi } from 'vitest';
+import { render, fireEvent } from '@nocobase/test/client';
+import { FlowEngine, FlowModel, FlowEngineProvider, largeField } from '@nocobase/flow-engine';
+import { SubTableColumnModel } from '../SubTableColumnModel';
+
+const previewClicked = vi.fn();
+
+class FakePreviewModel extends FlowModel {
+  render() {
+    return (
+      <span>
+        <div role="button" tabIndex={0} data-testid="thumb" onClick={previewClicked}>
+          file.png
+        </div>
+        {createPortal(<div data-testid="portal">preview modal</div>, document.body)}
+      </span>
+    );
+  }
+}
+
+@largeField()
+class FakeUploadModel extends FlowModel {
+  render() {
+    return <div data-testid="uploader">uploader</div>;
+  }
+}
+
+type CellRenderer = React.FC<Record<string, unknown>>;
+
+function setup({
+  disabled,
+  fieldInterface = 'attachment',
+  container,
+}: {
+  disabled: boolean;
+  fieldInterface?: string;
+  container?: HTMLElement;
+}) {
+  previewClicked.mockClear();
+  const engine = new FlowEngine();
+  engine.registerModels({ FakePreviewModel, FakeUploadModel });
+  const open = vi.fn();
+  engine.context.defineProperty('viewer', { value: { open } });
+
+  const field = engine.createModel<FakeUploadModel>({ use: 'FakeUploadModel', uid: 'f1' });
+  field.context.defineProperty('fieldPath', { value: 'items.files' });
+  field.context.defineProperty('collectionField', { value: { interface: fieldInterface } });
+  field.setSubModel('readPrettyField', { use: 'FakePreviewModel', uid: 'p1' });
+
+  const column = Object.create(SubTableColumnModel.prototype);
+  const ctx: Record<string, unknown> = {};
+  ctx.defineProperty = (key: string, options: PropertyDescriptor) =>
+    Object.defineProperty(ctx, key, { ...options, configurable: true });
+  Object.defineProperties(column, {
+    parent: {
+      value: {
+        context: { fieldIndex: [], collectionField: { name: 'items' } },
+        collection: { filterTargetKey: 'id' },
+        props: { value: [{ id: 1 }] },
+      },
+    },
+    subModels: { value: { field } },
+    props: { value: { disabled: false } },
+    context: { value: { fieldIndex: [], t: (s: string) => s } },
+    hasFormulaColumn: { value: false },
+    hasFormValueDrivenDataScopeColumn: { value: false },
+  });
+  column.mapSubModels = (_key: string, fn: (m: FlowModel) => React.ReactNode) => [fn(field)];
+  column.createFork = () => ({ context: ctx, uid: 'rowfork', flowEngine: undefined });
+  column.createRowItemContextPropertyOptions = () => ({});
+
+  const Cell: CellRenderer = SubTableColumnModel.prototype.renderItem.call(column);
+  const utils = render(
+    <FlowEngineProvider engine={engine}>
+      <Cell value={[{ id: 1, url: '/file.png' }]} id={1} rowIdx={0} record={{ id: 1 }} disabled={disabled} />
+    </FlowEngineProvider>,
+    container ? { container } : undefined,
+  );
+  return { ...utils, open };
+}
+
+function getCellTrigger(element: HTMLElement) {
+  return element.closest('div[style*="cursor"]') as HTMLElement;
+}
+
+describe('SubTableColumnModel large field cell', () => {
+  it('previews the attachment instead of opening the editor when the thumbnail is clicked', async () => {
+    const { findByTestId, open } = setup({ disabled: false });
+    const thumb = await findByTestId('thumb');
+
+    expect(thumb.closest('span[style*="pointer-events: none"]')).toBeNull();
+    fireEvent.click(thumb);
+
+    expect(previewClicked).toHaveBeenCalledTimes(1);
+    expect(open).not.toHaveBeenCalled();
+  });
+
+  it('opens the editor when the editable cell itself is clicked', async () => {
+    const { findByTestId, open, container } = setup({ disabled: false });
+    const thumb = await findByTestId('thumb');
+
+    expect(container.querySelector('.edit-icon')).not.toBeNull();
+    fireEvent.click(getCellTrigger(thumb));
+
+    expect(open).toHaveBeenCalledTimes(1);
+  });
+
+  it('ignores clicks bubbling from portal content such as the preview modal', async () => {
+    const { findByTestId, open } = setup({ disabled: false });
+    fireEvent.click(await findByTestId('portal'));
+
+    expect(open).not.toHaveBeenCalled();
+  });
+
+  it('still allows previewing but never editing when the cell is disabled', async () => {
+    const { findByTestId, open, container } = setup({ disabled: true });
+    const thumb = await findByTestId('thumb');
+    const trigger = getCellTrigger(thumb);
+
+    expect(trigger.style.cursor).toBe('default');
+    expect(container.querySelector('.edit-icon')).toBeNull();
+
+    fireEvent.click(thumb);
+    fireEvent.click(trigger);
+
+    expect(previewClicked).toHaveBeenCalledTimes(1);
+    expect(open).not.toHaveBeenCalled();
+  });
+
+  it('mounts the editor popover on body when the cell is rendered outside the app container (e.g. in a body-level modal)', async () => {
+    const appContainer = document.createElement('div');
+    appContainer.id = 'nocobase-app-container';
+    document.body.appendChild(appContainer);
+    try {
+      const { findByTestId, open } = setup({ disabled: false });
+      fireEvent.click(getCellTrigger(await findByTestId('thumb')));
+
+      expect(open.mock.calls[0][0].getPopupContainer()).toBe(document.body);
+    } finally {
+      appContainer.remove();
+    }
+  });
+
+  it('keeps the editor popover in the app container when the cell is rendered inside it', async () => {
+    const appContainer = document.createElement('div');
+    appContainer.id = 'nocobase-app-container';
+    document.body.appendChild(appContainer);
+    try {
+      const { findByTestId, open } = setup({ disabled: false, container: appContainer });
+      fireEvent.click(getCellTrigger(await findByTestId('thumb')));
+
+      expect(open.mock.calls[0][0].getPopupContainer()).toBe(appContainer);
+    } finally {
+      appContainer.remove();
+    }
+  });
+
+  it('keeps text-like large fields as a click-through placeholder that opens the editor', async () => {
+    const { container, open } = setup({ disabled: false, fieldInterface: 'textarea' });
+    const input = container.querySelector('input') as HTMLInputElement;
+
+    expect(input.closest('span[style*="pointer-events: none"]')).not.toBeNull();
+    fireEvent.click(getCellTrigger(input));
+
+    expect(open).toHaveBeenCalledTimes(1);
+  });
+});