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

package/lib/client/nodes/index.js

@@ -11,155 +11,100 @@ exports.RemoveButton = RemoveButton;
 exports.instructions = void 0;
 exports.useAvailableUpstreams = useAvailableUpstreams;
 exports.useNodeContext = useNodeContext;
-
 function _react() {
   const data = _interopRequireWildcard(require("react"));
-
   _react = function _react() {
     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 _react2() {
   const data = require("@formily/react");
-
   _react2 = function _react2() {
     return data;
   };
-
   return data;
 }
-
 function _antd() {
   const data = require("antd");
-
   _antd = function _antd() {
     return data;
   };
-
   return data;
 }
-
 function _reactI18next() {
   const data = require("react-i18next");
-
   _reactI18next = function _reactI18next() {
     return data;
   };
-
   return data;
 }
-
 function _jsonTemplates() {
   const data = _interopRequireDefault(require("json-templates"));
-
   _jsonTemplates = function _jsonTemplates() {
     return data;
   };
-
   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;
 }
-
 var _style = require("../style");
-
 var _AddButton = require("../AddButton");
-
 var _FlowContext = require("../FlowContext");
-
 var _calculation = _interopRequireDefault(require("./calculation"));
-
 var _condition = _interopRequireDefault(require("./condition"));
-
 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"));
-
 var _update = _interopRequireDefault(require("./update"));
-
 var _destroy = _interopRequireDefault(require("./destroy"));
-
 var _constants = require("../constants");
-
 var _locale = require("../locale");
-
 var _request = _interopRequireDefault(require("./request"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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 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 _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 _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) 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); }); }; }
-
 ;
 const instructions = new (_client().Registry)();
 exports.instructions = instructions;
@@ -173,31 +118,23 @@ instructions.register('create', _create.default);
 instructions.register('update', _update.default);
 instructions.register('destroy', _destroy.default);
 instructions.register('request', _request.default);
-
 function useUpdateAction() {
   const form = (0, _react2().useForm)();
   const api = (0, _client2().useAPIClient)();
   const ctx = (0, _client2().useActionContext)();
-
   const _useResourceActionCon = (0, _client2().useResourceActionContext)(),
-        refresh = _useResourceActionCon.refresh;
-
+    refresh = _useResourceActionCon.refresh;
   const data = useNodeContext();
-
   const _useFlowContext = (0, _FlowContext.useFlowContext)(),
-        workflow = _useFlowContext.workflow;
-
+    workflow = _useFlowContext.workflow;
   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;
         }
-
         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,
@@ -209,30 +146,24 @@ function useUpdateAction() {
         refresh();
       })();
     }
-
   };
 }
-
 ;
-
 const NodeContext = _react().default.createContext({});
-
 exports.NodeContext = NodeContext;
-
 function useNodeContext() {
   return (0, _react().useContext)(NodeContext);
 }
-
 function useAvailableUpstreams(node) {
   const stack = [];
-
+  if (!node) {
+    return [];
+  }
   for (let current = node.upstream; current; current = current.upstream) {
     stack.push(current);
   }
-
   return stack;
 }
-
 function Node({
   data
 }) {
@@ -264,42 +195,31 @@ function Node({
               `
   }, _react().default.createElement(_icons().CloseOutlined, null))));
 }
-
 function RemoveButton() {
   var _useFlowContext2;
-
   const _useTranslation = (0, _reactI18next().useTranslation)(),
-        t = _useTranslation.t;
-
+    t = _useTranslation.t;
   const api = (0, _client2().useAPIClient)();
-
   const _ref = (_useFlowContext2 = (0, _FlowContext.useFlowContext)()) !== null && _useFlowContext2 !== void 0 ? _useFlowContext2 : {},
-        workflow = _ref.workflow,
-        nodes = _ref.nodes,
-        refresh = _ref.refresh;
-
+    workflow = _ref.workflow,
+    nodes = _ref.nodes,
+    refresh = _ref.refresh;
   const current = useNodeContext();
-
   if (!workflow) {
     return null;
   }
-
   const resource = api.resource('workflows.nodes', workflow.id);
-
   function onRemove() {
     return _onRemove.apply(this, arguments);
   }
-
   function _onRemove() {
     _onRemove = _asyncToGenerator(function* () {
       function onOk() {
         return _onOk.apply(this, arguments);
       }
-
       function _onOk() {
         _onOk = _asyncToGenerator(function* () {
           var _resource$destroy;
-
           yield (_resource$destroy = resource.destroy) === null || _resource$destroy === void 0 ? void 0 : _resource$destroy.call(resource, {
             filterByTk: current.id
           });
@@ -307,19 +227,16 @@ function RemoveButton() {
         });
         return _onOk.apply(this, arguments);
       }
-
       const usingNodes = nodes.filter(node => {
         if (node === current) {
           return false;
         }
-
         const template = (0, _jsonTemplates().default)(node.config);
         const refs = template.parameters.filter(({
           key
         }) => key.startsWith(`$jobsMapByNodeId.${current.id}.`) || key === `$jobsMapByNodeId.${current.id}`);
         return refs.length;
       });
-
       if (usingNodes.length) {
         _antd().Modal.error({
           title: (0, _locale.lang)('Can not delete'),
@@ -327,13 +244,10 @@ function RemoveButton() {
             nodes: usingNodes.map(item => `#${item.id}`).join(', ')
           })
         });
