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

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

@@ -1,6 +1,8 @@
 import React from 'react';
 import { ISchema } from '@formily/react';
 import { Registry } from '@nocobase/utils/client';
+import { SchemaInitializerItemOptions } from '@nocobase/client';
+import { VariableOption } from '../variable';
 export interface Instruction {
     title: string;
     type: string;
@@ -20,12 +22,18 @@ export interface Instruction {
     components?: {
         [key: string]: any;
     };
-    render?(props: any): React.ReactElement;
+    render?(props: any): React.ReactNode;
     endding?: boolean;
-    getter?(node: any): React.ReactElement;
+    getOptions?(config: any, types?: any): VariableOption[] | null;
+    useInitializers?(node: any): SchemaInitializerItemOptions | null;
+    initializers?: {
+        [key: string]: any;
+    };
 }
 export declare const instructions: Registry<Instruction>;
+export declare const NodeContext: React.Context<any>;
 export declare function useNodeContext(): any;
+export declare function useAvailableUpstreams(node: any): any[];
 export declare function Node({ data }: {
     data: any;
 }): JSX.Element;

package/lib/client/nodes/index.js

@@ -5,9 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.JobButton = JobButton;
 exports.Node = Node;
+exports.NodeContext = void 0;
 exports.NodeDefaultView = NodeDefaultView;
 exports.RemoveButton = RemoveButton;
 exports.instructions = void 0;
+exports.useAvailableUpstreams = useAvailableUpstreams;
 exports.useNodeContext = useNodeContext;
 
 function _react() {
@@ -114,6 +116,8 @@ var _parallel = _interopRequireDefault(require("./parallel"));
 
 var _delay = _interopRequireDefault(require("./delay"));
 
+var _manual = _interopRequireDefault(require("./manual"));
+
 var _query = _interopRequireDefault(require("./query"));
 
 var _create = _interopRequireDefault(require("./create"));
@@ -134,6 +138,12 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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 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); }); }; }
@@ -145,6 +155,7 @@ instructions.register('condition', _condition.default);
 instructions.register('parallel', _parallel.default);
 instructions.register('calculation', _calculation.default);
 instructions.register('delay', _delay.default);
+instructions.register('manual', _manual.default);
 instructions.register('query', _query.default);
 instructions.register('create', _create.default);
 instructions.register('update', _update.default);
