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

package/lib/client/AddButton.js

@@ -77,6 +77,12 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+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 asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -94,7 +100,7 @@ function AddButton({
 
   const _ref = (_useFlowContext = (0, _FlowContext.useFlowContext)()) !== null && _useFlowContext !== void 0 ? _useFlowContext : {},
         workflow = _ref.workflow,
-        onNodeAdded = _ref.onNodeAdded;
+        refresh = _ref.refresh;
 
   if (!workflow) {
     return null;
@@ -118,10 +124,12 @@ function AddButton({
       const _keyPath = _slicedToArray(keyPath, 1),
             optionKey = _keyPath[0];
 
+      const instruction = _nodes.instructions.get(type);
+
       if (optionKey) {
-        var _instructions$get$opt, _instructions$get, _instructions$get$opt2;
+        var _instruction$options$, _instruction$options;
 
-        const _ref2 = (_instructions$get$opt = (_instructions$get = _nodes.instructions.get(type)) === null || _instructions$get === void 0 ? void 0 : (_instructions$get$opt2 = _instructions$get.options) === null || _instructions$get$opt2 === void 0 ? void 0 : _instructions$get$opt2.find(item => item.key === optionKey)) !== null && _instructions$get$opt !== void 0 ? _instructions$get$opt : {},
+        const _ref2 = (_instruction$options$ = (_instruction$options = instruction.options) === null || _instruction$options === void 0 ? void 0 : _instruction$options.find(item => item.key === optionKey)) !== null && _instruction$options$ !== void 0 ? _instruction$options$ : {},
               value = _ref2.value;
 
         Object.assign(config, value);
@@ -132,50 +140,53 @@ function AddButton({
           type,
           upstreamId: (_upstream$id = upstream === null || upstream === void 0 ? void 0 : upstream.id) !== null && _upstream$id !== void 0 ? _upstream$id : null,
           branchIndex,
+          title: compile(instruction.title),
           config
         }
       }),
             node = _yield$resource$creat.data.data;
 
-      onNodeAdded(node);
+      refresh();
     });
     return _onCreate.apply(this, arguments);
   }
 
+  const instructionList = Array.from(_nodes.instructions.getValues());
   const groups = [{
-    value: 'control',
-    name: `{{t("Control", { ns: "${_locale.NAMESPACE}" })}}`
+    key: 'control',
+    label: `{{t("Control", { ns: "${_locale.NAMESPACE}" })}}`
   }, {
-    value: 'collection',
-    name: `{{t("Collection operations", { ns: "${_locale.NAMESPACE}" })}}`
+    key: 'collection',
+    label: `{{t("Collection operations", { ns: "${_locale.NAMESPACE}" })}}`
   }, {
-    value: 'manual',
-    name: `{{t("Manual", { ns: "${_locale.NAMESPACE}" })}}`
+    key: 'manual',
+    label: `{{t("Manual", { ns: "${_locale.NAMESPACE}" })}}`
   }, {
-    value: 'extended',
-    name: `{{t("Extended types", { ns: "${_locale.NAMESPACE}" })}}`
-  }];
-  const instructionList = Array.from(_nodes.instructions.getValues());
+    key: 'extended',
+    label: `{{t("Extended types", { ns: "${_locale.NAMESPACE}" })}}`
+  }].filter(group => instructionList.filter(item => item.group === group.key).length).map(group => {
+    const groupInstructions = instructionList.filter(item => item.group === group.key);
+    return _objectSpread(_objectSpread({}, group), {}, {
+      type: 'group',
+      children: groupInstructions.map(item => ({
+        key: item.type,
+        label: item.title,
+        type: item.options ? 'subMenu' : null,
+        children: item.options ? item.options.map(option => ({
+          key: option.key,
+          label: option.label
+        })) : null
+      }))
+    });
+  });
   return _react().default.createElement("div", {
     className: (0, _css().cx)(_style.addButtonClass)
   }, _react().default.createElement(_antd().Dropdown, {
     trigger: ['click'],
     overlay: _react().default.createElement(_antd().Menu, {
-      onClick: ev => onCreate(ev)
-    }, groups.map(group => {
-      const groupInstructions = instructionList.filter(item => item.group === group.value);
-      return groupInstructions.length ? _react().default.createElement(_antd().Menu.ItemGroup, {
-        key: group.value,
-        title: compile(group.name)
-      }, groupInstructions.map(item => item.options ? _react().default.createElement(_antd().Menu.SubMenu, {
-        key: item.type,
-        title: compile(item.title)
-      }, item.options.map(option => _react().default.createElement(_antd().Menu.Item, {
-        key: option.key
-      }, compile(option.label)))) : _react().default.createElement(_antd().Menu.Item, {
-        key: item.type
-      }, compile(item.title)))) : null;
-    })),
+      onClick: ev => onCreate(ev),
+      items: compile(groups)
+    }),
     disabled: workflow.executed
   }, _react().default.createElement(_antd().Button, {
     shape: "circle",

package/lib/client/WorkflowCanvas.js

@@ -281,8 +281,7 @@ function WorkflowCanvas() {
     value: {
       workflow,
       nodes,
-      onNodeAdded: refresh,
-      onNodeRemoved: refresh
+      refresh
     }
   }, _react().default.createElement("div", {
     className: "workflow-toolbar"

package/lib/client/components/CollectionFieldset.js

@@ -96,8 +96,6 @@ 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; }
 
 function AssociationInput(props) {
-  var _data$config;
-
   const _useCollectionManager = (0, _client().useCollectionManager)(),
         getCollectionFields = _useCollectionManager.getCollectionFields;
 
@@ -107,9 +105,9 @@ function AssociationInput(props) {
   const fieldName = path.segments[path.segments.length - 1];
 
   const _useForm = (0, _react2().useForm)(),
-        data = _useForm.values;
+        config = _useForm.values;
 
-  const fields = getCollectionFields(data === null || data === void 0 ? void 0 : (_data$config = data.config) === null || _data$config === void 0 ? void 0 : _data$config.collection);
+  const fields = getCollectionFields(config === null || config === void 0 ? void 0 : config.collection);
 
   const _fields$find = fields.find(item => item.name === fieldName),
         type = _fields$find.type;
@@ -133,8 +131,6 @@ var _default = (0, _react2().observer)(({
   disabled,
   onChange: _onChange
 }) => {
-  var _data$config2;
-
   const _useTranslation = (0, _reactI18next().useTranslation)(),
         t = _useTranslation.t;
 
@@ -146,9 +142,9 @@ var _default = (0, _react2().observer)(({
         getCollectionFields = _useCollectionManager2.getCollectionFields;
 
   const _useForm2 = (0, _react2().useForm)(),
-        data = _useForm2.values;
+        config = _useForm2.values;
 
-  const collectionName = data === null || data === void 0 ? void 0 : (_data$config2 = data.config) === null || _data$config2 === void 0 ? void 0 : _data$config2.collection;
+  const collectionName = config === null || config === void 0 ? void 0 : config.collection;
   const fields = getCollectionFields(collectionName).filter(field => !field.hidden && (field.uiSchema ? !field.uiSchema['x-read-pretty'] : false) // TODO: should use some field option but not type to control this
   && !['formula'].includes(field.type));
   const unassignedFields = fields.filter(field => !(field.name in value));

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

@@ -6,10 +6,9 @@ declare const _default: {
     type: string;
     group: string;
     fieldset: {
-        'config.engine': {
+        engine: {
             type: string;
             title: string;
-            name: string;
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
@@ -18,10 +17,9 @@ declare const _default: {
             required: boolean;
             default: string;
         };
-        'config.expression': {
+        expression: {
             type: string;
             title: string;
-            name: string;
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {

package/lib/client/nodes/calculation.js

@@ -46,7 +46,7 @@ function _client() {
 }
 
 function _client2() {
-  const data = _interopRequireWildcard(require("@nocobase/evaluators/client"));
+  const data = require("@nocobase/evaluators/client");
 
   _client2 = function _client2() {
     return data;
@@ -65,10 +65,6 @@ var _RadioWithTooltip = require("../components/RadioWithTooltip");
 
 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; }
@@ -86,24 +82,22 @@ var _default = {
   type: 'calculation',
   group: 'control',
   fieldset: {
-    'config.engine': {
+    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({
+        options: Array.from(_client2().evaluators.getEntities()).reduce((result, [value, options]) => result.concat(_objectSpread({
           value
         }, options)), [])
       },
       required: true,
       default: 'math.js'
     },
-    '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': {
@@ -115,7 +109,7 @@ var _default = {
       }) {
         const values = form.values;
 
-        const _evaluators$get = _client2().default.get(values.config.engine),
+        const _evaluators$get = _client2().evaluators.get(values.engine),
               evaluate = _evaluators$get.evaluate;
 
         const exp = value.trim().replace(/{{([^{}]+)}}/g, '1');
@@ -129,7 +123,7 @@ var _default = {
       },
 
       'x-reactions': {
-        dependencies: ['config.engine'],
+        dependencies: ['engine'],
         fulfill: {
           schema: {
             description: '{{renderReference($deps[0])}}'

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': {

package/lib/client/nodes/condition.js

@@ -77,7 +77,7 @@ function _client2() {
 }
 
 function _client3() {
-  const data = _interopRequireWildcard(require("@nocobase/evaluators/client"));
+  const data = require("@nocobase/evaluators/client");
 
   _client3 = function _client3() {
     return data;
@@ -100,10 +100,6 @@ var _variable = require("../variable");
 
 var _RadioWithTooltip = require("../components/RadioWithTooltip");
 
-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 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; }
@@ -431,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',
@@ -448,30 +443,28 @@ var _default = {
         label: `{{t('Branch into "Yes" and "No"', { ns: "${_locale.NAMESPACE}" })}}`
       }]
     },
-    'config.engine': {
+    engine: {
       type: 'string',
       title: `{{t("Calculation engine", { ns: "${_locale.NAMESPACE}" })}}`,
-      name: 'config.engine',
       'x-decorator': 'FormItem',
       'x-component': 'RadioWithTooltip',
       'x-component-props': {
         options: [['basic', {
           label: `{{t("Basic", { ns: "${_locale.NAMESPACE}" })}}`
-        }], ...Array.from(_client3().default.getEntities())].reduce((result, [value, options]) => result.concat(_objectSpread({
+        }], ...Array.from(_client3().evaluators.getEntities())].reduce((result, [value, options]) => result.concat(_objectSpread({
           value
         }, options)), [])
       },
       required: true,
       default: 'basic'
     },
-    'config.calculation': {
+    calculation: {
       type: 'string',
-      name: 'config.calculation',
       title: `{{t("Condition", { ns: "${_locale.NAMESPACE}" })}}`,
       'x-decorator': 'FormItem',
       'x-component': 'CalculationConfig',
       'x-reactions': {
-        dependencies: ['config.engine'],
+        dependencies: ['engine'],
         fulfill: {
           state: {
             visible: '{{$deps[0] === "basic"}}'
@@ -480,10 +473,9 @@ var _default = {
       },
       required: true
     },
-    'config.expression': {
+    expression: {
       type: 'string',
       title: `{{t("Condition expression", { ns: "${_locale.NAMESPACE}" })}}`,
-      name: 'config.expression',
       'x-decorator': 'FormItem',
       'x-component': 'Variable.TextArea',
       'x-component-props': {
@@ -495,7 +487,7 @@ var _default = {
       }) {
         const values = form.values;
 
-        const _evaluators$get = _client3().default.get(values.config.engine),
+        const _evaluators$get = _client3().evaluators.get(values.engine),
               evaluate = _evaluators$get.evaluate;
 
         const exp = value.trim().replace(/{{([^{}]+)}}/g, '1');
@@ -509,7 +501,7 @@ var _default = {
       },
 
       'x-reactions': {
-        dependencies: ['config.engine'],
+        dependencies: ['engine'],
         fulfill: {
           state: {
             visible: '{{$deps[0] !== "basic"}}'

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

@@ -5,8 +5,7 @@ declare const _default: {
     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;

package/lib/client/nodes/create.js

@@ -29,20 +29,12 @@ var _variable = require("../variable");
 
 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; }
-
 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: '多条数据',
@@ -53,7 +45,7 @@ var _default = {
     //     disabled: true
     //   }
     // },
-    'config.params.values': _collection.values
+    'params.values': _collection.values
   },
   view: {},
   scope: {

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

@@ -4,18 +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;

package/lib/client/nodes/delay.js

@@ -18,18 +18,16 @@ var _default = {
   type: 'delay',
   group: 'control',
   fieldset: {
-    'config.duration': {
+    duration: {
       type: 'number',
-      name: 'config.duration',
       title: `{{t("Duration", { ns: "${_locale.NAMESPACE}" })}}`,
       'x-decorator': 'FormItem',
       'x-component': 'Duration',
       default: 60000,
       required: true
     },
-    'config.endStatus': {
+    endStatus: {
       type: 'number',
-      name: 'config.endStatus',
       title: `{{t("End Status", { ns: "${_locale.NAMESPACE}" })}}`,
       'x-decorator': 'FormItem',
       'x-component': 'Select',

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

@@ -5,10 +5,9 @@ declare const _default: {
     type: string;
     group: string;
     fieldset: {
-        'config.collection': {
+        collection: {
             type: string;
             title: string;
-            name: string;
             required: boolean;
             'x-reactions': string[];
             'x-decorator': string;
@@ -17,16 +16,14 @@ declare const _default: {
                 placeholder: string;
             };
         };
-        'config.params': {
+        params: {
             type: string;
-            name: string;
             title: string;
             'x-decorator': string;
             properties: {
                 filter: {
                     type: string;
                     title: string;
-                    name: string;
                     'x-decorator': string;
                     'x-decorator-props': {
                         labelAlign: string;

package/lib/client/nodes/destroy.js

@@ -24,10 +24,9 @@ var _default = {
   type: 'destroy',
   group: 'collection',
   fieldset: {
-    'config.collection': _collection.collection,
-    'config.params': {
+    collection: _collection.collection,
+    params: {
       type: 'object',
-      name: 'config.params',
       title: '',
       'x-decorator': 'FormItem',
       properties: {