-
         return;
       }
-
       const hasBranches = !nodes.find(item => item.upstream === current && item.branchIndex != null);
       const message = hasBranches ? t('Are you sure you want to delete it?') : (0, _locale.lang)('This node contains branches, deleting will also be preformed to them, are you sure?');
-
       _antd().Modal.confirm({
         title: t('Delete'),
         content: message,
@@ -342,7 +256,6 @@ function RemoveButton() {
     });
     return _onRemove.apply(this, arguments);
   }
-
   return workflow.executed ? null : _react().default.createElement(_antd().Button, {
     type: "text",
     shape: "circle",
@@ -351,25 +264,19 @@ function RemoveButton() {
     className: "workflow-node-remove-button"
   });
 }
-
 function JobButton() {
   var _useNodeContext;
-
   const compile = (0, _client2().useCompile)();
-
   const _useFlowContext3 = (0, _FlowContext.useFlowContext)(),
-        execution = _useFlowContext3.execution;
-
+    execution = _useFlowContext3.execution;
   const _ref2 = (_useNodeContext = useNodeContext()) !== null && _useNodeContext !== void 0 ? _useNodeContext : {},
-        id = _ref2.id,
-        type = _ref2.type,
-        title = _ref2.title,
-        job = _ref2.job;
-
+    id = _ref2.id,
+    type = _ref2.type,
+    title = _ref2.title,
+    job = _ref2.job;
   if (!execution) {
     return null;
   }
-
   if (!job) {
     return _react().default.createElement("span", {
       className: (0, _css().cx)('workflow-node-job-button', (0, _css().css)`
@@ -379,12 +286,11 @@ function JobButton() {
         `)
     });
   }
-
   const instruction = instructions.get(type);
   const _JobStatusOptionsMap$ = _constants.JobStatusOptionsMap[job.status],
-        value = _JobStatusOptionsMap$.value,
-        icon = _JobStatusOptionsMap$.icon,
-        color = _JobStatusOptionsMap$.color;
+    value = _JobStatusOptionsMap$.value,
+    icon = _JobStatusOptionsMap$.icon,
+    color = _JobStatusOptionsMap$.color;
   return _react().default.createElement(_client2().SchemaComponent, {
     schema: {
       type: 'void',
@@ -460,48 +366,37 @@ function JobButton() {
     }
   });
 }
-
 function NodeDefaultView(props) {
   var _useFlowContext4, _data$title;
-
   const data = props.data,
-        children = props.children;
+    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,
-        refresh = _ref3.refresh;
-
+    workflow = _ref3.workflow,
+    refresh = _ref3.refresh;
   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];
-
+    _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) {
+    _useState4 = _slicedToArray(_useState3, 2),
+    editingConfig = _useState4[0],
+    setEditingConfig = _useState4[1];
+  function onChangeTitle(_x2) {
     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: {
@@ -512,15 +407,12 @@ function NodeDefaultView(props) {
     });
     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);
@@ -529,7 +421,6 @@ function NodeDefaultView(props) {
       }
     }
   }
-
   return _react().default.createElement("div", {
     className: (0, _css().cx)(_style.nodeClass, `workflow-node-type-${data.type}`)
   }, _react().default.createElement("div", {
@@ -576,18 +467,15 @@ function NodeDefaultView(props) {
           'x-decorator': 'Form',
           'x-decorator-props': {
             disabled: workflow.executed,
-
             useValues(options) {
               const _useNodeContext2 = useNodeContext(),
-                    config = _useNodeContext2.config;
-
+                config = _useNodeContext2.config;
               return (0, _client2().useRequest)(() => {
                 return Promise.resolve({
                   data: config
                 });
               }, options);
             }
-
           },
           properties: _objectSpread(_objectSpread({}, workflow.executed ? {
             alert: {
@@ -610,14 +498,24 @@ function NodeDefaultView(props) {
               '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;
+                            &:not(.full-width){
+                              width: auto;
+                              min-width: 6em;
+                            }
+                          }
+
+                          .ant-input-affix-wrapper{
+                            &:not(.full-width){
+                              .ant-input{
+                                width: auto;
+                                min-width: 6em;
+                              }
+                            }
                           }
                         `
               },

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

@@ -4,46 +4,35 @@ 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);
+  const scope = (0, _variable.useWorkflowVariableOptions)([{
+    type: 'reference',
+    options: {
+      collection: 'users'
+    }
+  }]);
   return _react().default.createElement(_client().Variable.Input, {
     scope: scope,
-    types: [{
-      type: 'reference',
-      options: {
-        collection: 'users'
-      }
-    }],
     value: value[0],
     onChange: next => {
       _onChange([next]);

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

@@ -4,91 +4,65 @@ 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
@@ -110,7 +84,6 @@ function ModeConfig({
       }
     }) => {
       console.log(v);
-
       _onChange(Number(v));
     }
   }, _react().default.createElement(_antd2().Radio, {