@nocobase/client-v2 2.3.0-beta.15 → 2.3.0-beta.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client-v2",
-  "version": "2.3.0-beta.15",
+  "version": "2.3.0-beta.17",
   "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.15",
-    "@nocobase/flow-engine": "2.3.0-beta.15",
-    "@nocobase/sdk": "2.3.0-beta.15",
-    "@nocobase/shared": "2.3.0-beta.15",
-    "@nocobase/utils": "2.3.0-beta.15",
+    "@nocobase/evaluators": "2.3.0-beta.17",
+    "@nocobase/flow-engine": "2.3.0-beta.17",
+    "@nocobase/sdk": "2.3.0-beta.17",
+    "@nocobase/shared": "2.3.0-beta.17",
+    "@nocobase/utils": "2.3.0-beta.17",
     "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": "b27658d859f752a05c9956d416f8f03fd7f8e07f"
+  "gitHead": "f4203bf51579acea038f4e64f8d897bb79dfd314"
 }

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/InputFieldModel.tsx

@@ -58,7 +58,7 @@ export class InputFieldModel extends FieldModel {
       return <ScanInput {...this.props} />;
     }
     const { enableScan, disableManualInput, ...inputProps } = this.props;
-    return <IMESafeInput {...inputProps} />;
+    return <IMESafeInput {...inputProps} style={{ verticalAlign: 'top', ...inputProps.style }} />;
   }
 }
 

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

@@ -27,6 +27,22 @@ function createInputFieldModel(props?: Record<string, unknown>) {
 }
 
 describe('InputFieldModel', () => {
+  it('aligns plain inputs with the top of other filter form controls', () => {
+    const model = createInputFieldModel();
+
+    render(<>{model.render()}</>);
+
+    expect(screen.getByRole('textbox')).toHaveStyle({ verticalAlign: 'top' });
+  });
+
+  it('preserves explicitly configured input styles', () => {
+    const model = createInputFieldModel({ style: { verticalAlign: 'middle', width: 200 } });
+
+    render(<>{model.render()}</>);
+
+    expect(screen.getByRole('textbox')).toHaveStyle({ verticalAlign: 'middle', width: '200px' });
+  });
+
   it('renders the normal input when scan input is disabled', () => {
     const consoleError = vi.spyOn(console, 'error').mockImplementation(() => undefined);
     const model = createInputFieldModel({ disableManualInput: true, enableScan: false });

package/src/flow/models/fields/mobile-components/MobileLazySelect.tsx

@@ -263,6 +263,7 @@ export function MobileLazySelect(props: Readonly<LazySelectProps>) {
     <>
       <Select
         {...restProps}
+        disabled={disabled}
         dropdownStyle={buildDropdownStyle(dropdownStyle)}
         fieldNames={fieldNames}
         options={realOptions}

package/src/flow/models/fields/mobile-components/__tests__/MobileSelect.test.tsx

@@ -388,6 +388,26 @@ describe('MobileLazySelect', () => {
     resetMockState();
   });
 
+  it.each([false, true])('updates the disabled trigger state in %s multiple mode', (multiple) => {
+    const onDropdownVisibleChange = vi.fn();
+    const { rerender } = renderMobileLazySelect({ multiple, onDropdownVisibleChange });
+
+    rerender({ disabled: true });
+
+    expect(mockState.selectProps?.disabled).toBe(true);
+    act(() => {
+      mockState.selectProps?.onClick?.();
+    });
+    expect(screen.queryByTestId('popup')).not.toBeInTheDocument();
+    expect(onDropdownVisibleChange).not.toHaveBeenCalled();
+
+    rerender({ disabled: false });
+
+    expect(mockState.selectProps?.disabled).toBe(false);
+    openLazyPopup();
+    expect(onDropdownVisibleChange).toHaveBeenCalledWith(true);
+  });
+
   it('renders a translated cancel action after searching', () => {
     renderMobileLazySelect();