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

package/lib/client/nodes/calculation.js

@@ -4,122 +4,175 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 function _react() {
   const data = _interopRequireDefault(require("react"));
-
   _react = function _react() {
     return data;
   };
-
   return data;
 }
-
+function _antd() {
+  const data = require("@formily/antd");
+  _antd = function _antd() {
+    return data;
+  };
+  return data;
+}
 function _css() {
   const data = require("@emotion/css");
-
   _css = function _css() {
     return data;
   };
-
   return data;
 }
-
 function _jsonTemplates() {
   const data = _interopRequireDefault(require("json-templates"));
-
   _jsonTemplates = function _jsonTemplates() {
     return data;
   };
-
   return data;
 }
-
+function _reactI18next() {
+  const data = require("react-i18next");
+  _reactI18next = function _reactI18next() {
+    return data;
+  };
+  return data;
+}
+function _antd2() {
+  const data = require("antd");
+  _antd2 = function _antd2() {
+    return data;
+  };
+  return data;
+}
 function _client() {
   const data = require("@nocobase/client");
-
   _client = function _client() {
     return data;
   };
-
   return data;
 }
-
 function _client2() {
-  const data = _interopRequireWildcard(require("@nocobase/evaluators/client"));
-
+  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");
-
+var _renderEngineReference = require("../components/renderEngineReference");
 const _excluded = ["node", "insert"];
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 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; }
-
-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); }
+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) {
+  const _useCollectionManager = (0, _client().useCollectionManager)(),
+    getCollectionFields = _useCollectionManager.getCollectionFields,
+    getCollection = _useCollectionManager.getCollection;
+  if (field.type !== 'belongsTo') {
+    return false;
+  }
+  const fields = getCollectionFields(field.target);
+  return fields.some(f => f.interface === 'expression');
+}
+const DynamicConfig = ({
+  value,
+  onChange: _onChange
+}) => {
+  const _useTranslation = (0, _reactI18next().useTranslation)(),
+    t = _useTranslation.t;
+  const scope = (0, _variable.useWorkflowVariableOptions)([matchDynamicExpressionCollectionField]);
+  return _react().default.createElement(_antd().FormLayout, {
+    layout: "vertical"
+  }, _react().default.createElement(_antd().FormItem, {
+    label: t('Expression type', {
+      ns: _locale.NAMESPACE
+    })
+  }, _react().default.createElement(_antd2().Radio.Group, {
+    value: value === false ? false : value || null,
+    onChange: ev => {
+      _onChange(ev.target.value);
+    }
+  }, _react().default.createElement(_antd2().Radio, {
+    value: false
+  }, t("Static", {
+    ns: _locale.NAMESPACE
+  })), _react().default.createElement(_antd2().Radio, {
+    value: value || null
+  }, t("Dynamic", {
+    ns: _locale.NAMESPACE
+  })))), value !== false ? _react().default.createElement(_antd().FormItem, {
+    label: t('Select dynamic expression', {
+      ns: _locale.NAMESPACE
+    })
+  }, _react().default.createElement(_client().Variable.Input, {
+    value: value || null,
+    onChange: v => _onChange(v),
+    scope: scope
+  })) : null);
+};
+function useWorkflowVariableEntityOptions() {
+  return (0, _variable.useWorkflowVariableOptions)([{
+    type: "reference",
+    options: {
+      collection: "*",
+      entity: true
+    }
+  }]);
+}
 var _default = {
   title: `{{t("Calculation", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'calculation',
   group: 'control',
   fieldset: {
-    'config.engine': {
+    dynamic: {
+      type: 'string',
+      'x-component': 'DynamicConfig',
+      default: false
+    },
+    engine: {
       type: 'string',
       title: `{{t("Calculation engine", { ns: "${_locale.NAMESPACE}" })}}`,
-      name: 'config.engine',
       'x-decorator': 'FormItem',
       'x-component': 'RadioWithTooltip',
       'x-component-props': {
-        options: Array.from(_client2().default.getEntities()).reduce((result, [value, options]) => result.concat(_objectSpread({
-          value
-        }, options)), [])
+        options: (0, _client2().getOptions)()
       },
       required: true,
-      default: 'math.js'
+      default: 'math.js',
+      'x-reactions': {
+        dependencies: ['dynamic'],
+        fulfill: {
+          state: {
+            visible: '{{$deps[0] === false}}'
+          }
+        }
+      }
     },
-    'config.expression': {
+    expression: {
       type: 'string',
       title: `{{t("Calculation expression", { ns: "${_locale.NAMESPACE}" })}}`,
-      name: 'config.expression',
       'x-decorator': 'FormItem',
       'x-component': 'Variable.TextArea',
       'x-component-props': {
         scope: '{{useWorkflowVariableOptions}}'
       },
-
       ['x-validator'](value, rules, {
         form
       }) {
         const values = form.values;
-
-        const _evaluators$get = _client2().default.get(values.config.engine),
-              evaluate = _evaluators$get.evaluate;
-
-        const exp = value.trim().replace(/{{([^{}]+)}}/g, '1');
-
+        const _evaluators$get = _client2().evaluators.get(values.engine),
+          evaluate = _evaluators$get.evaluate;
+        const exp = value.trim().replace(/{{([^{}]+)}}/g, ' 1 ');
         try {
           evaluate(exp);
           return '';
@@ -127,36 +180,57 @@ var _default = {
           return (0, _locale.lang)('Expression syntax error');
         }
       },
-
-      'x-reactions': {
-        dependencies: ['config.engine'],
+      'x-reactions': [{
+        dependencies: ['dynamic'],
+        fulfill: {
+          state: {
+            visible: '{{$deps[0] === false}}'
+          }
+        }
+      }, {
+        dependencies: ['engine'],
         fulfill: {
           schema: {
-            description: '{{renderReference($deps[0])}}'
+            description: '{{renderEngineReference($deps[0])}}'
           }
         }
-      },
+      }],
       required: true
+    },
+    scope: {
+      type: 'string',
+      title: `{{t("Variable datasource", { ns: "${_locale.NAMESPACE}" })}}`,
+      'x-decorator': 'FormItem',
+      'x-component': 'Variable.Input',
+      'x-component-props': {
+        scope: '{{useWorkflowVariableEntityOptions}}'
+      },
+      'x-reactions': {
+        dependencies: ['dynamic'],
+        fulfill: {
+          state: {
+            visible: '{{$deps[0] !== false}}'
+          }
+        }
+      }
     }
   },
   view: {},
   scope: {
     useWorkflowVariableOptions: _variable.useWorkflowVariableOptions,
-    renderReference: _client2().renderReference
+    useWorkflowVariableEntityOptions,
+    renderEngineReference: _renderEngineReference.renderEngineReference
   },
   components: {
     CalculationResult({
       dataSource
     }) {
       var _execution$jobs;
-
       const _useFlowContext = (0, _FlowContext.useFlowContext)(),
-            execution = _useFlowContext.execution;
-
+        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
@@ -168,22 +242,19 @@ var _default = {
         `
       }, JSON.stringify(result, null, 2));
     },
