@nocobase/plugin-workflow 0.9.2-alpha.4 → 0.9.3-alpha.1

package/lib/client/components/FieldsSelect.js

@@ -52,7 +52,8 @@ const FieldsSelect = (0, _react2().observer)(props => {
     values = _useForm.values;
   const fields = getCollectionFields(values === null || values === void 0 ? void 0 : values.collection);
   return _react().default.createElement(_antd().Select, _objectSpread(_objectSpread({
-    className: "full-width"
+    className: "full-width",
+    dropdownMatchSelectWidth: false
   }, others), {}, {
     options: fields.filter(filter).map(field => {
       var _field$uiSchema;

package/lib/client/nodes/calculation.js

@@ -32,16 +32,16 @@ function _client2() {
   };
   return data;
 }
-function _antd2() {
-  const data = require("antd");
-  _antd2 = function _antd2() {
+function _client3() {
+  const data = require("@nocobase/utils/client");
+  _client3 = function _client3() {
     return data;
   };
   return data;
 }
-function _jsonTemplates() {
-  const data = _interopRequireDefault(require("json-templates"));
-  _jsonTemplates = function _jsonTemplates() {
+function _antd2() {
+  const data = require("antd");
+  _antd2 = function _antd2() {
     return data;
   };
   return data;
@@ -231,7 +231,7 @@ var _default = {
       if (!execution) {
         return (0, _locale.lang)('Calculation result');
       }
-      const result = (0, _jsonTemplates().default)(dataSource)({
+      const result = (0, _client3().parse)(dataSource)({
         $jobsMapByNodeId: ((_execution$jobs = execution.jobs) !== null && _execution$jobs !== void 0 ? _execution$jobs : []).reduce((map, job) => Object.assign(map, {
           [job.nodeId]: job.result
         }), {})

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

@@ -13,6 +13,7 @@ declare const _default: {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
+                dropdownMatchSelectWidth: boolean;
                 placeholder: string;
             };
         };

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

@@ -13,6 +13,7 @@ declare const _default: {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
+                dropdownMatchSelectWidth: boolean;
                 placeholder: string;
             };
         };

package/lib/client/nodes/index.js

@@ -53,13 +53,6 @@ function _reactI18next() {
   };
   return data;
 }
-function _jsonTemplates() {
-  const data = _interopRequireDefault(require("json-templates"));
-  _jsonTemplates = function _jsonTemplates() {
-    return data;
-  };
-  return data;
-}
 function _client() {
   const data = require("@nocobase/utils/client");
   _client = function _client() {
@@ -229,7 +222,7 @@ function RemoveButton() {
         if (node === current) {
           return false;
         }
-        const template = (0, _jsonTemplates().default)(node.config);
+        const template = (0, _client().parse)(node.config);
         const refs = template.parameters.filter(({
           key
         }) => key.startsWith(`$jobsMapByNodeId.${current.id}.`) || key === `$jobsMapByNodeId.${current.id}`);

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

@@ -25,13 +25,6 @@ function _antd() {
   };
   return data;
 }
-function _jsonTemplates() {
-  const data = _interopRequireDefault(require("json-templates"));
-  _jsonTemplates = function _jsonTemplates() {
-    return data;
-  };
-  return data;
-}
 function _css() {
   const data = require("@emotion/css");
   _css = function _css() {
@@ -468,7 +461,7 @@ function useFlowRecordFromBlock(opts) {
     dataSource = _useFieldSchema['x-context-datasource'];
   const _useFlowContext = (0, _FlowContext.useFlowContext)(),
     execution = _useFlowContext.execution;
-  const result = (0, _jsonTemplates().default)(dataSource)({
+  const result = (0, _client2().parse)(dataSource)({
     $context: execution === null || execution === void 0 ? void 0 : execution.context,
     $jobsMapByNodeId: ((_execution$jobs = execution === null || execution === void 0 ? void 0 : execution.jobs) !== null && _execution$jobs !== void 0 ? _execution$jobs : []).reduce((map, job) => Object.assign(map, {
       [job.nodeId]: job.result

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

@@ -14,6 +14,7 @@ declare const _default: {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
+                dropdownMatchSelectWidth: boolean;
                 placeholder: string;
             };
         };

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

@@ -13,6 +13,7 @@ declare const _default: {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
+                dropdownMatchSelectWidth: boolean;
                 placeholder: string;
             };
         };

package/lib/client/schemas/collection.d.ts

@@ -6,6 +6,7 @@ export declare const collection: {
     'x-decorator': string;
     'x-component': string;
     'x-component-props': {
+        dropdownMatchSelectWidth: boolean;
         placeholder: string;
     };
 };

package/lib/client/schemas/collection.js

@@ -34,6 +34,7 @@ const collection = {
   'x-decorator': 'FormItem',
   'x-component': 'Select',
   'x-component-props': {
+    dropdownMatchSelectWidth: false,
     placeholder: '{{t("Select collection")}}'
   }
 };

package/lib/client/triggers/collection.d.ts

@@ -20,6 +20,7 @@ declare const _default: {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
+                dropdownMatchSelectWidth: boolean;
                 placeholder: string;
             };
         };
@@ -29,6 +30,7 @@ declare const _default: {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
+                dropdownMatchSelectWidth: boolean;
                 options: {
                     label: string;
                     value: number;

package/lib/client/triggers/collection.js

@@ -70,6 +70,7 @@ var _default = {
       'x-decorator': 'FormItem',
       'x-component': 'Select',
       'x-component-props': {
+        dropdownMatchSelectWidth: false,
         options: collectionModeOptions,
         placeholder: `{{t("Trigger on", { ns: "${_locale.NAMESPACE}" })}}`
       },

package/lib/client/variable.js

@@ -81,7 +81,7 @@ function matchFieldType(field, type) {
   const inputType = typeof type;
   if (inputType === 'string') {
     var _BaseTypeSets$type;
-    return Boolean((_BaseTypeSets$type = BaseTypeSets[type]) === null || _BaseTypeSets$type === void 0 ? void 0 : _BaseTypeSets$type.has(field.interface));
+    return (_BaseTypeSets$type = BaseTypeSets[type]) === null || _BaseTypeSets$type === void 0 ? void 0 : _BaseTypeSets$type.has(field.interface);
   }
   if (inputType === 'object' && type.type === 'reference') {
     if (isAssociationField(field)) {

package/lib/server/Plugin.d.ts

@@ -5,12 +5,13 @@ import ExecutionModel from './models/Execution';
 import WorkflowModel from './models/Workflow';
 import Processor from './Processor';
 import { Trigger } from './triggers';
+import { CustomFunction } from './functions';
 import { Logger } from '@nocobase/logger';
 declare type ID = number | string;
 export default class WorkflowPlugin extends Plugin {
     instructions: Registry<Instruction>;
     triggers: Registry<Trigger>;
-    functions: Registry<Function>;
+    functions: Registry<CustomFunction>;
     private executing;
     private pending;
     private events;
@@ -19,7 +20,9 @@ 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: Object, options?: {
+    trigger(workflow: WorkflowModel, context: {
+        [key: string]: any;
+    }, options?: {
         context?: any;
     }): void;
     private prepare;

package/lib/server/Processor.js

@@ -18,15 +18,14 @@ function _evaluators() {
   };
   return data;
 }
-function _jsonTemplates() {
-  const data = _interopRequireDefault(require("json-templates"));
-  _jsonTemplates = function _jsonTemplates() {
+function _utils() {
+  const data = require("@nocobase/utils");
+  _utils = function _utils() {
     return data;
   };
   return data;
 }
 var _constants = require("./constants");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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 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; }
@@ -350,7 +349,7 @@ class Processor {
     };
   }
   getParsedValue(value, node) {
-    const template = (0, _jsonTemplates().default)(value);
+    const template = (0, _utils().parse)(value);
     const scope = this.getScope(node);
     template.parameters.forEach(({
       key

package/lib/server/functions/index.d.ts

@@ -1,4 +1,10 @@
 import Plugin from '..';
+import ExecutionModel from '../models/Execution';
+import FlowNodeModel from '../models/FlowNode';
+export declare type CustomFunction = (this: {
+    execution: ExecutionModel;
+    node?: FlowNodeModel;
+}) => any;
 export default function ({ functions }: Plugin, more?: {
-    [key: string]: Function;
+    [key: string]: CustomFunction;
 }): void;

package/lib/server/instructions/calculation.js

@@ -11,15 +11,14 @@ function _evaluators() {
   };
   return data;
 }
-function _jsonTemplates() {
-  const data = _interopRequireDefault(require("json-templates"));
-  _jsonTemplates = function _jsonTemplates() {
+function _utils() {
+  const data = require("@nocobase/utils");
+  _utils = function _utils() {
     return data;
   };
   return data;
 }
 var _constants = require("../constants");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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 = {
@@ -36,10 +35,10 @@ var _default = {
       let scope = processor.getScope();
       if (dynamic) {
         var _parse, _parse2, _node$config$scope;
-        const parsed = (_parse = (0, _jsonTemplates().default)(dynamic)(scope)) !== null && _parse !== void 0 ? _parse : {};
+        const parsed = (_parse = (0, _utils().parse)(dynamic)(scope)) !== null && _parse !== void 0 ? _parse : {};
         engine = parsed.engine;
         expression = parsed.expression;
-        scope = (_parse2 = (0, _jsonTemplates().default)((_node$config$scope = node.config.scope) !== null && _node$config$scope !== void 0 ? _node$config$scope : '')(scope)) !== null && _parse2 !== void 0 ? _parse2 : {};
+        scope = (_parse2 = (0, _utils().parse)((_node$config$scope = node.config.scope) !== null && _node$config$scope !== void 0 ? _node$config$scope : '')(scope)) !== null && _parse2 !== void 0 ? _parse2 : {};
       }
       const evaluator = _evaluators().evaluators.get(engine);
       try {

package/package.json

@@ -1,32 +1,31 @@
 {
   "name": "@nocobase/plugin-workflow",
-  "version": "0.9.2-alpha.4",
+  "version": "0.9.3-alpha.1",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "0.9.2-alpha.4",
-    "@nocobase/client": "0.9.2-alpha.4",
-    "@nocobase/database": "0.9.2-alpha.4",
-    "@nocobase/evaluators": "0.9.2-alpha.4",
-    "@nocobase/logger": "0.9.2-alpha.4",
-    "@nocobase/resourcer": "0.9.2-alpha.4",
-    "@nocobase/server": "0.9.2-alpha.4",
-    "@nocobase/utils": "0.9.2-alpha.4",
+    "@nocobase/actions": "0.9.3-alpha.1",
+    "@nocobase/client": "0.9.3-alpha.1",
+    "@nocobase/database": "0.9.3-alpha.1",
+    "@nocobase/evaluators": "0.9.3-alpha.1",
+    "@nocobase/logger": "0.9.3-alpha.1",
+    "@nocobase/resourcer": "0.9.3-alpha.1",
+    "@nocobase/server": "0.9.3-alpha.1",
+    "@nocobase/utils": "0.9.3-alpha.1",
     "antd": "4.22.8",
     "axios": "^0.27.2",
     "classnames": "^2.3.1",
     "cron-parser": "4.4.0",
-    "json-templates": "^4.2.0",
     "lru-cache": "8.0.5",
     "moment": "^2.29.2",
     "react-js-cron": "^3.1.0"
   },
   "devDependencies": {
-    "@nocobase/plugin-formula-field": "0.9.2-alpha.4",
-    "@nocobase/test": "0.9.2-alpha.4",
+    "@nocobase/plugin-formula-field": "0.9.3-alpha.1",
+    "@nocobase/test": "0.9.3-alpha.1",
     "@types/ejs": "^3.1.1"
   },
-  "gitHead": "96cb023f353a4fb099dea074c575be65ebab813f"
+  "gitHead": "24979bc561537c0b84469c161eeef1a6de4c4684"
 }