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

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;
@@ -65,19 +65,11 @@ var _RadioWithTooltip = require("../components/RadioWithTooltip");
 var _renderEngineReference = require("../components/renderEngineReference");
 var _locale = require("../locale");
 var _variable = require("../variable");
-const _excluded = ["node", "insert"];
+var _ValueBlock = require("../components/ValueBlock");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-function matchDynamicExpressionCollectionField(field) {
+function useDynamicExpressionCollectionFieldMatcher(field) {
   const _useCollectionManager = (0, _client().useCollectionManager)(),
-    getCollectionFields = _useCollectionManager.getCollectionFields,
-    getCollection = _useCollectionManager.getCollection;
+    getCollectionFields = _useCollectionManager.getCollectionFields;
   if (field.type !== 'belongsTo') {
     return false;
   }
@@ -90,10 +82,13 @@ const DynamicConfig = ({
 }) => {
   const _useTranslation = (0, _reactI18next().useTranslation)(),
     t = _useTranslation.t;
-  const scope = (0, _variable.useWorkflowVariableOptions)([matchDynamicExpressionCollectionField]);
+  const scope = (0, _variable.useWorkflowVariableOptions)({
+    types: [useDynamicExpressionCollectionFieldMatcher]
+  });
   return _react().default.createElement(_antd().FormLayout, {
     layout: "vertical"
   }, _react().default.createElement(_antd().FormItem, {
+    colon: true,
     label: t('Expression type', {
       ns: _locale.NAMESPACE
     })
@@ -113,6 +108,9 @@ const DynamicConfig = ({
   })))), value !== false ? _react().default.createElement(_antd().FormItem, {
     label: t('Select dynamic expression', {
       ns: _locale.NAMESPACE
+    }),
+    extra: t('Select the dynamic expression queried from the upstream node. You need to query it from an expression collection.', {
+      ns: _locale.NAMESPACE
     })
   }, _react().default.createElement(_client().Variable.Input, {
     value: value || null,
@@ -121,22 +119,26 @@ const DynamicConfig = ({
   })) : null);
 };
 function useWorkflowVariableEntityOptions() {
-  return (0, _variable.useWorkflowVariableOptions)([{
-    type: 'reference',
-    options: {
-      collection: '*',
-      entity: true
-    }
-  }]);
+  return (0, _variable.useWorkflowVariableOptions)({
+    types: [{
+      type: 'reference',
+      options: {
+        collection: '*',
+        entity: true
+      }
+    }]
+  });
 }
 var _default = {
   title: `{{t("Calculation", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'calculation',
   group: 'control',
+  description: `{{t("Calculate an expression based on a calculation engine and obtain a value as the result. Variables in the upstream nodes can be used in the expression. The expression can be static or dynamic one from an expression collections.", { ns: "${_locale.NAMESPACE}" })}}`,
   fieldset: {
     dynamic: {
       type: 'string',
       'x-component': 'DynamicConfig',
+      // description: `{{t("Select the dynamic expression queried from the upstream node. You need to query it from an expression collection.", { ns: "${NAMESPACE}" })}}`,
       default: false
     },
     engine: {
@@ -231,7 +233,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
         }), {})
@@ -245,7 +247,9 @@ var _default = {
     RadioWithTooltip: _RadioWithTooltip.RadioWithTooltip,
     DynamicConfig
   },
-  getOptions(config, types) {
+  useVariables(current, options) {
+    const _ref = options !== null && options !== void 0 ? options : {},
+      types = _ref.types;
     if (types && !types.some(type => type in _variable.BaseTypeSets || Object.values(_variable.BaseTypeSets).some(set => set.has(type)))) {
       return null;
     }
@@ -258,39 +262,10 @@ var _default = {
     return {
       type: 'item',
       title: (_node$title = node.title) !== null && _node$title !== void 0 ? _node$title : `#${node.id}`,
-      component: CalculationInitializer,
-      node
+      component: _ValueBlock.ValueBlock.Initializer,
+      node,
+      resultTitle: (0, _locale.lang)('Calculation result')
     };
   }
 };
-exports.default = _default;
-function CalculationInitializer(_ref) {
-  let node = _ref.node,
-    insert = _ref.insert,
-    props = _objectWithoutProperties(_ref, _excluded);
-  return _react().default.createElement(_client().SchemaInitializer.Item, _objectSpread(_objectSpread({}, props), {}, {
-    onClick: () => {
-      var _node$title2;
-      insert({
-        type: 'void',
-        name: node.id,
-        title: node.title,
-        'x-component': 'CardItem',
-        'x-component-props': {
-          title: (_node$title2 = node.title) !== null && _node$title2 !== void 0 ? _node$title2 : `#${node.id}`
-        },
-        'x-designer': 'SimpleDesigner',
-        properties: {
-          result: {
-            type: 'void',
-            'x-component': 'CalculationResult',
-            'x-component-props': {
-              // NOTE: as same format as other reference for migration of revision
-              dataSource: `{{$jobsMapByNodeId.${node.id}}}`
-            }
-          }
-        }
-      });
-    }
-  }));
-}
+exports.default = _default;

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

@@ -8,11 +8,6 @@ interface Calculator {
     group: string;
 }
 export declare const calculators: Registry<Calculator>;
-export declare function Calculation({ calculator, operands, onChange }: {
-    calculator: any;
-    operands?: any[];
-    onChange: any;
-}): JSX.Element;
 declare function CalculationConfig({ value, onChange }: {
     value: any;
     onChange: any;
@@ -21,6 +16,7 @@ declare const _default: {
     title: string;
     type: string;
     group: string;
+    description: string;
     fieldset: {
         rejectOnFalse: {
             type: string;
@@ -96,7 +92,7 @@ declare const _default: {
             rejectOnFalse: boolean;
         };
     }[];
-    render(data: any): JSX.Element;
+    render: (data: any) => JSX.Element;
     scope: {
         renderEngineReference: (key: string) => JSX.Element;
         useWorkflowVariableOptions: typeof useWorkflowVariableOptions;

package/lib/client/nodes/condition.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Calculation = Calculation;
 exports.default = exports.calculators = void 0;
 function _icons() {
   const data = require("@ant-design/icons");
@@ -211,7 +210,8 @@ function Calculation({
       operands,
       calculator: v
     }),
-    placeholder: (0, _locale.lang)('Calculator')
+    placeholder: (0, _locale.lang)('Calculator'),
+    dropdownMatchSelectWidth: false
   }, calculatorGroups.filter(group => Boolean(getGroupCalculators(group.value).length)).map(group => _react().default.createElement(_antd().Select.OptGroup, {
     key: group.value,
     label: compile(group.title)
@@ -380,6 +380,7 @@ var _default = {
   title: `{{t("Condition", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'condition',
   group: 'control',
+  description: `{{t('Based on boolean result of the calculation to determine whether to "continue" or "exit" the process, or continue on different branches of "yes" and "no".', { ns: "${_locale.NAMESPACE}" })}}`,
   fieldset: {
     rejectOnFalse: {
       type: 'boolean',
@@ -477,7 +478,7 @@ var _default = {
       rejectOnFalse: false
     }
   }],
-  render(data) {
+  render: function Renderer(data) {
     const _useTranslation2 = (0, _reactI18next().useTranslation)(),
       t = _useTranslation2.t;
     const _useFlowContext = (0, _FlowContext.useFlowContext)(),

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

@@ -4,16 +4,17 @@ declare const _default: {
     title: string;
     type: string;
     group: string;
+    description: string;
     fieldset: {
         collection: {
             type: string;
             title: string;
             required: boolean;
-            'x-reactions': string[];
+            'x-reactions': any[];
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
-                placeholder: string;
+                dropdownMatchSelectWidth: boolean;
             };
         };
         params: {
@@ -61,7 +62,9 @@ declare const _default: {
         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): import("../variable").VariableOption[];
+    useVariables({ config }: {
+        config: any;
+    }, options: any): import("../variable").VariableOption[];
     useInitializers(node: any): SchemaInitializerItemOptions | null;
     initializers: {
         CollectionFieldInitializers: typeof CollectionFieldInitializers;

package/lib/client/nodes/create.js

@@ -19,10 +19,16 @@ var _CollectionFieldInitializers = require("../components/CollectionFieldInitial
 var _variable = require("../variable");
 var _FieldsSelect = require("../components/FieldsSelect");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 var _default = {
   title: `{{t("Create record", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'create',
   group: 'collection',
+  description: `{{t("Add new record to a collection. You can use variables from upstream nodes to assign values to fields.", { ns: "${_locale.NAMESPACE}" })}}`,
   fieldset: {
     collection: _collection.collection,
     // multiple: {
@@ -51,13 +57,16 @@ var _default = {
     CollectionFieldset: _CollectionFieldset.default,
     FieldsSelect: _FieldsSelect.FieldsSelect
   },
-  getOptions(config, types) {
-    var _config$params, _config$params$append;
-    return (0, _variable.useCollectionFieldOptions)({
-      collection: config.collection,
-      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
-    });
+  useVariables({
+    config
+  }, options) {
+    var _options$depth, _config$params, _config$params$append;
+    const result = (0, _variable.useCollectionFieldOptions)(_objectSpread(_objectSpread({
+      collection: config === null || config === void 0 ? void 0 : config.collection
+    }, options), {}, {
+      depth: ((_options$depth = options === null || options === void 0 ? void 0 : options.depth) !== null && _options$depth !== void 0 ? _options$depth : config === null || config === void 0 ? void 0 : (_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
+    }));
+    return (result === null || result === void 0 ? void 0 : result.length) ? result : null;
   },
   useInitializers(node) {
     var _node$title;

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

@@ -3,6 +3,7 @@ declare const _default: {
     title: string;
     type: string;
     group: string;
+    description: string;
     fieldset: {
         duration: {
             type: string;

package/lib/client/nodes/delay.js

@@ -12,6 +12,7 @@ var _default = {
   title: `{{t("Delay", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'delay',
   group: 'control',
+  description: `{{t("Delay a period of time and then continue or exit the process. Can be used to set wait or timeout times in parallel branches.", { ns: "${_locale.NAMESPACE}" })}}`,
   fieldset: {
     duration: {
       type: 'number',

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

@@ -4,16 +4,17 @@ declare const _default: {
     title: string;
     type: string;
     group: string;
+    description: string;
     fieldset: {
         collection: {
             type: string;
             title: string;
             required: boolean;
-            'x-reactions': string[];
+            'x-reactions': any[];
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
-                placeholder: string;
+                dropdownMatchSelectWidth: boolean;
             };
         };
         params: {

package/lib/client/nodes/destroy.js

@@ -24,6 +24,7 @@ var _default = {
   title: '{{t("Delete record")}}',
   type: 'destroy',
   group: 'collection',
+  description: `{{t("Delete records of a collection. Could use variables in workflow context as filter. All records match the filter will be deleted.", { ns: "${_locale.NAMESPACE}" })}}`,
   fieldset: {
     collection: _collection.collection,
     params: {

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

@@ -7,6 +7,7 @@ export interface Instruction {
     title: string;
     type: string;
     group: string;
+    description?: string;
     options?: {
         label: string;
         value: any;
@@ -22,9 +23,10 @@ export interface Instruction {
     components?: {
         [key: string]: any;
     };
-    render?(props: any): React.ReactNode;
+    render?(props: any): JSX.Element;
     endding?: boolean;
-    getOptions?(config: any, types?: any): VariableOptions;
+    useVariables?(node: any, options?: any): VariableOptions;
+    useScopeVariables?(node: any, options?: any): VariableOptions;
     useInitializers?(node: any): SchemaInitializerItemOptions | null;
     initializers?: {
         [key: string]: any;
@@ -34,6 +36,7 @@ export declare const instructions: Registry<Instruction>;
 export declare const NodeContext: React.Context<any>;
 export declare function useNodeContext(): any;
 export declare function useAvailableUpstreams(node: any): any[];
+export declare function useUpstreamScopes(node: any): any[];
 export declare function Node({ data }: {
     data: any;
 }): JSX.Element;