@nocobase/flow-engine 2.0.0-alpha.3 → 2.0.0-alpha.30

package/src/locale/en-US.json

@@ -23,6 +23,7 @@
   "UID copied to clipboard": "UID copied to clipboard",
   "Copy failed": "Copy failed",
   "Copy failed, please copy [{{uid}}] manually.": "Copy failed, please copy [{{uid}}] manually.",
+  "Copy failed under HTTP. Clipboard API is unavailable on non-HTTPS pages. Please copy [{{uid}}] manually.": "Copy failed under HTTP. Clipboard API is unavailable on non-HTTPS pages. Please copy [{{uid}}] manually.",
   "Confirm delete": "Confirm delete",
   "Are you sure you want to delete this item? This action cannot be undone.": "Are you sure you want to delete this item? This action cannot be undone.",
   "Delete operation failed": "Delete operation failed",
@@ -57,5 +58,6 @@
   "Name": "Name",
   "Model with ID {{uid}} not found": "Model with ID {{uid}} not found",
   "Common actions": "Common actions",
-  "This variable is not available": "This variable is not available"
-}
+  "This variable is not available": "This variable is not available",
+  "Copy popup UID": "Copy popup UID"
+}

package/src/locale/zh-CN.json

@@ -23,6 +23,7 @@
   "UID copied to clipboard": "UID 已复制到剪贴板",
   "Copy failed": "复制失败",
   "Copy failed, please copy [{{uid}}] manually.": "复制失败，请手动复制 [{{uid}}]。",
+  "Copy failed under HTTP. Clipboard API is unavailable on non-HTTPS pages. Please copy [{{uid}}] manually.": "HTTP 环境下复制失败。非 HTTPS 页面不支持剪贴板 API，请手动复制 [{{uid}}]。",
   "Confirm delete": "确认删除",
   "Are you sure you want to delete this item? This action cannot be undone.": "确定要删除此项吗？此操作不可撤销。",
   "Delete operation failed": "删除操作失败",
@@ -57,5 +58,6 @@
   "Name": "名称",
   "Model with ID {{uid}} not found": "未找到 ID 为 {{uid}} 的模型",
   "Common actions": "通用操作",
-  "This variable is not available": "此变量不可用"
-}
+  "This variable is not available": "此变量不可用",
+  "Copy popup UID": "复制弹窗 UID"
+}

package/src/models/CollectionFieldModel.tsx

@@ -9,9 +9,11 @@
 
 import { Card, Form } from 'antd';
 import _ from 'lodash';
-import React from 'react';
+import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 import { CollectionField } from '../data-source';
 import { FlowEngineContext } from '../flowContext';
+import { useFlowModel } from '../hooks';
 import { DefaultStructure } from '../types';
 import { escapeT } from '../utils';
 import { FlowModel } from './flowModel';
@@ -33,6 +35,34 @@ export function FieldPlaceholder() {
   );
 }
 
+export function FieldDeletePlaceholder() {
+  const { t } = useTranslation();
+  const model: any = useFlowModel();
+  const blockModel = model.context.blockModel;
+  const dataSource = blockModel.collection.dataSource;
+  const collection = blockModel.collection;
+  const name = model.fieldPath;
+  const nameValue = useMemo(() => {
+    const dataSourcePrefix = `${t(dataSource.displayName || dataSource.key)} > `;
+    const collectionPrefix = collection ? `${t(collection.title) || collection.name || collection.tableName} > ` : '';
+    return `${dataSourcePrefix}${collectionPrefix}${name}`;
+  }, []);
+  return (
+    <Form.Item>
+      <div
+        style={{
+          color: 'rgba(0,0,0,0.45)',
+        }}
+      >
+        {t(`The {{type}} "{{name}}" may have been deleted. Please remove this {{blockType}}.`, {
+          type: t('Field'),
+          name: nameValue,
+          blockType: t('Field'),
+        }).replaceAll('&gt;', '>')}
+      </div>
+    </Form.Item>
+  );
+}
 export interface FieldSettingsInitParams {
   dataSourceKey: string;
   collectionName: string;
@@ -51,8 +81,12 @@ const defaultWhen = () => true;
 
 export class CollectionFieldModel<T extends DefaultStructure = DefaultStructure> extends FlowModel<T> {
   private static _bindings = new Map();
+  fieldDeleted = false;
 
   renderHiddenInConfig(): React.ReactNode | undefined {
+    if (this.fieldDeleted) {
+      return <FieldDeletePlaceholder />;
+    }
     return <FieldPlaceholder />;
   }
 
@@ -76,12 +110,14 @@ export class CollectionFieldModel<T extends DefaultStructure = DefaultStructure>
         return this.fieldPath;
       },
     });
