@nocobase/flow-engine 2.0.0-alpha.46 → 2.0.0-alpha.48

package/lib/data-source/index.d.ts

@@ -83,6 +83,33 @@ export declare class CollectionManager {
     clearCollections(): void;
     getAssociation(associationName: string): CollectionField | undefined;
     getChildrenCollections(name: any): any[];
+    getCollectionFieldsOptions(collectionName: string, type?: string | string[], interfaces?: string | string[], opts?: {
+        dataSource?: string;
+        cached?: Record<string, any>;
+        collectionNames?: string[];
+        /**
+         * 为 true 时允许查询所有关联字段
+         * 为 Array<string> 时仅允许查询指定的关联字段
+         */
+        association?: boolean | string[];
+        /**
+         * Max depth of recursion
+         */
+        maxDepth?: number;
+        allowAllTypes?: boolean;
+        /**
+         * 排除这些接口的字段
+         */
+        exceptInterfaces?: string[];
+        /**
+         * field value 的前缀，用 . 连接，比如 a.b.c
+         */
+        prefixFieldValue?: string;
+        /**
+         * 是否使用 prefixFieldValue 作为 field value
+         */
+        usePrefix?: boolean;
+    }): any;
 }
 export declare class Collection {
     fields: Map<string, CollectionField>;

package/lib/data-source/index.js

@@ -317,6 +317,57 @@ const _CollectionManager = class _CollectionManager {
     }, "getChildrens");
     return getChildrens(name);
   }
+  getCollectionFieldsOptions(collectionName, type, interfaces, opts) {
+    var _a;
+    const {
+      association = false,
+      cached = {},
+      collectionNames = [collectionName],
+      maxDepth = 1,
+      allowAllTypes = false,
+      exceptInterfaces = [],
+      prefixFieldValue = "",
+      usePrefix = false,
+      dataSource: customDataSourceNameValue
+    } = opts || {};
+    if (collectionNames.length - 1 > maxDepth) {
+      return;
+    }
+    if (cached[collectionName]) {
+      return import_lodash.default.cloneDeep(cached[collectionName]);
+    }
+    const collection = this.getCollection(collectionName);
+    if (!collection) {
+      throw new Error(`Collection ${collectionName} not found`);
+    }
+    const fields = collection.getFields();
+    const options = (_a = fields == null ? void 0 : fields.filter(
+      (field) => field.interface && !exceptInterfaces.includes(field.interface) && (allowAllTypes || type && type.includes(field.type) || interfaces && interfaces.includes(field.interface) || (association && field.target && field.target !== collectionName && Array.isArray(association) ? association.includes(field.interface) : false))
+    )) == null ? void 0 : _a.map((field) => {
+      var _a2, _b;
+      const result = {
+        value: usePrefix && prefixFieldValue ? `${prefixFieldValue}.${field.name}` : field.name,
+        label: ((_a2 = field == null ? void 0 : field.uiSchema) == null ? void 0 : _a2.title) || field.name,
+        ...field
+      };
+      if (association && field.target) {
+        result.children = collectionNames.includes(field.target) ? [] : this.getCollectionFieldsOptions(field.target, type, interfaces, {
+          ...opts,
+          cached,
+          dataSource: customDataSourceNameValue,
+          collectionNames: [...collectionNames, field.target],
+          prefixFieldValue: usePrefix ? prefixFieldValue ? `${prefixFieldValue}.${field.name}` : field.name : "",
+          usePrefix
+        });
+        if (!((_b = result.children) == null ? void 0 : _b.length)) {
+          return null;
+        }
+      }
+      return result;
+    }).filter(Boolean);
+    cached[collectionName] = options;
+    return options;
+  }
 };
 __name(_CollectionManager, "CollectionManager");
 let CollectionManager = _CollectionManager;

package/lib/resources/baseRecordResource.js

@@ -220,6 +220,9 @@ const _BaseRecordResource = class _BaseRecordResource extends import_apiResource
     return this;
   }
   setFilterByTk(filterByTk) {
+    if (filterByTk !== null && typeof filterByTk === "object") {
+      filterByTk = JSON.stringify(filterByTk);
+    }
     return this.addRequestParameter("filterByTk", filterByTk);
   }
   getFilterByTk() {

package/lib/utils/createCollectionContextMeta.js

@@ -101,7 +101,9 @@ function createCollectionContextMeta(collectionOrFactory, title) {
       properties: /* @__PURE__ */ __name(async () => {
         const properties = {};
         collection.fields.forEach((field) => {
-          properties[field.name] = createFieldMetadata(field);
+          if (field.filterable) {
+            properties[field.name] = createFieldMetadata(field);
+          }
         });
         return properties;
       }, "properties")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/flow-engine",
-  "version": "2.0.0-alpha.46",
+  "version": "2.0.0-alpha.48",
   "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.46",
-    "@nocobase/shared": "2.0.0-alpha.46",
+    "@nocobase/sdk": "2.0.0-alpha.48",
+    "@nocobase/shared": "2.0.0-alpha.48",
     "ahooks": "^3.7.2",
     "dayjs": "^1.11.9",
     "dompurify": "^3.0.2",
@@ -36,5 +36,5 @@
   ],
   "author": "NocoBase Team",
   "license": "AGPL-3.0",
-  "gitHead": "ebf3cbeea4957a914e3157f3c6b570dba685c46f"
+  "gitHead": "456be3a6e92f984fe283590c80d3ea9423695ba6"
 }

