@nocobase/plugin-workflow 0.9.0-alpha.2 → 0.9.1-alpha.2

package/lib/client/locale/zh-CN.d.ts

@@ -54,27 +54,37 @@ declare const _default: {
     Advanced: string;
     End: string;
     'Node result': string;
-    Constant: string;
-    Null: string;
-    Boolean: string;
-    String: string;
     Calculator: string;
     'Arithmetic calculation': string;
     'String operation': string;
+    'System variables': string;
+    'Current time': string;
     'Executed at': string;
     Queueing: string;
     'On going': string;
-    Succeeded: string;
-    Failed: string;
+    Resolved: string;
     Pending: string;
+    Failed: string;
+    Error: string;
+    Aborted: string;
     Canceled: string;
+    Rejected: string;
+    'Continue the process': string;
+    'Terminate the process': string;
+    'Save temporarily': string;
+    Operations: string;
     'This node contains branches, deleting will also be preformed to them, are you sure?': string;
     Control: string;
     'Collection operations': string;
+    Manual: string;
     'Extended types': string;
     'Node type': string;
     Calculation: string;
-    'Configure calculation': string;
+    'Calculation engine': string;
+    Basic: string;
+    'Calculation expression': string;
+    'Expression syntax error': string;
+    'Syntax references: ': string;
     'Calculation result': string;
     True: string;
     False: string;
@@ -83,7 +93,7 @@ declare const _default: {
     Mode: string;
     'Continue when "Yes"': string;
     'Branch into "Yes" and "No"': string;
-    Conditions: string;
+    'Condition expression': string;
     'Parallel branch': string;
     'Add branch': string;
     'All succeeded': string;
@@ -98,6 +108,21 @@ declare const _default: {
     'Select status': string;
     'Succeed and continue': string;
     'Fail and exit': string;
+    Assignee: string;
+    Assignees: string;
+    'User interface': string;
+    'Configure user interface': string;
+    'View user interface': string;
+    Separately: string;
+    'Each user has own task': string;
+    Collaboratively: string;
+    'Everyone shares one task': string;
+    Negotiation: string;
+    'All pass': string;
+    'Everyone should pass': string;
+    'Any pass': string;
+    'Anyone pass': string;
+    'Field name existed in form': string;
     'Create record': string;
     'Update record': string;
     'Query record': string;
@@ -110,21 +135,23 @@ declare const _default: {
     'Can not delete': string;
     'The result of this node has been referenced by other nodes ({{nodes}}), please remove the usage before deleting.': string;
     'HTTP request': string;
+    'HTTP method': string;
     URL: string;
-    'You can use the above available variables in URL.': string;
-    'Request headers': string;
-    'Name(e.g. Content-Type)': string;
-    'Value(e.g. Application/json)': string;
+    Headers: string;
     'Add request header': string;
-    'HTTP method': string;
-    'Request data': string;
+    Parameters: string;
+    'Add parameter': string;
+    Body: string;
+    'Use variable': string;
+    Format: string;
+    Insert: string;
+    'Timeout config': string;
+    ms: string;
     'Input request data': string;
-    'You can use the above available variables in request data.': string;
-    'Copy success!': string;
-    'Copy variable output template statement': string;
-    'Default headers is Content-Type: application/json': string;
+    'Only support standard JSON data': string;
+    '"Content-Type" only support "application/json", and no need to specify': string;
     'Ignore fail request and continue workflow': string;
-    'Syntax see': string;
-    'Show available variable tool': string;
+    'Workflow todos': string;
+    Task: string;
 };
 export default _default;

package/lib/client/locale/zh-CN.js

@@ -60,27 +60,37 @@ var _default = {
   'Advanced': '高级模式',
   'End': '结束',
   'Node result': '节点数据',
-  'Constant': '常量',
-  'Null': '空值',
-  'Boolean': '逻辑值',
-  'String': '字符串',
   'Calculator': '运算',
   'Arithmetic calculation': '算术运算',
   'String operation': '字符串',
+  'System variables': '系统变量',
+  'Current time': '当前时间',
   'Executed at': '执行于',
   'Queueing': '队列中',
   'On going': '进行中',
-  'Succeeded': '成功',
+  'Resolved': '完成',
+  'Pending': '待处理',
   'Failed': '失败',
-  'Pending': '等待处理',
+  'Error': '出错',
+  'Aborted': '已终止',
   'Canceled': '已取消',
+  'Rejected': '已拒绝',
+  'Continue the process': '继续流程',
+  'Terminate the process': '终止流程',
+  'Save temporarily': '暂存',
+  'Operations': '操作',
   'This node contains branches, deleting will also be preformed to them, are you sure?': '节点包含分支，将同时删除其所有分支下的子节点，确定继续？',
   'Control': '流程控制',
   'Collection operations': '数据表操作',
+  'Manual': '人工处理',
   'Extended types': '扩展类型',
   'Node type': '节点类型',
   'Calculation': '运算',
-  'Configure calculation': '配置运算',
+  'Calculation engine': '运算引擎',
+  'Basic': '基础',
+  'Calculation expression': '运算表达式',
+  'Expression syntax error': '表达式语法错误',
+  'Syntax references: ': '语法参考：',
   'Calculation result': '运算结果',
   'True': '真',
   'False': '假',
@@ -89,7 +99,7 @@ var _default = {
   'Mode': '模式',
   'Continue when "Yes"': '“是”则继续',
   'Branch into "Yes" and "No"': '“是”和“否”分别继续',
-  'Conditions': '条件配置',
+  'Condition expression': '条件表达式',
   'Parallel branch': '分支',
   'Add branch': '增加分支',
   'All succeeded': '全部成功',
@@ -104,6 +114,21 @@ var _default = {
   'Select status': '选择状态',
   'Succeed and continue': '通过并继续',
   'Fail and exit': '失败并退出',
+  'Assignee': '负责人',
+  'Assignees': '负责人',
+  'User interface': '操作界面',
+  'Configure user interface': '配置界面',
+  'View user interface': '查看界面',
+  'Separately': '分别处理',
+  'Each user has own task': '每个人处理各自的任务',
+  'Collaboratively': '协作处理',
+  'Everyone shares one task': '所有人共享同一个任务',
+  'Negotiation': '协商机制',
+  'All pass': '全部通过',
+  'Everyone should pass': '每个人通过才通过',
+  'Any pass': '任意通过',
+  'Anyone pass': '任何一人通过即通过',
+  'Field name existed in form': '表单中已有对应标识的字段',
   'Create record': '新增数据',
   'Update record': '更新数据',
   'Query record': '查询数据',
@@ -116,21 +141,23 @@ var _default = {
   'Can not delete': '无法删除',
   'The result of this node has been referenced by other nodes ({{nodes}}), please remove the usage before deleting.': '该节点的执行结果已被其他节点（{{nodes}}）引用，删除前请先移除引用。',
   'HTTP request': 'HTTP 请求',
+  'HTTP method': 'HTTP 方法',
   'URL': '地址',
-  'You can use the above available variables in URL.': '您可以在地址中使用使用上面的可用变量。',
-  'Request headers': '请求头',
-  'Name(e.g. Content-Type)': '名称(例如 Content-Type)',
-  'Value(e.g. Application/json)': '值(例如 Application/json)',
+  'Headers': '请求头',
   'Add request header': '添加请求头',
-  'HTTP method': 'HTTP 方法',
-  'Request data': '请求数据',
+  'Parameters': '参数',
+  'Add parameter': '添加参数',
+  'Body': '请求体',
+  'Use variable': '使用变量',
+  'Format': '格式化',
+  'Insert': '插入',
+  'Timeout config': '超时设置',
+  'ms': '毫秒',
   'Input request data': '输入请求数据',
-  'You can use the above available variables in request data.': '您可以在请求数据中使用上面的可用变量。',
-  'Copy success!': '拷贝成功！',
-  'Copy variable output template statement': '拷贝变量输出模版语句',
-  'Default headers is Content-Type: application/json': '默认请求头是 Content-Type: application/json',
-  'Ignore fail request and continue workflow': '忽略失败请求并继续工作流',
-  'Syntax see': '语法参考',
-  'Show available variable tool': '显示可用变量工具'
+  'Only support standard JSON data': '仅支持标准 JSON 数据',
+  '"Content-Type" only support "application/json", and no need to specify': '"Content-Type" 请求头仅支持 "application/json"，无需填写',
+  'Ignore fail request and continue workflow': '忽略失败的请求并继续工作流',
+  'Workflow todos': '工作流待办',
+  'Task': '任务'
 };
 exports.default = _default;

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

@@ -1,24 +1,56 @@
+import { SchemaInitializerItemOptions } from '@nocobase/client';
+import { useWorkflowVariableOptions } from '../variable';
+import { RadioWithTooltip } from '../components/RadioWithTooltip';
 declare const _default: {
     title: string;
     type: string;
     group: string;
     fieldset: {
-        'config.calculation': {
+        engine: {
             type: string;
             title: string;
-            name: string;
+            'x-decorator': string;
+            'x-component': string;
+            'x-component-props': {
+                options: any[];
+            };
             required: boolean;
+            default: string;
+        };
+        expression: {
+            type: string;
+            title: string;
             'x-decorator': string;
             'x-component': string;
+            'x-component-props': {
+                scope: string;
+            };
+            "x-validator"(value: any, rules: any, { form }: {
+                form: any;
+            }): string;
+            'x-reactions': {
+                dependencies: string[];
+                fulfill: {
+                    schema: {
+                        description: string;
+                    };
+                };
+            };
+            required: boolean;
         };
     };
     view: {};
+    scope: {
+        useWorkflowVariableOptions: typeof useWorkflowVariableOptions;
+        renderReference: (key: string) => JSX.Element;
+    };
     components: {
-        CalculationConfig({ value, onChange }: {
-            value: any;
-            onChange: any;
-        }): JSX.Element;
+        CalculationResult({ dataSource }: {
+            dataSource: any;
+        }): string | JSX.Element;
+        RadioWithTooltip: typeof RadioWithTooltip;
     };
-    getter(): JSX.Element;
+    getOptions(config: any, types: any): any[];
+    useInitializers(node: any): SchemaInitializerItemOptions;
 };
 export default _default;

package/lib/client/nodes/calculation.js

@@ -25,12 +25,52 @@ function _css() {
   return data;
 }
 
-var _calculators = require("../calculators");
+function _jsonTemplates() {
+  const data = _interopRequireDefault(require("json-templates"));
+
+  _jsonTemplates = function _jsonTemplates() {
+    return data;
+  };
+
+  return data;
+}
+
+function _client() {
+  const data = require("@nocobase/client");
+
+  _client = function _client() {
+    return data;
+  };
+
+  return data;
+}
+
+function _client2() {
+  const data = require("@nocobase/evaluators/client");
+
+  _client2 = function _client2() {
+    return data;
+  };
+
+  return data;
+}
+
+var _FlowContext = require("../FlowContext");
 
 var _locale = require("../locale");
 
+var _variable = require("../variable");
+
+var _RadioWithTooltip = require("../components/RadioWithTooltip");
+
+const _excluded = ["node", "insert"];
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+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 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; }
@@ -42,36 +82,142 @@ var _default = {
   type: 'calculation',
   group: 'control',
   fieldset: {
-    'config.calculation': {
-      type: 'object',
-      title: `{{t("Configure calculation", { ns: "${_locale.NAMESPACE}" })}}`,
-      name: 'config.calculation',
+    engine: {
+      type: 'string',
+      title: `{{t("Calculation engine", { ns: "${_locale.NAMESPACE}" })}}`,
+      'x-decorator': 'FormItem',
+      'x-component': 'RadioWithTooltip',
+      'x-component-props': {
+        options: Array.from(_client2().evaluators.getEntities()).reduce((result, [value, options]) => result.concat(_objectSpread({
+          value
+        }, options)), [])
+      },
       required: true,
+      default: 'math.js'
+    },
+    expression: {
+      type: 'string',
+      title: `{{t("Calculation expression", { ns: "${_locale.NAMESPACE}" })}}`,
       'x-decorator': 'FormItem',
-      'x-component': 'CalculationConfig'
+      'x-component': 'Variable.TextArea',
+      'x-component-props': {
+        scope: '{{useWorkflowVariableOptions}}'
+      },
+
+      ['x-validator'](value, rules, {
+        form
+      }) {
+        const values = form.values;
+
+        const _evaluators$get = _client2().evaluators.get(values.engine),
+              evaluate = _evaluators$get.evaluate;
+
+        const exp = value.trim().replace(/{{([^{}]+)}}/g, '1');
+
+        try {
+          evaluate(exp);
+          return '';
+        } catch (e) {
+          return (0, _locale.lang)('Expression syntax error');
+        }
+      },
+
+      'x-reactions': {
+        dependencies: ['engine'],
+        fulfill: {
+          schema: {
+            description: '{{renderReference($deps[0])}}'
+          }
+        }
+      },
+      required: true
     }
   },
   view: {},
+  scope: {
+    useWorkflowVariableOptions: _variable.useWorkflowVariableOptions,
+    renderReference: _client2().renderReference
+  },
   components: {
-    CalculationConfig({
-      value,
-      onChange
+    CalculationResult({
+      dataSource
     }) {
-      return _react().default.createElement(_calculators.Calculation, _objectSpread(_objectSpread({}, value), {}, {
-        onChange: onChange
-      }));
+      var _execution$jobs;
+
+      const _useFlowContext = (0, _FlowContext.useFlowContext)(),
+            execution = _useFlowContext.execution;
+
+      if (!execution) {
+        return (0, _locale.lang)('Calculation result');
+      }
+
+      const result = (0, _jsonTemplates().default)(dataSource)({
+        $jobsMapByNodeId: ((_execution$jobs = execution.jobs) !== null && _execution$jobs !== void 0 ? _execution$jobs : []).reduce((map, job) => Object.assign(map, {
+          [job.nodeId]: job.result
+        }), {})
+      });
+      return _react().default.createElement("pre", {
+        className: (0, _css().css)`
+          margin: 0;
+        `
+      }, JSON.stringify(result, null, 2));
+    },
+
+    RadioWithTooltip: _RadioWithTooltip.RadioWithTooltip
+  },
+
+  getOptions(config, types) {
+    if (types && !types.some(type => type in _variable.TypeSets || Object.values(_variable.TypeSets).some(set => set.has(type)))) {
+      return null;
     }
 
+    return [// { key: '', value: '', label: lang('Calculation result') }
+    ];
   },
 
-  getter() {
-    const _useWorkflowTranslati = (0, _locale.useWorkflowTranslation)(),
-          t = _useWorkflowTranslati.t;
+  useInitializers(node) {
+    var _node$title;
 
-    return _react().default.createElement("div", {
-      className: (0, _css().css)`flex-shrink: 0`
-    }, t('Calculation result'));
+    return {
+      type: 'item',
+      title: (_node$title = node.title) !== null && _node$title !== void 0 ? _node$title : `#${node.id}`,
+      component: CalculationInitializer,
+      node
+    };
   }
 
 };
-exports.default = _default;
+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}}}`
+            }
+          }
+        }
+      });
+    }
+  }));
+}

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

@@ -1,4 +1,18 @@
 /// <reference types="react" />
+import { Registry } from "@nocobase/utils/client";
+import { useWorkflowVariableOptions } from "../variable";
+import { RadioWithTooltip } from "../components/RadioWithTooltip";
+interface Calculator {
+    name: string;
+    type: 'boolean' | 'number' | 'string' | 'date' | 'unknown' | 'null' | 'array';
+    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;
@@ -8,9 +22,8 @@ declare const _default: {
     type: string;
     group: string;
     fieldset: {
-        'config.rejectOnFalse': {
+        rejectOnFalse: {
             type: string;
-            name: string;
             title: string;
             'x-decorator': string;
             'x-component': string;
@@ -22,12 +35,57 @@ declare const _default: {
                 label: string;
             }[];
         };
-        'config.calculation': {
+        engine: {
+            type: string;
+            title: string;
+            'x-decorator': string;
+            'x-component': string;
+            'x-component-props': {
+                options: [string, import("@nocobase/evaluators/client").Evaluator] | (string | {
+                    label: string;
+                })[];
+            };
+            required: boolean;
+            default: string;
+        };
+        calculation: {
             type: string;
-            name: string;
             title: string;
             'x-decorator': string;
             'x-component': string;
+            'x-reactions': {
+                dependencies: string[];
+                fulfill: {
+                    state: {
+                        visible: string;
+                    };
+                };
+            };
+            required: boolean;
+        };
+        expression: {
+            type: string;
+            title: string;
+            'x-decorator': string;
+            'x-component': string;
+            'x-component-props': {
+                scope: string;
+            };
+            "x-validator"(value: any, rules: any, { form }: {
+                form: any;
+            }): string;
+            'x-reactions': {
+                dependencies: string[];
+                fulfill: {
+                    state: {
+                        visible: string;
+                    };
+                    schema: {
+                        description: string;
+                    };
+                };
+            };
+            required: boolean;
         };
     };
     view: {};
@@ -39,8 +97,13 @@ declare const _default: {
         };
     }[];
     render(data: any): JSX.Element;
+    scope: {
+        renderReference: (key: string) => JSX.Element;
+        useWorkflowVariableOptions: typeof useWorkflowVariableOptions;
+    };
     components: {
         CalculationConfig: typeof CalculationConfig;
+        RadioWithTooltip: typeof RadioWithTooltip;
     };
 };
 export default _default;