@nocobase/client-v2 2.1.0-beta.34 → 2.1.0-beta.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client-v2",
-  "version": "2.1.0-beta.34",
+  "version": "2.1.0-beta.35",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.mjs",
@@ -26,10 +26,11 @@
     "@formily/antd-v5": "1.2.3",
     "@formily/react": "^2.2.27",
     "@formily/shared": "^2.2.27",
-    "@nocobase/evaluators": "2.1.0-beta.34",
-    "@nocobase/flow-engine": "2.1.0-beta.34",
-    "@nocobase/sdk": "2.1.0-beta.34",
-    "@nocobase/shared": "2.1.0-beta.34",
+    "@nocobase/evaluators": "2.1.0-beta.35",
+    "@nocobase/flow-engine": "2.1.0-beta.35",
+    "@nocobase/sdk": "2.1.0-beta.35",
+    "@nocobase/shared": "2.1.0-beta.35",
+    "@nocobase/utils": "2.1.0-beta.35",
     "ahooks": "^3.7.2",
     "antd": "5.24.2",
     "antd-style": "3.7.1",
@@ -43,5 +44,5 @@
     "react-i18next": "^11.15.1",
     "react-router-dom": "^6.30.1"
   },
-  "gitHead": "ca804833299c547f8d49f8d58f73273a4bfcd03c"
+  "gitHead": "74310d8b9e9581fcde14b5a93d12b41ddb5bb325"
 }

package/src/BaseApplication.tsx

@@ -40,6 +40,7 @@ import type {
   RouterOptions,
 } from './RouterManager';
 import { WebSocketClient, type WebSocketClientOptions } from './WebSocketClient';
+import { getOperators } from './json-logic/globalOperators';
 import { compose, normalizeContainer } from './utils';
 import { defineGlobalDeps } from './utils/globalDeps';
 import { getRequireJs } from './utils/requirejs';
@@ -57,6 +58,11 @@ type AuthTokenPayload = {
   token: string;
   authenticator: string | null;
 };
+export type JsonLogic = {
+  apply: (logic: any, data?: any) => any;
+  addOperation: (name: string, fn?: any) => void;
+  rmOperation: (name: string) => void;
+};
 
 const LEADING_SLASHES_REGEXP = /^\/+/;
 const TRAILING_SLASHES_REGEXP = /\/+$/;
@@ -123,6 +129,7 @@ export abstract class BaseApplication<
   public favicon!: string;
   public flowEngine: FlowEngine;
   public dataSourceManager: any;
