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

package/lib/client/triggers/index.js

@@ -56,7 +56,7 @@ function _react2() {
 }
 var _FlowContext = require("../FlowContext");
 var _locale = require("../locale");
-var _style = require("../style");
+var _style = _interopRequireDefault(require("../style"));
 var _collection = _interopRequireDefault(require("./collection"));
 var _schedule = _interopRequireDefault(require("./schedule/"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -114,6 +114,8 @@ function TriggerExecution() {
   const _useFlowContext2 = (0, _FlowContext.useFlowContext)(),
     workflow = _useFlowContext2.workflow,
     execution = _useFlowContext2.execution;
+  const _useStyles = (0, _style.default)(),
+    styles = _useStyles.styles;
   if (!execution) {
     return null;
   }
@@ -126,7 +128,8 @@ function TriggerExecution() {
       'x-component-props': {
         title: _react2().default.createElement(_icons().InfoOutlined, null),
         shape: 'circle',
-        className: _style.nodeJobButtonClass,
+        size: 'small',
+        className: styles.nodeJobButtonClass,
         type: 'primary'
       },
       properties: {
@@ -138,7 +141,7 @@ function TriggerExecution() {
           },
           'x-component': 'Action.Modal',
           title: _react2().default.createElement("div", {
-            className: (0, _client().cx)(_style.nodeTitleClass)
+            className: (0, _client().cx)(styles.nodeTitleClass)
           }, _react2().default.createElement(_antd().Tag, null, compile(trigger.title)), _react2().default.createElement("strong", null, workflow.title), _react2().default.createElement("span", {
             className: "workflow-node-id"
           }, "#", execution.id)),
@@ -186,6 +189,8 @@ const TriggerConfig = () => {
     _useState4 = _slicedToArray(_useState3, 2),
     editingConfig = _useState4[0],
     setEditingConfig = _useState4[1];
+  const _useStyles2 = (0, _style.default)(),
+    styles = _useStyles2.styles;
   let typeTitle = '';
   (0, _react2().useEffect)(() => {
     if (workflow) {
@@ -248,10 +253,10 @@ const TriggerConfig = () => {
     }
   }
   return _react2().default.createElement("div", {
-    className: (0, _client().cx)(_style.nodeCardClass),
+    className: (0, _client().cx)(styles.nodeCardClass),
     onClick: onOpenDrawer
   }, _react2().default.createElement("div", {
-    className: (0, _client().cx)(_style.nodeMetaClass, 'workflow-node-meta')
+    className: (0, _client().cx)(styles.nodeMetaClass, 'workflow-node-meta')
   }, _react2().default.createElement(_antd().Tag, {
     color: "gold"
   }, titleText)), _react2().default.createElement("div", null, _react2().default.createElement(_antd().Input.TextArea, {

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

@@ -32,8 +32,8 @@ function _reactI18next() {
   };
   return data;
 }
+var _FieldsSelect = require("../../components/FieldsSelect");
 var _locale = require("../../locale");
-var _DateFieldsSelect = require("./DateFieldsSelect");
 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 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; }
@@ -47,14 +47,15 @@ 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 dateFieldFilter(field) {
+  return !field.hidden && (field.uiSchema ? field.type === 'date' : false);
+}
 function OnField({
   value,
   onChange: _onChange
 }) {
   const _useTranslation = (0, _reactI18next().useTranslation)(),
     t = _useTranslation.t;
-  const _useWorkflowTranslati = (0, _locale.useWorkflowTranslation)(),
-    localT = _useWorkflowTranslati.t;
   const _useState = (0, _react().useState)(value.offset ? value.offset / Math.abs(value.offset) : 0),
     _useState2 = _slicedToArray(_useState, 2),
     dir = _useState2[0],
@@ -64,11 +65,13 @@ function OnField({
         display: flex;
         gap: 0.5em;
       `
-  }, _react().default.createElement(_DateFieldsSelect.DateFieldsSelect, {
+  }, _react().default.createElement(_FieldsSelect.FieldsSelect, {
     value: value.field,
     onChange: field => _onChange(_objectSpread(_objectSpread({}, value), {}, {
       field
-    }))
+    })),
+    filter: dateFieldFilter,
+    placeholder: t('Select field')
   }), value.field ? _react().default.createElement(_antd().Select, {
     value: dir,
     onChange: v => {
@@ -76,14 +79,18 @@ function OnField({
       _onChange(_objectSpread(_objectSpread({}, value), {}, {
         offset: Math.abs(value.offset) * v
       }));
-    }
-  }, _react().default.createElement(_antd().Select.Option, {
-    value: 0
-  }, localT('Exactly at')), _react().default.createElement(_antd().Select.Option, {
-    value: -1
-  }, t('Before')), _react().default.createElement(_antd().Select.Option, {
-    value: 1
-  }, t('After'))) : null, dir ? _react().default.createElement(_react().default.Fragment, null, _react().default.createElement(_antd().InputNumber, {
+    },
+    options: [{
+      value: 0,
+      label: (0, _locale.lang)('Exactly at')
+    }, {
+      value: -1,
+      label: t('Before')
+    }, {
+      value: 1,
+      label: t('After')
+    }]
+  }) : null, dir ? _react().default.createElement(_react().default.Fragment, null, _react().default.createElement(_antd().InputNumber, {
     value: Math.abs(value.offset),
     onChange: v => _onChange(_objectSpread(_objectSpread({}, value), {}, {
       offset: (v !== null && v !== void 0 ? v : 0) * dir
@@ -92,14 +99,19 @@ function OnField({
     value: value.unit || 86400000,
     onChange: unit => _onChange(_objectSpread(_objectSpread({}, value), {}, {
       unit
-    }))
-  }, _react().default.createElement(_antd().Select.Option, {
-    value: 86400000
-  }, localT('Days')), _react().default.createElement(_antd().Select.Option, {
-    value: 3600000
-  }, localT('Hours')), _react().default.createElement(_antd().Select.Option, {
-    value: 60000
-  }, localT('Minutes')), _react().default.createElement(_antd().Select.Option, {
-    value: 1000
-  }, localT('Seconds')))) : null);
+    })),
+    options: [{
+      value: 86400000,
+      label: (0, _locale.lang)('Days')
+    }, {
+      value: 3600000,
+      label: (0, _locale.lang)('Hours')
+    }, {
+      value: 60000,
+      label: (0, _locale.lang)('Minutes')
+    }, {
+      value: 1000,
+      label: (0, _locale.lang)('Seconds')
+    }]
+  })) : null);
 }

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

@@ -228,14 +228,14 @@ const ScheduleConfig = () => {
           'x-component': 'fieldset',
           'x-component-props': {
             className: (0, _client().css)`
-                  .ant-input-number {
-                    width: 4em;
-                  }
+                    .ant-input-number {
+                      width: 4em;
+                    }
 
-                  .ant-picker {
-                    width: auto;
-                  }
-                `
+                    .ant-picker {
+                      width: auto;
+                    }
+                  `
           },
           properties: ModeFieldsets[mode]
         }

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

@@ -15,7 +15,6 @@ declare const _default: {
     };
     components: {
         ScheduleConfig: () => import("react").JSX.Element;
-        FieldsSelect: import("react").MemoExoticComponent<import("@formily/reactive-react").ReactFC<Omit<any, "ref">>>;
     };
     useVariables(config: any, opts: any): any[];
     useInitializers(config: any): SchemaInitializerItemOptions | null;

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

@@ -16,12 +16,17 @@ var _constants = require("./constants");
 var _locale = require("../../locale");
 var _CollectionBlockInitializer = require("../../components/CollectionBlockInitializer");
 var _variable = require("../../variable");
-var _FieldsSelect = require("../../components/FieldsSelect");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var _default = {
   title: `{{t("Schedule event", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'schedule',
@@ -36,14 +41,14 @@ var _default = {
     useCollectionDataSource: _client().useCollectionDataSource
   },
   components: {
-    ScheduleConfig: _ScheduleConfig.ScheduleConfig,
-    FieldsSelect: _FieldsSelect.FieldsSelect
+    ScheduleConfig: _ScheduleConfig.ScheduleConfig
   },
   useVariables(config, opts) {
-    var _config$appends;
     const compile = (0, _client().useCompile)();
     const _useCollectionManager = (0, _client().useCollectionManager)(),
       getCollectionFields = _useCollectionManager.getCollectionFields;
+    const _opts$fieldNames = opts.fieldNames,
+      fieldNames = _opts$fieldNames === void 0 ? _variable.defaultFieldNames : _opts$fieldNames;
     const options = [];
     if (!(opts !== null && opts !== void 0 && opts.types) || opts.types.includes('date')) {
       options.push({
@@ -52,22 +57,29 @@ var _default = {
         label: (0, _locale.lang)('Trigger time')
       });
     }
-    const depth = (_config$appends = config.appends) !== null && _config$appends !== void 0 && _config$appends.length ? config.appends.reduce((max, item) => Math.max(max, item.split('.').length), 1) + 1 : 1;
-    const fieldOptions = (0, _variable.getCollectionFieldOptions)(_objectSpread(_objectSpread({
-      depth
-    }, opts), {}, {
-      collection: config.collection,
-      compile,
-      getCollectionFields
-    }));
+    // const depth = config.appends?.length
+    //   ? config.appends.reduce((max, item) => Math.max(max, item.split('.').length), 1) + 1
+    //   : 1;
     if (config.mode === _constants.SCHEDULE_MODE.COLLECTION_FIELD) {
-      if (fieldOptions.length) {
-        options.push({
-          key: 'data',
-          value: 'data',
-          label: (0, _locale.lang)('Trigger data'),
-          children: fieldOptions
-        });
+      var _config$appends;
+      const _getCollectionFieldOp = (0, _variable.getCollectionFieldOptions)(_objectSpread(_objectSpread({}, opts), {}, {
+          fields: [{
+            collectionName: config.collection,
+            name: 'data',
+            type: 'hasOne',
+            target: config.collection,
+            uiSchema: {
+              title: (0, _locale.lang)('Trigger data')
+            }
+          }],
+          appends: ['data', ...(((_config$appends = config.appends) === null || _config$appends === void 0 ? void 0 : _config$appends.map(item => `data.${item}`)) || [])],
+          compile,
+          getCollectionFields
+        })),
+        _getCollectionFieldOp2 = _slicedToArray(_getCollectionFieldOp, 1),
+        fieldOption = _getCollectionFieldOp2[0];
+      if (fieldOption) {
+        options.push(fieldOption);
       }
     }
     return options;

package/lib/client/variable.d.ts

@@ -1,34 +1,52 @@
 export type VariableOption = {
     key?: string;
-    value: string;
-    label: string;
+    value?: string;
+    label?: string;
     children?: VariableOptions;
+    [key: string]: any;
 };
 export type VariableOptions = VariableOption[] | null;
+export type VariableDataType = string | {
+    type: string;
+    options?: {
+        entity?: boolean;
+        collection?: string;
+    };
+} | ((field: any, appends?: string[]) => boolean);
+export type OptionsOfUseVariableOptions = {
+    types?: VariableDataType[];
+    fieldNames?: {
+        label?: string;
+        value?: string;
+        children?: string;
+    };
+};
+export declare const defaultFieldNames: {
+    readonly label: "label";
+    readonly value: "value";
+    readonly children: "children";
+};
 export declare const nodesOptions: {
     label: string;
     value: string;
-    useOptions(options: any): VariableOption[];
+    useOptions(options: OptionsOfUseVariableOptions): VariableOption[];
 };
 export declare const triggerOptions: {
     label: string;
     value: string;
-    useOptions(options: any): VariableOption[];
+    useOptions(options: OptionsOfUseVariableOptions): any;
 };
 export declare const scopeOptions: {
     label: string;
     value: string;
-    useOptions(options: any): VariableOption[];
+    useOptions(options: OptionsOfUseVariableOptions): VariableOption[];
 };
 export declare const systemOptions: {
     label: string;
     value: string;
-    useOptions({ types }: {
-        types: any;
-    }): {
+    useOptions({ types, fieldNames }: OptionsOfUseVariableOptions): {
+        [x: string]: string;
         key: string;
-        value: string;
-        label: string;
     }[];
 };
 export declare const BaseTypeSets: {
@@ -37,7 +55,7 @@ export declare const BaseTypeSets: {
     string: Set<string>;
     date: Set<string>;
 };
-export declare function useWorkflowVariableOptions(options?: {}): {
+export declare function useWorkflowVariableOptions(options?: OptionsOfUseVariableOptions): {
     label: any;
     value: any;
     key: any;

package/lib/client/variable.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.BaseTypeSets = void 0;
+exports.defaultFieldNames = exports.BaseTypeSets = void 0;
 exports.getCollectionFieldOptions = getCollectionFieldOptions;
 exports.triggerOptions = exports.systemOptions = exports.scopeOptions = exports.nodesOptions = void 0;
 exports.useWorkflowVariableOptions = useWorkflowVariableOptions;
@@ -25,6 +25,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+const defaultFieldNames = {
+  label: 'label',
+  value: 'value',
+  children: 'children'
+};
+exports.defaultFieldNames = defaultFieldNames;
 const nodesOptions = {
   label: `{{t("Node result", { ns: "${_locale.NAMESPACE}" })}}`,
   value: '$jobsMapByNodeId',
@@ -60,6 +66,8 @@ const scopeOptions = {
   label: `{{t("Scope variables", { ns: "${_locale.NAMESPACE}" })}}`,
   value: '$scopes',
   useOptions(options) {
+    const _options$fieldNames = options.fieldNames,
+      fieldNames = _options$fieldNames === void 0 ? defaultFieldNames : _options$fieldNames;
     const current = (0, _nodes.useNodeContext)();
     const scopes = (0, _nodes.useUpstreamScopes)(current);
     const result = [];
@@ -71,9 +79,9 @@ const scopeOptions = {
         var _node$title;
         result.push({
           key: node.id.toString(),
-          value: node.id.toString(),
-          label: (_node$title = node.title) !== null && _node$title !== void 0 ? _node$title : `#${node.id}`,
-          children: subOptions
+          [fieldNames.value]: node.id.toString(),
+          [fieldNames.label]: (_node$title = node.title) !== null && _node$title !== void 0 ? _node$title : `#${node.id}`,
+          [fieldNames.children]: subOptions
         });
       }
     });
@@ -85,12 +93,13 @@ const systemOptions = {
   label: `{{t("System variables", { ns: "${_locale.NAMESPACE}" })}}`,
   value: '$system',
   useOptions({
-    types
+    types,
+    fieldNames = defaultFieldNames
   }) {
     return [...(!types || types.includes('date') ? [{
       key: 'now',
-      value: 'now',
-      label: (0, _locale.lang)('System time')
+      [fieldNames.label]: (0, _locale.lang)('System time'),
+      [fieldNames.value]: 'now'
     }] : [])];
   }
 };
@@ -167,15 +176,20 @@ function filterTypedFields({
   });
 }
 function useWorkflowVariableOptions(options = {}) {
+  var _options$fieldNames2;
+  const fieldNames = Object.assign({}, defaultFieldNames, (_options$fieldNames2 = options.fieldNames) !== null && _options$fieldNames2 !== void 0 ? _options$fieldNames2 : {});
+  const opts = Object.assign(options, {
+    fieldNames
+  });
   const compile = (0, _client().useCompile)();
   const result = [scopeOptions, nodesOptions, triggerOptions, systemOptions].map(item => {
-    const opts = item.useOptions(options).filter(Boolean);
+    const children = item.useOptions(opts).filter(Boolean);
     return {
-      label: compile(item.label),
-      value: item.value,
-      key: item.value,
-      children: opts,
-      disabled: opts && !opts.length
+      [fieldNames.label]: compile(item.label),
+      [fieldNames.value]: item.value,
+      key: item[fieldNames.value],
+      [fieldNames.children]: children,
+      disabled: children && !children.length
     };
   });
   return result;
@@ -236,20 +250,17 @@ function loadChildren(_x) {
 }
 function _loadChildren() {
   _loadChildren = _asyncToGenerator(function* (option) {
-    const result = getCollectionFieldOptions({
+    const result = getCollectionFieldOptions(_objectSpread({
       collection: option.field.target,
       types: option.types,
-      appends: getNextAppends(option.field, option.appends),
-      sourceKey: option.field.key,
-      compile: this.compile,
-      getCollectionFields: this.getCollectionFields
-    });
+      appends: getNextAppends(option.field, option.appends)
+    }, this));
+    option.loadChildren = null;
     if (result.length) {
       option.children = result;
     } else {
       var _option$types;
       option.isLeaf = true;
-      option.loadChildren = null;
       const matchingType = (_option$types = option.types) === null || _option$types === void 0 ? void 0 : _option$types.some(type => matchFieldType(option.field, type, 0));
       if (!matchingType) {
         option.disabled = true;
@@ -265,7 +276,9 @@ function getCollectionFieldOptions(options) {
     _options$appends = options.appends,
     appends = _options$appends === void 0 ? [] : _options$appends,
     compile = options.compile,
-    getCollectionFields = options.getCollectionFields;
+    getCollectionFields = options.getCollectionFields,
+    _options$fieldNames3 = options.fieldNames,
+    fieldNames = _options$fieldNames3 === void 0 ? defaultFieldNames : _options$fieldNames3;
   const normalizedFields = getNormalizedFields(collection, {
     compile,
     getCollectionFields
@@ -273,7 +286,8 @@ function getCollectionFieldOptions(options) {
   const computedFields = fields !== null && fields !== void 0 ? fields : normalizedFields;
   const boundLoadChildren = loadChildren.bind({
     compile,
-    getCollectionFields
+    getCollectionFields,
+    fieldNames
   });
   const result = filterTypedFields({
     fields: computedFields,
@@ -285,13 +299,14 @@ function getCollectionFieldOptions(options) {
   }).map(field => {
     var _field$uiSchema5;
     const label = compile(((_field$uiSchema5 = field.uiSchema) === null || _field$uiSchema5 === void 0 ? void 0 : _field$uiSchema5.title) || field.name);
+    // console.log('===', label, field);
     const nextAppends = getNextAppends(field, appends);
     // TODO: no matching fields in next appends should consider isLeaf as true
     const isLeaf = !isAssociationField(field) || !nextAppends.length && !appends.includes(field.name);
     return {
-      label,
+      [fieldNames.label]: label,
       key: field.name,
-      value: field.name,
+      [fieldNames.value]: field.name,
       isLeaf,
       loadChildren: isLeaf ? null : boundLoadChildren,
       field,

package/lib/server/Plugin.d.ts

@@ -19,9 +19,7 @@ export default class WorkflowPlugin extends Plugin {
     onBeforeSave: (instance: WorkflowModel, options: any) => Promise<void>;
     load(): Promise<void>;
     toggle(workflow: WorkflowModel, enable?: boolean): void;
-    trigger(workflow: WorkflowModel, context: {
-        [key: string]: any;
-    }, options?: {
+    trigger(workflow: WorkflowModel, context: object, options?: {
         context?: any;
     }): void;
     private prepare;

package/lib/server/Plugin.js

@@ -133,7 +133,8 @@ class WorkflowPlugin extends _server().Plugin {
     }();
     this.prepare = /*#__PURE__*/_asyncToGenerator(function* () {
       var _options$context;
-      const event = _this.events.shift();
+      const _this$events = _slicedToArray(_this.events, 1),
+        event = _this$events[0];
       if (!event) {
         return;
       }
@@ -189,6 +190,7 @@ class WorkflowPlugin extends _server().Plugin {
           _this.pending.push([execution]);
         }
       }
+      _this.events.shift();
       if (_this.events.length) {
         yield _this.prepare();
       } else {
@@ -330,6 +332,7 @@ class WorkflowPlugin extends _server().Plugin {
       // resuming has high priority
       if (_this4.pending.length) {
         next = _this4.pending.shift();
+        _this4.getLogger(next[0].workflowId).info(`pending execution (${next[0].id}) ready to process`);
       } else {
         const execution = yield _this4.db.getRepository('executions').findOne({
           filter: {
@@ -339,13 +342,16 @@ class WorkflowPlugin extends _server().Plugin {
           sort: 'createdAt'
         });
         if (execution && execution.workflow.enabled) {
+          _this4.getLogger(execution.workflowId).info(`execution (${execution.id}) fetched from db`);
           next = [execution];
         }
       }
       if (next) {
-        _this4.process(...next);
-      } else {
-        _this4.executing = false;
+        yield _this4.process(...next);
+      }
+      _this4.executing = false;
+      if (next) {
+        _this4.dispatch();
       }
     })();
   }
@@ -365,8 +371,6 @@ class WorkflowPlugin extends _server().Plugin {
       } catch (err) {
         _this5.getLogger(execution.workflowId).error(`execution (${execution.id}) error: ${err.message}`, err);
       }
-      _this5.executing = false;
-      _this5.dispatch();
     })();
   }
   createProcessor(execution, options = {}) {

package/lib/server/Processor.d.ts

@@ -47,5 +47,5 @@ export default class Processor {
         $system: {};
         $scopes: {};
     };
-    getParsedValue(value: any, node?: any): any;
+    getParsedValue(value: any, node?: any, additionalScope?: object): any;
 }

package/lib/server/Processor.js

@@ -371,9 +371,9 @@ class Processor {
       $scopes
     };
   }
-  getParsedValue(value, node) {
+  getParsedValue(value, node, additionalScope) {
     const template = (0, _utils().parse)(value);
-    const scope = this.getScope(node);
+    const scope = Object.assign(this.getScope(node), additionalScope);
     template.parameters.forEach(({
       key
     }) => {

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

@@ -1,7 +1,7 @@
 import type { FlowNodeModel } from '../types';
 declare const _default: {
     run(node: FlowNodeModel, input: any, processor: any): Promise<{
-        result: any;
+        result: object;
         status: number;
     }>;
 };

package/lib/server/instructions/create.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _constants = require("../constants");
+var _utils = require("../utils");
 const _excluded = ["appends"];
 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; }
@@ -29,29 +30,28 @@ var _default = {
         repository = _node$constructor$dat.repository,
         model = _node$constructor$dat.model;
       const options = processor.getParsedValue(params, node);
-      const result = yield repository.create(_objectSpread(_objectSpread({}, options), {}, {
+      const created = yield repository.create(_objectSpread(_objectSpread({}, options), {}, {
         context: {
           executionId: processor.execution.id
         },
         transaction: processor.transaction
       }));
-      if (result && appends.length) {
-        const includeFields = appends.filter(field => !result.get(field) || !result[field]);
-        const included = yield model.findByPk(result[model.primaryKeyAttribute], {
-          attributes: [model.primaryKeyAttribute],
-          include: includeFields,
+      let result = created;
+      if (created && appends.length) {
+        const includeFields = appends.reduce((set, field) => {
+          set.add(field.split('.')[0]);
+          set.add(field);
+          return set;
+        }, new Set());
+        result = yield repository.findOne({
+          filterByTk: created[model.primaryKeyAttribute],
+          appends: Array.from(includeFields),
           transaction: processor.transaction
         });
-        includeFields.forEach(field => {
-          const value = included.get(field);
-          result.set(field, Array.isArray(value) ? value.map(item => item.toJSON()) : value.toJSON(), {
-            raw: true
-          });
-        });
       }
       return {
         // NOTE: get() for non-proxied instance (#380)
-        result: result === null || result === void 0 ? void 0 : result.toJSON(),
+        result: (0, _utils.toJSON)(result),
         status: _constants.JOB_STATUS.RESOLVED
       };
     })();

package/lib/server/instructions/index.js

@@ -32,7 +32,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typ
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _default(plugin, more = {}) {
   const instructions = plugin.instructions;
-  const natives = ['calculation', 'condition', 'parallel', 'loop', 'delay', 'manual', 'query', 'create', 'update', 'destroy', 'aggregate', 'request'].reduce((result, key) => Object.assign(result, {
+  const natives = ['calculation', 'condition', 'parallel', 'loop', 'delay', 'manual', 'query', 'create', 'update', 'destroy', 'aggregate', 'request', 'sql'].reduce((result, key) => Object.assign(result, {
     [key]: (0, _utils().requireModule)(_path().default.isAbsolute(key) ? key : _path().default.join(__dirname, key))
   }), {});
   for (var _i = 0, _Object$entries = Object.entries(_objectSpread(_objectSpread({}, more), natives)); _i < _Object$entries.length; _i++) {