@nocobase/plugin-workflow 0.9.1-alpha.2 → 0.9.2-alpha.1

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

@@ -98,7 +98,7 @@ declare const _default: {
     }[];
     render(data: any): JSX.Element;
     scope: {
-        renderReference: (key: string) => JSX.Element;
+        renderEngineReference: (key: string) => JSX.Element;
         useWorkflowVariableOptions: typeof useWorkflowVariableOptions;
     };
     components: {

package/lib/client/nodes/condition.js

@@ -5,109 +5,76 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Calculation = Calculation;
 exports.default = exports.calculators = void 0;
-
 function _react() {
   const data = _interopRequireDefault(require("react"));
-
   _react = function _react() {
     return data;
   };
-
   return data;
 }
-
 function _css() {
   const data = require("@emotion/css");
-
   _css = function _css() {
     return data;
   };
-
   return data;
 }
-
 function _antd() {
   const data = require("antd");
-
   _antd = function _antd() {
     return data;
   };
-
   return data;
 }
-
 function _icons() {
   const data = require("@ant-design/icons");
-
   _icons = function _icons() {
     return data;
   };
-
   return data;
 }
-
 function _reactI18next() {
   const data = require("react-i18next");
-
   _reactI18next = function _reactI18next() {
     return data;
   };
-
   return data;
 }
-
 function _client() {
   const data = require("@nocobase/utils/client");
-
   _client = function _client() {
     return data;
   };
-
   return data;
 }
-
 function _client2() {
   const data = require("@nocobase/client");
-
   _client2 = function _client2() {
     return data;
   };
-
   return data;
 }
-
 function _client3() {
   const data = require("@nocobase/evaluators/client");
-
   _client3 = function _client3() {
     return data;
   };
-
   return data;
 }
-
 var _ = require(".");
-
 var _Branch = require("../Branch");
-
 var _FlowContext = require("../FlowContext");
-
 var _style = require("../style");
-
 var _locale = require("../locale");
-
 var _variable = require("../variable");
-
 var _RadioWithTooltip = require("../components/RadioWithTooltip");
-
+var _renderEngineReference = require("../components/renderEngineReference");
 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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+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 calculators = new (_client().Registry)();
 exports.calculators = calculators;
 calculators.register('equal', {
@@ -213,11 +180,9 @@ const calculatorGroups = [{
   value: 'date',
   title: `{{t("Date", { ns: "${_locale.NAMESPACE}" })}}`
 }];
-
 function getGroupCalculators(group) {
   return Array.from(calculators.getEntities()).filter(([key, value]) => value.group === group);
 }
-
 function Calculation({
   calculator,
   operands = [],
@@ -238,7 +203,8 @@ function Calculation({
       calculator,
       operands: [v, operands[1]]
     }),
-    scope: options
+    scope: options,
+    useTypedConstant: true
   }), _react().default.createElement(_antd().Select, {
     value: calculator,
     onChange: v => _onChange({
@@ -260,10 +226,10 @@ function Calculation({
       calculator,
       operands: [operands[0], v]
     }),
-    scope: options
+    scope: options,
+    useTypedConstant: true
   }));
 }
-
 function CalculationItem({
   value,
   onChange: _onChange2,
@@ -272,10 +238,9 @@ function CalculationItem({
   if (!value) {
     return null;
   }
-
   const calculator = value.calculator,
-        _value$operands = value.operands,
-        operands = _value$operands === void 0 ? [] : _value$operands;
+    _value$operands = value.operands,
+    operands = _value$operands === void 0 ? [] : _value$operands;
   return _react().default.createElement("div", {
     className: (0, _css().css)`
       display: flex;
@@ -297,19 +262,16 @@ function CalculationItem({
     icon: _react().default.createElement(_icons().CloseCircleOutlined, null)
   }));
 }
-
 function CalculationGroup({
   value,
   onChange: _onChange3
 }) {
   const _useTranslation = (0, _reactI18next().useTranslation)(),
-        t = _useTranslation.t;
-
+    t = _useTranslation.t;
   const _value$type = value.type,
-        type = _value$type === void 0 ? 'and' : _value$type,
-        _value$calculations = value.calculations,
-        calculations = _value$calculations === void 0 ? [] : _value$calculations;
-
+    type = _value$type === void 0 ? 'and' : _value$type,
+    _value$calculations = value.calculations,
+    calculations = _value$calculations === void 0 ? [] : _value$calculations;
   function onAddSingle() {
     _onChange3(_objectSpread(_objectSpread({}, value), {}, {
       calculations: [...calculations, {
@@ -318,7 +280,6 @@ function CalculationGroup({
       }]
     }));
   }
-
   function onAddGroup() {
     _onChange3(_objectSpread(_objectSpread({}, value), {}, {
       calculations: [...calculations, {
@@ -330,23 +291,18 @@ function CalculationGroup({
       }]
     }));
   }
-
   function _onRemove(i) {
     calculations.splice(i, 1);
-
     _onChange3(_objectSpread(_objectSpread({}, value), {}, {
       calculations: [...calculations]
     }));
   }
-
   function onItemChange(i, v) {
     calculations.splice(i, 1, v);
-
     _onChange3(_objectSpread(_objectSpread({}, value), {}, {
       calculations: [...calculations]
     }));
   }
-
   return _react().default.createElement("div", {
     className: (0, _css().cx)('node-type-condition-group', (0, _css().css)`
       position: relative;
@@ -403,7 +359,6 @@ function CalculationGroup({
     onClick: onAddGroup
   }, t('Add condition group'))));
 }
-
 function CalculationConfig({
   value,
   onChange: _onChange4
@@ -421,7 +376,6 @@ function CalculationConfig({
     }))
   });
 }
-
 var _default = {
   title: `{{t("Condition", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'condition',
@@ -481,17 +435,13 @@ var _default = {
       'x-component-props': {
         scope: '{{useWorkflowVariableOptions}}'
       },
-
       ['x-validator'](value, rules, {
         form
       }) {
         const values = form.values;
-
         const _evaluators$get = _client3().evaluators.get(values.engine),
-              evaluate = _evaluators$get.evaluate;
-
-        const exp = value.trim().replace(/{{([^{}]+)}}/g, '1');
-
+          evaluate = _evaluators$get.evaluate;
+        const exp = value.trim().replace(/{{([^{}]+)}}/g, ' 1 ');
         try {
           evaluate(exp);
           return '';
@@ -499,7 +449,6 @@ var _default = {
           return (0, _locale.lang)('Expression syntax error');
         }
       },
-
       'x-reactions': {
         dependencies: ['engine'],
         fulfill: {
@@ -507,7 +456,7 @@ var _default = {
             visible: '{{$deps[0] !== "basic"}}'
           },
           schema: {
-            description: '{{renderReference($deps[0])}}'
+            description: '{{renderEngineReference($deps[0])}}'
           }
         }
       },
@@ -528,16 +477,13 @@ var _default = {
       rejectOnFalse: false
     }
   }],
-
   render(data) {
     const _useTranslation2 = (0, _reactI18next().useTranslation)(),
-          t = _useTranslation2.t;
-
+      t = _useTranslation2.t;
     const _useFlowContext = (0, _FlowContext.useFlowContext)(),
-          nodes = _useFlowContext.nodes;
-
+      nodes = _useFlowContext.nodes;
     const id = data.id,
-          rejectOnFalse = data.config.rejectOnFalse;
+      rejectOnFalse = data.config.rejectOnFalse;
     const trueEntry = nodes.find(item => item.upstreamId === id && item.branchIndex === 1);
     const falseEntry = nodes.find(item => item.upstreamId === id && item.branchIndex === 0);
     return _react().default.createElement(_.NodeDefaultView, {
@@ -581,9 +527,8 @@ var _default = {
       className: (0, _css().css)`left: 4em;`
     }, t('Yes')))));
   },
-
   scope: {
-    renderReference: _client3().renderReference,
+    renderEngineReference: _renderEngineReference.renderEngineReference,
     useWorkflowVariableOptions: _variable.useWorkflowVariableOptions
   },
   components: {

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

@@ -16,16 +16,41 @@ declare const _default: {
                 placeholder: string;
             };
         };
-        'params.values': {
+        params: {
             type: string;
-            title: string;
-            'x-decorator': string;
-            'x-decorator-props': {
-                labelAlign: string;
-                className: string;
+            properties: {
+                values: {
+                    type: string;
+                    title: string;
+                    'x-decorator': string;
+                    'x-decorator-props': {
+                        labelAlign: string;
+                        className: string;
+                    };
+                    'x-component': string;
+                    description: string;
+                };
+                appends: {
+                    type: string;
+                    title: string;
+                    description: string;
+                    'x-decorator': string;
+                    'x-component': string;
+                    'x-component-props': {
+                        mode: string;
+                        placeholder: string;
+                        filter(field: any): boolean;
+                    };
+                    'x-reactions': {
+                        dependencies: string[];
+                        fulfill: {
+                            state: {
+                                visible: string;
+                            };
+                        };
+                    }[];
+                };
             };
-            'x-component': string;
-            description: string;
         };
     };
     view: {};
@@ -34,8 +59,9 @@ declare const _default: {
     };
     components: {
         CollectionFieldset: import("react").MemoExoticComponent<import("react").FunctionComponent<Pick<any, string | number | symbol>>>;
+        FieldsSelect: import("react").MemoExoticComponent<import("react").FunctionComponent<Pick<any, string | number | symbol>>>;
     };
-    getOptions(config: any, types: any): any;
+    getOptions(config: any, types: any): import("../variable").VariableOption[];
     useInitializers(node: any): SchemaInitializerItemOptions | null;
     initializers: {
         CollectionFieldInitializers: typeof CollectionFieldInitializers;

package/lib/client/nodes/create.js

@@ -4,31 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 function _client() {
   const data = require("@nocobase/client");
-
   _client = function _client() {
     return data;
   };
-
   return data;
 }
-
 var _collection = require("../schemas/collection");
-
 var _CollectionFieldset = _interopRequireDefault(require("../components/CollectionFieldset"));
-
 var _locale = require("../locale");
-
 var _CollectionBlockInitializer = require("../components/CollectionBlockInitializer");
-
 var _CollectionFieldInitializers = require("../components/CollectionFieldInitializers");
-
 var _variable = require("../variable");
-
+var _FieldsSelect = require("../components/FieldsSelect");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 var _default = {
   title: `{{t("Create record", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'create',
@@ -45,30 +35,35 @@ var _default = {
     //     disabled: true
     //   }
     // },
-    'params.values': _collection.values
+    params: {
+      type: 'object',
+      properties: {
+        values: _collection.values,
+        appends: _collection.appends
+      }
+    }
   },
   view: {},
   scope: {
     useCollectionDataSource: _client().useCollectionDataSource
   },
   components: {
-    CollectionFieldset: _CollectionFieldset.default
+    CollectionFieldset: _CollectionFieldset.default,
+    FieldsSelect: _FieldsSelect.FieldsSelect
   },
-
   getOptions(config, types) {
+    var _config$params, _config$params$append;
     return (0, _variable.useCollectionFieldOptions)({
       collection: config.collection,
-      types
+      types,
+      depth: ((_config$params = config.params) === null || _config$params === void 0 ? void 0 : (_config$params$append = _config$params.appends) === null || _config$params$append === void 0 ? void 0 : _config$params$append.length) ? 1 : 0
     });
   },
-
   useInitializers(node) {
     var _node$title;
-
     if (!node.config.collection) {
       return null;
     }
-
     return {
       type: 'item',
       title: (_node$title = node.title) !== null && _node$title !== void 0 ? _node$title : `#${node.id}`,
@@ -77,7 +72,6 @@ var _default = {
       dataSource: `{{$jobsMapByNodeId.${node.id}}}`
     };
   },
-
   initializers: {
     CollectionFieldInitializers: _CollectionFieldInitializers.CollectionFieldInitializers
   }

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

@@ -17,14 +17,12 @@ declare const _default: {
             title: string;
             'x-decorator': string;
             'x-component': string;
-            'x-component-props': {
-                placeholder: string;
-            };
             enum: {
                 label: string;
                 value: number;
             }[];
             required: boolean;
+            default: number;
         };
     };
     view: {};

package/lib/client/nodes/delay.js

@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _Duration = _interopRequireDefault(require("../components/Duration"));
-
 var _constants = require("../constants");
-
 var _locale = require("../locale");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 var _default = {
   title: `{{t("Delay", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'delay',
@@ -30,10 +25,7 @@ var _default = {
       type: 'number',
       title: `{{t("End Status", { ns: "${_locale.NAMESPACE}" })}}`,
       'x-decorator': 'FormItem',
-      'x-component': 'Select',
-      'x-component-props': {
-        placeholder: `{{t("Select status", { ns: "${_locale.NAMESPACE}" })}}`
-      },
+      'x-component': 'Radio.Group',
       enum: [{
         label: `{{t("Succeed and continue", { ns: "${_locale.NAMESPACE}" })}}`,
         value: _constants.JOB_STATUS.RESOLVED
@@ -41,7 +33,8 @@ var _default = {
         label: `{{t("Fail and exit", { ns: "${_locale.NAMESPACE}" })}}`,
         value: _constants.JOB_STATUS.FAILED
       }],
-      required: true
+      required: true,
+      default: _constants.JOB_STATUS.RESOLVED
     }
   },
   view: {},

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

@@ -18,17 +18,12 @@ declare const _default: {
         };
         params: {
             type: string;
-            title: string;
-            'x-decorator': string;
             properties: {
                 filter: {
+                    "x-validator"(value: any): string;
                     type: string;
                     title: string;
                     'x-decorator': string;
-                    'x-decorator-props': {
-                        labelAlign: string;
-                        className: string;
-                    };
                     'x-component': string;
                     'x-component-props': {
                         useProps(): {

package/lib/client/nodes/destroy.js

@@ -4,21 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 function _client() {
   const data = require("@nocobase/client");
-
   _client = function _client() {
     return data;
   };
-
   return data;
 }
-
 var _FilterDynamicComponent = require("../components/FilterDynamicComponent");
-
 var _collection = require("../schemas/collection");
-
+var _utils = require("../utils");
+var _locale = require("../locale");
+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("Delete record")}}',
   type: 'destroy',
@@ -27,10 +28,12 @@ var _default = {
     collection: _collection.collection,
     params: {
       type: 'object',
-      title: '',
-      'x-decorator': 'FormItem',
       properties: {
-        filter: _collection.filter
+        filter: _objectSpread(_objectSpread({}, _collection.filter), {}, {
+          ['x-validator'](value) {
+            return (0, _utils.isValidFilter)(value) ? '' : `{{t("Please add at least one condition", { ns: "${_locale.NAMESPACE}" })}}`;
+          }
+        })
       }
     }
   },

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

@@ -2,7 +2,7 @@ import React from 'react';
 import { ISchema } from '@formily/react';
 import { Registry } from '@nocobase/utils/client';
 import { SchemaInitializerItemOptions } from '@nocobase/client';
-import { VariableOption } from '../variable';
+import { VariableOptions } from '../variable';
 export interface Instruction {
     title: string;
     type: string;
@@ -24,7 +24,7 @@ export interface Instruction {
     };
     render?(props: any): React.ReactNode;
     endding?: boolean;
-    getOptions?(config: any, types?: any): VariableOption[] | null;
+    getOptions?(config: any, types?: any): VariableOptions;
     useInitializers?(node: any): SchemaInitializerItemOptions | null;
     initializers?: {
         [key: string]: any;