+  public jsonLogic!: JsonLogic;
   public context: FlowEngineContext & {
     routeRepository: RouteRepository;
     appInfo: Promise<Record<string, any>>;
@@ -220,6 +227,7 @@ export abstract class BaseApplication<
 
   protected afterManagersInitialized() {
     this.aiManager = new AIManager(this);
+    this.jsonLogic = getOperators();
   }
 
   protected configureContext() {

package/src/PluginManager.ts

@@ -26,6 +26,8 @@ export type PluginData = {
   version: string;
   url: string;
   clientV2Url?: string;
+  devMode?: 'esm';
+  appDevDependencies?: string[];
   type: 'local' | 'upload' | 'npm';
 };
 

package/src/__tests__/app.test.tsx

@@ -48,6 +48,14 @@ describe('app', () => {
       expect(app.getHref('/test')).toBe('/test');
     });
 
+    it('should initialize shared jsonLogic operators', () => {
+      const app = new Application({ router });
+
+      expect(app.jsonLogic.apply({ $eq: [1, '1'] })).toBe(true);
+      app.jsonLogic.addOperation('$testAlwaysTrue', () => true);
+      expect(app.jsonLogic.apply({ $testAlwaysTrue: [] })).toBe(true);
+    });
+
     it('should apply the provided favicon immediately', () => {
       const app = new Application({ router });
 

package/src/__tests__/remotePlugins.test.ts

@@ -14,8 +14,11 @@ import { configRequirejs, defineDevPlugins, getPlugins } from '../utils/remotePl
 describe('client-v2 remotePlugins', () => {
   afterEach(() => {
     window.define = undefined;
+    window.__nocobase_app_dev_plugins__ = undefined;
   });
 
+  const createModuleUrl = (code: string) => `data:text/javascript;charset=utf-8,${encodeURIComponent(code)}`;
+
   it('should define dev plugins with /client-v2 module ids', () => {
     class DemoPlugin extends Plugin {}
 
@@ -58,6 +61,151 @@ describe('client-v2 remotePlugins', () => {
     expect(mockDefine).not.toHaveBeenCalledWith('@nocobase/demo/client', expect.any(Function));
   });
 
+  it('should request remote plugins when devDynamicImport only resolves some plugins', async () => {
+    class DemoPlugin extends Plugin {}
+
+    const remoteFn = vi.fn();
+    const requirejs: any = {
+      requirejs: (pluginData, resolve) => {
+        remoteFn();
+        resolve({ default: DemoPlugin });
+      },
+    };
+    requirejs.requirejs.config = vi.fn();
+
+    const mockDefine: any = vi.fn();
+    window.define = mockDefine;
+
+    const plugins = await getPlugins({
+      requirejs,
+      pluginData: [
+        {
+          name: '@nocobase/demo',
+          packageName: '@nocobase/demo',
+          url: 'https://demo.com/dist/client-v2/index.js',
+        },
+        {
+          name: '@nocobase/remote',
+          packageName: '@nocobase/remote',
+          url: 'https://remote.com/dist/client-v2/index.js',
+        },
+      ] as any,
+      devDynamicImport: ((packageName) => {
+        if (packageName === '@nocobase/demo') {
+          return Promise.resolve({ default: DemoPlugin });
+        }
+        return Promise.resolve(null);
+      }) as any,
+    });
+
+    expect(plugins).toEqual([
+      ['@nocobase/demo', DemoPlugin],
+      ['@nocobase/remote', DemoPlugin],
+    ]);
+    expect(remoteFn).toHaveBeenCalledTimes(1);
+    expect(mockDefine).toHaveBeenCalledTimes(1);
+    expect(requirejs.requirejs.config).toHaveBeenCalledWith({
+      waitSeconds: 120,
+      paths: {
+        '@nocobase/remote/client-v2': 'https://remote.com/dist/client-v2/index.js',
+      },
+    });
+  });
+
+  it('should register ESM dev plugins before importing dependent plugins', async () => {
+    const requirejs: any = {
+      requirejs: vi.fn(),
+    };
+    requirejs.requirejs.config = vi.fn();
+
+    const mockDefine: any = vi.fn();
+    window.define = mockDefine;
+
+    const plugins = await getPlugins({
+      requirejs,
+      pluginData: [
+        {
+          name: '@nocobase/dependent',
+          packageName: '@nocobase/dependent',
+          url: createModuleUrl(`
+              const dependency = window.__nocobase_app_dev_plugins__ && window.__nocobase_app_dev_plugins__['@nocobase/dependency/client-v2'];
+            export default class DependentPlugin extends dependency.default {
+              static SharedBase = dependency.SharedBase;
+            }
+          `),
+          devMode: 'esm',
+          appDevDependencies: ['@nocobase/dependency'],
+        },
+        {
+          name: '@nocobase/dependency',
+          packageName: '@nocobase/dependency',
+          url: createModuleUrl('export class SharedBase {}; export default class DependencyPlugin {}'),
+          devMode: 'esm',
+        },
+      ] as any,
+    });
+
+    const dependencyModule = window.__nocobase_app_dev_plugins__['@nocobase/dependency/client-v2'] as {
+      default?: unknown;
+      SharedBase?: unknown;
+    };
+    const dependentPlugin = plugins[1][1] as (typeof plugins)[number][1] & { SharedBase?: unknown };
+
+    expect(plugins.map(([name]) => name)).toEqual(['@nocobase/dependency', '@nocobase/dependent']);
+    expect(dependencyModule.SharedBase).toBeDefined();
+    expect(plugins[0][1]).toBe(dependencyModule.default);
+    expect(dependentPlugin.SharedBase).toBe(dependencyModule.SharedBase);
+    expect(mockDefine).toHaveBeenCalledWith('@nocobase/dependency/client-v2', expect.any(Function));
+    expect(requirejs.requirejs.config).not.toHaveBeenCalled();
+  });
+
+  it('should load RequireJS dependencies before ESM dev plugins', async () => {
+    class DependencyPlugin extends Plugin {}
+    const SharedBase = { source: 'remote' };
+    const dependencyModule = {
+      SharedBase,
+      default: DependencyPlugin,
+    };
+    const requirejs: any = {
+      requirejs: vi.fn((packageNames, resolve) => {
+        expect(packageNames).toEqual(['@nocobase/remote-dependency/client-v2']);
+        resolve(dependencyModule);
+      }),
+    };
+    requirejs.requirejs.config = vi.fn();
+
+    window.define = vi.fn();
+
+    const plugins = await getPlugins({
+      requirejs,
+      pluginData: [
+        {
+          name: '@nocobase/dependent',
+          packageName: '@nocobase/dependent',
+          url: createModuleUrl(`
+            const dependency = window.__nocobase_app_dev_plugins__ && window.__nocobase_app_dev_plugins__['@nocobase/remote-dependency/client-v2'];
+            export default class DependentPlugin extends dependency.default {
+              static SharedBase = dependency.SharedBase;
+            }
+          `),
+          devMode: 'esm',
+          appDevDependencies: ['@nocobase/remote-dependency'],
+        },
+        {
+          name: '@nocobase/remote-dependency',
+          packageName: '@nocobase/remote-dependency',
+          url: 'https://dependency.com',
+        },
+      ] as any,
+    });
+
+    const dependentPlugin = plugins[1][1] as (typeof plugins)[number][1] & { SharedBase?: unknown };
+
+    expect(plugins.map(([name]) => name)).toEqual(['@nocobase/remote-dependency', '@nocobase/dependent']);
+    expect(window.__nocobase_app_dev_plugins__['@nocobase/remote-dependency/client-v2']).toBe(dependencyModule);
+    expect(dependentPlugin.SharedBase).toBe(SharedBase);
+  });
+
   it('should configure remote plugin paths with /client-v2 module ids', () => {
     const requirejs: any = {
       requirejs: {

package/src/css-variable/CSSVariableProvider.tsx

@@ -9,8 +9,8 @@
 
 import { TinyColor } from '@ctrl/tinycolor';
 import { useEffect } from 'react';
-import { CustomToken, defaultTheme } from '@nocobase/client-v2';
 import { theme } from 'antd';
+import { type CustomToken, defaultTheme } from '../theme';
 
 interface Result extends ReturnType<typeof theme.useToken> {
   token: CustomToken;

package/src/flow/actions/filterFormDefaultValues.tsx

@@ -122,12 +122,11 @@ const FilterFormDefaultValuesUI = observer(
         rootCollection={getCollectionFromModel(ctx.model)}
         value={value}
         onChange={handleChange}
-        fixedMode="default"
-        showCondition={false}
         showValueEditorWhenNoField
         getValueInputProps={getValueInputProps}
         isTitleFieldCandidate={isTitleFieldCandidate}
         onSyncAssociationTitleField={onSyncAssociationTitleField}
+        enableDateVariableAsConstant
       />
     );
   },