@nocobase/flow-engine 2.0.0-alpha.51 → 2.0.0-alpha.52

package/lib/components/subModel/AddSubModelButton.js

@@ -130,9 +130,21 @@ const transformSubModelItems = /* @__PURE__ */ __name(async (items, model, subMo
   const toggleItems = [];
   for (let i = 0; i < items.length; i++) {
     const item = items[i];
-    if (item.toggleable && item.useModel) {
+    let resolvedUseModel = item.useModel;
+    if (!resolvedUseModel && item.toggleable) {
+      try {
+        const createOpts = await getCreateModelOptions(item, model.context);
+        resolvedUseModel = createOpts == null ? void 0 : createOpts.use;
+        if (resolvedUseModel) {
+          item.useModel = resolvedUseModel;
+        }
+      } catch (error) {
+        console.error("[NocoBase]: Failed to resolve useModel for toggleable item:", error);
+      }
+    }
+    if (item.toggleable && resolvedUseModel) {
       item.toggleDetector = (ctx) => {
-        const C = ctx.engine.getModelClass(item.useModel);
+        const C = ctx.engine.getModelClass(resolvedUseModel);
         const r = ctx.model.findSubModel(subModelKey, (m) => {
           if (item.toggleable === true) {
             return m.constructor === C;
@@ -143,7 +155,7 @@ const transformSubModelItems = /* @__PURE__ */ __name(async (items, model, subMo
         return !!r;
       };
       item.customRemove = async (ctx, item2) => {
-        const C = ctx.engine.getModelClass(item2.useModel);
+        const C = ctx.engine.getModelClass(resolvedUseModel);
         const r = ctx.model.findSubModel(subModelKey, (m) => {
           if (item2.toggleable === true) {
             return m.constructor === C;

package/lib/data-source/index.js

@@ -671,7 +671,19 @@ const _CollectionField = class _CollectionField {
   }
   get enum() {
     var _a;
-    return ((_a = this.options.uiSchema) == null ? void 0 : _a.enum) || [];
+    const options = ((_a = this.options.uiSchema) == null ? void 0 : _a.enum) || [];
+    if (this.type === "integer") {
+      return options.map((v) => {
+        if (typeof v !== "object") {
+          return v;
+        }
+        return {
+          ...v,
+          value: Number(v.value)
+        };
+      });
+    }
+    return options;
   }
   get defaultValue() {
     return this.options.defaultValue == null ? void 0 : this.options.defaultValue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/flow-engine",
-  "version": "2.0.0-alpha.51",
+  "version": "2.0.0-alpha.52",
   "private": false,
   "description": "A standalone flow engine for NocoBase, managing workflows, models, and actions.",
   "main": "lib/index.js",
@@ -8,8 +8,8 @@
   "dependencies": {
     "@formily/antd-v5": "1.x",
     "@formily/reactive": "2.x",
-    "@nocobase/sdk": "2.0.0-alpha.51",
-    "@nocobase/shared": "2.0.0-alpha.51",
+    "@nocobase/sdk": "2.0.0-alpha.52",
+    "@nocobase/shared": "2.0.0-alpha.52",
     "ahooks": "^3.7.2",
     "dayjs": "^1.11.9",
     "dompurify": "^3.0.2",
@@ -36,5 +36,5 @@
   ],
   "author": "NocoBase Team",
   "license": "AGPL-3.0",
-  "gitHead": "a1e34dd97f370d54f3d80a6b83ab7ddb9c72dc18"
+  "gitHead": "b32992d8baeb4ca6616d839ca2f9c023d49476a9"
 }

package/src/components/subModel/AddSubModelButton.tsx

@@ -208,9 +208,25 @@ const transformSubModelItems = async (
   const toggleItems: Array<{ item: SubModelItem; index: number }> = [];
   for (let i = 0; i < items.length; i++) {
     const item = items[i];
-    if (item.toggleable && item.useModel) {
+
+    // 自动从 createModelOptions 中推断 useModel，避免遗漏导致 toggleable 失效
+    let resolvedUseModel = item.useModel;
+    if (!resolvedUseModel && item.toggleable) {
+      try {
+        const createOpts = await getCreateModelOptions(item, model.context);
+        resolvedUseModel = createOpts?.use;
+        if (resolvedUseModel) {
+          item.useModel = resolvedUseModel;
+        }
+      } catch (error) {
+        // ignore and fall back to existing useModel
+        console.error('[NocoBase]: Failed to resolve useModel for toggleable item:', error);
+      }
+    }
+
+    if (item.toggleable && resolvedUseModel) {
       item.toggleDetector = (ctx) => {
-        const C = ctx.engine.getModelClass(item.useModel); // 确保 use 是有效的模型类
+        const C = ctx.engine.getModelClass(resolvedUseModel); // 确保 use 是有效的模型类
         const r = ctx.model.findSubModel(subModelKey, (m) => {
           if (item.toggleable === true) {
             return m.constructor === C;
@@ -221,7 +237,7 @@ const transformSubModelItems = async (
         return !!r;
       };
       item.customRemove = async (ctx, item) => {
-        const C = ctx.engine.getModelClass(item.useModel); // 确保 use 是有效的模型类
+        const C = ctx.engine.getModelClass(resolvedUseModel); // 确保 use 是有效的模型类
         const r = ctx.model.findSubModel(subModelKey, (m) => {
           if (item.toggleable === true) {
             return m.constructor === C;

package/src/components/subModel/__tests__/AddSubModelButton.test.tsx

@@ -233,6 +233,32 @@ describe('transformItems - toggleable items', () => {
     expect(((parent.subModels as any).items || []).length).toBe(0);
   });
 
+  it('infers useModel from createModelOptions when toggleable is enabled', async () => {
+    const engine = setupEngine();
+    const parent = engine.createModel<ToggleParent>({ use: 'ToggleParent', uid: 'toggle-parent-infer' });
+    const child = engine.createModel<ToggleChild>({ use: 'ToggleChild', uid: 'toggle-child-infer' });
+    parent.addSubModel('items', child);
+
+    const definition: SubModelItem[] = [
+      {
+        key: 'toggle-child',
+        label: 'Toggle Child',
+        toggleable: true,
+        // intentionally omit useModel to rely on createModelOptions.use
+        createModelOptions: { use: 'ToggleChild' },
+      },
+    ];
+
+    const factory = transformItems(definition, parent, 'items', 'array');
+    const resolved = await (typeof factory === 'function' ? factory() : Promise.resolve(factory));
+    const toggleItem = resolved[0];
+
+    expect(definition[0].useModel).toBe('ToggleChild');
+    expect(toggleItem.isToggled).toBe(true);
+    const { getByRole } = render(<>{toggleItem.label}</>);
+    expect(getByRole('switch')).toHaveAttribute('aria-checked', 'true');
+  });
+
   it('keeps toggleable item off when sub model missing', async () => {
     const engine = setupEngine();
     const parent = engine.createModel<ToggleParent>({ use: 'ToggleParent', uid: 'toggle-parent-off' });

package/src/data-source/index.ts

@@ -8,8 +8,8 @@
  */
 
 import { observable } from '@formily/reactive';
-import _ from 'lodash';
 import { CascaderProps } from 'antd';
+import _ from 'lodash';
 import { FlowEngine } from '../flowEngine';
 import { jioToJoiSchema } from './jioToJoiSchema';
 import { sortCollectionsByInherits } from './sortCollectionsByInherits';
@@ -803,7 +803,19 @@ export class CollectionField {
   }
 
   get enum(): any[] {
-    return this.options.uiSchema?.enum || [];
+    const options = this.options.uiSchema?.enum || [];
+    if (this.type === 'integer') {
+      return options.map((v) => {
+        if (typeof v !== 'object') {
+          return v;
+        }
+        return {
+          ...v,
+          value: Number(v.value),
+        };
+      });
+    }
+    return options;
   }
 
   get defaultValue() {