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

package/lib/client/nodes/index.js

@@ -144,6 +144,18 @@ 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
 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); }); }; }
@@ -183,21 +195,14 @@ function useUpdateAction() {
         if (workflow.executed) {
           _antd().message.error((0, _locale.lang)('Node in executed workflow cannot be modified'));
 
-          return;
-        } // TODO: how to do validation separately for each field? especially disabled for dynamic fields?
-
-
-        try {
-          yield form.submit();
-        } catch (err) {
           return;
         }
 
+        yield form.submit();
         yield (_api$resource$update = (_api$resource = api.resource('flow_nodes', data.id)).update) === null || _api$resource$update === void 0 ? void 0 : _api$resource$update.call(_api$resource, {
           filterByTk: data.id,
           values: {
-            title: form.values.title,
-            config: form.values.config
+            config: form.values
           }
         });
         ctx.setVisible(false);
@@ -271,7 +276,7 @@ function RemoveButton() {
   const _ref = (_useFlowContext2 = (0, _FlowContext.useFlowContext)()) !== null && _useFlowContext2 !== void 0 ? _useFlowContext2 : {},
         workflow = _ref.workflow,
         nodes = _ref.nodes,
-        onNodeRemoved = _ref.onNodeRemoved;
+        refresh = _ref.refresh;
 
   const current = useNodeContext();
 
@@ -295,12 +300,10 @@ function RemoveButton() {
         _onOk = _asyncToGenerator(function* () {
           var _resource$destroy;
 
-          const _yield$resource$destr = yield (_resource$destroy = resource.destroy) === null || _resource$destroy === void 0 ? void 0 : _resource$destroy.call(resource, {
+          yield (_resource$destroy = resource.destroy) === null || _resource$destroy === void 0 ? void 0 : _resource$destroy.call(resource, {
             filterByTk: current.id
-          }),
-                node = _yield$resource$destr.data.data;
-
-          onNodeRemoved(node);
+          });
+          refresh();
         });
         return _onOk.apply(this, arguments);
       }
@@ -372,6 +375,7 @@ function JobButton() {
       className: (0, _css().cx)('workflow-node-job-button', (0, _css().css)`
           border: 2px solid #d9d9d9;
           border-radius: 50%;
+          cursor: not-allowed;
         `)
     });
   }
