@nocobase/client-v2 2.1.0-beta.27 → 2.1.0-beta.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client-v2",
-  "version": "2.1.0-beta.27",
+  "version": "2.1.0-beta.29",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.mjs",
@@ -24,17 +24,18 @@
     "@formily/antd-v5": "1.2.3",
     "@formily/react": "^2.2.27",
     "@formily/shared": "^2.2.27",
-    "@nocobase/flow-engine": "2.1.0-beta.27",
-    "@nocobase/sdk": "2.1.0-beta.27",
-    "@nocobase/shared": "2.1.0-beta.27",
+    "@nocobase/flow-engine": "2.1.0-beta.29",
+    "@nocobase/sdk": "2.1.0-beta.29",
+    "@nocobase/shared": "2.1.0-beta.29",
     "ahooks": "^3.7.2",
     "antd": "5.24.2",
     "classnames": "^2.3.1",
     "dayjs": "^1.11.10",
     "i18next": "^22.4.9",
+    "json5": "^2.2.3",
     "lodash": "4.17.21",
     "react-i18next": "^11.15.1",
     "react-router-dom": "^6.30.1"
   },
-  "gitHead": "6d9e2d4ac3c6bf40951c8eb252860e47aa3a3c37"
+  "gitHead": "86c41be29dcbcac6fd6aa46b4a137ef07a27c1d0"
 }

package/src/components/form/JsonTextArea.tsx

