@nocobase/plugin-workflow 0.11.0-alpha.1 → 0.11.1-alpha.2

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

@@ -25,7 +25,7 @@ function submit(_x, _x2) {
 }
 function _submit() {
   _submit = _asyncToGenerator(function* (context, next) {
-    var _values$result, _forms$formKey, _forms$formKey$action, _userJob$node$config$2, _userJob$result;
+    var _values$result, _values$result2, _forms$formKey, _forms$formKey$action, _userJob$node$config$2, _actionItem$values, _userJob$result;
     const repository = _actions().utils.getRepositoryFromParams(context);
     const _context$action$param = context.action.params,
       filterByTk = _context$action$param.filterByTk,
@@ -49,11 +49,13 @@ function _submit() {
     }
     const _userJob$node$config$ = userJob.node.config.forms,
       forms = _userJob$node$config$ === void 0 ? {} : _userJob$node$config$;
-    const _Object$keys = Object.keys((_values$result = values.result) !== null && _values$result !== void 0 ? _values$result : {}),
-      _Object$keys2 = _slicedToArray(_Object$keys, 1),
-      formKey = _Object$keys2[0];
+    const _Object$keys$filter = Object.keys((_values$result = values.result) !== null && _values$result !== void 0 ? _values$result : {}).filter(key => key !== '_'),
+      _Object$keys$filter2 = _slicedToArray(_Object$keys$filter, 1),
+      formKey = _Object$keys$filter2[0];
+    const actionKey = (_values$result2 = values.result) === null || _values$result2 === void 0 ? void 0 : _values$result2._;
+    const actionItem = (_forms$formKey = forms[formKey]) === null || _forms$formKey === void 0 ? void 0 : (_forms$formKey$action = _forms$formKey.actions) === null || _forms$formKey$action === void 0 ? void 0 : _forms$formKey$action.find(item => item.key === actionKey);
     // NOTE: validate status
-    if (userJob.status !== _constants.JOB_STATUS.PENDING || userJob.job.status !== _constants.JOB_STATUS.PENDING || userJob.execution.status !== _constants.EXECUTION_STATUS.STARTED || !userJob.workflow.enabled || !((_forms$formKey = forms[formKey]) !== null && _forms$formKey !== void 0 && (_forms$formKey$action = _forms$formKey.actions) !== null && _forms$formKey$action !== void 0 && _forms$formKey$action.includes(values.status))) {
+    if (userJob.status !== _constants.JOB_STATUS.PENDING || userJob.job.status !== _constants.JOB_STATUS.PENDING || userJob.execution.status !== _constants.EXECUTION_STATUS.STARTED || !userJob.workflow.enabled || !actionKey || (actionItem === null || actionItem === void 0 ? void 0 : actionItem.status) == null) {
       return context.throw(400);
     }
     userJob.execution.workflow = userJob.workflow;
@@ -64,9 +66,17 @@ function _submit() {
     if (!assignees.includes(currentUser.id) || userJob.userId !== currentUser.id) {
       return context.throw(403);
     }
+    const presetValues = processor.getParsedValue((_actionItem$values = actionItem.values) !== null && _actionItem$values !== void 0 ? _actionItem$values : {}, null, {
+      currentUser: currentUser.toJSON(),
+      currentRecord: values.result[formKey],
+      currentTime: new Date()
+    });
     userJob.set({
-      status: values.status,
-      result: values.status ? values.result : Object.assign((_userJob$result = userJob.result) !== null && _userJob$result !== void 0 ? _userJob$result : {}, values.result)
+      status: actionItem.status,
+      result: actionItem.status > _constants.JOB_STATUS.PENDING ? {
+        [formKey]: Object.assign(values.result[formKey], presetValues),
+        _: actionKey
+      } : Object.assign((_userJob$result = userJob.result) !== null && _userJob$result !== void 0 ? _userJob$result : {}, values.result)
     });
     const handler = instruction.formTypes.get(forms[formKey].type);
     if (handler && userJob.status) {
@@ -79,8 +89,10 @@ function _submit() {
     context.body = userJob;
     context.status = 202;
     yield next();
+    userJob.job.execution = userJob.execution;
     userJob.job.latestUserJob = userJob;
     // NOTE: resume the process and no `await` for quick returning
+    processor.logger.info(`manual node (${userJob.nodeId}) action trigger execution (${userJob.execution.id}) to resume`);
     plugin.resume(userJob.job);
   });
   return _submit.apply(this, arguments);

package/lib/server/instructions/manual/forms/create.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
+const _excluded = ["_"];
 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; }
@@ -15,6 +16,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 _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 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 _default(_x, _x2, _x3) {
@@ -28,7 +31,10 @@ function _ref() {
     if (!repo) {
       throw new Error(`collection ${collection} for create data on manual node not found`);
     }
-    const _Object$values = Object.values(instance.result),
+    const _instance$result = instance.result,
+      _ = _instance$result._,
+      form = _objectWithoutProperties(_instance$result, _excluded);
+    const _Object$values = Object.values(form),
       _Object$values2 = _slicedToArray(_Object$values, 1),
       values = _Object$values2[0];
     yield repo.create({

package/lib/server/instructions/manual/forms/update.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
+const _excluded = ["_"];
 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; }
@@ -15,6 +16,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 _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 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 _default(_x, _x2, _x3) {
@@ -29,7 +32,10 @@ function _ref() {
     if (!repo) {
       throw new Error(`collection ${collection} for update data on manual node not found`);
     }
-    const _Object$values = Object.values(instance.result),
+    const _instance$result = instance.result,
+      _ = _instance$result._,
+      form = _objectWithoutProperties(_instance$result, _excluded);
+    const _Object$values = Object.values(form),
       _Object$values2 = _slicedToArray(_Object$values, 1),
       values = _Object$values2[0];
     yield repo.update({

package/lib/server/instructions/query.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _constants = require("../constants");
+var _utils = require("../utils");
 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; }
@@ -24,7 +25,13 @@ var _default = {
         failOnEmpty = _node$config$failOnEm === void 0 ? false : _node$config$failOnEm;
       const repo = node.constructor.database.getRepository(collection);
       const options = processor.getParsedValue(params, node);
+      const appends = options.appends ? Array.from(options.appends.reduce((set, field) => {
+        set.add(field.split('.')[0]);
+        set.add(field);
+        return set;
+      }, new Set())) : options.appends;
       const result = yield (multiple ? repo.find : repo.findOne).call(repo, _objectSpread(_objectSpread({}, options), {}, {
+        appends: appends,
         transaction: processor.transaction
       }));
       if (failOnEmpty && (multiple ? !result.length : !result)) {
@@ -37,7 +44,7 @@ var _default = {
       // e.g. Object.prototype.hasOwnProperty.call(result, 'id') // false
       // so the properties can not be get by json-templates(object-path)
       return {
-        result: multiple ? result.map(item => item.toJSON()) : result === null || result === void 0 ? void 0 : result.toJSON(),
+        result: (0, _utils.toJSON)(result),
         status: _constants.JOB_STATUS.RESOLVED
       };
     })();

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

@@ -13,6 +13,6 @@ export type RequestConfig = Pick<AxiosRequestConfig, 'url' | 'method' | 'params'
 export default class implements Instruction {
     plugin: any;
     constructor(plugin: any);
-    run(node: FlowNodeModel, input: any, processor: Processor): Promise<any>;
+    run(node: FlowNodeModel, prevJob: any, processor: Processor): Promise<any>;
     resume(node: FlowNodeModel, job: any, processor: Processor): Promise<any>;
 }

package/lib/server/instructions/request.js

@@ -57,12 +57,14 @@ class _default {
     this.plugin = void 0;
     this.plugin = plugin;
   }
-  run(node, input, processor) {
+  run(node, prevJob, processor) {
     var _this = this;
     return _asyncToGenerator(function* () {
+      var _prevJob$id;
       const job = yield processor.saveJob({
         status: _constants.JOB_STATUS.PENDING,
-        nodeId: node.id
+        nodeId: node.id,
+        upstreamId: (_prevJob$id = prevJob === null || prevJob === void 0 ? void 0 : prevJob.id) !== null && _prevJob$id !== void 0 ? _prevJob$id : null
       });
       const config = processor.getParsedValue(node.config, node);
       // eslint-disable-next-line promise/catch-or-return

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

@@ -0,0 +1,12 @@
+import { Processor } from '..';
+import type { FlowNodeModel } from '../types';
+declare const _default: {
+    run(node: FlowNodeModel, input: any, processor: Processor): Promise<{
+        status: number;
+        result?: undefined;
+    } | {
+        result: [unknown[], unknown];
+        status: number;
+    }>;
+};
+export default _default;

package/lib/server/instructions/sql.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _ = require("..");
+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); }); }; }
+var _default = {
+  run(node, input, processor) {
+    return _asyncToGenerator(function* () {
+      var _node$config$sql;
+      const sequelize = node.constructor.database.sequelize;
+      const sql = processor.getParsedValue((_node$config$sql = node.config.sql) !== null && _node$config$sql !== void 0 ? _node$config$sql : '', node).trim();
+      if (!sql) {
+        return {
+          status: _.JOB_STATUS.RESOLVED
+        };
+      }
+      const result = yield sequelize.query(sql, {
+        transaction: processor.transaction
+        // plain: true,
+        // model: db.getCollection(node.config.collection).model
+      });
+
+      return {
+        result,
+        status: _.JOB_STATUS.RESOLVED
+      };
+    })();
+  }
+};
+exports.default = _default;

package/lib/server/migrations/20230710115902-manual-action-values.d.ts

@@ -0,0 +1,4 @@
+import { Migration } from '@nocobase/server';
+export default class extends Migration {
+    up(): Promise<void>;
+}

package/lib/server/migrations/20230710115902-manual-action-values.js

@@ -0,0 +1,97 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+function _server() {
+  const data = require("@nocobase/server");
+  _server = function _server() {
+    return data;
+  };
+  return data;
+}
+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 findSchema(root, filter, onlyLeaf = false) {
+  const result = [];
+  if (!root) {
+    return result;
+  }
+  if (filter(root) && (!onlyLeaf || !root.properties)) {
+    result.push(root);
+    return result;
+  }
+  if (root.properties) {
+    Object.keys(root.properties).forEach(key => {
+      result.push(...findSchema(root.properties[key], filter));
+    });
+  }
+  return result;
+}
+function migrateConfig(config) {
+  const _config$forms = config.forms,
+    forms = _config$forms === void 0 ? {} : _config$forms,
+    _config$schema = config.schema,
+    schema = _config$schema === void 0 ? {} : _config$schema;
+  const root = {
+    properties: schema
+  };
+  Object.keys(forms).forEach(key => {
+    const form = forms[key];
+    const formSchema = findSchema(root, item => item.name === key);
+    const actions = findSchema(formSchema[0], item => item['x-component'] === 'Action');
+    form.actions = actions.map(action => {
+      action['x-designer'] = 'ManualActionDesigner';
+      action['x-action-settings'] = {};
+      delete action['x-action'];
+      return {
+        status: action['x-decorator-props'].value,
+        values: {},
+        key: action.name
+      };
+    });
+  });
+  return config;
+}
+class _default extends _server().Migration {
+  up() {
+    var _this = this;
+    return _asyncToGenerator(function* () {
+      const match = yield _this.app.version.satisfies('<0.11.0-alpha.2');
+      if (!match) {
+        return;
+      }
+      const db = _this.context.db;
+      const NodeRepo = db.getRepository('flow_nodes');
+      yield db.sequelize.transaction( /*#__PURE__*/function () {
+        var _ref = _asyncToGenerator(function* (transaction) {
+          const nodes = yield NodeRepo.find({
+            filter: {
+              type: 'manual'
+            },
+            transaction
+          });
+          console.log('%d nodes need to be migrated.', nodes.length);
+          yield nodes.reduce((promise, node) => promise.then(() => {
+            node.set('config', _objectSpread({}, migrateConfig(node.config)));
+            node.changed('config', true);
+            return node.save({
+              silent: true,
+              transaction
+            });
+          }), Promise.resolve());
+        });
+        return function (_x) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+    })();
+  }
+}
+exports.default = _default;

package/lib/server/triggers/collection.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _ = require("..");
+var _utils = require("../utils");
 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; } }
@@ -72,22 +73,23 @@ function _handler() {
         return;
       }
     }
+    let result = data;
     if (appends !== null && appends !== void 0 && appends.length && !(mode & MODE_BITMAP.DESTROY)) {
-      const includeFields = appends.filter(field => !data.get(field) || !data[field]);
-      const included = yield model.findByPk(data[model.primaryKeyAttribute], {
-        attributes: [model.primaryKeyAttribute],
-        include: includeFields,
+      const includeFields = appends.reduce((set, field) => {
+        set.add(field.split('.')[0]);
+        set.add(field);
+        return set;
+      }, new Set());
+      result = yield repository.findOne({
+        filterByTk: data[model.primaryKeyAttribute],
+        appends: Array.from(includeFields),
         transaction
       });
-      includeFields.forEach(field => {
-        const value = included.get(field);
-        data.set(field, Array.isArray(value) ? value.map(item => item.toJSON()) : value ? value.toJSON() : null, {
-          raw: true
-        });
-      });
     }
+    // TODO: `result.toJSON()` throws error
+    const json = (0, _utils.toJSON)(result);
     this.plugin.trigger(workflow, {
-      data: data.toJSON()
+      data: json
     }, {
       context
     });

package/lib/server/utils.d.ts

@@ -0,0 +1,2 @@
+import { Model } from '@nocobase/database';
+export declare function toJSON(data: Model | Model[]): object;

package/lib/server/utils.js

@@ -0,0 +1,21 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.toJSON = toJSON;
+function toJSON(data) {
+  if (typeof data !== 'object' || !data) {
+    return data;
+  }
+  if (Array.isArray(data)) {
+    return data.map(toJSON);
+  }
+  const result = data.get();
+  Object.keys(data.constructor.associations).forEach(key => {
+    if (result[key] != null) {
+      result[key] = toJSON(result[key]);
+    }
+  });
+  return result;
+}

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流",
   "description": "A powerful workflow plugin designed to support business process management and automation.",
   "description.zh-CN": "工作流插件，为业务流程管理和自动化提供支持。",
-  "version": "0.11.0-alpha.1",
+  "version": "0.11.1-alpha.2",
   "license": "AGPL-3.0",
   "main": "./lib/server/index.js",
   "files": [
@@ -23,11 +23,9 @@
     "classnames": "^2.3.1",
     "cron-parser": "4.4.0",
     "lru-cache": "8.0.5",
-    "react-js-cron": "^3.1.0",
-    "sequelize": "^6.26.0",
-    "winston": "^3.8.2"
+    "react-js-cron": "^3.1.0"
   },
-  "devDependencies": {
+  "peerDependencies": {
     "@ant-design/icons": "^5.1.4",
     "@formily/antd-v5": "1.1.0-beta.4",
     "@formily/core": "2.2.26",
@@ -37,18 +35,21 @@
     "@nocobase/database": "0.11.0-alpha.1",
     "@nocobase/evaluators": "0.11.0-alpha.1",
     "@nocobase/logger": "0.11.0-alpha.1",
-    "@nocobase/plugin-formula-field": "0.11.0-alpha.1",
     "@nocobase/plugin-users": "0.11.0-alpha.1",
     "@nocobase/resourcer": "0.11.0-alpha.1",
     "@nocobase/server": "0.11.0-alpha.1",
-    "@nocobase/test": "0.11.0-alpha.1",
     "@nocobase/utils": "0.11.0-alpha.1",
-    "@types/ejs": "^3.1.1",
-    "antd": "5.6.3",
+    "antd": "^5.6.4",
     "dayjs": "^1.11.8",
     "react": "18.x",
     "react-i18next": "^11.15.1",
-    "react-router-dom": "^6.11.2"
+    "react-router-dom": "^6.11.2",
+    "sequelize": "^6.26.0",
+    "winston": "^3.8.2"
+  },
+  "devDependencies": {
+    "@nocobase/test": "0.11.1-alpha.2",
+    "@types/ejs": "^3.1.1"
   },
-  "gitHead": "7581b6d3a3a54f09f06a9effb7e3e65328281b2b"
+  "gitHead": "8482aa720ea1c3abbbb9fe1208e73778bd63f1cf"
 }

package/src/client/AddButton.tsx

@@ -1,11 +1,11 @@
 import { PlusOutlined } from '@ant-design/icons';
-import { cx, useAPIClient, useCompile } from '@nocobase/client';
+import { cx, css, useAPIClient, useCompile } from '@nocobase/client';
 import { Button, Dropdown, MenuProps } from 'antd';
 import React, { useCallback, useMemo } from 'react';
 import { useFlowContext } from './FlowContext';
 import { NAMESPACE } from './locale';
 import { Instruction, instructions } from './nodes';
-import { addButtonClass } from './style';
+import useStyles from './style';
 
 interface AddButtonProps {
   upstream;
@@ -17,6 +17,8 @@ export function AddButton({ upstream, branchIndex = null }: AddButtonProps) {
   const api = useAPIClient();
   const { workflow, refresh } = useFlowContext() ?? {};
   const instructionList = Array.from(instructions.getValues()) as Instruction[];
+  const { styles } = useStyles();
+
   const groups = useMemo(() => {
     return [
       { key: 'control', label: `{{t("Control", { ns: "${NAMESPACE}" })}}` },
@@ -80,7 +82,7 @@ export function AddButton({ upstream, branchIndex = null }: AddButtonProps) {
 
   const menu = useMemo<MenuProps>(() => {
     return {
-      onClick: (ev) => onCreate(ev),
+      onClick: onCreate,
       items: compile(groups),
     };
   }, [groups, onCreate]);
@@ -90,8 +92,18 @@ export function AddButton({ upstream, branchIndex = null }: AddButtonProps) {
   }
 
   return (
-    <div className={cx(addButtonClass)}>
-      <Dropdown trigger={['click']} menu={menu} disabled={workflow.executed}>
+    <div className={styles.addButtonClass}>
+      <Dropdown
+        trigger={['click']}
+        menu={menu}
+        disabled={workflow.executed}
+        overlayClassName={css`
+          .ant-dropdown-menu-root{
+            max-height: 30em;
+            overflow-y: auto;
+          }
+        `}
+      >
         <Button shape="circle" icon={<PlusOutlined />} />
       </Dropdown>
     </div>

package/src/client/Branch.tsx

@@ -2,7 +2,7 @@ import { cx } from '@nocobase/client';
 import React from 'react';
 import { AddButton } from './AddButton';
 import { Node } from './nodes';
-import { branchClass } from './style';
+import useStyles from './style';
 
 export function Branch({
   from = null,
@@ -15,13 +15,15 @@ export function Branch({
   branchIndex?: number | null;
   controller?: any;
 }) {
+  const { styles } = useStyles();
+
   const list: any[] = [];
   for (let node = entry; node; node = node.downstream) {
     list.push(node);
   }
 
   return (
-    <div className={cx(branchClass)}>
+    <div className={cx(styles.branchClass)}>
       <div className="workflow-branch-lines" />
       {controller}
       <AddButton upstream={from} branchIndex={branchIndex} />

package/src/client/CanvasContent.tsx

@@ -3,18 +3,20 @@ import { Tag } from 'antd';
 import React from 'react';
 import { Branch } from './Branch';
 import { lang } from './locale';
-import { branchBlockClass, nodeCardClass, nodeMetaClass } from './style';
+import useStyles from './style';
 import { TriggerConfig } from './triggers';
 
 export function CanvasContent({ entry }) {
+  const { styles } = useStyles();
+
   return (
     <div className="workflow-canvas">
       <TriggerConfig />
-      <div className={branchBlockClass}>
+      <div className={styles.branchBlockClass}>
         <Branch entry={entry} />
       </div>
-      <div className={cx('end', nodeCardClass)}>
-        <div className={cx(nodeMetaClass)}>
+      <div className={cx('end', styles.nodeCardClass)}>
+        <div className={cx(styles.nodeMetaClass)}>
           <Tag color="#333">{lang('End')}</Tag>
         </div>
       </div>

package/src/client/ExecutionCanvas.tsx

@@ -15,7 +15,7 @@ import { ExecutionStatusOptionsMap, JobStatusOptions } from './constants';
 import { FlowContext, useFlowContext } from './FlowContext';
 import { lang, NAMESPACE } from './locale';
 import { instructions } from './nodes';
-import { nodeTitleClass } from './style';
+import useStyles from './style';
 import { linkNodes } from './utils';
 
 function attachJobs(nodes, jobs: any[] = []): void {
@@ -41,6 +41,8 @@ function attachJobs(nodes, jobs: any[] = []): void {
 function JobModal() {
   const compile = useCompile();
   const { viewJob: job, setViewJob } = useFlowContext();
+  const { styles } = useStyles();
+
   const { node = {} } = job ?? {};
   const instruction = instructions.get(node.type);
 
@@ -58,7 +60,7 @@ function JobModal() {
               },
               'x-component': 'Action.Modal',
               title: (
-                <div className={nodeTitleClass}>
+                <div className={styles.nodeTitleClass}>
                   <Tag>{compile(instruction?.title)}</Tag>
                   <strong>{node.title}</strong>
                   <span className="workflow-node-id">#{node.id}</span>
@@ -144,17 +146,13 @@ export function ExecutionCanvas() {
     >
       <div className="workflow-toolbar">
         <header>
-          <Breadcrumb>
-            <Breadcrumb.Item>
-              <Link to={`/admin/settings/workflow/workflows`}>{lang('Workflow')}</Link>
-            </Breadcrumb.Item>
-            <Breadcrumb.Item>
-              <Link to={`/admin/settings/workflow/workflows/${workflow.id}`}>{workflow.title}</Link>
-            </Breadcrumb.Item>
-            <Breadcrumb.Item>
-              <strong>{`#${execution.id}`}</strong>
-            </Breadcrumb.Item>
-          </Breadcrumb>
+          <Breadcrumb
+            items={[
+              { title: <Link to={`/admin/settings/workflow/workflows`}>{lang('Workflow')}</Link> },
+              { title: <Link to={`/admin/settings/workflow/workflows/${workflow.id}`}>{workflow.title}</Link> },
+              { title: <strong>{`#${execution.id}`}</strong> },
+            ]}
+          />
         </header>
         <aside>
           <Tag color={statusOption.color}>{compile(statusOption.label)}</Tag>

package/src/client/ExecutionPage.tsx

@@ -2,13 +2,14 @@ import { cx, SchemaComponent } from '@nocobase/client';
 import React from 'react';
 import { useParams } from 'react-router-dom';
 import { ExecutionCanvas } from './ExecutionCanvas';
-import { workflowPageClass } from './style';
+import useStyles from './style';
 
 export const ExecutionPage = () => {
   const params = useParams<any>();
+  const { styles } = useStyles();
 
   return (
-    <div className={cx(workflowPageClass)}>
+    <div className={cx(styles.workflowPageClass)}>
       <SchemaComponent
         schema={{
           type: 'void',