@@ -458,34 +462,97 @@ function JobButton() {
 }
 
 function NodeDefaultView(props) {
-  var _useFlowContext4;
+  var _useFlowContext4, _data$title;
 
+  const data = props.data,
+        children = props.children;
   const compile = (0, _client2().useCompile)();
+  const api = (0, _client2().useAPIClient)();
 
   const _ref3 = (_useFlowContext4 = (0, _FlowContext.useFlowContext)()) !== null && _useFlowContext4 !== void 0 ? _useFlowContext4 : {},
-        workflow = _ref3.workflow;
+        workflow = _ref3.workflow,
+        refresh = _ref3.refresh;
 
-  if (!workflow) {
-    return null;
-  }
-
-  const data = props.data,
-        children = props.children;
   const instruction = instructions.get(data.type);
   const detailText = workflow.executed ? '{{t("View")}}' : '{{t("Configure")}}';
+  const typeTitle = compile(instruction.title);
+
+  const _useState = (0, _react().useState)((_data$title = data.title) !== null && _data$title !== void 0 ? _data$title : typeTitle),
+        _useState2 = _slicedToArray(_useState, 2),
+        editingTitle = _useState2[0],
+        setEditingTitle = _useState2[1];
+
+  const _useState3 = (0, _react().useState)(false),
+        _useState4 = _slicedToArray(_useState3, 2),
+        editingConfig = _useState4[0],
+        setEditingConfig = _useState4[1];
+
+  function onChangeTitle(_x) {
+    return _onChangeTitle.apply(this, arguments);
+  }
+
+  function _onChangeTitle() {
+    _onChangeTitle = _asyncToGenerator(function* (next) {
+      var _api$resource$update2, _api$resource2;
+
+      const title = next || typeTitle;
+      setEditingTitle(title);
+
+      if (title === data.title) {
+        return;
+      }
+
+      yield (_api$resource$update2 = (_api$resource2 = api.resource('flow_nodes')).update) === null || _api$resource$update2 === void 0 ? void 0 : _api$resource$update2.call(_api$resource2, {
+        filterByTk: data.id,
+        values: {
+          title
+        }
+      });
+      refresh();
+    });
+    return _onChangeTitle.apply(this, arguments);
+  }
+
+  function onOpenDrawer(ev) {
+    if (ev.target === ev.currentTarget) {
+      setEditingConfig(true);
+      return;
+    }
+
+    const whiteSet = new Set(['workflow-node-meta', 'workflow-node-config-button', 'ant-input-disabled']);
+
+    for (let el = ev.target; el && el !== ev.currentTarget; el = el.parentNode) {
+      if (Array.from(el.classList).some(name => whiteSet.has(name))) {
+        setEditingConfig(true);
+        ev.stopPropagation();
+        return;
+      }
+    }
+  }
+
   return _react().default.createElement("div", {
     className: (0, _css().cx)(_style.nodeClass, `workflow-node-type-${data.type}`)
   }, _react().default.createElement("div", {
-    className: (0, _css().cx)(_style.nodeCardClass)
+    className: (0, _css().cx)(_style.nodeCardClass, {
+      configuring: editingConfig
+    }),
+    onClick: onOpenDrawer
   }, _react().default.createElement("div", {
-    className: (0, _css().cx)(_style.nodeHeaderClass)
-  }, _react().default.createElement("div", {
-    className: (0, _css().cx)(_style.nodeMetaClass)
-  }, _react().default.createElement(_antd().Tag, null, compile(instruction.title))), _react().default.createElement("h4", {
-    className: (0, _css().cx)(_style.nodeTitleClass)
-  }, _react().default.createElement("strong", null, data.title), _react().default.createElement("span", {
+    className: (0, _css().cx)(_style.nodeMetaClass, 'workflow-node-meta')
+  }, _react().default.createElement(_antd().Tag, null, typeTitle), _react().default.createElement("span", {
     className: "workflow-node-id"
-  }, "#", data.id)), _react().default.createElement(RemoveButton, null), _react().default.createElement(JobButton, null)), _react().default.createElement(_client2().SchemaComponent, {
+  }, data.id)), _react().default.createElement("div", null, _react().default.createElement(_antd().Input.TextArea, {
+    disabled: workflow.executed,
+    value: editingTitle,
+    onChange: ev => setEditingTitle(ev.target.value),
+    onBlur: ev => onChangeTitle(ev.target.value),
+    autoSize: true
+  })), _react().default.createElement(RemoveButton, null), _react().default.createElement(JobButton, null), _react().default.createElement(_client2().ActionContext.Provider, {
+    value: {
+      visible: editingConfig,
+      setVisible: setEditingConfig
+    }
+  }, _react().default.createElement(_client2().SchemaComponent, {
     scope: instruction.scope,
     components: instruction.components,
     schema: {
@@ -493,99 +560,93 @@ function NodeDefaultView(props) {
       properties: _objectSpread(_objectSpread({}, instruction.view ? {
         view: instruction.view
       } : {}), {}, {
-        config: {
+        button: {
           type: 'void',
-          title: detailText,
-          'x-component': 'Action.Link',
+          'x-content': detailText,
+          'x-component': _antd().Button,
           'x-component-props': {
-            type: 'primary'
+            type: 'link',
+            className: 'workflow-node-config-button'
+          }
+        },
+        [`${instruction.type}_${data.id}`]: {
+          type: 'void',
+          title: instruction.title,
+          'x-component': 'Action.Drawer',
+          'x-decorator': 'Form',
+          'x-decorator-props': {
+            disabled: workflow.executed,
+
+            useValues(options) {
+              const _useNodeContext2 = useNodeContext(),
+                    config = _useNodeContext2.config;
+
+              return (0, _client2().useRequest)(() => {
+                return Promise.resolve({
+                  data: config
+                });
+              }, options);
+            }
+
           },
-          properties: {
-            [`${instruction.type}_${data.id}`]: {
+          properties: _objectSpread(_objectSpread({}, workflow.executed ? {
+            alert: {
               type: 'void',
-              title: instruction.title,
-              'x-component': 'Action.Drawer',
-              'x-decorator': 'Form',
-              'x-decorator-props': {
-                disabled: workflow.executed,
-
-                useValues(options) {
-                  const d = useNodeContext();
-                  return (0, _client2().useRequest)(() => {
-                    return Promise.resolve({
-                      data: d
-                    });
-                  }, options);
-                }
-
+              'x-component': _antd().Alert,
+              'x-component-props': {
+                type: 'warning',
+                showIcon: true,
+                message: `{{t("Node in executed workflow cannot be modified", { ns: "${_locale.NAMESPACE}" })}}`,
+                className: (0, _css().css)`
+                            width: 100%;
+                            font-size: 85%;
+                            margin-bottom: 2em;
+                          `
+              }
+            }
+          } : {}), {}, {
+            fieldset: {
+              type: 'void',
+              'x-component': 'fieldset',
+              'x-component-props': {
+                className: (0, _css().css)`
+                          .ant-input,
+                          .ant-select,
+                          .ant-cascader-picker,
+                          .ant-picker,
+                          .ant-input-number,
+                          .ant-input-affix-wrapper{
+                            width: auto;
+                            min-width: 6em;
+                          }
+                        `
               },
-              properties: _objectSpread(_objectSpread({}, workflow.executed ? {
-                alert: {
-                  'x-component': _antd().Alert,
+              properties: instruction.fieldset
+            },
+            actions: workflow.executed ? null : {
+              type: 'void',
+              'x-component': 'Action.Drawer.Footer',
+              properties: {
+                cancel: {
+                  title: '{{t("Cancel")}}',
+                  'x-component': 'Action',
                   'x-component-props': {
-                    type: 'warning',
-                    showIcon: true,
-                    message: `{{t("Node in executed workflow cannot be modified", { ns: "${_locale.NAMESPACE}" })}}`,
-                    className: (0, _css().css)`
-                              width: 100%;
-                              font-size: 85%;
-                              margin-bottom: 2em;
-                            `
+                    useAction: '{{ cm.useCancelAction }}'
                   }
-                }
-              } : {}), {}, {
-                title: {
-                  type: 'string',
-                  name: 'title',
-                  title: '{{t("Name")}}',
-                  'x-decorator': 'FormItem',
-                  'x-component': 'Input'
                 },
-                config: {
-                  type: 'void',
-                  name: 'config',
-                  'x-component': 'fieldset',
+                submit: {
+                  title: '{{t("Submit")}}',
+                  'x-component': 'Action',
                   'x-component-props': {
-                    className: (0, _css().css)`
-                            .ant-input,
-                            .ant-select,
-                            .ant-cascader-picker,
-                            .ant-picker,
-                            .ant-input-number,
-                            .ant-input-affix-wrapper{
-                              width: auto;
-                              min-width: 6em;
-                            }
-                          `
-                  },
-                  properties: instruction.fieldset
-                },
-                actions: workflow.executed ? null : {
-                  type: 'void',
-                  'x-component': 'Action.Drawer.Footer',
-                  properties: {
-                    cancel: {
-                      title: '{{t("Cancel")}}',
-                      'x-component': 'Action',
-                      'x-component-props': {
-                        useAction: '{{ cm.useCancelAction }}'
-                      }
-                    },
-                    submit: {
-                      title: '{{t("Submit")}}',
-                      'x-component': 'Action',
-                      'x-component-props': {
-                        type: 'primary',
-                        useAction: useUpdateAction
-                      }
-                    }
+                    type: 'primary',
+                    useAction: useUpdateAction
                   }
                 }
-              })
+              }
             }
-          }
+          })
         }
       })
     }
-  })), children);
+  }))), children);
 }

package/lib/client/nodes/manual/AssigneesSelect.js

@@ -56,9 +56,10 @@ function AssigneesSelect({
     service: {
       resource: 'users'
     },
+    manual: false,
     value: value[0],
     onChange: v => {
-      _onChange([v]);
+      _onChange(v != null ? [v] : []);
     }
   }));
 }

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