@@ -0,0 +1,129 @@
+/**
+ * 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 { css, cx } from '@emotion/css';
+import { Input, Typography } from 'antd';
+import type { TextAreaProps } from 'antd/es/input';
+import JSON5 from 'json5';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+
+export interface JsonTextAreaProps extends Omit<TextAreaProps, 'value' | 'onChange'> {
+  value?: unknown;
+  onChange?: (value: unknown) => void;
+  space?: number;
+  json5?: boolean;
+  showError?: boolean;
+}
+
+const jsonTextAreaClassName = css`
+  font-size: 80%;
+  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+`;
+
+function stringifyJsonValue(value: unknown, json: typeof JSON | typeof JSON5, space: number) {
+  if (value == null) {
+    return '';
+  }
+
+  if (typeof value === 'string') {
+    try {
+      json.parse(value);
+      return value;
+    } catch {
+      return json.stringify(value, undefined, space);
+    }
+  }
+
+  return json.stringify(value, undefined, space);
+}
+
+export const JsonTextArea = React.memo((props: JsonTextAreaProps) => {
+  const {
+    value,
+    onChange,
+    space = 2,
+    json5 = false,
+    showError = true,
+    className,
+    status,
+    onBlur,
+    ...textAreaProps
+  } = props;
+  const json = json5 ? JSON5 : JSON;
+  const [text, setText] = useState(() => stringifyJsonValue(value, json, space));
+  const [error, setError] = useState<string>();
+
+  useEffect(() => {
+    setText(stringifyJsonValue(value, json, space));
+  }, [json, space, value]);
+
+  const parseText = useCallback(
+    (nextText: string) => {
+      if (nextText.trim() === '') {
+        return null;
+      }
+
+      return json.parse(nextText);
+    },
+    [json],
+  );
+
+  const handleChange = useCallback(
+    (event: React.ChangeEvent<HTMLTextAreaElement>) => {
+      const nextText = event.target.value;
+      setText(nextText);
+
+      try {
+        parseText(nextText);
+        setError(undefined);
+      } catch (err) {
+        setError(err instanceof Error ? err.message : String(err));
+      }
+    },
+    [parseText],
+  );
+
+  const handleBlur = useCallback(
+    (event: React.FocusEvent<HTMLTextAreaElement>) => {
+      try {
+        const parsed = parseText(event.target.value);
+        setError(undefined);
+        setText(parsed == null ? '' : json.stringify(parsed, undefined, space));
+        onChange?.(parsed);
+      } catch (err) {
+        setError(err instanceof Error ? err.message : String(err));
+      }
+
+      onBlur?.(event);
+    },
+    [json, onBlur, onChange, parseText, space],
+  );
+
+  const mergedStatus = useMemo(() => status || (error ? 'error' : undefined), [error, status]);
+
+  return (
+    <>
+      <Input.TextArea
+        {...textAreaProps}
+        value={text}
+        onChange={handleChange}
+        onBlur={handleBlur}
+        status={mergedStatus}
+        className={cx(jsonTextAreaClassName, className)}
+      />
+      {showError && error ? (
+        <Typography.Text type="danger" style={{ display: 'block', marginTop: 4 }}>
+          {error}
+        </Typography.Text>
+      ) : null}
+    </>
+  );
+});
+
+JsonTextArea.displayName = 'JsonTextArea';

package/src/components/index.ts

@@ -10,4 +10,5 @@
 export * from './AppComponents';
 export * from './BlankComponent';
 export * from './Icon';
+export * from './form/JsonTextArea';
 export * from './RouterContextCleaner';

package/src/flow/actions/__tests__/fieldLinkageRules.scopeDepth.test.ts

@@ -535,4 +535,482 @@ describe('fieldLinkageRules action - linkage scope metadata', () => {
       linkageScopeDepth: 0,
     });
   });
+
+  it('runs row-scoped linkage rules for subtable row forks without subModels.items and deduplicates the same row', async () => {
+    const setFormValues = vi.fn(async () => undefined);
+    const linkageAssignHandler = vi.fn((actionCtx: any, { value, addFormValuePatch }: any) => {
+      expect(actionCtx.linkageScopeDepth).toBe(0);
+      expect(actionCtx.item?.value?.uid).toBe('role-uid-1');
+      expect(value[0]?.value).toBe('role-uid-1');
+      addFormValuePatch({ path: 'roles.name', value: value[0].value });
+    });
+
+    const engine = new FlowEngine();
+    const makeRowFork = (uid: string) => {
+      const rowFork = new FlowModel({ uid, flowEngine: engine }) as any;
+      rowFork.context.defineMethod('subTableRowFork', () => true);
+      rowFork.context.defineProperty('fieldIndex', {
+        value: ['roles:0'],
+      });
+      rowFork.context.defineProperty('item', {
+        value: {
+          index: 0,
+          __is_new__: true,
+          value: {
+            uid: 'role-uid-1',
+          },
+        },
+      });
+      rowFork.context.defineProperty('setFormValues', {
+        value: setFormValues,
+      });
+      rowFork.context.defineProperty('app', {
+        value: {
+          jsonLogic: {
+            apply: () => true,
+          },
+        },
+      });
+      rowFork.getAction = vi.fn((name: string) => {
+        if (name === 'linkageAssignField') {
+          return {
+            handler: linkageAssignHandler,
+          };
+        }
+      });
+      return rowFork;
+    };
+
+    const rowFork1 = makeRowFork('role-row-fork-1');
+    const rowFork2 = makeRowFork('role-row-fork-2');
+
+    const masterModel1: any = {
+      uid: 'master-role-grid-1',
+      forks: new Set([rowFork1]),
+    };
+    const masterModel2: any = {
+      uid: 'master-role-grid-2',
+      forks: new Set([rowFork2]),
+    };
+
+    const rolesField: any = {
+      type: 'hasMany',
+      isAssociationField: () => true,
+      targetCollection: {
+        getField: (name: string) => ({ name, isAssociationField: () => false }),
+      },
+    };
+
+    const gridModel: any = {
+      uid: 'grid-model-role-row',
+      context: {
+        blockModel: {
+          collection: {
+            getField: (name: string) => (name === 'roles' ? rolesField : null),
+          },
+        },
+      },
+      getAction: vi.fn((name: string) => {
+        if (name === 'linkageAssignField') {
+          return {
+            handler: linkageAssignHandler,
+          };
+        }
+      }),
+      __allModels: [],
+    };
+
+    const ctx: any = {
+      model: gridModel,
+      engine: {
+        forEachModel: (cb: (m: any) => void) => {
+          cb(masterModel1);
+          cb(masterModel2);
+        },
+      },
+      flowKey: 'eventSettings',
+      inputArgs: {
+        source: 'user',
+        txId: 'tx-role-row',
+        changedPaths: [['roles', 0, 'uid']],
+      },
+      app: {
+        jsonLogic: {
+          apply: () => true,
+        },
+      },
+      resolveJsonTemplate: async (v: any) => {
+        if (v === '{{ ctx.item.value.uid }}') {
+          return 'role-uid-1';
+        }
+        return v;
+      },
+    };
+
+    await fieldLinkageRules.handler(ctx, {
+      value: [
+        {
+          key: 'rule-role-row',
+          title: 'rule-role-row',
+          enable: true,
+          condition: { logic: '$and', items: [] },
+          actions: [
+            {
+              name: 'linkageAssignField',
+              params: {
+                value: [
+                  {
+                    key: 'r1',
+                    enable: true,
+                    targetPath: 'roles.name',
+                    mode: 'assign',
+                    value: '{{ ctx.item.value.uid }}',
+                    condition: { logic: '$and', items: [] },
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      ],
+    });
+
+    expect(linkageAssignHandler).toHaveBeenCalledTimes(1);
+    expect(setFormValues).toHaveBeenCalledTimes(1);
+    expect(setFormValues).toHaveBeenCalledWith(
+      [
+        {
+          path: ['roles', 0, 'name'],
+          value: 'role-uid-1',
+        },
+      ],
+      expect.objectContaining({
+        source: 'linkage',
+        linkageTxId: 'tx-role-row',
+        linkageScopeDepth: 0,
+      }),
+    );
+  });
+
+  it('keeps row-scoped default patches following while current value is still the last default', async () => {
+    const store = {
+      roles: [{ uid: 'role-uid-1', name: '' }],
+    };
+    const getAt = (path: Array<string | number>) => path.reduce((acc: any, seg) => acc?.[seg], store as any);
+    const setAt = (path: Array<string | number>, value: any) => {
+      let cur: any = store;
+      for (const seg of path.slice(0, -1)) {
+        cur = cur[seg];
+      }
+      cur[path[path.length - 1]] = value;
+    };
+    const pathKey = (path: Array<string | number>) => JSON.stringify(path);
+    const lastDefaults = new Map<string, any>();
+    const form = {
+      getFieldValue: (path: Array<string | number>) => getAt(path),
+    };
+    const formValueRuntime = {
+      canApplyDefaultValuePatch: vi.fn((path: Array<string | number>, value: any) => {
+        const current = getAt(path);
+        const last = lastDefaults.get(pathKey(path));
+        if (current === undefined || current === null || current === '') return true;
+        if (typeof last !== 'undefined' && current === last) return true;
+        if (current === value) {
+          lastDefaults.set(pathKey(path), value);
+        }
+        return false;
+      }),
+      recordDefaultValuePatch: vi.fn((path: Array<string | number>, value: any) => {
+        lastDefaults.set(pathKey(path), value);
+      }),
+    };
+    const setFormValues = vi.fn(async (patches: Array<{ path: Array<string | number>; value: any }>) => {
+      for (const patch of patches) {
+        setAt(patch.path, patch.value);
+      }
+    });
+    const defaultHandler = vi.fn((actionCtx: any, { value, addFormValuePatch }: any) => {
+      addFormValuePatch({ path: value[0].targetPath, value: value[0].value, whenEmpty: true });
+    });
+
+    const engine = new FlowEngine();
+    const rowFork = new FlowModel({ uid: 'role-default-row-fork', flowEngine: engine }) as any;
+    rowFork.context.defineProperty('subTableRowFork', {
+      value: true,
+    });
+    rowFork.context.defineProperty('fieldIndex', {
+      value: ['roles:0'],
+    });
+    rowFork.context.defineProperty('form', {
+      value: form,
+    });
+    rowFork.context.defineProperty('item', {
+      get: () => ({
+        index: 0,
+        __is_new__: true,
+        value: store.roles[0],
+      }),
+    });
+    rowFork.context.defineProperty('setFormValues', {
+      value: setFormValues,
+    });
+    rowFork.context.defineProperty('app', {
+      value: {
+        jsonLogic: {
+          apply: () => true,
+        },
+      },
+    });
+    rowFork.getAction = vi.fn((name: string) => {
+      if (name === 'setFieldsDefaultValue') {
+        return {
+          handler: defaultHandler,
+        };
+      }
+    });
+
+    const masterModel: any = {
+      uid: 'master-role-default-grid',
+      forks: new Set([rowFork]),
+    };
+    const rolesField: any = {
+      type: 'hasMany',
+      isAssociationField: () => true,
+      targetCollection: {
+        getField: (name: string) => ({ name, isAssociationField: () => false }),
+      },
+    };
+    const blockModel: any = {
+      collection: {
+        getField: (name: string) => (name === 'roles' ? rolesField : null),
+      },
+      formValueRuntime,
+    };
+    rowFork.context.defineProperty('blockModel', {
+      value: blockModel,
+    });
+    const gridModel: any = {
+      uid: 'grid-model-role-default-row',
+      context: {
+        blockModel,
+      },
+      getAction: vi.fn((name: string) => {
+        if (name === 'setFieldsDefaultValue') {
+          return {
+            handler: defaultHandler,
+          };
+        }
+      }),
+      __allModels: [],
+    };
+    const ctx: any = {
+      model: gridModel,
+      engine: {
+        forEachModel: (cb: (m: any) => void) => {
+          cb(masterModel);
+        },
+      },
+      flowKey: 'eventSettings',
+      inputArgs: {
+        source: 'user',
+        txId: 'tx-role-default-row',
+        changedPaths: [['roles', 0, 'uid']],
+      },
+      app: {
+        jsonLogic: {
+          apply: () => true,
+        },
+      },
+      resolveJsonTemplate: async (v: any) => v,
+    };
+    const makeParams = (value: string) => ({
+      value: [
+        {
+          key: `rule-${value}`,
+          title: `rule-${value}`,
+          enable: true,
+          condition: { logic: '$and', items: [] },
+          actions: [
+            {
+              name: 'setFieldsDefaultValue',
+              params: {
+                value: [
+                  {
+                    key: `r-${value}`,
+                    enable: true,
+                    targetPath: 'roles.name',
+                    mode: 'default',
+                    value,
+                    condition: { logic: '$and', items: [] },
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      ],
+    });
+
+    await fieldLinkageRules.handler(ctx, makeParams('role-uid-1'));
+    expect(store.roles[0].name).toBe('role-uid-1');
+
+    store.roles[0].uid = 'role-uid-2';
+    await fieldLinkageRules.handler(ctx, makeParams('role-uid-2'));
+    expect(store.roles[0].name).toBe('role-uid-2');
+    expect(setFormValues).toHaveBeenCalledTimes(2);
+    expect(formValueRuntime.canApplyDefaultValuePatch).toHaveBeenCalledTimes(2);
+    expect(formValueRuntime.recordDefaultValuePatch).toHaveBeenCalledTimes(2);
+
+    store.roles[0].name = 'manual';
+    store.roles[0].uid = 'role-uid-3';
+    await fieldLinkageRules.handler(ctx, makeParams('role-uid-3'));
+    expect(store.roles[0].name).toBe('manual');
+    expect(setFormValues).toHaveBeenCalledTimes(2);
+  });
+
+  it('skips stale subtable row forks after the row has been removed', async () => {
+    const setFormValues = vi.fn(async () => undefined);
+    const defaultHandler = vi.fn((actionCtx: any, { addFormValuePatch }: any) => {
+      addFormValuePatch({ path: 'roles.title', value: 'stale-title', whenEmpty: true });
+    });
+    const form = {
+      getFieldValue: vi.fn((path: Array<string | number>) => {
+        if (JSON.stringify(path) === JSON.stringify(['roles', 2])) {
+          return undefined;
+        }
+        if (JSON.stringify(path) === JSON.stringify(['roles'])) {
+          return [
+            { name: '1', title: '1' },
+            { name: '3', title: '3' },
+          ];
+        }
+      }),
+    };
+
+    const engine = new FlowEngine();
+    const staleRowFork = new FlowModel({ uid: 'stale-role-row-fork', flowEngine: engine }) as any;
+    staleRowFork.context.defineProperty('subTableRowFork', {
+      value: true,
+    });
+    staleRowFork.context.defineProperty('fieldIndex', {
+      value: ['roles:2'],
+    });
+    staleRowFork.context.defineProperty('form', {
+      value: form,
+    });
+    staleRowFork.context.defineProperty('item', {
+      value: {
+        index: 2,
+        __is_new__: true,
+        value: { name: '3', title: '3' },
+      },
+    });
+    staleRowFork.context.defineProperty('setFormValues', {
+      value: setFormValues,
+    });
+    staleRowFork.context.defineProperty('app', {
+      value: {
+        jsonLogic: {
+          apply: () => true,
+        },
+      },
+    });
+    staleRowFork.getAction = vi.fn((name: string) => {
+      if (name === 'setFieldsDefaultValue') {
+        return {
+          handler: defaultHandler,
+        };
+      }
+    });
+
+    const masterModel: any = {
+      uid: 'master-stale-role-grid',
+      forks: new Set([staleRowFork]),
+    };
+    const rolesField: any = {
+      type: 'hasMany',
+      isAssociationField: () => true,
+      targetCollection: {
+        getField: (name: string) => ({ name, isAssociationField: () => false }),
+      },
+    };
+    const blockModel: any = {
+      collection: {
+        getField: (name: string) => (name === 'roles' ? rolesField : null),
+      },
+      formValueRuntime: {
+        canApplyDefaultValuePatch: vi.fn(() => true),
+        recordDefaultValuePatch: vi.fn(),
+      },
+    };
+    staleRowFork.context.defineProperty('blockModel', {
+      value: blockModel,
+    });
+
+    const gridModel: any = {
+      uid: 'grid-model-stale-role-row',
+      context: {
+        blockModel,
+      },
+      getAction: vi.fn((name: string) => {
+        if (name === 'setFieldsDefaultValue') {
+          return {
+            handler: defaultHandler,
+          };
+        }
+      }),
+      __allModels: [],
+    };
+    const ctx: any = {
+      model: gridModel,
+      engine: {
+        forEachModel: (cb: (m: any) => void) => {
+          cb(masterModel);
+        },
+      },
+      flowKey: 'eventSettings',
+      inputArgs: {
+        source: 'user',
+        txId: 'tx-stale-row',
+        changedPaths: [['roles']],
+      },
+      app: {
+        jsonLogic: {
+          apply: () => true,
+        },
+      },
+      resolveJsonTemplate: async (v: any) => v,
+    };
+
+    await fieldLinkageRules.handler(ctx, {
+      value: [
+        {
+          key: 'rule-stale-row',
+          title: 'rule-stale-row',
+          enable: true,
+          condition: { logic: '$and', items: [] },
+          actions: [
+            {
+              name: 'setFieldsDefaultValue',
+              params: {
+                value: [
+                  {
+                    key: 'r-stale-row',
+                    enable: true,
+                    targetPath: 'roles.title',
+                    mode: 'default',
+                    value: 'stale-title',
+                    condition: { logic: '$and', items: [] },
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      ],
+    });
+
+    expect(defaultHandler).not.toHaveBeenCalled();
+    expect(setFormValues).not.toHaveBeenCalled();
+  });
 });