@nocobase/plugin-workflow 0.10.0-alpha.5 → 0.10.1-alpha.1

package/lib/client/components/DynamicExpression.js

@@ -69,6 +69,9 @@ const InternalExpression = (0, _react().observer)(props => {
     _useState2 = _slicedToArray(_useState, 2),
     collection = _useState2[0],
     setCollection = _useState2[1];
+  const compile = (0, _client().useCompile)();
+  const _useCollectionManager = (0, _client().useCollectionManager)(),
+    getCollectionFields = _useCollectionManager.getCollectionFields;
   (0, _react().useFormEffects)(() => {
     (0, _core().onFormInitialValuesChange)(form => {
       setCollection(form.values.sourceCollection);
@@ -78,8 +81,10 @@ const InternalExpression = (0, _react().observer)(props => {
       onChange(null);
     });
   });
-  const options = (0, _variable.useCollectionFieldOptions)({
-    collection: collection
+  const options = (0, _variable.getCollectionFieldOptions)({
+    collection,
+    compile,
+    getCollectionFields
   });
   return _react2().default.createElement(_client().Variable.TextArea, _objectSpread(_objectSpread({}, props), {}, {
     scope: options
@@ -91,8 +96,13 @@ function Result(props) {
   const _useTranslation = (0, _reactI18next().useTranslation)(),
     t = _useTranslation.t;
   const values = (0, _client().useRecord)();
-  const options = (0, _react2().useMemo)(() => (0, _variable.useCollectionFieldOptions)({
-    collection: values.sourceCollection
+  const compile = (0, _client().useCompile)();
+  const _useCollectionManager2 = (0, _client().useCollectionManager)(),
+    getCollectionFields = _useCollectionManager2.getCollectionFields;
+  const options = (0, _react2().useMemo)(() => (0, _variable.getCollectionFieldOptions)({
+    collection: values.sourceCollection,
+    compile,
+    getCollectionFields
   }), [values.sourceCollection, values.sourceCollection]);
   return props.value ? _react2().default.createElement(_client().Variable.TextArea, _objectSpread(_objectSpread({}, props), {}, {
     scope: options

package/lib/client/nodes/aggregate.d.ts

@@ -178,9 +178,15 @@ declare const _default: {
         };
         AssociatedConfig: typeof AssociatedConfig;
     };
-    useVariables(current: any, { types }: {
+    useVariables({ id, title }: {
+        id: any;
+        title: any;
+    }, { types }: {
         types: any;
-    }): any[];
+    }): {
+        value: string;
+        label: any;
+    };
     useInitializers(node: any): SchemaInitializerItemOptions | null;
 };
 export default _default;

package/lib/client/nodes/aggregate.js

@@ -38,7 +38,6 @@ var _FilterDynamicComponent = require("../components/FilterDynamicComponent");
 var _variable = require("../variable");
 var _FieldsSelect = require("../components/FieldsSelect");
 var _ValueBlock = require("../components/ValueBlock");
-var _ = require(".");
 const _excluded = ["value", "onChange"];
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -49,8 +48,9 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typ
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-function matchToManyField(field, depth) {
-  return ['hasMany', 'belongsToMany'].includes(field.type) && depth;
+function matchToManyField(field, appends) {
+  const fieldPrefix = `${field.name}.`;
+  return ['hasMany', 'belongsToMany'].includes(field.type) && (appends.includes(field.name) || appends.some(item => item.startsWith(fieldPrefix)));
 }
 function AssociatedConfig(_ref) {
   let value = _ref.value,
@@ -61,7 +61,6 @@ function AssociatedConfig(_ref) {
   const compile = (0, _client().useCompile)();
   const _useCollectionManager = (0, _client().useCollectionManager)(),
     getCollection = _useCollectionManager.getCollection;
-  const current = (0, _.useNodeContext)();
   const options = [_variable.nodesOptions, _variable.triggerOptions].map(item => {
     var _item$useOptions;
     const children = (_item$useOptions = item.useOptions({
@@ -322,15 +321,19 @@ var _default = {
     ValueBlock: _ValueBlock.ValueBlock,
     AssociatedConfig
   },
-  useVariables(current, {
+  useVariables({
+    id,
+    title
+  }, {
     types
   }) {
     if (types && !types.some(type => type in _variable.BaseTypeSets || Object.values(_variable.BaseTypeSets).some(set => set.has(type)))) {
       return null;
     }
-    return [
-      // { key: '', value: '', label: lang('Calculation result') }
-    ];
+    return {
+      value: `${id}`,
+      label: title
+    };
   },
   useInitializers(node) {
     var _node$title;

package/lib/client/nodes/calculation.d.ts

@@ -1,14 +1,6 @@
 import { SchemaInitializerItemOptions } from '@nocobase/client';
 import React from 'react';
 import { RadioWithTooltip } from '../components/RadioWithTooltip';
-import { useWorkflowVariableOptions } from '../variable';
-declare function useWorkflowVariableEntityOptions(): {
-    label: any;
-    value: any;
-    key: any;
-    children: any;
-    disabled: boolean;
-}[];
 declare const _default: {
     title: string;
     type: string;
@@ -44,9 +36,6 @@ declare const _default: {
             title: string;
             'x-decorator': string;
             'x-component': string;
-            'x-component-props': {
-                scope: string;
-            };
             "x-validator"(value: any, rules: any, { form }: {
                 form: any;
             }): string;
@@ -75,7 +64,7 @@ declare const _default: {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
-                scope: string;
+                changeOnSelect: boolean;
             };
             'x-reactions': {
                 dependencies: string[];
@@ -89,11 +78,11 @@ declare const _default: {
     };
     view: {};
     scope: {
-        useWorkflowVariableOptions: typeof useWorkflowVariableOptions;
-        useWorkflowVariableEntityOptions: typeof useWorkflowVariableEntityOptions;
         renderEngineReference: (key: string) => React.JSX.Element;
     };
     components: {
+        CalculationExpression(props: any): React.JSX.Element;
+        ScopeSelect(props: any): React.JSX.Element;
         CalculationResult({ dataSource }: {
             dataSource: any;
         }): string | React.JSX.Element;
@@ -103,7 +92,13 @@ declare const _default: {
             onChange: any;
         }) => React.JSX.Element;
     };
-    useVariables(current: any, options: any): any[];
+    useVariables({ id, title }: {
+        id: any;
+        title: any;
+    }, options: any): {
+        value: any;
+        label: any;
+    };
     useInitializers(node: any): SchemaInitializerItemOptions;
 };
 export default _default;

package/lib/client/nodes/calculation.js

@@ -67,13 +67,20 @@ var _locale = require("../locale");
 var _variable = require("../variable");
 var _ValueBlock = require("../components/ValueBlock");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function useDynamicExpressionCollectionFieldMatcher(field) {
-  const _useCollectionManager = (0, _client().useCollectionManager)(),
-    getCollectionFields = _useCollectionManager.getCollectionFields;
-  if (field.type !== 'belongsTo') {
+  var _this$getCollection;
+  if (!['belongsTo', 'hasOne'].includes(field.type)) {
     return false;
   }
-  const fields = getCollectionFields(field.target);
+  if (((_this$getCollection = this.getCollection(field.collectionName)) === null || _this$getCollection === void 0 ? void 0 : _this$getCollection.template) === 'expression') {
+    return true;
+  }
+  const fields = this.getCollectionFields(field.target);
   return fields.some(f => f.interface === 'expression');
 }
 const DynamicConfig = ({
@@ -82,8 +89,14 @@ const DynamicConfig = ({
 }) => {
   const _useTranslation = (0, _reactI18next().useTranslation)(),
     t = _useTranslation.t;
+  const _useCollectionManager = (0, _client().useCollectionManager)(),
+    getCollectionFields = _useCollectionManager.getCollectionFields,
+    getCollection = _useCollectionManager.getCollection;
   const scope = (0, _variable.useWorkflowVariableOptions)({
-    types: [useDynamicExpressionCollectionFieldMatcher]
+    types: [useDynamicExpressionCollectionFieldMatcher.bind({
+      getCollectionFields,
+      getCollection
+    })]
   });
   return _react().default.createElement(_antd().FormLayout, {
     layout: "vertical"
@@ -118,17 +131,6 @@ const DynamicConfig = ({
     scope: scope
   })) : null);
 };
-function useWorkflowVariableEntityOptions() {
-  return (0, _variable.useWorkflowVariableOptions)({
-    types: [{
-      type: 'reference',
-      options: {
-        collection: '*',
-        entity: true
-      }
-    }]
-  });
-}
 var _default = {
   title: `{{t("Calculation", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'calculation',
@@ -164,10 +166,13 @@ var _default = {
       type: 'string',
       title: `{{t("Calculation expression", { ns: "${_locale.NAMESPACE}" })}}`,
       'x-decorator': 'FormItem',
-      'x-component': 'Variable.TextArea',
-      'x-component-props': {
-        scope: '{{useWorkflowVariableOptions}}'
-      },
+      'x-component': 'CalculationExpression',
+      // NOTE: can not use Variable.Input and scope directly as below,
+      //       because the scope will be cached.
+      // 'x-component': 'Variable.Input',
+      // 'x-component-props': {
+      //   scope: '{{useWorkflowVariableOptions()}}',
+      // },
       ['x-validator'](value, rules, {
         form
       }) {
@@ -203,15 +208,15 @@ var _default = {
       type: 'string',
       title: `{{t("Variable datasource", { ns: "${_locale.NAMESPACE}" })}}`,
       'x-decorator': 'FormItem',
-      'x-component': 'Variable.Input',
+      'x-component': 'ScopeSelect',
       'x-component-props': {
-        scope: '{{useWorkflowVariableEntityOptions}}'
+        changeOnSelect: true
       },
       'x-reactions': {
         dependencies: ['dynamic'],
         fulfill: {
           state: {
-            visible: '{{$deps[0] !== false}}'
+            visible: '{{$deps[0]}}'
           }
         }
       }
@@ -219,11 +224,29 @@ var _default = {
   },
   view: {},
   scope: {
-    useWorkflowVariableOptions: _variable.useWorkflowVariableOptions,
-    useWorkflowVariableEntityOptions,
     renderEngineReference: _renderEngineReference.renderEngineReference
   },
   components: {
+    CalculationExpression(props) {
+      const scope = (0, _variable.useWorkflowVariableOptions)();
+      return _react().default.createElement(_client().Variable.TextArea, _objectSpread({
+        scope: scope
+      }, props));
+    },
+    ScopeSelect(props) {
+      const scope = (0, _variable.useWorkflowVariableOptions)({
+        types: [{
+          type: 'reference',
+          options: {
+            collection: '*',
+            entity: true
+          }
+        }]
+      });
+      return _react().default.createElement(_client().Variable.Input, _objectSpread({
+        scope: scope
+      }, props));
+    },
     CalculationResult({
       dataSource
     }) {
@@ -247,15 +270,19 @@ var _default = {
     RadioWithTooltip: _RadioWithTooltip.RadioWithTooltip,
     DynamicConfig
   },
-  useVariables(current, options) {
+  useVariables({
+    id,
+    title
+  }, options) {
     const _ref = options !== null && options !== void 0 ? options : {},
       types = _ref.types;
     if (types && !types.some(type => type in _variable.BaseTypeSets || Object.values(_variable.BaseTypeSets).some(set => set.has(type)))) {
       return null;
     }
-    return [
-      // { key: '', value: '', label: lang('Calculation result') }
-    ];
+    return {
+      value: id,
+      label: title
+    };
   },
   useInitializers(node) {
     var _node$title;

package/lib/client/nodes/condition.d.ts

@@ -64,9 +64,6 @@ declare const _default: {
             title: string;
             'x-decorator': string;
             'x-component': string;
-            'x-component-props': {
-                scope: string;
-            };
             "x-validator"(value: any, rules: any, { form }: {
                 form: any;
             }): string;
@@ -101,6 +98,7 @@ declare const _default: {
     };
     components: {
         CalculationConfig: typeof CalculationConfig;
+        CalculationExpression(props: any): React.JSX.Element;
         RadioWithTooltip: typeof RadioWithTooltip;
     };
 };

package/lib/client/nodes/condition.js

@@ -432,10 +432,7 @@ var _default = {
       type: 'string',
       title: `{{t("Condition expression", { ns: "${_locale.NAMESPACE}" })}}`,
       'x-decorator': 'FormItem',
-      'x-component': 'Variable.TextArea',
-      'x-component-props': {
-        scope: '{{useWorkflowVariableOptions}}'
-      },
+      'x-component': 'CalculationExpression',
       ['x-validator'](value, rules, {
         form
       }) {
@@ -540,6 +537,12 @@ var _default = {
   },
   components: {
     CalculationConfig,
+    CalculationExpression(props) {
+      const scope = (0, _variable.useWorkflowVariableOptions)();
+      return _react().default.createElement(_client().Variable.TextArea, _objectSpread({
+        scope: scope
+      }, props));
+    },
     RadioWithTooltip: _RadioWithTooltip.RadioWithTooltip
   }
 };

package/lib/client/nodes/create.d.ts

@@ -61,9 +61,11 @@ declare const _default: {
         CollectionFieldset: import("react").MemoExoticComponent<import("@formily/reactive-react").ReactFC<Pick<any, string | number | symbol>>>;
         FieldsSelect: import("react").MemoExoticComponent<import("@formily/reactive-react").ReactFC<Pick<any, string | number | symbol>>>;
     };
-    useVariables({ config }: {
+    useVariables({ id, title, config }: {
+        id: any;
+        title: any;
         config: any;
-    }, options: any): import("../variable").VariableOption[];
+    }, options: any): import("../variable").VariableOption;
     useInitializers(node: any): SchemaInitializerItemOptions | null;
     initializers: {};
 };

package/lib/client/nodes/create.js

@@ -23,6 +23,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var _default = {
   title: `{{t("Create record", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'create',
@@ -57,15 +63,36 @@ var _default = {
     FieldsSelect: _FieldsSelect.FieldsSelect
   },
   useVariables({
+    id,
+    title,
     config
   }, options) {
-    var _options$depth, _config$params, _config$params$append;
-    const result = (0, _variable.useCollectionFieldOptions)(_objectSpread(_objectSpread({
-      collection: config === null || config === void 0 ? void 0 : config.collection
-    }, options), {}, {
-      depth: ((_options$depth = options === null || options === void 0 ? void 0 : options.depth) !== null && _options$depth !== void 0 ? _options$depth : config === null || config === void 0 ? void 0 : (_config$params = config.params) === null || _config$params === void 0 ? void 0 : (_config$params$append = _config$params.appends) === null || _config$params$append === void 0 ? void 0 : _config$params$append.length) ? 1 : 0
-    }));
-    return (result === null || result === void 0 ? void 0 : result.length) ? result : null;
+    var _config$params, _config$params$append;
+    const compile = (0, _client().useCompile)();
+    const _useCollectionManager = (0, _client().useCollectionManager)(),
+      getCollectionFields = _useCollectionManager.getCollectionFields;
+    // const depth = config?.params?.appends?.length
+    //   ? config?.params?.appends.reduce((max, item) => Math.max(max, item.split('.').length), 1)
+    //   : 0;
+    const name = `${id}`;
+    const _getCollectionFieldOp = (0, _variable.getCollectionFieldOptions)(_objectSpread(_objectSpread({}, options), {}, {
+        fields: [{
+          collectionName: config.collection,
+          name,
+          type: 'hasOne',
+          target: config.collection,
+          uiSchema: {
+            title
+          }
+        }],
+        // depth: options?.depth ?? depth,
+        appends: [name, ...(((_config$params = config.params) === null || _config$params === void 0 ? void 0 : (_config$params$append = _config$params.appends) === null || _config$params$append === void 0 ? void 0 : _config$params$append.map(item => `${name}.${item}`)) || [])],
+        compile,
+        getCollectionFields
+      })),
+      _getCollectionFieldOp2 = _slicedToArray(_getCollectionFieldOp, 1),
+      result = _getCollectionFieldOp2[0];
+    return result;
   },
   useInitializers(node) {
     var _node$title;

package/lib/client/nodes/index.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import { ISchema } from '@formily/react';
 import { Registry } from '@nocobase/utils/client';
 import { SchemaInitializerItemOptions } from '@nocobase/client';
-import { VariableOptions } from '../variable';
+import { VariableOption, VariableOptions } from '../variable';
 export interface Instruction {
     title: string;
     type: string;
@@ -25,7 +25,7 @@ export interface Instruction {
     };
     component?(props: any): JSX.Element;
     endding?: boolean;
-    useVariables?(node: any, options?: any): VariableOptions;
+    useVariables?(node: any, options?: any): VariableOption;
     useScopeVariables?(node: any, options?: any): VariableOptions;
     useInitializers?(node: any): SchemaInitializerItemOptions | null;
     initializers?: {

package/lib/client/nodes/loop.d.ts

@@ -14,7 +14,9 @@ declare const _default: {
             'x-component': string;
             'x-component-props': {
                 scope: string;
+                changeOnSelect: boolean;
                 useTypedConstant: string[];
+                className: string;
             };
             required: boolean;
         };

package/lib/client/nodes/loop.js

@@ -66,8 +66,20 @@ var _default = {
       'x-decorator': 'FormItem',
       'x-component': 'Variable.Input',
       'x-component-props': {
-        scope: '{{useWorkflowVariableOptions}}',
-        useTypedConstant: ['string', 'number', 'null']
+        scope: '{{useWorkflowVariableOptions()}}',
+        changeOnSelect: true,
+        useTypedConstant: ['string', 'number', 'null'],
+        className: (0, _css().css)`
+          width: 100%;
+
+          .variable {
+            flex: 1;
+          }
+
+          .ant-input.null-value {
+            width: 100%;
+          }
+        `
       },
       required: true
     }

package/lib/client/nodes/manual/WorkflowTodo.js

@@ -628,6 +628,7 @@ function Drawer() {
   }));
 }
 function Decorator({
+  params = {},
   children
 }) {
   const _useCollectionManager = (0, _client().useCollectionManager)(),
@@ -637,12 +638,13 @@ function Decorator({
     collection: 'users_jobs',
     resource: 'users_jobs',
     action: 'list',
-    params: {
+    params: _objectSpread(_objectSpread({
       pageSize: 20,
-      sort: ['-createdAt'],
+      sort: ['-createdAt']
+    }, params), {}, {
       appends: ['user', 'node', 'workflow'],
       except: ['node.config', 'workflow.config']
-    },
+    }),
     rowKey: 'id',
     showIndex: true,
     dragSort: false

package/lib/client/nodes/manual/index.d.ts

@@ -58,17 +58,23 @@ declare const _default: {
         ModeConfig: typeof ModeConfig;
         AssigneesSelect: typeof AssigneesSelect;
     };
-    useVariables({ config }: {
+    useVariables({ id, title, config }: {
+        id: any;
+        title: any;
         config: any;
     }, { types }: {
         types: any;
     }): {
-        key: string;
         value: string;
         label: any;
-        title: any;
-        children: import("../../variable").VariableOption[];
-    }[];
+        children: {
+            key: string;
+            value: string;
+            label: any;
+            title: any;
+            children: import("../../variable").VariableOption[];
+        }[];
+    };
     useInitializers(node: any): SchemaInitializerItemOptions | null;
     initializers: {};
 };

package/lib/client/nodes/manual/index.js

@@ -94,11 +94,16 @@ var _default = {
     AssigneesSelect: _AssigneesSelect.AssigneesSelect
   },
   useVariables({
+    id,
+    title,
     config
   }, {
     types
   }) {
     var _config$forms;
+    const compile = (0, _client().useCompile)();
+    const _useCollectionManager = (0, _client().useCollectionManager)(),
+      getCollectionFields = _useCollectionManager.getCollectionFields;
     const formKeys = Object.keys((_config$forms = config.forms) !== null && _config$forms !== void 0 ? _config$forms : {});
     if (!formKeys.length) {
       return null;
@@ -106,26 +111,32 @@ var _default = {
     const options = formKeys.map(formKey => {
       var _form$collection;
       const form = config.forms[formKey];
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      const options = (0, _variable.useCollectionFieldOptions)({
+      const fieldsOptions = (0, _variable.getCollectionFieldOptions)({
         fields: (_form$collection = form.collection) === null || _form$collection === void 0 ? void 0 : _form$collection.fields,
         collection: form.collection,
-        types
+        types,
+        compile,
+        getCollectionFields
       });
-      return options.length ? {
+      const label = compile(form.title) || formKey;
+      return fieldsOptions.length ? {
         key: formKey,
         value: formKey,
-        label: form.title || formKey,
-        title: form.title || formKey,
-        children: options
+        label,
+        title: label,
+        children: fieldsOptions
       } : null;
     }).filter(Boolean);
-    return options.length ? options : null;
+    return options.length ? {
+      value: `${id}`,
+      label: title,
+      children: options
+    } : null;
   },
   useInitializers(node) {
     var _node$config$forms;
-    const _useCollectionManager = (0, _client().useCollectionManager)(),
-      getCollection = _useCollectionManager.getCollection;
+    const _useCollectionManager2 = (0, _client().useCollectionManager)(),
+      getCollection = _useCollectionManager2.getCollection;
     const formKeys = Object.keys((_node$config$forms = node.config.forms) !== null && _node$config$forms !== void 0 ? _node$config$forms : {});
     if (!formKeys.length || node.config.mode) {
       return null;

package/lib/client/nodes/query.d.ts

@@ -77,9 +77,11 @@ declare const _default: {
         FilterDynamicComponent: typeof FilterDynamicComponent;
         FieldsSelect: import("react").MemoExoticComponent<import("@formily/reactive-react").ReactFC<Pick<any, string | number | symbol>>>;
     };
-    useVariables({ config }: {
+    useVariables({ id, title, config }: {
+        id: any;
+        title: any;
         config: any;
-    }, options: any): import("../variable").VariableOption[];
+    }, options: any): import("../variable").VariableOption;
     useInitializers(node: any): SchemaInitializerItemOptions | null;
     initializers: {};
 };

package/lib/client/nodes/query.js

@@ -22,6 +22,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var _default = {
   title: `{{t("Query record", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'query',
@@ -59,15 +65,36 @@ var _default = {
     FieldsSelect: _FieldsSelect.FieldsSelect
   },
   useVariables({
+    id,
+    title,
     config
   }, options) {
-    var _options$depth, _config$params, _config$params$append;
-    const result = (0, _variable.useCollectionFieldOptions)(_objectSpread(_objectSpread({
-      collection: config === null || config === void 0 ? void 0 : config.collection
-    }, options), {}, {
-      depth: ((_options$depth = options === null || options === void 0 ? void 0 : options.depth) !== null && _options$depth !== void 0 ? _options$depth : config === null || config === void 0 ? void 0 : (_config$params = config.params) === null || _config$params === void 0 ? void 0 : (_config$params$append = _config$params.appends) === null || _config$params$append === void 0 ? void 0 : _config$params$append.length) ? 1 : 0
-    }));
-    return (result === null || result === void 0 ? void 0 : result.length) ? result : null;
+    var _config$params, _config$params$append;
+    const compile = (0, _client().useCompile)();
+    const _useCollectionManager = (0, _client().useCollectionManager)(),
+      getCollectionFields = _useCollectionManager.getCollectionFields;
+    // const depth = config?.params?.appends?.length
+    //   ? config?.params?.appends.reduce((max, item) => Math.max(max, item.split('.').length), 1)
+    //   : 0;
+    const name = `${id}`;
+    const _getCollectionFieldOp = (0, _variable.getCollectionFieldOptions)(_objectSpread(_objectSpread({}, options), {}, {
+        fields: [{
+          collectionName: config.collection,
+          name,
+          type: 'hasOne',
+          target: config.collection,
+          uiSchema: {
+            title
+          }
+        }],
+        // depth: options?.depth ?? depth,
+        appends: [name, ...(((_config$params = config.params) === null || _config$params === void 0 ? void 0 : (_config$params$append = _config$params.appends) === null || _config$params$append === void 0 ? void 0 : _config$params$append.map(item => `${name}.${item}`)) || [])],
+        compile,
+        getCollectionFields
+      })),
+      _getCollectionFieldOp2 = _slicedToArray(_getCollectionFieldOp, 1),
+      result = _getCollectionFieldOp2[0];
+    return result;
   },
   useInitializers(node) {
     var _node$title;

package/lib/client/nodes/request.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { useWorkflowVariableOptions } from '../variable';
 declare const _default: {
     title: string;
@@ -59,7 +60,7 @@ declare const _default: {
                                 'x-decorator': string;
                                 'x-component': string;
                                 'x-component-props': {
-                                    scope: typeof useWorkflowVariableOptions;
+                                    scope: string;
                                     useTypedConstant: boolean;
                                 };
                             };
@@ -105,7 +106,7 @@ declare const _default: {
                                 'x-decorator': string;
                                 'x-component': string;
                                 'x-component-props': {
-                                    scope: typeof useWorkflowVariableOptions;
+                                    scope: string;
                                     useTypedConstant: boolean;
                                 };
                             };
@@ -133,7 +134,7 @@ declare const _default: {
             'x-decorator-props': {};
             'x-component': string;
             'x-component-props': {
-                scope: typeof useWorkflowVariableOptions;
+                changeOnSelect: boolean;
                 autoSize: {
                     minRows: number;
                 };
@@ -163,13 +164,16 @@ declare const _default: {
         };
     };
     view: {};
-    scope: {};
+    scope: {
+        useWorkflowVariableOptions: typeof useWorkflowVariableOptions;
+    };
     components: {
-        ArrayItems: import("react").FC<import("react").PropsWithChildren<import("react").HTMLAttributes<HTMLDivElement> & import("@formily/antd").IArrayBaseProps>> & import("@formily/antd").ArrayBaseMixins & {
-            Item?: import("react").FC<import("react").HTMLAttributes<HTMLDivElement> & {
+        ArrayItems: React.FC<React.PropsWithChildren<React.HTMLAttributes<HTMLDivElement> & import("@formily/antd").IArrayBaseProps>> & import("@formily/antd").ArrayBaseMixins & {
+            Item?: React.FC<React.HTMLAttributes<HTMLDivElement> & {
                 type?: "divide" | "card";
             }>;
         };
+        RequestBody(props: any): React.JSX.Element;
     };
 };
 export default _default;

package/lib/client/nodes/request.js

@@ -4,6 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+function _react() {
+  const data = _interopRequireDefault(require("react"));
+  _react = function _react() {
+    return data;
+  };
+  return data;
+}
 function _antd() {
   const data = require("@formily/antd");
   _antd = function _antd() {
@@ -11,8 +18,21 @@ function _antd() {
   };
   return data;
 }
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
+    return data;
+  };
+  return data;
+}
 var _locale = require("../locale");
 var _variable = require("../variable");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 var _default = {
   title: `{{t("HTTP request", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'request',
@@ -85,7 +105,7 @@ var _default = {
                 'x-decorator': 'FormItem',
                 'x-component': 'Variable.Input',
                 'x-component-props': {
-                  scope: _variable.useWorkflowVariableOptions,
+                  scope: '{{useWorkflowVariableOptions()}}',
                   useTypedConstant: true
                 }
               },
@@ -131,7 +151,7 @@ var _default = {
                 'x-decorator': 'FormItem',
                 'x-component': 'Variable.Input',
                 'x-component-props': {
-                  scope: _variable.useWorkflowVariableOptions,
+                  scope: '{{useWorkflowVariableOptions()}}',
                   useTypedConstant: true
                 }
               },
@@ -157,9 +177,9 @@ var _default = {
       title: `{{t("Body", { ns: "${_locale.NAMESPACE}" })}}`,
       'x-decorator': 'FormItem',
       'x-decorator-props': {},
-      'x-component': 'Variable.JSON',
+      'x-component': 'RequestBody',
       'x-component-props': {
-        scope: _variable.useWorkflowVariableOptions,
+        changeOnSelect: true,
         autoSize: {
           minRows: 10
         },
@@ -189,9 +209,17 @@ var _default = {
     }
   },
   view: {},
-  scope: {},
+  scope: {
+    useWorkflowVariableOptions: _variable.useWorkflowVariableOptions
+  },
   components: {
-    ArrayItems: _antd().ArrayItems
+    ArrayItems: _antd().ArrayItems,
+    RequestBody(props) {
+      const scope = (0, _variable.useWorkflowVariableOptions)();
+      return _react().default.createElement(_client().Variable.JSON, _objectSpread({
+        scope: scope
+      }, props));
+    }
   }
 };
 exports.default = _default;

package/lib/client/triggers/collection.js

@@ -61,6 +61,14 @@ var _default = {
             value: null
           }
         }
+      }, {
+        target: 'appends',
+        effects: ['onFieldValueChange'],
+        fulfill: {
+          state: {
+            value: []
+          }
+        }
       }]
     }),
     mode: {
@@ -134,21 +142,27 @@ var _default = {
     FieldsSelect: _FieldsSelect.FieldsSelect
   },
   useVariables(config, options) {
-    var _options$depth, _config$appends;
-    const _useWorkflowTranslati = (0, _locale.useWorkflowTranslation)(),
-      t = _useWorkflowTranslati.t;
+    var _config$appends;
+    const compile = (0, _client().useCompile)();
+    const _useCollectionManager = (0, _client().useCollectionManager)(),
+      getCollectionFields = _useCollectionManager.getCollectionFields;
     const rootFields = [{
       collectionName: config.collection,
       name: 'data',
       type: 'hasOne',
       target: config.collection,
       uiSchema: {
-        title: t('Trigger data')
+        title: (0, _locale.lang)('Trigger data')
       }
     }];
-    const result = (0, _variable.useCollectionFieldOptions)(_objectSpread(_objectSpread({}, options), {}, {
+    // const depth = config.appends?.length
+    //   ? config.appends.reduce((max, item) => Math.max(max, item.split('.').length), 1) + 1
+    //   : 1;
+    const result = (0, _variable.getCollectionFieldOptions)(_objectSpread(_objectSpread({}, options), {}, {
       fields: rootFields,
-      depth: (_options$depth = options === null || options === void 0 ? void 0 : options.depth) !== null && _options$depth !== void 0 ? _options$depth : ((_config$appends = config.appends) === null || _config$appends === void 0 ? void 0 : _config$appends.length) ? 2 : 1
+      appends: ['data', ...(((_config$appends = config.appends) === null || _config$appends === void 0 ? void 0 : _config$appends.map(item => `data.${item}`)) || [])],
+      compile,
+      getCollectionFields
     }));
     return result;
   },

package/lib/client/triggers/index.js

@@ -201,6 +201,7 @@ const TriggerConfig = () => {
     }
   }, [workflow]);
   const form = (0, _react().useMemo)(() => (0, _core().createForm)({
+    initialValues: workflow === null || workflow === void 0 ? void 0 : workflow.config,
     values: workflow === null || workflow === void 0 ? void 0 : workflow.config,
     disabled: workflow === null || workflow === void 0 ? void 0 : workflow.executed
   }), [workflow]);

package/lib/client/triggers/schedule/index.d.ts

@@ -16,9 +16,7 @@ declare const _default: {
         ScheduleConfig: () => import("react").JSX.Element;
         FieldsSelect: import("react").MemoExoticComponent<import("@formily/reactive-react").ReactFC<Pick<any, string | number | symbol>>>;
     };
-    useVariables(config: any, { types }: {
-        types: any;
-    }): any[];
+    useVariables(config: any, opts: any): any[];
     useInitializers(config: any): SchemaInitializerItemOptions | null;
     initializers: {};
 };

package/lib/client/triggers/schedule/index.js

@@ -17,6 +17,11 @@ var _locale = require("../../locale");
 var _CollectionBlockInitializer = require("../../components/CollectionBlockInitializer");
 var _variable = require("../../variable");
 var _FieldsSelect = require("../../components/FieldsSelect");
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 var _default = {
   title: `{{t("Schedule event", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'schedule',
@@ -34,28 +39,33 @@ var _default = {
     ScheduleConfig: _ScheduleConfig.ScheduleConfig,
     FieldsSelect: _FieldsSelect.FieldsSelect
   },
-  useVariables(config, {
-    types
-  }) {
-    const _useWorkflowTranslati = (0, _locale.useWorkflowTranslation)(),
-      t = _useWorkflowTranslati.t;
+  useVariables(config, opts) {
+    var _config$appends;
+    const compile = (0, _client().useCompile)();
+    const _useCollectionManager = (0, _client().useCollectionManager)(),
+      getCollectionFields = _useCollectionManager.getCollectionFields;
     const options = [];
-    if (!types || types.includes('date')) {
+    if (!(opts === null || opts === void 0 ? void 0 : opts.types) || opts.types.includes('date')) {
       options.push({
         key: 'date',
         value: 'date',
-        label: t('Trigger time')
+        label: (0, _locale.lang)('Trigger time')
       });
     }
-    const fieldOptions = (0, _variable.useCollectionFieldOptions)({
-      collection: config.collection
-    });
+    const depth = ((_config$appends = config.appends) === null || _config$appends === void 0 ? void 0 : _config$appends.length) ? config.appends.reduce((max, item) => Math.max(max, item.split('.').length), 1) + 1 : 1;
+    const fieldOptions = (0, _variable.getCollectionFieldOptions)(_objectSpread(_objectSpread({
+      depth
+    }, opts), {}, {
+      collection: config.collection,
+      compile,
+      getCollectionFields
+    }));
     if (config.mode === _constants.SCHEDULE_MODE.COLLECTION_FIELD) {
       if (fieldOptions.length) {
         options.push({
           key: 'data',
           value: 'data',
-          label: t('Trigger data'),
+          label: (0, _locale.lang)('Trigger data'),
           children: fieldOptions
         });
       }

package/lib/client/variable.d.ts

@@ -37,7 +37,6 @@ export declare const BaseTypeSets: {
     string: Set<string>;
     date: Set<string>;
 };
-export declare function filterTypedFields(fields: any, types: any, depth?: number): any;
 export declare function useWorkflowVariableOptions(options?: {}): {
     label: any;
     value: any;
@@ -45,4 +44,4 @@ export declare function useWorkflowVariableOptions(options?: {}): {
     children: any;
     disabled: boolean;
 }[];
-export declare function useCollectionFieldOptions(options: any): VariableOption[];
+export declare function getCollectionFieldOptions(options: any): VariableOption[];

package/lib/client/variable.js

@@ -4,9 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.BaseTypeSets = void 0;
-exports.filterTypedFields = filterTypedFields;
+exports.getCollectionFieldOptions = getCollectionFieldOptions;
 exports.triggerOptions = exports.systemOptions = exports.scopeOptions = exports.nodesOptions = void 0;
-exports.useCollectionFieldOptions = useCollectionFieldOptions;
 exports.useWorkflowVariableOptions = useWorkflowVariableOptions;
 function _client() {
   const data = require("@nocobase/client");
@@ -19,6 +18,8 @@ var _FlowContext = require("./FlowContext");
 var _locale = require("./locale");
 var _nodes = require("./nodes");
 var _triggers = require("./triggers");
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -34,15 +35,9 @@ const nodesOptions = {
     upstreams.forEach(node => {
       var _instruction$useVaria;
       const instruction = _nodes.instructions.get(node.type);
-      const subOptions = (_instruction$useVaria = instruction.useVariables) === null || _instruction$useVaria === void 0 ? void 0 : _instruction$useVaria.call(instruction, node, options);
-      if (subOptions) {
-        var _node$title;
-        result.push({
-          key: node.id.toString(),
-          value: node.id.toString(),
-          label: (_node$title = node.title) !== null && _node$title !== void 0 ? _node$title : `#${node.id}`,
-          children: subOptions
-        });
+      const subOption = (_instruction$useVaria = instruction.useVariables) === null || _instruction$useVaria === void 0 ? void 0 : _instruction$useVaria.call(instruction, node, options);
+      if (subOption) {
+        result.push(subOption);
       }
     });
     return result;
@@ -73,11 +68,11 @@ const scopeOptions = {
       const instruction = _nodes.instructions.get(node.type);
       const subOptions = (_instruction$useScope = instruction.useScopeVariables) === null || _instruction$useScope === void 0 ? void 0 : _instruction$useScope.call(instruction, node, options);
       if (subOptions) {
-        var _node$title2;
+        var _node$title;
         result.push({
           key: node.id.toString(),
           value: node.id.toString(),
-          label: (_node$title2 = node.title) !== null && _node$title2 !== void 0 ? _node$title2 : `#${node.id}`,
+          label: (_node$title = node.title) !== null && _node$title !== void 0 ? _node$title : `#${node.id}`,
           children: subOptions
         });
       }
@@ -95,7 +90,7 @@ const systemOptions = {
     return [...(!types || types.includes('date') ? [{
       key: 'now',
       value: 'now',
-      label: `{{t("System time")}}`
+      label: (0, _locale.lang)('System time')
     }] : [])];
   }
 };
@@ -110,7 +105,7 @@ const BaseTypeSets = {
 // { type: 'reference', options: { collection: 'attachments', multiple: false } }
 // { type: 'reference', options: { collection: 'myExpressions', entity: false } }
 exports.BaseTypeSets = BaseTypeSets;
-function matchFieldType(field, type, depth) {
+function matchFieldType(field, type, appends) {
   const inputType = typeof type;
   if (inputType === 'string') {
     var _BaseTypeSets$type;
@@ -128,42 +123,67 @@ function matchFieldType(field, type, depth) {
     }
   }
   if (inputType === 'function') {
-    return type(field, depth);
+    return type(field, appends);
   }
   return false;
 }
 function isAssociationField(field) {
   return ['belongsTo', 'hasOne', 'hasMany', 'belongsToMany'].includes(field.type);
 }
-function filterTypedFields(fields, types, depth = 1) {
-  if (!types) {
-    return fields;
-  }
+function getNextAppends(field, appends) {
+  const fieldPrefix = `${field.name}.`;
+  return appends.filter(item => item.startsWith(fieldPrefix)).map(item => item.replace(fieldPrefix, ''));
+}
+function filterTypedFields({
+  fields,
+  types,
+  appends,
+  compile,
+  getCollectionFields
+}) {
   return fields.filter(field => {
-    if (isAssociationField(field) && depth && filterTypedFields(useNormalizedFields(field.target), types, depth - 1).length) {
-      return true;
+    const match = (types === null || types === void 0 ? void 0 : types.length) ? types.some(type => matchFieldType(field, type, appends)) : true;
+    if (isAssociationField(field)) {
+      const nextAppends = getNextAppends(field, appends);
+      const included = appends.includes(field.name);
+      if (match) {
+        return included;
+      } else {
+        return (nextAppends.length || included) && filterTypedFields({
+          fields: getNormalizedFields(field.target, {
+            compile,
+            getCollectionFields
+          }),
+          types,
+          // depth: depth - 1,
+          appends: nextAppends,
+          compile,
+          getCollectionFields
+        }).length;
+      }
+    } else {
+      return match;
     }
-    return types.some(type => matchFieldType(field, type, depth));
   });
 }
 function useWorkflowVariableOptions(options = {}) {
   const compile = (0, _client().useCompile)();
   const result = [scopeOptions, nodesOptions, triggerOptions, systemOptions].map(item => {
-    const opts = typeof item.useOptions === 'function' ? item.useOptions(options).filter(Boolean) : null;
+    const opts = item.useOptions(options).filter(Boolean);
     return {
       label: compile(item.label),
       value: item.value,
       key: item.value,
-      children: compile(opts),
+      children: opts,
       disabled: opts && !opts.length
     };
   });
   return result;
 }
-function useNormalizedFields(collectionName) {
-  const compile = (0, _client().useCompile)();
-  const _useCollectionManager = (0, _client().useCollectionManager)(),
-    getCollectionFields = _useCollectionManager.getCollectionFields;
+function getNormalizedFields(collectionName, {
+  compile,
+  getCollectionFields
+}) {
   const fields = getCollectionFields(collectionName);
   const foreignKeyFields = [];
   const otherFields = [];
@@ -211,28 +231,73 @@ function useNormalizedFields(collectionName) {
   }
   return otherFields.filter(field => field.interface && !field.hidden);
 }
-function useCollectionFieldOptions(options) {
+function loadChildren(_x) {
+  return _loadChildren.apply(this, arguments);
+}
+function _loadChildren() {
+  _loadChildren = _asyncToGenerator(function* (option) {
+    const result = getCollectionFieldOptions({
+      collection: option.field.target,
+      types: option.types,
+      appends: getNextAppends(option.field, option.appends),
+      sourceKey: option.field.key,
+      compile: this.compile,
+      getCollectionFields: this.getCollectionFields
+    });
+    if (result.length) {
+      option.children = result;
+    } else {
+      var _option$types;
+      option.isLeaf = true;
+      option.loadChildren = null;
+      const matchingType = (_option$types = option.types) === null || _option$types === void 0 ? void 0 : _option$types.some(type => matchFieldType(option.field, type, 0));
+      if (!matchingType) {
+        option.disabled = true;
+      }
+    }
+  });
+  return _loadChildren.apply(this, arguments);
+}
+function getCollectionFieldOptions(options) {
   const fields = options.fields,
     collection = options.collection,
     types = options.types,
-    _options$depth = options.depth,
-    depth = _options$depth === void 0 ? 1 : _options$depth;
-  const compile = (0, _client().useCompile)();
-  const normalizedFields = useNormalizedFields(collection);
+    _options$appends = options.appends,
+    appends = _options$appends === void 0 ? [] : _options$appends,
+    compile = options.compile,
+    getCollectionFields = options.getCollectionFields;
+  const normalizedFields = getNormalizedFields(collection, {
+    compile,
+    getCollectionFields
+  });
   const computedFields = fields !== null && fields !== void 0 ? fields : normalizedFields;
-  const result = filterTypedFields(computedFields, types, depth).filter(field => !isAssociationField(field) || depth).map(field => {
+  const boundLoadChildren = loadChildren.bind({
+    compile,
+    getCollectionFields
+  });
+  const result = filterTypedFields({
+    fields: computedFields,
+    types,
+    // depth,
+    appends,
+    compile,
+    getCollectionFields
+  }).map(field => {
     var _field$uiSchema5;
     const label = compile(((_field$uiSchema5 = field.uiSchema) === null || _field$uiSchema5 === void 0 ? void 0 : _field$uiSchema5.title) || field.name);
+    const nextAppends = getNextAppends(field, appends);
+    // TODO: no matching fields in next appends should consider isLeaf as true
+    const isLeaf = !isAssociationField(field) || !nextAppends.length && !appends.includes(field.name);
     return {
       label,
       key: field.name,
       value: field.name,
-      children: isAssociationField(field) && depth ? useCollectionFieldOptions({
-        collection: field.target,
-        types,
-        depth: depth - 1
-      }) : null,
-      field
+      isLeaf,
+      loadChildren: isLeaf ? null : boundLoadChildren,
+      field,
+      // depth,
+      appends,
+      types
     };
   });
   return result;

package/package.json

@@ -4,19 +4,19 @@
   "displayName.zh-CN": "工作流",
   "description": " a powerful workflow plugin designed to support business process management and automation. .",
   "description.zh-CN": "工作流插件，为业务流程管理和自动化提供支持。",
-  "version": "0.10.0-alpha.5",
+  "version": "0.10.1-alpha.1",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "0.10.0-alpha.5",
-    "@nocobase/client": "0.10.0-alpha.5",
-    "@nocobase/database": "0.10.0-alpha.5",
-    "@nocobase/evaluators": "0.10.0-alpha.5",
-    "@nocobase/logger": "0.10.0-alpha.5",
-    "@nocobase/resourcer": "0.10.0-alpha.5",
-    "@nocobase/server": "0.10.0-alpha.5",
-    "@nocobase/utils": "0.10.0-alpha.5",
+    "@nocobase/actions": "0.10.1-alpha.1",
+    "@nocobase/client": "0.10.1-alpha.1",
+    "@nocobase/database": "0.10.1-alpha.1",
+    "@nocobase/evaluators": "0.10.1-alpha.1",
+    "@nocobase/logger": "0.10.1-alpha.1",
+    "@nocobase/resourcer": "0.10.1-alpha.1",
+    "@nocobase/server": "0.10.1-alpha.1",
+    "@nocobase/utils": "0.10.1-alpha.1",
     "antd": "^4.24.8",
     "axios": "^0.27.2",
     "classnames": "^2.3.1",
@@ -26,9 +26,9 @@
     "react-js-cron": "^3.1.0"
   },
   "devDependencies": {
-    "@nocobase/plugin-formula-field": "0.10.0-alpha.5",
-    "@nocobase/test": "0.10.0-alpha.5",
+    "@nocobase/plugin-formula-field": "0.10.1-alpha.1",
+    "@nocobase/test": "0.10.1-alpha.1",
     "@types/ejs": "^3.1.1"
   },
-  "gitHead": "1be8fcdad42688064460761cea22830cf392c7c0"
+  "gitHead": "8f415f5e0ee2e72d681f9ab16af5911b52c374a9"
 }