@@ -8,9 +8,8 @@ declare const _default: {
     type: string;
     group: string;
     fieldset: {
-        'config.assignees': {
+        assignees: {
             type: string;
-            name: string;
             title: string;
             'x-decorator': string;
             'x-component': string;
@@ -18,9 +17,8 @@ declare const _default: {
             required: boolean;
             default: any[];
         };
-        'config.mode': {
+        mode: {
             type: string;
-            name: string;
             title: string;
             'x-decorator': string;
             'x-component': string;
@@ -34,7 +32,7 @@ declare const _default: {
                 };
             };
         };
-        'config.schema': {
+        schema: {
             type: string;
             title: string;
             'x-decorator': string;

package/lib/client/nodes/manual/index.js

@@ -54,33 +54,24 @@ var _default = {
   type: 'manual',
   group: 'manual',
   fieldset: {
-    'config.assignees': {
+    assignees: {
       type: 'array',
-      name: 'config.assignees',
       title: `{{t("Assignees", { ns: "${_locale.NAMESPACE}" })}}`,
       'x-decorator': 'FormItem',
       'x-component': 'AssigneesSelect',
       'x-component-props': {// multiple: true,
-        // fieldNames: {
-        //   label: 'nickname',
-        //   value: 'id',
-        // },
-        // service: {
-        //   resource: 'users'
-        // },
       },
       required: true,
       default: []
     },
-    'config.mode': {
+    mode: {
       type: 'number',
-      name: 'config.mode',
       title: `{{t("Mode", { ns: "${_locale.NAMESPACE}" })}}`,
       'x-decorator': 'FormItem',
       'x-component': 'ModeConfig',
       default: 1,
       'x-reactions': {
-        dependencies: ['config.assignees'],
+        dependencies: ['assignees'],
         fulfill: {
           state: {
             visible: '{{$deps[0].length > 1}}'
@@ -88,7 +79,7 @@ var _default = {
         }
       }
     },
-    'config.schema': {
+    schema: {
       type: 'void',
       title: `{{t("User interface", { ns: "${_locale.NAMESPACE}" })}}`,
       'x-decorator': 'FormItem',

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

@@ -4,9 +4,8 @@ declare const _default: {
     type: string;
     group: string;
     fieldset: {
-        'config.mode': {
+        mode: {
             type: string;
-            name: string;
             title: string;
             'x-decorator': string;
             'x-component': string;

package/lib/client/nodes/parallel.js

@@ -78,9 +78,8 @@ var _default = {
   type: 'parallel',
   group: 'control',
   fieldset: {
-    'config.mode': {
+    mode: {
       type: 'string',
-      name: 'config.mode',
       title: `{{t("Mode", { ns: "${_locale.NAMESPACE}" })}}`,
       'x-decorator': 'FormItem',
       'x-component': 'RadioWithTooltip',
@@ -109,6 +108,7 @@ var _default = {
           mode = data.config.mode;
 
     const _useFlowContext = (0, _FlowContext.useFlowContext)(),
+          workflow = _useFlowContext.workflow,
           nodes = _useFlowContext.nodes;
 
     const branches = nodes.reduce((result, node) => {
@@ -154,7 +154,8 @@ var _default = {
       }, _react().default.createElement(_antd().Button, {
         shape: "circle",
         icon: _react().default.createElement(_icons().PlusOutlined, null),
-        onClick: () => setBranchCount(branchCount - 1)
+        onClick: () => setBranchCount(branchCount - 1),
+        disabled: workflow.executed
       })) : null
     }))), _react().default.createElement("div", {
       className: (0, _css().css)`
@@ -162,7 +163,10 @@ var _default = {
               height: 2em;
             `
     }, _react().default.createElement(_antd().Tooltip, {
-      title: (0, _locale.lang)('Add branch')
+      title: (0, _locale.lang)('Add branch'),
+      className: (0, _css().css)`
+              visibility: ${workflow.executed ? 'hidden' : 'visible'}
+            `
     }, _react().default.createElement(_antd().Button, {
       icon: _react().default.createElement(_icons().PlusOutlined, null),
       className: (0, _css().css)`
@@ -174,7 +178,8 @@ var _default = {
                     transform: rotate(-45deg);
                   }
                 `,
-      onClick: () => setBranchCount(branchCount + 1)
+      onClick: () => setBranchCount(branchCount + 1),
+      disabled: workflow.executed
     })))));
   },
 

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

@@ -6,10 +6,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;
@@ -18,16 +17,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/query.js

@@ -32,7 +32,7 @@ var _default = {
   type: 'query',
   group: 'collection',
   fieldset: {
-    'config.collection': _collection.collection,
+    collection: _collection.collection,
     // 'config.multiple': {
     //   type: 'boolean',
     //   title: `{{t("Multiple records", { ns: "${NAMESPACE}" })}}`,
@@ -43,9 +43,8 @@ var _default = {
     //     disabled: true
     //   }
     // },
-    'config.params': {
+    params: {
       type: 'object',
-      name: 'config.params',
       title: '',
       'x-decorator': 'FormItem',
       properties: {

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

@@ -4,9 +4,8 @@ declare const _default: {
     type: string;
     group: string;
     fieldset: {
-        'config.method': {
+        method: {
             type: string;
-            name: string;
             required: boolean;
             title: string;
             'x-decorator': string;
@@ -21,9 +20,8 @@ declare const _default: {
             }[];
             default: string;
         };
-        'config.url': {
+        url: {
             type: string;
-            name: string;
             required: boolean;
             title: string;
             'x-decorator': string;
@@ -35,9 +33,8 @@ declare const _default: {
                 placeholder: string;
             };
         };
-        'config.headers': {
+        headers: {
             type: string;
-            name: string;
             'x-component': string;
             'x-decorator': string;
             title: string;
@@ -82,9 +79,8 @@ declare const _default: {
                 };
             };
         };
-        'config.params': {
+        params: {
             type: string;
-            name: string;
             'x-component': string;
             'x-decorator': string;
             title: string;
@@ -128,9 +124,8 @@ declare const _default: {
                 };
             };
         };
-        'config.data': {
+        data: {
             type: string;
-            name: string;
             title: string;
             'x-decorator': string;
             'x-decorator-props': {};
@@ -145,9 +140,8 @@ declare const _default: {
             };
             description: string;
         };
-        'config.timeout': {
+        timeout: {
             type: string;
-            name: string;
             title: string;
             'x-decorator': string;
             'x-decorator-props': {};
@@ -159,9 +153,8 @@ declare const _default: {
                 defaultValue: number;
             };
         };
-        'config.ignoreFail': {
+        ignoreFail: {
             type: string;
-            name: string;
             title: string;
             'x-decorator': string;
             'x-component': string;