@@ -167,15 +178,22 @@ function useUpdateAction() {
   return {
     run() {
       return _asyncToGenerator(function* () {
+        var _api$resource$update, _api$resource;
+
         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?
-        // await form.submit();
 
 
-        yield api.resource('flow_nodes', data.id).update({
+        try {
+          yield form.submit();
+        } catch (err) {
+          return;
+        }
+
+        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,
@@ -192,12 +210,24 @@ function useUpdateAction() {
 
 ;
 
-const NodeContext = _react().default.createContext(null);
+const NodeContext = _react().default.createContext({});
+
+exports.NodeContext = NodeContext;
 
 function useNodeContext() {
   return (0, _react().useContext)(NodeContext);
 }
 
+function useAvailableUpstreams(node) {
+  const stack = [];
+
+  for (let current = node.upstream; current; current = current.upstream) {
+    stack.push(current);
+  }
+
+  return stack;
+}
+
 function Node({
   data
 }) {
@@ -263,7 +293,9 @@ function RemoveButton() {
 
       function _onOk() {
         _onOk = _asyncToGenerator(function* () {
-          const _yield$resource$destr = yield resource.destroy({
+          var _resource$destroy;
+
+          const _yield$resource$destr = 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;
@@ -353,21 +385,26 @@ function JobButton() {
     schema: {
       type: 'void',
       properties: {
-        job: {
+        [`${job.id}-button`]: {
           type: 'void',
           'x-component': 'Action',
           'x-component-props': {
-            title: icon,
+            title: _react().default.createElement(_antd().Tag, {
+              color: color
+            }, icon),
             shape: 'circle',
             className: ['workflow-node-job-button', (0, _css().css)`
-                background-color: ${color};
-                &:hover,&:focus{
-                  background-color: ${color}
+                .ant-tag{
+                  padding: 0;
+                  width: 100%;
+                  line-height: 18px;
+                  margin-right: 0;
+                  border-radius: 50%;
                 }
               `]
           },
           properties: {
-            [job.id]: {
+            [`${job.id}-modal`]: {
               type: 'void',
               'x-decorator': 'Form',
               'x-decorator-props': {
@@ -453,8 +490,9 @@ function NodeDefaultView(props) {
     components: instruction.components,
     schema: {
       type: 'void',
-      properties: {
-        view: instruction.view,
+      properties: _objectSpread(_objectSpread({}, instruction.view ? {
+        view: instruction.view
+      } : {}), {}, {
         config: {
           type: 'void',
           title: detailText,
@@ -463,12 +501,14 @@ function NodeDefaultView(props) {
             type: 'primary'
           },
           properties: {
-            [instruction.type]: {
+            [`${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 d = useNodeContext();
                   return (0, _client2().useRequest)(() => {
@@ -479,7 +519,21 @@ function NodeDefaultView(props) {
                 }
 
               },
-              properties: {
+              properties: _objectSpread(_objectSpread({}, workflow.executed ? {
+                alert: {
+                  '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;
+                            `
+                  }
+                }
+              } : {}), {}, {
                 title: {
                   type: 'string',
                   name: 'title',
@@ -492,8 +546,8 @@ function NodeDefaultView(props) {
                   name: 'config',
                   'x-component': 'fieldset',
                   'x-component-props': {
-                    disabled: workflow.executed,
                     className: (0, _css().css)`
+                            .ant-input,
                             .ant-select,
                             .ant-cascader-picker,
                             .ant-picker,
@@ -506,18 +560,10 @@ function NodeDefaultView(props) {
                   },
                   properties: instruction.fieldset
                 },
-                actions: {
+                actions: workflow.executed ? null : {
                   type: 'void',
                   'x-component': 'Action.Drawer.Footer',
-                  properties: workflow.executed ? {
-                    close: {
-                      title: '{{t("Close")}}',
-                      'x-component': 'Action',
-                      'x-component-props': {
-                        useAction: '{{ cm.useCancelAction }}'
-                      }
-                    }
-                  } : {
+                  properties: {
                     cancel: {
                       title: '{{t("Cancel")}}',
                       'x-component': 'Action',
@@ -535,11 +581,11 @@ function NodeDefaultView(props) {
                     }
                   }
                 }
-              }
+              })
             }
           }
         }
-      }
+      })
     }
   })), children);
 }

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

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+export declare function AssigneesSelect({ multiple, value, onChange }: {
+    multiple?: boolean;
+    value?: any[];
+    onChange: any;
+}): JSX.Element;

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

@@ -0,0 +1,64 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.AssigneesSelect = AssigneesSelect;
+
+function _client() {
+  const data = require("@nocobase/client");
+
+  _client = function _client() {
+    return data;
+  };
+
+  return data;
+}
+
+function _react() {
+  const data = _interopRequireDefault(require("react"));
+
+  _react = function _react() {
+    return data;
+  };
+
+  return data;
+}
+
+var _variable = require("../../variable");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function AssigneesSelect({
+  multiple = false,
+  value = [],
+  onChange: _onChange
+}) {
+  const scope = (0, _variable.useWorkflowVariableOptions)();
+  console.log(value);
+  return _react().default.createElement(_client().Variable.Input, {
+    scope: scope,
+    types: [{
+      type: 'reference',
+      options: {
+        collection: 'users'
+      }
+    }],
+    value: value[0],
+    onChange: next => {
+      _onChange([next]);
+    }
+  }, _react().default.createElement(_client().RemoteSelect, {
+    fieldNames: {
+      label: 'nickname',
+      value: 'id'
+    },
+    service: {
+      resource: 'users'
+    },
+    value: value[0],
+    onChange: v => {
+      _onChange([v]);
+    }
+  }));
+}

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

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+export declare function ModeConfig({ value, onChange }: {
+    value: any;
+    onChange: any;
+}): JSX.Element;

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

@@ -0,0 +1,160 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ModeConfig = ModeConfig;
+
+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 _antd2() {
+  const data = require("antd");
+
+  _antd2 = function _antd2() {
+    return data;
+  };
+
+  return data;
+}
+
+function _icons() {
+  const data = require("@ant-design/icons");
+
+  _icons = function _icons() {
+    return data;
+  };
+
+  return data;
+}
+
+function _css() {
+  const data = require("@emotion/css");
+
+  _css = function _css() {
+    return data;
+  };
+
+  return data;
+}
+
+function _client() {
+  const data = require("@nocobase/client");
+
+  _client = function _client() {
+    return data;
+  };
+
+  return data;
+}
+
+var _locale = require("../../locale");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function parseMode(v) {
+  if (!v) {
+    return 'single';
+  }
+
+  if (v >= 1) {
+    return 'all';
+  }
+
+  if (v <= -1) {
+    return 'any';
+  }
+
+  const dir = Math.sign(v);
+
+  if (dir > 0) {
+    return '';
+  }
+}
+
+function ModeConfig({
+  value,
+  onChange: _onChange
+}) {
+  const mode = parseMode(value);
+  return _react().default.createElement("fieldset", {
+    className: (0, _css().css)`
+      .ant-radio-group{
+        .anticon{
+          margin-left: .5em;
+        }
+      }
+    `
+  }, _react().default.createElement(_antd2().Form.Item, null, _react().default.createElement(_antd2().Radio.Group, {
+    value: Boolean(value),
+    onChange: ({
+      target: {
+        value: v
+      }
+    }) => {
+      console.log(v);
+
+      _onChange(Number(v));
+    }
+  }, _react().default.createElement(_antd2().Radio, {
+    value: true
+  }, _react().default.createElement(_antd2().Tooltip, {
+    title: (0, _locale.lang)('Each user has own task'),
+    placement: "bottom"
+  }, _react().default.createElement("span", null, (0, _locale.lang)('Separately')), _react().default.createElement(_icons().QuestionCircleOutlined, {
+    style: {
+      color: '#999'
+    }
+  }))), _react().default.createElement(_antd2().Radio, {
+    value: false
+  }, _react().default.createElement(_antd2().Tooltip, {
+    title: (0, _locale.lang)('Everyone shares one task'),
+    placement: "bottom"
+  }, _react().default.createElement("span", null, (0, _locale.lang)('Collaboratively')), _react().default.createElement(_icons().QuestionCircleOutlined, {
+    style: {
+      color: '#999'
+    }
+  }))))), value ? _react().default.createElement("fieldset", null, _react().default.createElement(_antd().FormLayout, {
+    layout: "vertical"
+  }, _react().default.createElement(_client().FormItem, {
+    label: (0, _locale.lang)('Negotiation')
+  }, _react().default.createElement(_antd2().Radio.Group, {
+    value: value,
+    onChange: _onChange
+  }, _react().default.createElement(_antd2().Radio, {
+    value: 1
+  }, _react().default.createElement(_antd2().Tooltip, {
+    title: (0, _locale.lang)('Everyone should pass'),
+    placement: "bottom"
+  }, _react().default.createElement("span", null, (0, _locale.lang)('All pass')), _react().default.createElement(_icons().QuestionCircleOutlined, {
+    style: {
+      color: '#999'
+    }
+  }))), _react().default.createElement(_antd2().Radio, {
+    value: -1
+  }, _react().default.createElement(_antd2().Tooltip, {
+    title: (0, _locale.lang)('Anyone pass'),
+    placement: "bottom"
+  }, _react().default.createElement("span", null, (0, _locale.lang)('Any pass')), _react().default.createElement(_icons().QuestionCircleOutlined, {
+    style: {
+      color: '#999'
+    }
+  }))))))) : null);
+}

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

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+export declare function SchemaConfig({ value, onChange }: {
+    value: any;
+    onChange: any;
+}): JSX.Element;
+export declare function SchemaConfigButton(props: any): JSX.Element;