-
-    RadioWithTooltip: _RadioWithTooltip.RadioWithTooltip
+    RadioWithTooltip: _RadioWithTooltip.RadioWithTooltip,
+    DynamicConfig
   },
-
   getOptions(config, types) {
-    if (types && !types.some(type => type in _variable.TypeSets || Object.values(_variable.TypeSets).some(set => set.has(type)))) {
+    if (types && !types.some(type => type in _variable.BaseTypeSets || Object.values(_variable.BaseTypeSets).some(set => set.has(type)))) {
       return null;
     }
-
-    return [// { key: '', value: '', label: lang('Calculation result') }
+    return [
+      // { key: '', value: '', label: lang('Calculation result') }
     ];
   },
-
   useInitializers(node) {
     var _node$title;
-
     return {
       type: 'item',
       title: (_node$title = node.title) !== null && _node$title !== void 0 ? _node$title : `#${node.id}`,
@@ -191,19 +262,15 @@ var _default = {
       node
     };
   }
-
 };
 exports.default = _default;
-
 function CalculationInitializer(_ref) {
   let node = _ref.node,
-      insert = _ref.insert,
-      props = _objectWithoutProperties(_ref, _excluded);
-
+    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,

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

@@ -22,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;
@@ -36,10 +35,9 @@ declare const _default: {
                 label: string;
             }[];
         };
-        'config.engine': {
+        engine: {
             type: string;
             title: string;
-            name: string;
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
@@ -50,9 +48,8 @@ declare const _default: {
             required: boolean;
             default: string;
         };
-        'config.calculation': {
+        calculation: {
             type: string;
-            name: string;
             title: string;
             'x-decorator': string;
             'x-component': string;
@@ -66,10 +63,9 @@ declare const _default: {
             };
             required: boolean;
         };
-        'config.expression': {
+        expression: {
             type: string;
             title: string;
-            name: string;
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
@@ -102,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: {