package/src/data-source/index.ts

@@ -9,6 +9,7 @@
 
 import { observable } from '@formily/reactive';
 import _ from 'lodash';
+import { CascaderProps } from 'antd';
 import { FlowEngine } from '../flowEngine';
 import { jioToJoiSchema } from './jioToJoiSchema';
 import { sortCollectionsByInherits } from './sortCollectionsByInherits';
@@ -338,6 +339,118 @@ export class CollectionManager {
     };
     return getChildrens(name);
   }
+
+  getCollectionFieldsOptions(
+    collectionName: string,
+    type?: string | string[],
+    interfaces?: string | string[],
+    opts?: {
+      dataSource?: string;
+      cached?: Record<string, any>;
+      collectionNames?: string[];
+      /**
+       * 为 true 时允许查询所有关联字段
+       * 为 Array<string> 时仅允许查询指定的关联字段
+       */
+      association?: boolean | string[];
+      /**
+       * Max depth of recursion
+       */
+      maxDepth?: number;
+      allowAllTypes?: boolean;
+      /**
+       * 排除这些接口的字段
+       */
+      exceptInterfaces?: string[];
+      /**
+       * field value 的前缀，用 . 连接，比如 a.b.c
+       */
+      prefixFieldValue?: string;
+      /**
+       * 是否使用 prefixFieldValue 作为 field value
+       */
+      usePrefix?: boolean;
+    },
+  ) {
+    const {
+      association = false,
+      cached = {},
+      collectionNames = [collectionName],
+      maxDepth = 1,
+      allowAllTypes = false,
+      exceptInterfaces = [],
+      prefixFieldValue = '',
+      usePrefix = false,
+      dataSource: customDataSourceNameValue,
+    } = opts || {};
+
+    if (collectionNames.length - 1 > maxDepth) {
+      return;
+    }
+
+    if (cached[collectionName]) {
+      // avoid infinite recursion
+      return _.cloneDeep(cached[collectionName]);
+    }
+
+    // Fetch the collection
+    const collection = this.getCollection(collectionName);
+    if (!collection) {
+      throw new Error(`Collection ${collectionName} not found`);
+    }
+
+    // Get the fields of the collection
+    const fields = collection.getFields(); // Assuming `getFields` returns an array of fields for the collection.
+
+    const options = fields
+      ?.filter(
+        (field) =>
+          field.interface &&
+          !exceptInterfaces.includes(field.interface) &&
+          (allowAllTypes ||
+            (type && type.includes(field.type)) ||
+            (interfaces && interfaces.includes(field.interface)) ||
+            (association && field.target && field.target !== collectionName && Array.isArray(association)
+              ? association.includes(field.interface)
+              : false)),
+      )
+      ?.map((field) => {
+        const result: CascaderProps<any>['options'][0] = {
+          value: usePrefix && prefixFieldValue ? `${prefixFieldValue}.${field.name}` : field.name,
+          label: field?.uiSchema?.title || field.name,
+          ...field,
+        };
+
+        if (association && field.target) {
+          result.children = collectionNames.includes(field.target)
+            ? []
+            : this.getCollectionFieldsOptions(field.target, type, interfaces, {
+                ...opts,
+                cached,
+                dataSource: customDataSourceNameValue,
+                collectionNames: [...collectionNames, field.target],
+                prefixFieldValue: usePrefix
+                  ? prefixFieldValue
+                    ? `${prefixFieldValue}.${field.name}`
+                    : field.name
+                  : '',
+                usePrefix,
+              });
+
+          // If no children are found, don't return the field
+          if (!result.children?.length) {
+            return null;
+          }
+        }
+        return result;
+      })
+      // Filter out null values (i.e., fields with no valid options)
+      .filter(Boolean);
+
+    // Cache the result to avoid infinite recursion
+    cached[collectionName] = options;
+    return options;
+  }
 }
 
 // Collection 负责管理自己的 Field

package/src/resources/baseRecordResource.ts

@@ -228,6 +228,9 @@ export abstract class BaseRecordResource<TData = any> extends APIResource<TData>
   }
 
   setFilterByTk(filterByTk: any) {
+    if (filterByTk !== null && typeof filterByTk === 'object') {
+      filterByTk = JSON.stringify(filterByTk);
+    }
     return this.addRequestParameter('filterByTk', filterByTk);
   }
 

package/src/utils/createCollectionContextMeta.ts

@@ -110,7 +110,9 @@ export function createCollectionContextMeta(
 
         // 添加所有字段
         collection.fields.forEach((field) => {
-          properties[field.name] = createFieldMetadata(field);
+          if (field.filterable) {
+            properties[field.name] = createFieldMetadata(field);
+          }
         });
 
         return properties;