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

package/lib/client/nodes/condition.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.Calculation = Calculation;
+exports.default = exports.calculators = void 0;
 
 function _react() {
   const data = _interopRequireDefault(require("react"));
@@ -55,6 +56,36 @@ function _reactI18next() {
   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");
@@ -63,10 +94,12 @@ var _FlowContext = require("../FlowContext");
 
 var _style = require("../style");
 
-var _calculators = require("../calculators");
-
 var _locale = require("../locale");
 
+var _variable = require("../variable");
+
+var _RadioWithTooltip = require("../components/RadioWithTooltip");
+
 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; }
@@ -75,9 +108,165 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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; }
 
+const calculators = new (_client().Registry)();
+exports.calculators = calculators;
+calculators.register('equal', {
+  name: '=',
+  type: 'boolean',
+  group: 'boolean'
+});
+calculators.register('notEqual', {
+  name: '≠',
+  type: 'boolean',
+  group: 'boolean'
+});
+calculators.register('gt', {
+  name: '>',
+  type: 'boolean',
+  group: 'boolean'
+});
+calculators.register('gte', {
+  name: '≥',
+  type: 'boolean',
+  group: 'boolean'
+});
+calculators.register('lt', {
+  name: '<',
+  type: 'boolean',
+  group: 'boolean'
+});
+calculators.register('lte', {
+  name: '≤',
+  type: 'boolean',
+  group: 'boolean'
+});
+calculators.register('add', {
+  name: '+',
+  type: 'number',
+  group: 'number'
+});
+calculators.register('minus', {
+  name: '-',
+  type: 'number',
+  group: 'number'
+});
+calculators.register('multiple', {
+  name: '*',
+  type: 'number',
+  group: 'number'
+});
+calculators.register('divide', {
+  name: '/',
+  type: 'number',
+  group: 'number'
+});
+calculators.register('mod', {
+  name: '%',
+  type: 'number',
+  group: 'number'
+});
+calculators.register('includes', {
+  name: '{{t("contains")}}',
+  type: 'boolean',
+  group: 'string'
+});
+calculators.register('notIncludes', {
+  name: '{{t("does not contain")}}',
+  type: 'boolean',
+  group: 'string'
+});
+calculators.register('startsWith', {
+  name: '{{t("starts with")}}',
+  type: 'boolean',
+  group: 'string'
+});
+calculators.register('notStartsWith', {
+  name: '{{t("not starts with")}}',
+  type: 'boolean',
+  group: 'string'
+});
+calculators.register('endsWith', {
+  name: '{{t("ends with")}}',
+  type: 'boolean',
+  group: 'string'
+});
+calculators.register('notEndsWith', {
+  name: '{{t("not ends with")}}',
+  type: 'boolean',
+  group: 'string'
+});
+calculators.register('concat', {
+  name: `{{t("concat", { ns: "${_locale.NAMESPACE}" })}}`,
+  type: 'string',
+  group: 'string'
+});
+const calculatorGroups = [{
+  value: 'boolean',
+  title: '{{t("Comparision")}}'
+}, {
+  value: 'number',
+  title: `{{t("Arithmetic calculation", { ns: "${_locale.NAMESPACE}" })}}`
+}, {
+  value: 'string',
+  title: `{{t("String operation", { ns: "${_locale.NAMESPACE}" })}}`
+}, {
+  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 = [],
+  onChange: _onChange
+}) {
+  const compile = (0, _client2().useCompile)();
+  const options = (0, _variable.useWorkflowVariableOptions)();
+  return _react().default.createElement("fieldset", {
+    className: (0, _css().css)`
+      display: flex;
+      gap: .5em;
+      align-items: center;
+      flex-wrap: wrap;
+    `
+  }, _react().default.createElement(_client2().Variable.Input, {
+    value: operands[0],
+    onChange: v => _onChange({
+      calculator,
+      operands: [v, operands[1]]
+    }),
+    scope: options
+  }), _react().default.createElement(_antd().Select, {
+    value: calculator,
+    onChange: v => _onChange({
+      operands,
+      calculator: v
+    }),
+    placeholder: (0, _locale.lang)('Calculator')
+  }, calculatorGroups.filter(group => Boolean(getGroupCalculators(group.value).length)).map(group => _react().default.createElement(_antd().Select.OptGroup, {
+    key: group.value,
+    label: compile(group.title)
+  }, getGroupCalculators(group.value).map(([value, {
+    name
+  }]) => _react().default.createElement(_antd().Select.Option, {
+    key: value,
+    value: value
+  }, compile(name)))))), _react().default.createElement(_client2().Variable.Input, {
+    value: operands[1],
+    onChange: v => _onChange({
+      calculator,
+      operands: [operands[0], v]
+    }),
+    scope: options
+  }));
+}
+
 function CalculationItem({
   value,
-  onChange: _onChange,
+  onChange: _onChange2,
   onRemove
 }) {
   if (!value) {
@@ -86,7 +275,7 @@ function CalculationItem({
 
   const calculator = value.calculator,
         _value$operands = value.operands,
-        operands = _value$operands === void 0 ? [null] : _value$operands;
+        operands = _value$operands === void 0 ? [] : _value$operands;
   return _react().default.createElement("div", {
     className: (0, _css().css)`
       display: flex;
@@ -95,13 +284,13 @@ function CalculationItem({
     `
   }, value.group ? _react().default.createElement(CalculationGroup, {
     value: value.group,
-    onChange: group => _onChange(_objectSpread(_objectSpread({}, value), {}, {
+    onChange: group => _onChange2(_objectSpread(_objectSpread({}, value), {}, {
       group
     }))
-  }) : _react().default.createElement(_calculators.Calculation, {
+  }) : _react().default.createElement(Calculation, {
     operands: operands,
     calculator: calculator,
-    onChange: _onChange
+    onChange: _onChange2
   }), _react().default.createElement(_antd().Button, {
     onClick: onRemove,
     type: "link",
@@ -111,7 +300,7 @@ function CalculationItem({
 
 function CalculationGroup({
   value,
-  onChange: _onChange2
+  onChange: _onChange3
 }) {
   const _useTranslation = (0, _reactI18next().useTranslation)(),
         t = _useTranslation.t;
@@ -122,7 +311,7 @@ function CalculationGroup({
         calculations = _value$calculations === void 0 ? [] : _value$calculations;
 
   function onAddSingle() {
-    _onChange2(_objectSpread(_objectSpread({}, value), {}, {
+    _onChange3(_objectSpread(_objectSpread({}, value), {}, {
       calculations: [...calculations, {
         not: false,
         calculator: 'equal'
@@ -131,7 +320,7 @@ function CalculationGroup({
   }
 
   function onAddGroup() {
-    _onChange2(_objectSpread(_objectSpread({}, value), {}, {
+    _onChange3(_objectSpread(_objectSpread({}, value), {}, {
       calculations: [...calculations, {
         not: false,
         group: {
@@ -145,7 +334,7 @@ function CalculationGroup({
   function _onRemove(i) {
     calculations.splice(i, 1);
 
-    _onChange2(_objectSpread(_objectSpread({}, value), {}, {
+    _onChange3(_objectSpread(_objectSpread({}, value), {}, {
       calculations: [...calculations]
     }));
   }
@@ -153,7 +342,7 @@ function CalculationGroup({
   function onItemChange(i, v) {
     calculations.splice(i, 1, v);
 
-    _onChange2(_objectSpread(_objectSpread({}, value), {}, {
+    _onChange3(_objectSpread(_objectSpread({}, value), {}, {
       calculations: [...calculations]
     }));
   }
@@ -162,12 +351,10 @@ function CalculationGroup({
     className: (0, _css().cx)('node-type-condition-group', (0, _css().css)`
       position: relative;
       width: 100%;
-
       .node-type-condition-group{
         padding: .5em 1em;
         border: 1px dashed #ddd;
       }
-
       + button{
         position: absolute;
         right: 0;
@@ -178,7 +365,6 @@ function CalculationGroup({
         display: flex;
         align-items: center;
         gap: .5em;
-
         .ant-select{
           width: auto;
           min-width: 6em;
@@ -186,7 +372,7 @@ function CalculationGroup({
       `
   }, _react().default.createElement(_reactI18next().Trans, null, 'Meet ', _react().default.createElement(_antd().Select, {
     value: type,
-    onChange: t => _onChange2(_objectSpread(_objectSpread({}, value), {}, {
+    onChange: t => _onChange3(_objectSpread(_objectSpread({}, value), {}, {
       type: t
     }))
   }, _react().default.createElement(_antd().Select.Option, {
@@ -204,7 +390,6 @@ function CalculationGroup({
     className: (0, _css().css)`
         button{
           padding: 0;
-
           &:not(:last-child){
             margin-right: 1em;
           }
@@ -221,7 +406,7 @@ function CalculationGroup({
 
 function CalculationConfig({
   value,
-  onChange: _onChange3
+  onChange: _onChange4
 }) {
   const rule = value && Object.keys(value).length ? value : {
     group: {
@@ -231,7 +416,7 @@ function CalculationConfig({
   };
   return _react().default.createElement(CalculationGroup, {
     value: rule.group,
-    onChange: group => _onChange3(_objectSpread(_objectSpread({}, rule), {}, {
+    onChange: group => _onChange4(_objectSpread(_objectSpread({}, rule), {}, {
       group
     }))
   });
@@ -242,9 +427,8 @@ var _default = {
   type: 'condition',
   group: 'control',
   fieldset: {
-    'config.rejectOnFalse': {
+    rejectOnFalse: {
       type: 'boolean',
-      name: 'config.rejectOnFalse',
       title: `{{t("Mode", { ns: "${_locale.NAMESPACE}" })}}`,
       'x-decorator': 'FormItem',
       'x-component': 'Radio.Group',
@@ -253,29 +437,92 @@ var _default = {
       },
       enum: [{
         value: true,
-        label: (0, _locale.lang)('Continue when "Yes"')
+        label: `{{t('Continue when "Yes"', { ns: "${_locale.NAMESPACE}" })}}`
       }, {
         value: false,
-        label: (0, _locale.lang)('Branch into "Yes" and "No"')
+        label: `{{t('Branch into "Yes" and "No"', { ns: "${_locale.NAMESPACE}" })}}`
       }]
     },
-    'config.calculation': {
+    engine: {
+      type: 'string',
+      title: `{{t("Calculation engine", { ns: "${_locale.NAMESPACE}" })}}`,
+      'x-decorator': 'FormItem',
+      'x-component': 'RadioWithTooltip',
+      'x-component-props': {
+        options: [['basic', {
+          label: `{{t("Basic", { ns: "${_locale.NAMESPACE}" })}}`
+        }], ...Array.from(_client3().evaluators.getEntities())].reduce((result, [value, options]) => result.concat(_objectSpread({
+          value
+        }, options)), [])
+      },
+      required: true,
+      default: 'basic'
+    },
+    calculation: {
+      type: 'string',
+      title: `{{t("Condition", { ns: "${_locale.NAMESPACE}" })}}`,
+      'x-decorator': 'FormItem',
+      'x-component': 'CalculationConfig',
+      'x-reactions': {
+        dependencies: ['engine'],
+        fulfill: {
+          state: {
+            visible: '{{$deps[0] === "basic"}}'
+          }
+        }
+      },
+      required: true
+    },
+    expression: {
       type: 'string',
-      name: 'config.calculation',
-      title: `{{t("Conditions", { ns: "${_locale.NAMESPACE}" })}}`,
+      title: `{{t("Condition 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 = _client3().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: {
+          state: {
+            visible: '{{$deps[0] !== "basic"}}'
+          },
+          schema: {
+            description: '{{renderReference($deps[0])}}'
+          }
+        }
+      },
+      required: true
     }
   },
   view: {},
   options: [{
-    label: (0, _locale.lang)('Continue when "Yes"'),
+    label: `{{t('Continue when "Yes"', { ns: "${_locale.NAMESPACE}" })}}`,
     key: 'rejectOnFalse',
     value: {
       rejectOnFalse: true
     }
   }, {
-    label: (0, _locale.lang)('Branch into "Yes" and "No"'),
+    label: `{{t('Branch into "Yes" and "No"', { ns: "${_locale.NAMESPACE}" })}}`,
     key: 'branch',
     value: {
       rejectOnFalse: false
@@ -335,8 +582,13 @@ var _default = {
     }, t('Yes')))));
   },
 
+  scope: {
+    renderReference: _client3().renderReference,
+    useWorkflowVariableOptions: _variable.useWorkflowVariableOptions
+  },
   components: {
-    CalculationConfig
+    CalculationConfig,
+    RadioWithTooltip: _RadioWithTooltip.RadioWithTooltip
   }
 };
 exports.default = _default;

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

@@ -1,12 +1,11 @@
-import React from 'react';
-import { useCollectionDataSource } from '@nocobase/client';
+import { SchemaInitializerItemOptions, useCollectionDataSource } from '@nocobase/client';
+import { CollectionFieldInitializers } from '../components/CollectionFieldInitializers';
 declare const _default: {
     title: string;
     type: string;
     group: string;
     fieldset: {
-        'config.collection': {
-            name: string;
+        collection: {
             type: string;
             title: string;
             required: boolean;
@@ -17,10 +16,9 @@ declare const _default: {
                 placeholder: string;
             };
         };
-        'config.params.values': {
+        'params.values': {
             type: string;
             title: string;
-            name: string;
             'x-decorator': string;
             'x-decorator-props': {
                 labelAlign: string;
@@ -35,10 +33,12 @@ declare const _default: {
         useCollectionDataSource: typeof useCollectionDataSource;
     };
     components: {
-        CollectionFieldset: React.MemoExoticComponent<React.FunctionComponent<Pick<any, string | number | symbol>>>;
+        CollectionFieldset: import("react").MemoExoticComponent<import("react").FunctionComponent<Pick<any, string | number | symbol>>>;
+    };
+    getOptions(config: any, types: any): any;
+    useInitializers(node: any): SchemaInitializerItemOptions | null;
+    initializers: {
+        CollectionFieldInitializers: typeof CollectionFieldInitializers;
     };
-    getter({ onChange }: {
-        onChange: any;
-    }): JSX.Element;
 };
 export default _default;

package/lib/client/nodes/create.js

@@ -5,16 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-
-  _react = function _react() {
-    return data;
-  };
-
-  return data;
-}
-
 function _client() {
   const data = require("@nocobase/client");
 
@@ -27,32 +17,24 @@ function _client() {
 
 var _collection = require("../schemas/collection");
 
-var _FlowContext = require("../FlowContext");
-
-var _CollectionFieldSelect = _interopRequireDefault(require("../components/CollectionFieldSelect"));
-
 var _CollectionFieldset = _interopRequireDefault(require("../components/CollectionFieldset"));
 
 var _locale = require("../locale");
 
-var _calculators = require("../calculators");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _CollectionBlockInitializer = require("../components/CollectionBlockInitializer");
 
-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; }
+var _CollectionFieldInitializers = require("../components/CollectionFieldInitializers");
 
-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; }
+var _variable = require("../variable");
 
-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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var _default = {
   title: `{{t("Create record", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'create',
   group: 'collection',
   fieldset: {
-    'config.collection': _objectSpread(_objectSpread({}, _collection.collection), {}, {
-      name: 'config.collection'
-    }),
+    collection: _collection.collection,
     // multiple: {
     //   type: 'boolean',
     //   title: '多条数据',
@@ -63,7 +45,7 @@ var _default = {
     //     disabled: true
     //   }
     // },
-    'config.params.values': _collection.values
+    'params.values': _collection.values
   },
   view: {},
   scope: {
@@ -73,27 +55,31 @@ var _default = {
     CollectionFieldset: _CollectionFieldset.default
   },
 
-  getter({
-    onChange: _onChange
-  }) {
-    const _useOperandContext = (0, _calculators.useOperandContext)(),
-          options = _useOperandContext.options;
+  getOptions(config, types) {
+    return (0, _variable.useCollectionFieldOptions)({
+      collection: config.collection,
+      types
+    });
+  },
+
+  useInitializers(node) {
+    var _node$title;
 
-    const _useFlowContext = (0, _FlowContext.useFlowContext)(),
-          nodes = _useFlowContext.nodes;
+    if (!node.config.collection) {
+      return null;
+    }
 
-    const _nodes$find = nodes.find(n => n.id == options.nodeId),
-          config = _nodes$find.config;
+    return {
+      type: 'item',
+      title: (_node$title = node.title) !== null && _node$title !== void 0 ? _node$title : `#${node.id}`,
+      component: _CollectionBlockInitializer.CollectionBlockInitializer,
+      collection: node.config.collection,
+      dataSource: `{{$jobsMapByNodeId.${node.id}}}`
+    };
+  },
 
-    const value = options === null || options === void 0 ? void 0 : options.path;
-    return _react().default.createElement(_CollectionFieldSelect.default, {
-      collection: config.collection,
-      value: value,
-      onChange: path => {
-        _onChange(`{{$jobsMapByNodeId.${options.nodeId}.${path}}}`);
-      }
-    });
+  initializers: {
+    CollectionFieldInitializers: _CollectionFieldInitializers.CollectionFieldInitializers
   }
-
 };
 exports.default = _default;

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

@@ -4,17 +4,16 @@ declare const _default: {
     type: string;
     group: string;
     fieldset: {
-        'config.duration': {
+        duration: {
             type: string;
-            name: string;
             title: string;
             'x-decorator': string;
             'x-component': string;
             default: number;
+            required: boolean;
         };
-        'config.endStatus': {
+        endStatus: {
             type: string;
-            name: string;
             title: string;
             'x-decorator': string;
             'x-component': string;
@@ -25,6 +24,7 @@ declare const _default: {
                 label: string;
                 value: number;
             }[];
+            required: boolean;
         };
     };
     view: {};