-    this.context.blockModel.addAppends(this.fieldPath);
-    this.context.blockModel.addAppends(this.associationPathName);
+    if (this.context.blockModel) {
+      this.context.blockModel.addAppends(this.fieldPath);
+      this.context.blockModel.addAppends(this.associationPathName);
+    }
   }
 
   getFieldSettingsInitParams(): FieldSettingsInitParams {
-    return this.getStepParams('fieldSettings', 'init');
+    return this.getStepParams('fieldSettings', 'init') || {};
   }
 
   get fieldPath(): string {
@@ -103,6 +139,9 @@ export class CollectionFieldModel<T extends DefaultStructure = DefaultStructure>
   }
 
   static getBindingsByField(ctx: FlowEngineContext, collectionField: CollectionField): BindingOptions[] {
+    if (!collectionField) {
+      return;
+    }
     const interfaceName = collectionField.interface;
 
     // Check if the interface exists in the map

package/src/models/__tests__/flowModel.getFlows.sort.test.ts

@@ -10,13 +10,13 @@
 import { describe, expect, test, beforeEach } from 'vitest';
 import { FlowModel } from '@nocobase/flow-engine';
 
-describe('FlowModel.getFlows sorting and getAutoFlows order', () => {
+describe('FlowModel.getFlows sorting and getEventFlows(beforeRender) order', () => {
   let TestFlowModel: typeof FlowModel;
   let model: FlowModel;
 
   beforeEach(() => {
     // use a fresh subclass to isolate class-level registries
-    TestFlowModel = class extends FlowModel {};
+    TestFlowModel = class extends FlowModel<any> {};
     // provide a minimal fake engine to avoid circular deps in tests
     const fakeEngine = { getModel: () => undefined } as any;
     model = new TestFlowModel({ flowEngine: fakeEngine } as any);
@@ -37,7 +37,7 @@ describe('FlowModel.getFlows sorting and getAutoFlows order', () => {
     expect(orderedKeys).toEqual(['flowD', 'flowB', 'flowC', 'flowA']);
   });
 
-  test('getAutoFlows keeps getFlows order and filters out manual/on flows', () => {
+  test("getEventFlows('beforeRender') keeps getFlows order and filters out manual/on flows", () => {
     // class-level
     TestFlowModel.registerFlow('flowA', { title: 'A', sort: 10, steps: {} });
     TestFlowModel.registerFlow('flowB', { title: 'B', sort: 5, steps: {} });
@@ -51,7 +51,7 @@ describe('FlowModel.getFlows sorting and getAutoFlows order', () => {
     model.registerFlow('manualFlow', { title: 'Manual', manual: true, sort: -1, steps: {} });
 
     const getFlowsOrder = Array.from(model.getFlows().keys());
-    const autoFlowKeys = model.getAutoFlows().map((f) => f.key);
+    const autoFlowKeys = model.getEventFlows('beforeRender').map((f) => f.key);
 
     // auto flows should exclude event/manual flows
     expect(autoFlowKeys).toEqual(['flowD', 'flowB', 'flowC', 'flowE', 'flowA']);