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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client-v2",
-  "version": "2.1.0-beta.26",
+  "version": "2.1.0-beta.27",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.mjs",
@@ -24,9 +24,9 @@
     "@formily/antd-v5": "1.2.3",
     "@formily/react": "^2.2.27",
     "@formily/shared": "^2.2.27",
-    "@nocobase/flow-engine": "2.1.0-beta.26",
-    "@nocobase/sdk": "2.1.0-beta.26",
-    "@nocobase/shared": "2.1.0-beta.26",
+    "@nocobase/flow-engine": "2.1.0-beta.27",
+    "@nocobase/sdk": "2.1.0-beta.27",
+    "@nocobase/shared": "2.1.0-beta.27",
     "ahooks": "^3.7.2",
     "antd": "5.24.2",
     "classnames": "^2.3.1",
@@ -36,5 +36,5 @@
     "react-i18next": "^11.15.1",
     "react-router-dom": "^6.30.1"
   },
-  "gitHead": "b17e1a72057813fa27d8435bf0f2af67ea4b059f"
+  "gitHead": "6d9e2d4ac3c6bf40951c8eb252860e47aa3a3c37"
 }

package/src/BaseApplication.tsx

@@ -356,7 +356,7 @@ export abstract class BaseApplication<
   addRoutes() {
     this.router.add('not-found', {
       path: '*',
-      Component: this.components['AppNotFound'],
+      Component: () => null,
     });
   }
 

package/src/__tests__/app.test.tsx

@@ -72,29 +72,46 @@ describe('app', () => {
     });
   });
 
