@nocobase/client-v2 2.3.0-alpha.1 → 2.3.0-beta.3

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

@@ -13,6 +13,22 @@ import JSON5 from 'json5';
 import React, { useState, useEffect, useRef } from 'react';
 import { FieldModel } from '../base/FieldModel';
 
+const jsonValidationRuleMarker = '__jsonSyntaxValidation';
+
+interface JsonValidationRule {
+  [jsonValidationRuleMarker]: true;
+  type: 'any';
+  validator?: (_rule: unknown, value: unknown) => Promise<void>;
+}
+
+function isRuleObject(rule: unknown): rule is Record<string, unknown> {
+  return typeof rule === 'object' && rule !== null;
+}
+
+function isJsonValidationRule(rule: unknown): rule is JsonValidationRule {
+  return isRuleObject(rule) && rule[jsonValidationRuleMarker] === true;
+}
+
 const jsonCss = css`
   font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
   font-size: 14px;
@@ -40,7 +56,7 @@ export const JsonInput = observer((props: any) => {
     }
 
     internalChange.current = false;
-  }, [value]);
+  }, [_JSON, space, value]);
 
   // 用户输入时
   const handleChange = (ev) => {
@@ -91,23 +107,30 @@ JsonFieldModel.registerFlow({
   key: 'jsonInitSetting',
   steps: {
     initValidation: {
-      handler(ctx, params) {
-        const rules = ctx.model.parent.props.rules || [];
+      handler(ctx) {
+        const currentRules = Array.isArray(ctx.model.parent.props.rules) ? ctx.model.parent.props.rules : [];
+        const rules = currentRules.filter((rule: unknown) => {
+          return (!isRuleObject(rule) || Object.keys(rule).length > 0) && !isJsonValidationRule(rule);
+        });
         // 添加 JSON 语法校验规则
         rules.push({
-          validator: (_, value) => {
+          // validator 函数序列化后会被丢弃；保留 any 类型可避免持久化规则退化为默认字符串校验。
+          type: 'any',
+          [jsonValidationRuleMarker]: true,
+          validator: (_rule: unknown, value: unknown) => {
             // 允许空
             if (value === null || value === undefined || value === '') return Promise.resolve();
             // 如果已经是对象/数组，直接通过
             if (typeof value === 'object') return Promise.resolve();
             try {
-              JSON.parse(value);
+              JSON.parse(String(value));
               return Promise.resolve();
-            } catch (err) {
-              return Promise.reject(ctx.t('Invalid JSON format') + ': ' + err.message);
+            } catch (error) {
+              const message = error instanceof Error ? error.message : String(error);
+              return Promise.reject(ctx.t('Invalid JSON format') + ': ' + message);
             }
           },
-        });
+        } satisfies JsonValidationRule);
         ctx.model.parent.setProps({
           rules,
         });

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

@@ -20,7 +20,7 @@ function toSafeNumber(value) {
     return value;
   }
   if (value > Number.MAX_SAFE_INTEGER || value < Number.MIN_SAFE_INTEGER) {
-    return new BigNumber(value).toString();
+    return new BigNumber(value).toFixed();
   } else {
     return Number(value);
   }

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

@@ -0,0 +1,33 @@
+/**
+ * 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 { formatNumber } from '../DisplayNumberFieldModel';
+
+describe('formatNumber', () => {
+  it('formats a 30-digit decimal without scientific notation or precision loss', () => {
+    expect(
+      formatNumber({
+        value: '123456789012345678901234567890',
+        formatStyle: 'normal',
+        step: '1',
+      }),
+    ).toBe('123,456,789,012,345,678,901,234,567,890');
+  });
+
+  it('formats the 22-digit value from the reported v2 scenario', () => {
+    expect(
+      formatNumber({
+        value: '1234567890123458152112',
+        formatStyle: 'normal',
+        step: '1',
+      }),
+    ).toBe('1,234,567,890,123,458,152,112');
+  });
+});

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

@@ -0,0 +1,82 @@
+/**
+ * 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, FlowModel } from '@nocobase/flow-engine';
+import { describe, expect, it } from 'vitest';
+import { JsonFieldModel } from '../JsonFieldModel';
+
+interface ValidationRule {
+  required?: boolean;
+  type?: string;
+  validator?: (_rule: unknown, value: unknown) => Promise<void>;
+}
+
+function createModels(rules: ValidationRule[]) {
+  const engine = new FlowEngine();
+  engine.registerModels({ JsonFieldModel });
+  const parent = engine.createModel<FlowModel<{ subModels: { field: JsonFieldModel } }>>({
+    use: FlowModel,
+    uid: 'json-form-item',
+    props: { rules },
+    subModels: {
+      field: {
+        use: JsonFieldModel,
+        uid: 'json-field',
+      },
+    },
+  });
+
+  return { field: parent.subModels.field, parent };
+}
+
+function initializeJsonValidation(field: JsonFieldModel) {
+  const step = field.getFlow('jsonInitSetting')?.steps.initValidation;
+  if (!step) {
+    throw new Error('JSON validation step is not registered');
+  }
+  step.handler(field.context, {});
+}
+
+describe('JsonFieldModel validation', () => {
+  it('replaces legacy empty rules with one serializable JSON validation rule', async () => {
+    const { field, parent } = createModels([{}, { required: true }]);
+
+    initializeJsonValidation(field);
+
+    const rules = parent.props.rules as ValidationRule[];
+    expect(rules).toHaveLength(2);
+    expect(rules[0]).toEqual({ required: true });
+    expect(rules[1]).toMatchObject({ type: 'any' });
+    expect(rules[1].validator).toBeTypeOf('function');
+    if (!rules[1].validator) {
+      throw new Error('JSON validator is missing');
+    }
+    await expect(rules[1].validator({}, { name: 'NocoBase' })).resolves.toBeUndefined();
+    await expect(rules[1].validator({}, '{"name":')).rejects.toContain('Invalid JSON format');
+
+    const persistedRules = JSON.parse(JSON.stringify(parent.serialize())).props.rules as ValidationRule[];
+    expect(persistedRules).toHaveLength(2);
+    expect(persistedRules[1]).toMatchObject({ type: 'any' });
+    expect(persistedRules[1].validator).toBeUndefined();
+  });
+
+  it('re-registers the runtime validator without duplicating its persisted placeholder', () => {
+    const { field, parent } = createModels([{}]);
+    initializeJsonValidation(field);
+    const persistedRules = JSON.parse(JSON.stringify(parent.serialize())).props.rules as ValidationRule[];
+    parent.setProps({ rules: persistedRules });
+
+    initializeJsonValidation(field);
+
+    const rules = parent.props.rules as ValidationRule[];
+    expect(rules).toHaveLength(1);
+    expect(rules[0]).toMatchObject({ type: 'any' });
+    expect(rules[0].validator).toBeTypeOf('function');
+  });
+});

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

@@ -0,0 +1,47 @@
+/**
+ * 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 { fireEvent, render, screen } from '@testing-library/react';
+import React from 'react';
+import { describe, expect, it, vi } from 'vitest';
+import { InputNumberField } from '../NumberFieldModel';
+
+describe('InputNumberField', () => {
+  it('keeps the existing number value type for regular input', () => {
+    const onChange = vi.fn();
+
+    render(<InputNumberField stringMode onChange={onChange} />);
+    fireEvent.change(screen.getByRole('spinbutton'), { target: { value: '123' } });
+
+    expect(onChange).toHaveBeenLastCalledWith(123);
+    expect(onChange).not.toHaveBeenCalledWith('123');
+  });
+
+  it('preserves a high-precision decimal string in string mode', () => {
+    const onChange = vi.fn();
+    const value = '123456789012345678901234567890';
+
+    render(<InputNumberField stringMode onChange={onChange} />);
+    fireEvent.change(screen.getByRole('spinbutton'), { target: { value } });
+
+    expect(onChange).toHaveBeenLastCalledWith(value);
+    expect(screen.getByRole('spinbutton')).toHaveValue(value);
+  });
+
+  it('does not switch to scientific notation at the 22-digit boundary', () => {
+    const onChange = vi.fn();
+    const value = '1234567890123458152112';
+
+    render(<InputNumberField stringMode onChange={onChange} />);
+    fireEvent.change(screen.getByRole('spinbutton'), { target: { value } });
+
+    expect(onChange).toHaveBeenLastCalledWith(value);
+    expect(onChange).not.toHaveBeenCalledWith('1.234567890123458152112e+21');
+  });
+});

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

@@ -206,6 +206,11 @@ export function MobileLazySelect(props: Readonly<LazySelectProps>) {
         return;
       }
       const selectedId = vals[0];
+      if (selectedId === undefined) {
+        onChange(undefined as unknown as AssociationOption);
+        handleClose();
+        return;
+      }
       const record = optionMap.get(selectedId);
       if (record) {
         if (valueMode === 'value') {
@@ -291,6 +296,7 @@ export function MobileLazySelect(props: Readonly<LazySelectProps>) {
             value={searchText}
             onChange={handleSearchChange}
             onCancel={handleClose}
+            cancelText={t('Cancel')}
             showCancelButton
           />
         </div>

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

@@ -9,7 +9,7 @@
 
 import { useFlowModelContext } from '@nocobase/flow-engine';
 import { Select } from 'antd';
-import { Button, CheckList, Popup, SearchBar } from 'antd-mobile';
+import { Button, CheckList, ConfigProvider, Popup, SearchBar, useConfig } from 'antd-mobile';
 import React, { useEffect, useMemo, useState } from 'react';
 
 const mobileSelectSafeAreaPaddingBottom = 'calc(12px + env(safe-area-inset-bottom, 0px))';
@@ -26,11 +26,28 @@ function getMobileSelectListStyle(hasConfirmFooter: boolean): React.CSSPropertie
   };
 }
 
+function normalizeMobileLocale(locale?: string) {
+  return locale === 'zh-CH' ? 'zh-CN' : locale;
+}
+
 export function MobileSelect(props) {
   const { value, displayValue, onChange, onChangeComplete, disabled, options = [], mode } = props;
   const isMultiple = ['multiple', 'tags'].includes(mode);
   const ctx = useFlowModelContext();
   const t = ctx.t;
+  const { locale: mobileLocale } = useConfig();
+  const searchBarLocale = useMemo(() => {
+    const currentLocale = normalizeMobileLocale(ctx.locale);
+    const inheritedLocale = normalizeMobileLocale(mobileLocale.locale);
+
+    return {
+      ...mobileLocale,
+      SearchBar: {
+        ...mobileLocale.SearchBar,
+        name: currentLocale === inheritedLocale ? mobileLocale.SearchBar.name : t('Search'),
+      },
+    };
+  }, [ctx.locale, mobileLocale, t]);
   const [visible, setVisible] = useState(false);
   const [selected, setSelected] = useState(value || []);
   const [searchText, setSearchText] = useState(null);
@@ -77,7 +94,15 @@ export function MobileSelect(props) {
         destroyOnClose
       >
         <div style={{ margin: '10px' }}>
-          <SearchBar placeholder={t('search')} value={searchText} onChange={(v) => setSearchText(v)} showCancelButton />
+          <ConfigProvider locale={searchBarLocale}>
+            <SearchBar
+              placeholder={t('search')}
+              value={searchText}
+              onChange={(v) => setSearchText(v)}
+              cancelText={t('Cancel')}
+              showCancelButton
+            />
+          </ConfigProvider>
         </div>
         <div style={getMobileSelectListStyle(isMultiple)}>
           <CheckList

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

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import React from 'react';
+import React, { type ComponentProps, type ReactNode } from 'react';
 import { beforeEach, describe, it, expect, vi } from 'vitest';
 import { act, fireEvent, render, screen } from '@nocobase/test/client';
 import { MobileLazySelect } from '../MobileLazySelect';
@@ -23,11 +23,29 @@ const RELATION_OPTIONS = [
   { uuid: 'c7d99828-a1de-9e70-4c2d-b0139abdf02e' },
 ];
 
+type SelectProps = ComponentProps<(typeof import('antd'))['Select']>;
+type PopupProps = ComponentProps<(typeof import('antd-mobile'))['Popup']>;
+type CheckListProps = ComponentProps<(typeof import('antd-mobile'))['CheckList']>;
+type ButtonProps = ComponentProps<(typeof import('antd-mobile'))['Button']>;
+type SearchBarProps = ComponentProps<(typeof import('antd-mobile'))['SearchBar']>;
+type ConfigProviderProps = ComponentProps<(typeof import('antd-mobile'))['ConfigProvider']>;
+type MobileLocale = {
+  locale: string;
+  common: { cancel: string };
+  SearchBar: { name: string };
+};
+
 const mockState = vi.hoisted(() => ({
-  selectProps: undefined as any,
-  popupProps: undefined as any,
-  checklistProps: undefined as any,
-  confirmButtonProps: undefined as any,
+  selectProps: undefined as SelectProps | undefined,
+  popupProps: undefined as PopupProps | undefined,
+  checklistProps: undefined as CheckListProps | undefined,
+  confirmButtonProps: undefined as ButtonProps | undefined,
+  mobileLocale: {
+    locale: 'zh-CH',
+    common: { cancel: '取消' },
+    SearchBar: { name: '搜索框' },
+  },
+  flowLocale: 'en-US',
 }));
 
 function resetMockState() {
@@ -35,6 +53,12 @@ function resetMockState() {
   mockState.popupProps = undefined;
   mockState.checklistProps = undefined;
   mockState.confirmButtonProps = undefined;
+  mockState.mobileLocale = {
+    locale: 'zh-CH',
+    common: { cancel: '取消' },
+    SearchBar: { name: '搜索框' },
+  };
+  mockState.flowLocale = 'en-US';
 }
 
 function clickTrigger() {
@@ -115,7 +139,20 @@ vi.mock('@nocobase/flow-engine', async () => {
   return {
     ...actual,
     useFlowModelContext: () => ({
-      t: (value: string) => value,
+      locale: mockState.flowLocale,
+      t: (value: string) =>
+        ({
+          'zh-CN': {
+            Cancel: '取消',
+            Search: '搜索',
+            search: '搜索',
+          },
+          'zh-TW': {
+            Cancel: '取消',
+            Search: '搜尋',
+            search: '搜尋',
+          },
+        })[mockState.flowLocale]?.[value] || value,
     }),
     useFlowModel: () => ({
       context: {
@@ -130,7 +167,7 @@ vi.mock('antd', async () => {
   const actual = await vi.importActual<any>('antd');
   return {
     ...actual,
-    Select: (props: any) => {
+    Select: (props: SelectProps) => {
       mockState.selectProps = props;
       return <div data-testid="antd-select" />;
     },
@@ -138,15 +175,22 @@ vi.mock('antd', async () => {
 });
 
 vi.mock('antd-mobile', () => {
-  const MockCheckList: any = (props: any) => {
+  const MockCheckList = (props: CheckListProps) => {
     mockState.checklistProps = props;
     return <div data-testid="checklist">{props.children}</div>;
   };
 
-  MockCheckList.Item = ({ value, children }: any) => <div data-testid={`item-${value}`}>{children}</div>;
+  MockCheckList.Item = ({ value, children }: { value: string | number; children?: ReactNode }) => (
+    <div data-testid={`item-${value}`}>{children}</div>
+  );
 
   return {
-    Button: (props: any) => {
+    ConfigProvider: ({ children, locale }: ConfigProviderProps) => {
+      mockState.mobileLocale = locale as MobileLocale;
+      return <>{children}</>;
+    },
+    useConfig: () => ({ locale: mockState.mobileLocale }),
+    Button: (props: ButtonProps) => {
       mockState.confirmButtonProps = props;
       return (
         <button type="button" data-testid="confirm" onClick={props.onClick}>
@@ -154,12 +198,26 @@ vi.mock('antd-mobile', () => {
         </button>
       );
     },
-    Popup: (props: any) => {
+    Popup: (props: PopupProps) => {
       mockState.popupProps = props;
       return props.visible ? <div data-testid="popup">{props.children}</div> : null;
     },
-    SearchBar: ({ value, onChange }: any) => (
-      <input data-testid="search" value={value ?? ''} onChange={(e) => onChange?.(e.target.value)} />
+    SearchBar: ({ value, onChange, onCancel, cancelText, placeholder, showCancelButton }: SearchBarProps) => (
+      <div>
+        <input
+          aria-label={mockState.mobileLocale.SearchBar.name}
+          data-testid="search"
+          placeholder={placeholder}
+          type="search"
+          value={value ?? ''}
+          onChange={(e) => onChange?.(e.target.value)}
+        />
+        {showCancelButton && value ? (
+          <button type="button" onClick={onCancel}>
+            {cancelText ?? mockState.mobileLocale.common.cancel}
+          </button>
+        ) : null}
+      </div>
     ),
     CheckList: MockCheckList,
   };
@@ -199,6 +257,47 @@ describe('MobileSelect', () => {
     expect(onChangeComplete).toHaveBeenCalledTimes(1);
   });
 
+  it('localizes the search input accessible name', () => {
+    renderMobileSelect();
+
+    openPopup();
+
+    expect(screen.getByRole('searchbox', { name: 'Search' })).toBeInTheDocument();
+  });
+
+  it('renders a translated cancel action after searching', () => {
+    renderMobileSelect();
+
+    openPopup();
+    act(() => {
+      fireEvent.change(screen.getByTestId('search'), { target: { value: 'Option' } });
+    });
+
+    expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
+  });
+
+  it('preserves the Chinese search input accessible name', () => {
+    mockState.flowLocale = 'zh-CN';
+    renderMobileSelect();
+
+    openPopup();
+    act(() => {
+      fireEvent.change(screen.getByTestId('search'), { target: { value: 'Option' } });
+    });
+
+    expect(screen.getByRole('searchbox', { name: '搜索框' })).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: '取消' })).toBeInTheDocument();
+  });
+
+  it('does not reuse the simplified Chinese accessible name for traditional Chinese', () => {
+    mockState.flowLocale = 'zh-TW';
+    renderMobileSelect();
+
+    openPopup();
+
+    expect(screen.getByRole('searchbox', { name: '搜尋' })).toBeInTheDocument();
+  });
+
   it('defers commit until confirm in multiple mode', () => {
     const { onChange, onChangeComplete } = renderMobileSelect({ value: [], mode: 'multiple' });
     openPopup();
@@ -289,6 +388,33 @@ describe('MobileLazySelect', () => {
     resetMockState();
   });
 
+  it('renders a translated cancel action after searching', () => {
+    renderMobileLazySelect();
+
+    openLazyPopup();
+    act(() => {
+      fireEvent.change(screen.getByTestId('search'), { target: { value: '11' } });
+    });
+
+    expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
+  });
+
+  it('clears the selected relation record when it is tapped again in single mode', () => {
+    const { onChange } = renderMobileLazySelect({
+      value: RELATION_OPTIONS[0],
+      multiple: false,
+    });
+
+    openLazyPopup();
+    expect(mockState.checklistProps?.value).toEqual([RELATION_OPTIONS[0].uuid]);
+
+    selectValues([]);
+
+    expect(onChange).toHaveBeenCalledTimes(1);
+    expect(onChange).toHaveBeenCalledWith(undefined);
+    expect(screen.queryByTestId('popup')).not.toBeInTheDocument();
+  });
+
   it('keeps pending relation records selected until confirm', () => {
     const { onChange, rerender } = renderMobileLazySelect();
 

package/src/flow/utils/dataScopeFormValueClear.ts

@@ -105,9 +105,6 @@ function resolveItemDependencyPath(ctx: FlowContext, depPath: NamePath): DataSco
     ctx,
     parseFieldIndexEntries((ctx.model as any)?.context?.fieldIndex ?? (ctx as any)?.fieldIndex),
   );
-  if (!entries.length) {
-    return wildcardDeps();
-  }
 
   let parentDepth = 0;
   let cursor = [...depPath];
@@ -121,6 +118,10 @@ function resolveItemDependencyPath(ctx: FlowContext, depPath: NamePath): DataSco
     return wildcardDeps();
   }
 
+  if (!entries.length) {
+    return parentDepth === 0 ? resolveRootItemDependencyPath(cursor) : emptyDeps();
+  }
+
   if (parentDepth === entries.length) {
     return resolveRootItemDependencyPath(cursor);
   }

package/src/index.ts

@@ -53,4 +53,5 @@ export {
 } from './flow-compat';
 export type { NocoBaseDesktopRoute } from './flow-compat';
 export * from './utils/markdownSanitize';
+export * from './ui-operation';
 export { default as AntdAppProvider } from './theme/AntdAppProvider';

package/src/layout-manager/LayoutContentRoute.tsx

@@ -38,11 +38,12 @@ export const LayoutContentRoute = (props: LayoutContentRouteProps) => {
       id: lastMatch?.id,
       name: lastMatch?.id,
       pathname: location.pathname,
+      state: location.state,
       params: (lastMatch?.params || {}) as Record<string, string | undefined>,
       layoutRouteName: layout.routeName,
       layoutBasePathname: layoutMatch?.pathname,
     };
-  }, [layout.routeName, location.pathname, matches]);
+  }, [layout.routeName, location.pathname, location.state, matches]);
   if (!model) {
     throw new Error(`[NocoBase] Layout '${layout.routeName}' model '${layout.uid}' is not mounted.`);
   }

package/src/layout-manager/LayoutRoute.tsx

@@ -71,11 +71,12 @@ export const LayoutRoute = (props: LayoutRouteProps) => {
       id: lastMatch?.id,
       name: lastMatch?.id,
       pathname: location.pathname,
+      state: location.state,
       params: lastMatchParams,
       layoutRouteName: layout.routeName,
       layoutBasePathname: layoutMatch?.pathname,
     };
-  }, [lastMatch?.id, lastMatchParams, layout.routeName, layoutMatch?.pathname, location.pathname]);
+  }, [lastMatch?.id, lastMatchParams, layout.routeName, layoutMatch?.pathname, location.pathname, location.state]);
   const { loading, data, error } = useRequest(
     async () => {
       const existingModel = flowEngine.getModel<BaseLayoutModel>(layout.uid);