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

package/lib/client/components/Duration.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-  _react = function _react() {
+function _css() {
+  const data = require("@emotion/css");
+  _css = function _css() {
     return data;
   };
   return data;
@@ -18,9 +18,9 @@ function _antd() {
   };
   return data;
 }
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
+function _react() {
+  const data = _interopRequireDefault(require("react"));
+  _react = function _react() {
     return data;
   };
   return data;
@@ -62,6 +62,7 @@ function _default({
     value: quantity,
     onChange: v => _onChange(Math.round(v * option.value))
   }), _react().default.createElement(_antd().Select, {
+    dropdownMatchSelectWidth: false,
     value: option.value,
     onChange: unit => _onChange(Math.round(quantity * unit))
   }, UnitOptions.map(item => _react().default.createElement(_antd().Select.Option, {

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: {};
 };