-  it('should mount the app and display "Not Found"', async () => {
+  it('should mount the base app with blank fallback route', async () => {
     const app = createMockClient();
     const element = document.createElement('div');
     act(() => {
       app.mount(element);
     });
-    await waitFor(() => expect(element.textContent).toContain('Sorry, the page you visited does not exist.'));
+    await waitFor(() => expect(element.querySelector('.ant-app')).not.toBeNull());
+    expect(element.textContent).toBe('');
   });
 
-  it('should render default "Not Found" view', async () => {
+  it('should render blank fallback route by default', async () => {
     const app = createMockClient();
     await renderApp(app);
-    expect(screen.getByText('Sorry, the page you visited does not exist.')).toBeInTheDocument();
+    expect(screen.queryByText('Sorry, the page you visited does not exist.')).not.toBeInTheDocument();
   });
 
-  it('should render custom "Not Found" component', async () => {
+  it('should not render custom "Not Found" component before builtin routes are added', async () => {
     class PluginHelloClient extends Plugin {}
     const app = createMockClient({
       plugins: [PluginHelloClient],
       components: { AppNotFound: () => <div>Not Found2</div> },
     });
     await renderApp(app);
-    expect(screen.getByText('Not Found2')).toBeInTheDocument();
+    expect(screen.queryByText('Not Found2')).not.toBeInTheDocument();
+  });
+
+  it('should render builtin "Not Found" view after builtin routes are added', async () => {
+    const app = createMockClient({
+      plugins: [NocoBaseBuildInPlugin as any],
+      router: { type: 'memory', initialEntries: ['/missing'] },
+    });
+    app.apiMock.onGet('app:getLang').reply(200, {
+      data: {
+        lang: 'en-US',
+        resources: { client: {} },
+        cron: {},
+      },
+    });
+    await renderApp(app);
+    expect(screen.getByText('Sorry, the page you visited does not exist.')).toBeInTheDocument();
   });
 
   it('should support app provider functionality', async () => {

package/src/flow/actions/titleField.tsx

@@ -8,7 +8,7 @@
  */
 
 import { defineAction, DisplayItemModel, FlowModelContext, tExpr } from '@nocobase/flow-engine';
-import { isTitleField } from '../../flow-compat';
+import { getFlowFieldInterfaceOptions, isTitleFieldInterface } from '../../flow-compat';
 
 const normalizeFilterTargetKey = (filterTargetKey: any) => {
   if (typeof filterTargetKey === 'string') {
@@ -37,10 +37,15 @@ export const titleField = defineAction({
   title: tExpr('Title field'),
   uiMode: (ctx) => {
     const targetCollection = ctx.collectionField.targetCollection;
-    const dataSourceManager = ctx.app.dataSourceManager;
+    const dataSourceManager =
+      ctx.dataSourceManager || ctx.model?.context?.dataSourceManager || ctx.app?.dataSourceManager;
     const targetFields = targetCollection?.getFields?.() ?? [];
     const options = targetFields
-      .filter((field) => isTitleField(dataSourceManager, field.options))
+      .filter((field) =>
+        isTitleFieldInterface(
+          getFlowFieldInterfaceOptions(field.options?.interface || field.interface, dataSourceManager),
+        ),
+      )
       .map((field) => ({
         value: field.name,
         label: field?.title,

package/src/flow/components/FieldAssignValueInput.tsx

@@ -485,6 +485,7 @@ type AssignValueFieldSource = {
 const ASSIGN_VALUE_IGNORED_PROP_KEYS = new Set([
   'value',
   'defaultValue',
+  'hidden',
   'onChange',
   'onClick',
   'open',

package/src/flow/components/code-editor/__tests__/linter.test.ts

@@ -39,6 +39,24 @@ describe('code-editor linter', () => {
     );
   });
 
+  it('does not warn for callback parameters used inside JSX', () => {
+    const code = `
+const columns = [
+  {
+    render: (roles, record) => (
+      <div>
+        {roles.map((role) => <Tag key={role.name}>{record.nickname || role.title}</Tag>)}
+      </div>
+    ),
+  },
+];
+`;
+    const diags = computeDiagnosticsFromText(code);
+    expect(diags.some((d) => d.message.includes('Possible undefined variable: roles'))).toBe(false);
+    expect(diags.some((d) => d.message.includes('Possible undefined variable: record'))).toBe(false);
+    expect(diags.some((d) => d.message.includes('Possible undefined variable: role'))).toBe(false);
+  });
+
   it('reports non-callable expression warning', () => {
     const code = `(1+2)()`;
     const diags = computeDiagnosticsFromText(code);

package/src/flow/components/code-editor/__tests__/runjsDiagnostics.test.ts

@@ -38,6 +38,29 @@ describe('runjsDiagnostics', () => {
     expect(res.issues.some((i) => i.type === 'lint' && i.ruleId === 'no-noncallable-call')).toBe(true);
   });
 
+  it('does not report JSX callback parameters as undefined variables', async () => {
+    const ctx = createTestCtx();
+    const code = `
+const { Tag } = ctx.libs.antd;
+const columns = [
+  {
+    render: (roles, record) => (
+      <div>
+        {roles.map((role) => <Tag key={role.name}>{record.nickname || role.title}</Tag>)}
+      </div>
+    ),
+  },
+];
+ctx.render(<div />);
+`;
+    const res = await diagnoseRunJS(code, ctx);
+    expect(
+      res.issues.some(
+        (i) => i.type === 'lint' && i.ruleId === 'possible-undefined-variable' && /roles|record|role/.test(i.message),
+      ),
+    ).toBe(false);
+  });
+
   it('reports suspicious short ctx member call as a lint issue', async () => {
     const ctx = createTestCtx();
     const res = await diagnoseRunJS('ctx.fw();', ctx);

package/src/flow/components/code-editor/index.tsx

@@ -133,6 +133,19 @@ export const CodeEditor: React.FC<CodeEditorProps> = ({
     return createRunJSCompletionSource({ hostCtx, staticOptions: finalExtra });
   }, [hostCtx, finalExtra]);
 
+  const runCurrentCode = useCallback(async () => {
+    const code = viewRef.current?.state.doc.toString() || '';
+    clearDiagnostics(viewRef.current);
+    const res = await run(code);
+    if (!res?.success) {
+      const rawErr = res?.error;
+      const errText = res?.timeout ? tr('Execution timed out') : String(rawErr || tr('Unknown error'));
+      const pos = parseErrorLineColumn(rawErr);
+      if (pos && viewRef.current) markErrorAt(viewRef.current, pos.line, pos.column, errText);
+    }
+    return res;
+  }, [run, tr]);
+
   // JSX 转换支持暂时移除：直接按原样运行代码
 
   // 错误标注相关工具已提取至 errorHelpers.ts
@@ -153,6 +166,9 @@ export const CodeEditor: React.FC<CodeEditorProps> = ({
       const v = viewRef.current;
       return v ? v.state.doc.toString() : '';
     },
+    run() {
+      return Promise.resolve(undefined);
+    },
 
     buttonGroupHeight: 0,
     snippetEntries: [],
@@ -160,6 +176,7 @@ export const CodeEditor: React.FC<CodeEditorProps> = ({
   });
   extraEditorRef.current.snippetEntries = snippetEntries;
   extraEditorRef.current.logs = logs;
+  extraEditorRef.current.run = runCurrentCode;
 
   // snippet group display handled in SnippetsDrawer
 
@@ -210,23 +227,7 @@ export const CodeEditor: React.FC<CodeEditorProps> = ({
                   {tr('Snippets')}
                 </Button>
                 <>
-                  <Button
-                    size="small"
-                    loading={running}
-                    onClick={async () => {
-                      const code = viewRef.current?.state.doc.toString() || '';
-                      clearDiagnostics(viewRef.current);
-                      const res = await run(code);
-                      if (!res?.success) {
-                        const rawErr = res?.error;
-                        const errText = res?.timeout
-                          ? tr('Execution timed out')
-                          : String(rawErr || tr('Unknown error'));
-                        const pos = parseErrorLineColumn(rawErr);
-                        if (pos && viewRef.current) markErrorAt(viewRef.current, pos.line, pos.column, errText);
-                      }
-                    }}
-                  >
+                  <Button size="small" loading={running} onClick={runCurrentCode}>
                     {tr('Run')}
                   </Button>
                 </>