@nocobase/plugin-workflow 0.10.0-alpha.2 → 0.10.0-alpha.4

package/lib/client/AddButton.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.AddButton = AddButton;
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-  _react = function _react() {
+function _icons() {
+  const data = require("@ant-design/icons");
+  _icons = function _icons() {
     return data;
   };
   return data;
@@ -18,45 +18,46 @@ function _css() {
   };
   return data;
 }
-function _antd() {
-  const data = require("antd");
-  _antd = function _antd() {
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
     return data;
   };
   return data;
 }
-function _icons() {
-  const data = require("@ant-design/icons");
-  _icons = function _icons() {
+function _antd() {
+  const data = require("antd");
+  _antd = function _antd() {
     return data;
   };
   return data;
 }
-function _client() {
-  const data = require("@nocobase/client");
-  _client = function _client() {
+function _react() {
+  const data = _interopRequireWildcard(require("react"));
+  _react = function _react() {
     return data;
   };
   return data;
 }
 var _FlowContext = require("./FlowContext");
+var _locale = require("./locale");
 var _nodes = require("./nodes");
 var _style = require("./style");
-var _locale = require("./locale");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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; }
 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; }
+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; }
 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 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 AddButton({
   upstream,
   branchIndex = null
@@ -67,18 +68,46 @@ function AddButton({
   const _ref = (_useFlowContext = (0, _FlowContext.useFlowContext)()) !== null && _useFlowContext !== void 0 ? _useFlowContext : {},
     workflow = _ref.workflow,
     refresh = _ref.refresh;
-  if (!workflow) {
-    return null;
-  }
-  const resource = api.resource('workflows.nodes', workflow.id);
-  function onCreate(_x) {
-    return _onCreate.apply(this, arguments);
-  }
-  function _onCreate() {
-    _onCreate = _asyncToGenerator(function* ({
+  const instructionList = Array.from(_nodes.instructions.getValues());
+  const groups = (0, _react().useMemo)(() => {
+    return [{
+      key: 'control',
+      label: `{{t("Control", { ns: "${_locale.NAMESPACE}" })}}`
+    }, {
+      key: 'collection',
+      label: `{{t("Collection operations", { ns: "${_locale.NAMESPACE}" })}}`
+    }, {
+      key: 'manual',
+      label: `{{t("Manual", { ns: "${_locale.NAMESPACE}" })}}`
+    }, {
+      key: 'extended',
+      label: `{{t("Extended types", { ns: "${_locale.NAMESPACE}" })}}`
+    }].filter(group => instructionList.filter(item => item.group === group.key).length).map(group => {
+      const groupInstructions = instructionList.filter(item => item.group === group.key);
+      return _objectSpread(_objectSpread({}, group), {}, {
+        type: 'group',
+        children: groupInstructions.map(item => ({
+          key: item.type,
+          label: item.title,
+          type: item.options ? 'subMenu' : null,
+          children: item.options ? item.options.map(option => ({
+            key: option.key,
+            label: option.label
+          })) : null
+        }))
+      });
+    });
+  }, [instructionList]);
+  const resource = (0, _react().useMemo)(() => {
+    if (!workflow) {
+      return null;
+    }
+    return api.resource('workflows.nodes', workflow.id);
+  }, [workflow === null || workflow === void 0 ? void 0 : workflow.id]);
+  const onCreate = (0, _react().useCallback)( /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator(function* ({
       keyPath
     }) {
-      var _upstream$id;
       const type = keyPath.pop();
       const config = {};
       const _keyPath = _slicedToArray(keyPath, 1),
@@ -86,11 +115,13 @@ function AddButton({
       const instruction = _nodes.instructions.get(type);
       if (optionKey) {
         var _instruction$options$, _instruction$options;
-        const _ref2 = (_instruction$options$ = (_instruction$options = instruction.options) === null || _instruction$options === void 0 ? void 0 : _instruction$options.find(item => item.key === optionKey)) !== null && _instruction$options$ !== void 0 ? _instruction$options$ : {},
-          value = _ref2.value;
+        const _ref3 = (_instruction$options$ = (_instruction$options = instruction.options) === null || _instruction$options === void 0 ? void 0 : _instruction$options.find(item => item.key === optionKey)) !== null && _instruction$options$ !== void 0 ? _instruction$options$ : {},
+          value = _ref3.value;
         Object.assign(config, value);
       }
-      const _yield$resource$creat = yield resource.create({
+      if (resource) {
+        var _upstream$id;
+        yield resource.create({
           values: {
             type,
             upstreamId: (_upstream$id = upstream === null || upstream === void 0 ? void 0 : upstream.id) !== null && _upstream$id !== void 0 ? _upstream$id : null,
@@ -98,48 +129,28 @@ function AddButton({
             title: compile(instruction.title),
             config
           }
-        }),
-        node = _yield$resource$creat.data.data;
-      refresh();
+        });
+        refresh();
+      }
     });
-    return _onCreate.apply(this, arguments);
+    return function (_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }(), [branchIndex, resource === null || resource === void 0 ? void 0 : resource.create, upstream === null || upstream === void 0 ? void 0 : upstream.id]);
+  const menu = (0, _react().useMemo)(() => {
+    return {
+      onClick: ev => onCreate(ev),
+      items: compile(groups)
+    };
+  }, [groups, onCreate]);
+  if (!workflow) {
+    return null;
   }
-  const instructionList = Array.from(_nodes.instructions.getValues());
-  const groups = [{
-    key: 'control',
-    label: `{{t("Control", { ns: "${_locale.NAMESPACE}" })}}`
-  }, {
-    key: 'collection',
-    label: `{{t("Collection operations", { ns: "${_locale.NAMESPACE}" })}}`
-  }, {
-    key: 'manual',
-    label: `{{t("Manual", { ns: "${_locale.NAMESPACE}" })}}`
-  }, {
-    key: 'extended',
-    label: `{{t("Extended types", { ns: "${_locale.NAMESPACE}" })}}`
-  }].filter(group => instructionList.filter(item => item.group === group.key).length).map(group => {
-    const groupInstructions = instructionList.filter(item => item.group === group.key);
-    return _objectSpread(_objectSpread({}, group), {}, {
-      type: 'group',
-      children: groupInstructions.map(item => ({
-        key: item.type,
-        label: item.title,
-        type: item.options ? 'subMenu' : null,
-        children: item.options ? item.options.map(option => ({
-          key: option.key,
-          label: option.label
-        })) : null
-      }))
-    });
-  });
   return _react().default.createElement("div", {
     className: (0, _css().cx)(_style.addButtonClass)
   }, _react().default.createElement(_antd().Dropdown, {
     trigger: ['click'],
-    overlay: _react().default.createElement(_antd().Menu, {
-      onClick: ev => onCreate(ev),
-      items: compile(groups)
-    }),
+    menu: menu,
     disabled: workflow.executed
   }, _react().default.createElement(_antd().Button, {
     shape: "circle",

package/lib/client/WorkflowCanvas.js

@@ -129,8 +129,8 @@ function WorkflowCanvas() {
       title = _ref2.title;
     setTitle === null || setTitle === void 0 ? void 0 : setTitle(`${(0, _locale.lang)('Workflow')}${title ? `: ${title}` : ''}`);
   }, [data === null || data === void 0 ? void 0 : data.data]);
-  if (!(data === null || data === void 0 ? void 0 : data.data) && !loading) {
-    return _react().default.createElement("div", null, (0, _locale.lang)('Load failed'));
+  if (!(data === null || data === void 0 ? void 0 : data.data)) {
+    return _react().default.createElement("div", null, loading ? (0, _locale.lang)('Loading') : (0, _locale.lang)('Load failed'));
   }
   const _ref3 = (_data$data2 = data === null || data === void 0 ? void 0 : data.data) !== null && _data$data2 !== void 0 ? _data$data2 : {},
     _ref3$nodes = _ref3.nodes,

package/lib/client/components/CollectionFieldset.d.ts

@@ -1,3 +1,4 @@
 import React from 'react';
+export declare function useCollectionUIFields(collection: any): import("@nocobase/client").CollectionFieldOptions[];
 declare const CollectionFieldSet: React.MemoExoticComponent<import("@formily/react").ReactFC<Pick<any, string | number | symbol>>>;
 export default CollectionFieldSet;

package/lib/client/components/CollectionFieldset.js

@@ -4,16 +4,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-  _react = function _react() {
+exports.useCollectionUIFields = useCollectionUIFields;
+function _icons() {
+  const data = require("@ant-design/icons");
+  _icons = function _icons() {
     return data;
   };
   return data;
 }
-function _react2() {
+function _css() {
+  const data = require("@emotion/css");
+  _css = function _css() {
+    return data;
+  };
+  return data;
+}
+function _react() {
   const data = require("@formily/react");
-  _react2 = function _react2() {
+  _react = function _react() {
     return data;
   };
   return data;
@@ -25,9 +33,9 @@ function _antd() {
   };
   return data;
 }
-function _icons() {
-  const data = require("@ant-design/icons");
-  _icons = function _icons() {
+function _react2() {
+  const data = _interopRequireWildcard(require("react"));
+  _react2 = function _react2() {
     return data;
   };
   return data;
@@ -39,13 +47,6 @@ function _reactI18next() {
   };
   return data;
 }
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
-    return data;
-  };
-  return data;
-}
 function _client() {
   const data = require("@nocobase/client");
   _client = function _client() {
@@ -55,7 +56,8 @@ function _client() {
 }
 var _locale = require("../locale");
 var _variable = require("../variable");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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; }
 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 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; }
@@ -66,10 +68,10 @@ function _toPrimitive(input, hint) { if (typeof input !== "object" || input ===
 function AssociationInput(props) {
   const _useCollectionManager = (0, _client().useCollectionManager)(),
     getCollectionFields = _useCollectionManager.getCollectionFields;
-  const _useField = (0, _react2().useField)(),
+  const _useField = (0, _react().useField)(),
     path = _useField.path;
   const fieldName = path.segments[path.segments.length - 1];
-  const _useForm = (0, _react2().useForm)(),
+  const _useForm = (0, _react().useForm)(),
     config = _useForm.values;
   const fields = getCollectionFields(config === null || config === void 0 ? void 0 : config.collection);
   const _fields$find = fields.find(item => item.name === fieldName),
@@ -79,34 +81,59 @@ function AssociationInput(props) {
     const trimed = ev.target.value.trim();
     props.onChange(['belongsTo', 'hasOne'].includes(type) ? trimed : trimed.split(/[,\s]+/));
   }
-  return _react().default.createElement(_antd().Input, _objectSpread(_objectSpread({}, props), {}, {
+  return _react2().default.createElement(_antd().Input, _objectSpread(_objectSpread({}, props), {}, {
     value: value,
     onChange: onChange
   }));
 }
+function useCollectionUIFields(collection) {
+  const _useCollectionManager2 = (0, _client().useCollectionManager)(),
+    getCollectionFields = _useCollectionManager2.getCollectionFields;
+  return getCollectionFields(collection).filter(field => !field.hidden && (field.uiSchema ? !field.uiSchema['x-read-pretty'] : false));
+}
 // NOTE: observer for watching useProps
-const CollectionFieldSet = (0, _react2().observer)(({
+const CollectionFieldSet = (0, _react().observer)(({
   value,
   disabled,
-  onChange: _onChange
+  onChange: _onChange,
+  filter
 }) => {
   const _useTranslation = (0, _reactI18next().useTranslation)(),
     t = _useTranslation.t;
   const compile = (0, _client().useCompile)();
-  const form = (0, _react2().useForm)();
-  const _useCollectionManager2 = (0, _client().useCollectionManager)(),
-    getCollection = _useCollectionManager2.getCollection,
-    getCollectionFields = _useCollectionManager2.getCollectionFields;
-  const _useForm2 = (0, _react2().useForm)(),
-    config = _useForm2.values;
-  const collectionName = config === null || config === void 0 ? void 0 : config.collection;
-  const fields = getCollectionFields(collectionName).filter(field => !field.hidden && (field.uiSchema ? !field.uiSchema['x-read-pretty'] : false) &&
-  // TODO: should use some field option but not type to control this
-  !['formula'].includes(field.type));
-  const unassignedFields = fields.filter(field => !value || !(field.name in value));
+  const form = (0, _react().useForm)();
+  const _useCollectionManager3 = (0, _client().useCollectionManager)(),
+    getCollection = _useCollectionManager3.getCollection;
   const scope = (0, _variable.useWorkflowVariableOptions)();
+  const config = form.values;
+  const collectionName = config === null || config === void 0 ? void 0 : config.collection;
+  const collectionFields = useCollectionUIFields(collectionName);
+  const fields = filter ? collectionFields.filter(filter.bind(config)) : collectionFields;
+  const unassignedFields = (0, _react2().useMemo)(() => fields.filter(field => !value || !(field.name in value)), [fields, value]);
   const mergedDisabled = disabled || form.disabled;
-  return _react().default.createElement("fieldset", {
+  const menu = (0, _react2().useMemo)(() => {
+    return {
+      onClick: ({
+        key
+      }) => {
+        _onChange(_objectSpread(_objectSpread({}, value), {}, {
+          [key]: null
+        }));
+      },
+      style: {
+        maxHeight: 300,
+        overflowY: 'auto'
+      },
+      items: unassignedFields.map(field => {
+        var _field$uiSchema$title, _field$uiSchema;
+        return {
+          key: field.name,
+          label: compile((_field$uiSchema$title = (_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.title) !== null && _field$uiSchema$title !== void 0 ? _field$uiSchema$title : field.name)
+        };
+      })
+    };
+  }, [_onChange, unassignedFields, value]);
+  return _react2().default.createElement("fieldset", {
     className: (0, _css().css)`
           margin-top: 0.5em;
 
@@ -118,24 +145,24 @@ const CollectionFieldSet = (0, _react2().observer)(({
             }
           }
         `
-  }, fields.length ? _react().default.createElement(_client().CollectionProvider, {
+  }, fields.length ? _react2().default.createElement(_client().CollectionProvider, {
     collection: getCollection(collectionName)
   }, fields.filter(field => value && field.name in value).map(field => {
-    var _field$uiSchema$title, _field$uiSchema;
+    var _field$uiSchema$title2, _field$uiSchema2;
     // constant for associations to use Input, others to use CollectionField
     // dynamic values only support belongsTo/hasOne association, other association type should disable
     const ConstantCompoent = ['belongsTo', 'hasOne', 'hasMany', 'belongsToMany'].includes(field.type) ? AssociationInput : _client().CollectionField;
     // TODO: try to use <ObjectField> to replace this map
-    return _react().default.createElement(_antd().Form.Item, {
+    return _react2().default.createElement(_antd().Form.Item, {
       key: field.name,
-      label: compile((_field$uiSchema$title = (_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.title) !== null && _field$uiSchema$title !== void 0 ? _field$uiSchema$title : field.name),
+      label: compile((_field$uiSchema$title2 = (_field$uiSchema2 = field.uiSchema) === null || _field$uiSchema2 === void 0 ? void 0 : _field$uiSchema2.title) !== null && _field$uiSchema$title2 !== void 0 ? _field$uiSchema$title2 : field.name),
       labelAlign: "left",
       className: (0, _css().css)`
                       .ant-form-item-control-input-content {
                         display: flex;
                       }
                     `
-    }, _react().default.createElement(_client().Variable.Input, {
+    }, _react2().default.createElement(_client().Variable.Input, {
       scope: scope,
       value: value[field.name],
       onChange: next => {
@@ -143,7 +170,7 @@ const CollectionFieldSet = (0, _react2().observer)(({
           [field.name]: next
         }));
       }
-    }, _react().default.createElement(_client().SchemaComponent, {
+    }, _react2().default.createElement(_client().SchemaComponent, {
       schema: {
         type: 'void',
         properties: {
@@ -155,9 +182,9 @@ const CollectionFieldSet = (0, _react2().observer)(({
           }
         }
       }
-    })), !mergedDisabled ? _react().default.createElement(_antd().Button, {
+    })), !mergedDisabled ? _react2().default.createElement(_antd().Button, {
       type: "link",
-      icon: _react().default.createElement(_icons().CloseCircleOutlined, null),
+      icon: _react2().default.createElement(_icons().CloseCircleOutlined, null),
       onClick: () => {
         const _field$name = field.name,
           _ = value[_field$name],
@@ -165,28 +192,11 @@ const CollectionFieldSet = (0, _react2().observer)(({
         _onChange(rest);
       }
     }) : null);
-  }), unassignedFields.length ? _react().default.createElement(_antd().Dropdown, {
-    overlay: _react().default.createElement(_antd().Menu, {
-      items: unassignedFields.map(field => {
-        var _field$uiSchema$title2, _field$uiSchema2;
-        return {
-          key: field.name,
-          label: compile((_field$uiSchema$title2 = (_field$uiSchema2 = field.uiSchema) === null || _field$uiSchema2 === void 0 ? void 0 : _field$uiSchema2.title) !== null && _field$uiSchema$title2 !== void 0 ? _field$uiSchema$title2 : field.name)
-        };
-      }),
-      onClick: ({
-        key
-      }) => _onChange(_objectSpread(_objectSpread({}, value), {}, {
-        [key]: null
-      })),
-      className: (0, _css().css)`
-                      max-height: 300px;
-                      overflow-y: auto;
-                    `
-    })
-  }, _react().default.createElement(_antd().Button, {
-    icon: _react().default.createElement(_icons().PlusOutlined, null)
-  }, t('Add field'))) : null) : _react().default.createElement("p", null, (0, _locale.lang)('Please select collection first')));
+  }), unassignedFields.length ? _react2().default.createElement(_antd().Dropdown, {
+    menu: menu
+  }, _react2().default.createElement(_antd().Button, {
+    icon: _react2().default.createElement(_icons().PlusOutlined, null)
+  }, t('Add field'))) : null) : _react2().default.createElement("p", null, (0, _locale.lang)('Please select collection first')));
 }, {
   displayName: 'CollectionFieldSet'
 });

package/lib/client/locale/zh-CN.d.ts

@@ -153,6 +153,11 @@ declare const _default: {
     'Add new record to a collection. You can use variables from upstream nodes to assign values to fields.': string;
     'Update record': string;
     'Update records of a collection. You can use variables from upstream nodes as query conditions and field values.': string;
+    'Update mode': string;
+    'Update in a batch': string;
+    'Update one by one': string;
+    'Update all eligible data at one time, which has better performance when the amount of data is large. But the updated data will not trigger other workflows, and will not record audit logs.': string;
+    'The updated data can trigger other workflows, and the audit log will also be recorded. But it is usually only applicable to several or dozens of pieces of data, otherwise there will be performance problems.': string;
     'Query record': string;
     'Query records from a collection. You can use variables from upstream nodes as query conditions.': string;
     'Allow multiple records as result': string;

package/lib/client/locale/zh-CN.js

@@ -159,6 +159,11 @@ var _default = {
   'Add new record to a collection. You can use variables from upstream nodes to assign values to fields.': '向一个数据表中添加新的数据。可以使用上游节点里的变量为字段赋值。',
   'Update record': '更新数据',
   'Update records of a collection. You can use variables from upstream nodes as query conditions and field values.': '更新一个数据表中的数据。可以使用上游节点里的变量作为查询条件和数据值。',
+  'Update mode': '更新模式',
+  'Update in a batch': '批量更新',
+  'Update one by one': '逐条更新',
+  'Update all eligible data at one time, which has better performance when the amount of data is large. But the updated data will not trigger other workflows, and will not record audit logs.': '一次性更新所有符合条件的数据，在数据量较大时有比较好的性能；但被更新的数据不会触发其他工作流，也不会记录更新日志。',
+  'The updated data can trigger other workflows, and the audit log will also be recorded. But it is usually only applicable to several or dozens of pieces of data, otherwise there will be performance problems.': '被更新的数据可以再次触发其他工作流，也会记录更新日志；但通常只适用于数条或数十条数据，否则会有性能问题。',
   'Query record': '查询数据',
   'Query records from a collection. You can use variables from upstream nodes as query conditions.': '查询一个数据表中的数据。可以使用上游节点里的变量作为查询条件。',
   'Allow multiple records as result': '允许结果是多条数据',

package/lib/client/nodes/index.js

@@ -287,7 +287,7 @@ function InnerJobButton(_ref2) {
     color = _JobStatusOptionsMap$.color;
   return _react().default.createElement(_antd().Button, _objectSpread(_objectSpread({}, props), {}, {
     shape: "circle",
-    className: _style.nodeJobButtonClass
+    className: (0, _css().cx)(_style.nodeJobButtonClass, props.className)
   }), _react().default.createElement(_antd().Tag, {
     color: color
   }, icon));
@@ -336,7 +336,7 @@ function JobButton() {
                   }
                 `
           }, _react().default.createElement("span", {
-            className: _style.nodeJobButtonClass
+            className: (0, _css().cx)(_style.nodeJobButtonClass, 'inner')
           }, _react().default.createElement(_antd().Tag, {
             color: color
           }, icon)), _react().default.createElement("time", null, (0, _client().str2moment)(job.updatedAt).format('YYYY-MM-DD HH:mm:ss')))

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

@@ -1,5 +1,10 @@
+import React from 'react';
 import { useCollectionDataSource } from '@nocobase/client';
 import { FilterDynamicComponent } from '../components/FilterDynamicComponent';
+declare function IndividualHooksRadioWithTooltip({ onChange, ...props }: {
+    [x: string]: any;
+    onChange: any;
+}): React.JSX.Element;
 declare const _default: {
     title: string;
     type: string;
@@ -20,6 +25,20 @@ declare const _default: {
         params: {
             type: string;
             properties: {
+                individualHooks: {
+                    type: string;
+                    title: string;
+                    'x-decorator': string;
+                    'x-component': string;
+                    'x-component-props': {
+                        options: {
+                            label: string;
+                            value: boolean;
+                            tooltip: string;
+                        }[];
+                    };
+                    default: boolean;
+                };
                 filter: {
                     title: string;
                     "x-validator"(value: any): string;
@@ -35,6 +54,9 @@ declare const _default: {
                     };
                 };
                 values: {
+                    'x-component-props': {
+                        filter(this: any, field: any): any;
+                    };
                     type: string;
                     title: string;
                     'x-decorator': string;
@@ -54,7 +76,8 @@ declare const _default: {
     };
     components: {
         FilterDynamicComponent: typeof FilterDynamicComponent;
-        CollectionFieldset: import("react").MemoExoticComponent<import("@formily/reactive-react").ReactFC<Pick<any, string | number | symbol>>>;
+        CollectionFieldset: React.MemoExoticComponent<import("@formily/react").ReactFC<Pick<any, string | number | symbol>>>;
+        IndividualHooksRadioWithTooltip: typeof IndividualHooksRadioWithTooltip;
     };
 };
 export default _default;

package/lib/client/nodes/update.js

@@ -4,6 +4,20 @@ 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 _react2() {
+  const data = require("@formily/react");
+  _react2 = function _react2() {
+    return data;
+  };
+  return data;
+}
 function _client() {
   const data = require("@nocobase/client");
   _client = function _client() {
@@ -12,16 +26,49 @@ function _client() {
   return data;
 }
 var _FilterDynamicComponent = require("../components/FilterDynamicComponent");
-var _CollectionFieldset = _interopRequireDefault(require("../components/CollectionFieldset"));
+var _CollectionFieldset = _interopRequireWildcard(require("../components/CollectionFieldset"));
 var _utils = require("../utils");
 var _locale = require("../locale");
 var _collection = require("../schemas/collection");
+var _RadioWithTooltip = require("../components/RadioWithTooltip");
+const _excluded = ["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; }
 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 _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 IndividualHooksRadioWithTooltip(_ref) {
+  let onChange = _ref.onChange,
+    props = _objectWithoutProperties(_ref, _excluded);
+  const form = (0, _react2().useForm)();
+  const collection = form.values.collection;
+  const fields = (0, _CollectionFieldset.useCollectionUIFields)(collection);
+  const field = (0, _react2().useField)();
+  function onValueChange({
+    target
+  }) {
+    const valuesField = field.query('.values').take();
+    if (!valuesField) {
+      return;
+    }
+    const filteredValues = fields.reduce((result, item) => {
+      if (item.name in valuesField.value && (target.value || !['hasOne', 'hasMany', 'belongsToMany'].includes(item.type))) {
+        result[item.name] = valuesField.value[item.name];
+      }
+      return result;
+    }, {});
+    form.setValuesIn('params.values', filteredValues);
+    onChange(target.value);
+  }
+  return _react().default.createElement(_RadioWithTooltip.RadioWithTooltip, _objectSpread(_objectSpread({}, props), {}, {
+    onChange: onValueChange
+  }));
+}
 var _default = {
   title: `{{t("Update record", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'update',
@@ -32,13 +79,38 @@ var _default = {
     params: {
       type: 'object',
       properties: {
+        individualHooks: {
+          type: 'boolean',
+          title: `{{t("Update mode", { ns: "${_locale.NAMESPACE}" })}}`,
+          'x-decorator': 'FormItem',
+          'x-component': 'IndividualHooksRadioWithTooltip',
+          'x-component-props': {
+            options: [{
+              label: `{{t("Update in a batch", { ns: "${_locale.NAMESPACE}" })}}`,
+              value: false,
+              tooltip: `{{t("Update all eligible data at one time, which has better performance when the amount of data is large. But the updated data will not trigger other workflows, and will not record audit logs.", { ns: "${_locale.NAMESPACE}" })}}`
+            }, {
+              label: `{{t("Update one by one", { ns: "${_locale.NAMESPACE}" })}}`,
+              value: true,
+              tooltip: `{{t("The updated data can trigger other workflows, and the audit log will also be recorded. But it is usually only applicable to several or dozens of pieces of data, otherwise there will be performance problems.", { ns: "${_locale.NAMESPACE}" })}}`
+            }]
+          },
+          default: false
+        },
         filter: _objectSpread(_objectSpread({}, _collection.filter), {}, {
           title: `{{t("Only update records matching conditions", { ns: "${_locale.NAMESPACE}" })}}`,
           ['x-validator'](value) {
             return (0, _utils.isValidFilter)(value) ? '' : `{{t("Please add at least one condition", { ns: "${_locale.NAMESPACE}" })}}`;
           }
         }),
-        values: _collection.values
+        values: _objectSpread(_objectSpread({}, _collection.values), {}, {
+          'x-component-props': {
+            filter(field) {
+              var _this$params;
+              return ((_this$params = this.params) === null || _this$params === void 0 ? void 0 : _this$params.individualHooks) || !['hasOne', 'hasMany', 'belongsToMany'].includes(field.type);
+            }
+          }
+        })
       }
     }
   },
@@ -48,7 +120,8 @@ var _default = {
   },
   components: {
     FilterDynamicComponent: _FilterDynamicComponent.FilterDynamicComponent,
-    CollectionFieldset: _CollectionFieldset.default
+    CollectionFieldset: _CollectionFieldset.default,
+    IndividualHooksRadioWithTooltip
   }
 };
 exports.default = _default;

package/lib/client/style.js

@@ -266,6 +266,10 @@ const nodeJobButtonClass = (0, _css().css)`
     border: none;
   }
 
+  &.inner{
+    position: static;
+  }
+
   .ant-tag {
     padding: 0;
     width: 100%;

package/lib/client/triggers/index.js

@@ -19,6 +19,13 @@ function _css() {
   };
   return data;
 }
+function _core() {
+  const data = require("@formily/core");
+  _core = function _core() {
+    return data;
+  };
+  return data;
+}
 function _react2() {
   const data = require("@formily/react");
   _react2 = function _react2() {
@@ -186,24 +193,28 @@ const TriggerConfig = () => {
     _useState4 = _slicedToArray(_useState3, 2),
     editingConfig = _useState4[0],
     setEditingConfig = _useState4[1];
+  let typeTitle = '';
   (0, _react().useEffect)(() => {
     if (workflow) {
       var _workflow$title;
       setEditingTitle((_workflow$title = workflow.title) !== null && _workflow$title !== void 0 ? _workflow$title : typeTitle);
     }
   }, [workflow]);
+  const form = (0, _react().useMemo)(() => (0, _core().createForm)({
+    values: workflow === null || workflow === void 0 ? void 0 : workflow.config,
+    disabled: workflow === null || workflow === void 0 ? void 0 : workflow.executed
+  }), [workflow]);
   if (!workflow || !workflow.type) {
     return null;
   }
   const title = workflow.title,
     type = workflow.type,
-    config = workflow.config,
     executed = workflow.executed;
-  const _triggers$get = triggers.get(type),
-    typeTitle = _triggers$get.title,
-    fieldset = _triggers$get.fieldset,
-    scope = _triggers$get.scope,
-    components = _triggers$get.components;
+  const trigger = triggers.get(type);
+  const fieldset = trigger.fieldset,
+    scope = trigger.scope,
+    components = trigger.components;
+  typeTitle = trigger.title;
   const detailText = executed ? '{{t("View")}}' : '{{t("Configure")}}';
   const titleText = `${(0, _locale.lang)('Trigger')}: ${compile(typeTitle)}`;
   function onChangeTitle(_x2) {
@@ -261,6 +272,7 @@ const TriggerConfig = () => {
     }
   }, _react().default.createElement(_client2().SchemaComponent, {
     schema: {
+      name: `workflow-trigger-${workflow.id}`,
       type: 'void',
       properties: {
         config: {
@@ -276,14 +288,9 @@ const TriggerConfig = () => {
           type: 'void',
           title: titleText,
           'x-component': 'Action.Drawer',
-          'x-decorator': 'Form',
+          'x-decorator': 'FormV2',
           'x-decorator-props': {
-            disabled: workflow.executed,
-            useValues(options) {
-              return (0, _client2().useRequest)(() => Promise.resolve({
-                data: config
-              }), options);
-            }
+            form
           },
           properties: _objectSpread(_objectSpread({}, executed ? {
             alert: {

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

@@ -174,7 +174,17 @@ const ModeFieldsets = {
         placeholder: `{{t("No limit", { ns: "${_locale.NAMESPACE}" })}}`,
         min: 0
       }
-    }
+    },
+    appends: _objectSpread(_objectSpread({}, _collection.appends), {}, {
+      'x-reactions': [{
+        dependencies: ['mode', 'collection'],
+        fulfill: {
+          state: {
+            visible: `{{$deps[0] === ${_constants.SCHEDULE_MODE.COLLECTION_FIELD} && $deps[1]}}`
+          }
+        }
+      }]
+    })
   }
 };
 const scheduleModeOptions = [{

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

@@ -8,26 +8,6 @@ declare const _default: {
             'x-component': string;
             'x-component-props': {};
         };
-        appends: {
-            'x-reactions': {
-                dependencies: string[];
-                fulfill: {
-                    state: {
-                        visible: string;
-                    };
-                };
-            }[];
-            type: string;
-            title: string;
-            description: string;
-            'x-decorator': string;
-            'x-component': string;
-            'x-component-props': {
-                mode: string;
-                placeholder: string;
-                filter(field: any): boolean;
-            };
-        };
     };
     scope: {
         useCollectionDataSource: typeof useCollectionDataSource;

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

@@ -16,13 +16,7 @@ var _constants = require("./constants");
 var _locale = require("../../locale");
 var _CollectionBlockInitializer = require("../../components/CollectionBlockInitializer");
 var _variable = require("../../variable");
-var _collection = require("../../schemas/collection");
 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',
@@ -31,17 +25,7 @@ var _default = {
       type: 'void',
       'x-component': 'ScheduleConfig',
       'x-component-props': {}
-    },
-    appends: _objectSpread(_objectSpread({}, _collection.appends), {}, {
-      'x-reactions': [{
-        dependencies: ['mode', 'collection'],
-        fulfill: {
-          state: {
-            visible: `{{$deps[0] === ${_constants.SCHEDULE_MODE.COLLECTION_FIELD} && $deps[1]}}`
-          }
-        }
-      }]
-    })
+    }
   },
   scope: {
     useCollectionDataSource: _client().useCollectionDataSource

package/lib/server/Plugin.js

@@ -265,9 +265,11 @@ class WorkflowPlugin extends _server().Plugin {
         workflows.forEach(workflow => {
           _this2.toggle(workflow);
         });
+      }));
+      _this2.app.on('afterStart', () => {
         // check for not started executions
         _this2.dispatch();
-      }));
+      });
       _this2.app.on('beforeStop', /*#__PURE__*/_asyncToGenerator(function* () {
         const collection = db.getCollection('workflows');
         const workflows = yield collection.repository.find({
@@ -301,8 +303,9 @@ class WorkflowPlugin extends _server().Plugin {
       return;
     }
     this.events.push([workflow, context, options]);
-    this.getLogger(workflow.id).debug(`new event triggered, now events: ${this.events.length}`, {
-      data: workflow.config
+    this.getLogger(workflow.id).info(`new event triggered, now events: ${this.events.length}`);
+    this.getLogger(workflow.id).debug(`event data:`, {
+      data: context
     });
     if (this.events.length > 1) {
       return;

package/lib/server/Processor.d.ts

@@ -31,9 +31,9 @@ export default class Processor {
     private commit;
     private exec;
     run(node: any, input?: any): any;
-    end(node: any, job: any): Promise<any>;
+    end(node: any, job: JobModel): Promise<any>;
     recall(node: any, job: any): Promise<any>;
-    exit(job: JobModel | null): Promise<any>;
+    exit(s?: number): Promise<any>;
     saveJob(payload: any): Promise<any>;
     getBranches(node: FlowNodeModel): FlowNodeModel[];
     findBranchStartNode(node: FlowNodeModel, parent?: FlowNodeModel): FlowNodeModel | null;

package/lib/server/Processor.js

@@ -26,18 +26,18 @@ function _utils() {
   return data;
 }
 var _constants = require("./constants");
+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 _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; }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+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 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 _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; }
 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); }); }; }
 class Processor {
@@ -123,7 +123,7 @@ class Processor {
           result: execution.context
         });
       } else {
-        yield _this3.exit(null);
+        yield _this3.exit(_constants.JOB_STATUS.RESOLVED);
       }
     })();
   }
@@ -223,7 +223,7 @@ class Processor {
       }
       // really done for all nodes
       // * should mark execution as done with last job status
-      return _this8.exit(job);
+      return _this8.exit(job.status);
     })();
   }
   recall(node, job) {
@@ -237,17 +237,19 @@ class Processor {
       return _this9.exec(instruction.resume.bind(instruction), node, job);
     })();
   }
-  exit(job) {
+  exit(s) {
     var _this10 = this;
     return _asyncToGenerator(function* () {
-      var _this10$constructor$S;
-      const status = job ? (_this10$constructor$S = _this10.constructor.StatusMap[job.status]) !== null && _this10$constructor$S !== void 0 ? _this10$constructor$S : Math.sign(job.status) : _constants.EXECUTION_STATUS.RESOLVED;
-      _this10.logger.info(`execution (${_this10.execution.id}) all nodes finished, finishing execution...`);
-      yield _this10.execution.update({
-        status
-      }, {
-        transaction: _this10.transaction
-      });
+      if (typeof s === 'number') {
+        var _this10$constructor$S;
+        const status = (_this10$constructor$S = _this10.constructor.StatusMap[s]) !== null && _this10$constructor$S !== void 0 ? _this10$constructor$S : Math.sign(s);
+        yield _this10.execution.update({
+          status
+        }, {
+          transaction: _this10.transaction
+        });
+      }
+      _this10.logger.info(`execution (${_this10.execution.id}) exiting with status ${_this10.execution.status}`);
       yield _this10.commit();
       return null;
     })();
@@ -265,15 +267,10 @@ class Processor {
           transaction: _this11.transaction
         });
       } else if (payload.id) {
-        var _yield$model$update = yield model.update(payload, {
-          where: {
-            id: payload.id
-          },
-          returning: true,
+        job = yield model.findByPk(payload.id);
+        yield job.update(payload, {
           transaction: _this11.transaction
         });
-        var _yield$model$update2 = _slicedToArray(_yield$model$update, 1);
-        job = _yield$model$update2[0];
       } else {
         job = yield model.create(_objectSpread(_objectSpread({}, payload), {}, {
           executionId: _this11.execution.id

package/lib/server/instructions/delay.js

@@ -27,7 +27,7 @@ class _default {
         const duration = node.config.duration;
         // add to schedule
         _this.schedule(job, duration);
-        return processor.end(node, job);
+        return processor.exit();
       });
       return function (_x, _x2, _x3) {
         return _ref.apply(this, arguments);

package/lib/server/instructions/loop.d.ts

@@ -6,7 +6,7 @@ declare const _default: {
         status: number;
         result: number;
     }>;
-    resume(node: FlowNodeModel, branchJob: any, processor: Processor): Promise<JobModel>;
+    resume(node: FlowNodeModel, branchJob: any, processor: Processor): Promise<any>;
     getScope(node: any, index: any, processor: any): {
         item: any;
         index: any;

package/lib/server/instructions/loop.js

@@ -68,7 +68,7 @@ var _default = {
         status = job.status;
       // if loop has been done (resolved / rejected), do not care newly executed branch jobs.
       if (status !== _constants.JOB_STATUS.PENDING) {
-        return null;
+        return processor.exit();
       }
       const nextIndex = result + 1;
       const target = processor.getParsedValue(loop.config.target, node);

package/lib/server/instructions/manual/actions.js

@@ -75,7 +75,7 @@ function _submit() {
     yield userJob.save({
       transaction: processor.transaction
     });
-    yield processor.exit(userJob.job);
+    yield processor.exit();
     context.body = userJob;
     context.status = 202;
     yield next();

package/lib/server/instructions/parallel.js

@@ -100,7 +100,7 @@ var _default = {
         status = job.status;
       // if parallel has been done (resolved / rejected), do not care newly executed branch jobs.
       if (status !== _constants.JOB_STATUS.PENDING) {
-        return null;
+        return processor.exit();
       }
       // find the index of the node which start the branch
       const jobNode = processor.nodesMap.get(branchJob.nodeId);
@@ -119,7 +119,7 @@ var _default = {
         yield job.save({
           transaction: processor.transaction
         });
-        return processor.end(node, job);
+        return processor.exit();
       }
       return job;
     })();

package/lib/server/instructions/request.js

@@ -76,11 +76,11 @@ class _default {
           result: error.isAxiosError ? error.toJSON() : error.message
         });
       }).finally(() => {
-        _this.plugin.app.logger.info(`[Workflow] request (#${node.id}) response received, status: ${job.get('status')}`);
+        processor.logger.info(`request (#${node.id}) response received, status: ${job.get('status')}`);
         _this.plugin.resume(job);
       });
-      _this.plugin.app.logger.info(`[Workflow] request (#${node.id}) sent to "${config.url}", waiting for response...`);
-      return null;
+      processor.logger.info(`request (#${node.id}) sent to "${config.url}", waiting for response...`);
+      return processor.exit();
     })();
   }
   resume(node, job, processor) {

package/lib/server/instructions/update.js

@@ -15,10 +15,9 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 var _default = {
   run(node, input, processor) {
     return _asyncToGenerator(function* () {
+      var _result$length;
       const _node$config = node.config,
         collection = _node$config.collection,
-        _node$config$multiple = _node$config.multiple,
-        multiple = _node$config$multiple === void 0 ? false : _node$config$multiple,
         _node$config$params = _node$config.params,
         params = _node$config$params === void 0 ? {} : _node$config$params;
       const repo = node.constructor.database.getRepository(collection);
@@ -30,7 +29,7 @@ var _default = {
         transaction: processor.transaction
       }));
       return {
-        result: multiple ? result : result[0] || null,
+        result: (_result$length = result.length) !== null && _result$length !== void 0 ? _result$length : result,
         status: _constants.JOB_STATUS.RESOLVED
       };
     })();

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.2",
+  "version": "0.10.0-alpha.4",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "0.10.0-alpha.2",
-    "@nocobase/client": "0.10.0-alpha.2",
-    "@nocobase/database": "0.10.0-alpha.2",
-    "@nocobase/evaluators": "0.10.0-alpha.2",
-    "@nocobase/logger": "0.10.0-alpha.2",
-    "@nocobase/resourcer": "0.10.0-alpha.2",
-    "@nocobase/server": "0.10.0-alpha.2",
-    "@nocobase/utils": "0.10.0-alpha.2",
+    "@nocobase/actions": "0.10.0-alpha.4",
+    "@nocobase/client": "0.10.0-alpha.4",
+    "@nocobase/database": "0.10.0-alpha.4",
+    "@nocobase/evaluators": "0.10.0-alpha.4",
+    "@nocobase/logger": "0.10.0-alpha.4",
+    "@nocobase/resourcer": "0.10.0-alpha.4",
+    "@nocobase/server": "0.10.0-alpha.4",
+    "@nocobase/utils": "0.10.0-alpha.4",
     "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.2",
-    "@nocobase/test": "0.10.0-alpha.2",
+    "@nocobase/plugin-formula-field": "0.10.0-alpha.4",
+    "@nocobase/test": "0.10.0-alpha.4",
     "@types/ejs": "^3.1.1"
   },
-  "gitHead": "85028ae1733fcbd46ecd5d291dacbdc175f7f073"
+  "gitHead": "62dacadb2a83d30cb36dda9074f2f3a072a37484"
 }