@nocobase/flow-engine 2.0.0-alpha.5 → 2.0.0-alpha.6

package/lib/data-source/index.js

@@ -446,6 +446,7 @@ const _Collection = class _Collection {
     return field.targetCollection.getFieldByPath(otherKeys.join("."));
   }
   getField(fieldName) {
+    this.setFields(this.options.fields);
     return this.fields.get(fieldName);
   }
   getFullFieldPath(name) {

package/lib/models/CollectionFieldModel.d.ts

@@ -12,6 +12,7 @@ import { FlowEngineContext } from '../flowContext';
 import { DefaultStructure } from '../types';
 import { FlowModel } from './flowModel';
 export declare function FieldPlaceholder(): React.JSX.Element;
+export declare function FieldDeletePlaceholder(): React.JSX.Element;
 export interface FieldSettingsInitParams {
     dataSourceKey: string;
     collectionName: string;
@@ -26,6 +27,7 @@ export interface BindingOptions {
 }
 export declare class CollectionFieldModel<T extends DefaultStructure = DefaultStructure> extends FlowModel<T> {
     private static _bindings;
+    fieldDeleted: boolean;
     renderHiddenInConfig(): React.ReactNode | undefined;
     get title(): any;
     onInit(options: any): void;

package/lib/models/CollectionFieldModel.js

@@ -40,11 +40,14 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 var CollectionFieldModel_exports = {};
 __export(CollectionFieldModel_exports, {
   CollectionFieldModel: () => CollectionFieldModel,
+  FieldDeletePlaceholder: () => FieldDeletePlaceholder,
   FieldPlaceholder: () => FieldPlaceholder
 });
 module.exports = __toCommonJS(CollectionFieldModel_exports);
 var import_antd = require("antd");
 var import_react = __toESM(require("react"));
+var import_react_i18next = require("react-i18next");
+var import_hooks = require("../hooks");
 var import_utils = require("../utils");
 var import_flowModel = require("./flowModel");
 function FieldPlaceholder() {
@@ -62,9 +65,40 @@ function FieldPlaceholder() {
   ));
 }
 __name(FieldPlaceholder, "FieldPlaceholder");
+function FieldDeletePlaceholder() {
+  const { t } = (0, import_react_i18next.useTranslation)();
+  const model = (0, import_hooks.useFlowModel)();
+  const blockModel = model.context.blockModel;
+  const dataSource = blockModel.collection.dataSource;
+  const collection = blockModel.collection;
+  const name = model.fieldPath;
+  const nameValue = (0, import_react.useMemo)(() => {
+    const dataSourcePrefix = `${t(dataSource.displayName || dataSource.key)} > `;
+    const collectionPrefix = collection ? `${t(collection.title) || collection.name || collection.tableName} > ` : "";
+    return `${dataSourcePrefix}${collectionPrefix}${name}`;
+  }, []);
+  return /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, null, /* @__PURE__ */ import_react.default.createElement(
+    "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(">", ">")
+  ));
+}
+__name(FieldDeletePlaceholder, "FieldDeletePlaceholder");
 const defaultWhen = /* @__PURE__ */ __name(() => true, "defaultWhen");
 const _CollectionFieldModel = class _CollectionFieldModel extends import_flowModel.FlowModel {
+  fieldDeleted = false;
   renderHiddenInConfig() {
+    if (this.fieldDeleted) {
+      return /* @__PURE__ */ import_react.default.createElement(FieldDeletePlaceholder, null);
+    }
     return /* @__PURE__ */ import_react.default.createElement(FieldPlaceholder, null);
   }
   get title() {
@@ -107,6 +141,9 @@ const _CollectionFieldModel = class _CollectionFieldModel extends import_flowMod
     }
   }
   static getBindingsByField(ctx, collectionField) {
+    if (!collectionField) {
+      return;
+    }
     const interfaceName = collectionField.interface;
     if (!this.bindings.has(interfaceName)) {
       return [];
@@ -238,5 +275,6 @@ CollectionFieldModel.registerFlow({
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CollectionFieldModel,
+  FieldDeletePlaceholder,
   FieldPlaceholder
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/flow-engine",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "private": false,
   "description": "A standalone flow engine for NocoBase, managing workflows, models, and actions.",
   "main": "lib/index.js",
@@ -33,5 +33,5 @@
   ],
   "author": "NocoBase Team",
   "license": "AGPL-3.0",
-  "gitHead": "943e035bbec27f9ecfe8ce8857955945f20976f3"
+  "gitHead": "276a65c0656bbace2df7593be0f53c96b7b0725b"
 }

package/src/data-source/index.ts

@@ -490,6 +490,7 @@ export class Collection {
   }
 
   getField(fieldName: string): CollectionField | undefined {
+    this.setFields(this.options.fields); //数据表字段被删除
     return this.fields.get(fieldName);
   }
 

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 />;
   }
 
@@ -103,6 +137,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