@nocobase/plugin-workflow 0.10.1-alpha.1 → 0.11.1-alpha.1

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

@@ -4,37 +4,30 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ModeConfig = ModeConfig;
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-  _react = function _react() {
+function _icons() {
+  const data = require("@ant-design/icons");
+  _icons = function _icons() {
     return data;
   };
   return data;
 }
-function _antd() {
-  const data = require("@formily/antd");
-  _antd = function _antd() {
+function _antdV() {
+  const data = require("@formily/antd-v5");
+  _antdV = function _antdV() {
     return data;
   };
   return data;
 }
-function _antd2() {
+function _antd() {
   const data = require("antd");
-  _antd2 = function _antd2() {
-    return data;
-  };
-  return data;
-}
-function _icons() {
-  const data = require("@ant-design/icons");
-  _icons = function _icons() {
+  _antd = function _antd() {
     return data;
   };
   return data;
 }
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
+function _react() {
+  const data = _interopRequireDefault(require("react"));
+  _react = function _react() {
     return data;
   };
   return data;
@@ -69,14 +62,14 @@ function ModeConfig({
 }) {
   const mode = parseMode(value);
   return _react().default.createElement("fieldset", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
         .ant-radio-group {
           .anticon {
             margin-left: 0.5em;
           }
         }
       `
-  }, _react().default.createElement(_antd2().Form.Item, null, _react().default.createElement(_antd2().Radio.Group, {
+  }, _react().default.createElement(_antd().Form.Item, null, _react().default.createElement(_antd().Radio.Group, {
     value: Boolean(value),
     onChange: ({
       target: {
@@ -86,43 +79,43 @@ function ModeConfig({
       console.log(v);
       _onChange(Number(v));
     }
-  }, _react().default.createElement(_antd2().Radio, {
+  }, _react().default.createElement(_antd().Radio, {
     value: true
-  }, _react().default.createElement(_antd2().Tooltip, {
+  }, _react().default.createElement(_antd().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, {
+  }))), _react().default.createElement(_antd().Radio, {
     value: false
-  }, _react().default.createElement(_antd2().Tooltip, {
+  }, _react().default.createElement(_antd().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, {
+  }))))), value ? _react().default.createElement("fieldset", null, _react().default.createElement(_antdV().FormLayout, {
     layout: "vertical"
   }, _react().default.createElement(_client().FormItem, {
     label: (0, _locale.lang)('Negotiation')
-  }, _react().default.createElement(_antd2().Radio.Group, {
+  }, _react().default.createElement(_antd().Radio.Group, {
     value: value,
     onChange: _onChange
-  }, _react().default.createElement(_antd2().Radio, {
+  }, _react().default.createElement(_antd().Radio, {
     value: 1
-  }, _react().default.createElement(_antd2().Tooltip, {
+  }, _react().default.createElement(_antd().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, {
+  }))), _react().default.createElement(_antd().Radio, {
     value: -1
-  }, _react().default.createElement(_antd2().Tooltip, {
+  }, _react().default.createElement(_antd().Tooltip, {
     title: (0, _locale.lang)('Anyone pass'),
     placement: "bottom"
   }, _react().default.createElement("span", null, (0, _locale.lang)('Any pass')), _react().default.createElement(_icons().QuestionCircleOutlined, {

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

@@ -1,10 +1,9 @@
 import React from 'react';
 import { ISchema } from '@formily/react';
 import { SchemaInitializerItemOptions } from '@nocobase/client';
-import { Registry } from '@nocobase/utils/client';
 import { JOB_STATUS } from '../../constants';
-declare type ValueOf<T> = T[keyof T];
-export declare type FormType = {
+type ValueOf<T> = T[keyof T];
+export type FormType = {
     type: 'create' | 'update' | 'custom';
     title: string;
     actions: ValueOf<typeof JOB_STATUS>[];
@@ -14,7 +13,7 @@ export declare type FormType = {
         [key: string]: any;
     };
 };
-export declare type ManualFormType = {
+export type ManualFormType = {
     title: string;
     config: {
         useInitializer: () => SchemaInitializerItemOptions;
@@ -37,7 +36,7 @@ export declare type ManualFormType = {
         };
     };
 };
-export declare const manualFormTypes: Registry<ManualFormType>;
+export declare const manualFormTypes: any;
 export declare function SchemaConfig({ value, onChange }: {
     value: any;
     onChange: any;

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

@@ -13,6 +13,13 @@ function _react() {
   };
   return data;
 }
+function _core() {
+  const data = require("@formily/core");
+  _core = function _core() {
+    return data;
+  };
+  return data;
+}
 function _react2() {
   const data = require("@formily/react");
   _react2 = function _react2() {
@@ -20,9 +27,23 @@ function _react2() {
   };
   return data;
 }
-function _lodash() {
-  const data = require("lodash");
-  _lodash = function _lodash() {
+function _antdV() {
+  const data = require("@formily/antd-v5");
+  _antdV = function _antdV() {
+    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;
@@ -41,28 +62,30 @@ function _client2() {
   };
   return data;
 }
-var _triggers = require("../../triggers");
 var _ = require("..");
+var _constants = require("../../constants");
 var _FlowContext = require("../../FlowContext");
 var _locale = require("../../locale");
-var _constants = require("../../constants");
-var _custom = _interopRequireDefault(require("./forms/custom"));
+var _triggers = require("../../triggers");
+var _DetailsBlockProvider = require("./DetailsBlockProvider");
+var _FormBlockProvider = require("./FormBlockProvider");
 var _create = _interopRequireDefault(require("./forms/create"));
+var _custom = _interopRequireDefault(require("./forms/custom"));
 var _update = _interopRequireDefault(require("./forms/update"));
-var _FormBlockProvider = require("./FormBlockProvider");
-var _DetailsBlockProvider = require("./DetailsBlockProvider");
-const _excluded = ["action", "actionProps"];
+var _variable = require("../../variable");
+const _excluded = ["action", "actionProps", "insert"],
+  _excluded2 = ["action", "actionProps"];
 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 _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 _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 = 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 _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) { 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; }
@@ -138,10 +161,141 @@ function AddBlockButton(props) {
     title: "{{t('Add block')}}"
   }));
 }
-function ActionInitializer(_ref) {
+function AssignedFieldValues() {
+  var _fieldSchema$xAction, _fieldSchema$xAction2, _fieldSchema$xAction3;
+  const ctx = (0, _react().useContext)(_client().SchemaComponentContext);
+  const _useTranslation = (0, _reactI18next().useTranslation)(),
+    t = _useTranslation.t;
+  const fieldSchema = (0, _react2().useFieldSchema)();
+  const scope = (0, _variable.useWorkflowVariableOptions)({
+    fieldNames: {
+      label: 'title',
+      value: 'name'
+    }
+  });
+  const _useState = (0, _react().useState)(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    open = _useState2[0],
+    setOpen = _useState2[1];
+  const _useState3 = (0, _react().useState)((_fieldSchema$xAction = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction2 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction2 === void 0 ? void 0 : (_fieldSchema$xAction3 = _fieldSchema$xAction2.assignedValues) === null || _fieldSchema$xAction3 === void 0 ? void 0 : _fieldSchema$xAction3.schema) !== null && _fieldSchema$xAction !== void 0 ? _fieldSchema$xAction : {
+      type: 'void',
+      'x-component': 'Grid',
+      'x-initializer': 'CustomFormItemInitializers',
+      properties: {}
+    }),
+    _useState4 = _slicedToArray(_useState3, 2),
+    initialSchema = _useState4[0],
+    setInitialSchema = _useState4[1];
+  const _useState5 = (0, _react().useState)(null),
+    _useState6 = _slicedToArray(_useState5, 2),
+    schema = _useState6[0],
+    setSchema = _useState6[1];
+  const _useSchemaOptionsCont = (0, _client().useSchemaOptionsContext)(),
+    components = _useSchemaOptionsCont.components;
+  (0, _react().useEffect)(() => {
+    setSchema(new (_react2().Schema)({
+      properties: {
+        grid: initialSchema
+      }
+    }));
+  }, [initialSchema]);
+  const form = (0, _react().useMemo)(() => {
+    var _fieldSchema$xAction4, _fieldSchema$xAction5;
+    const initialValues = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction4 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction4 === void 0 ? void 0 : (_fieldSchema$xAction5 = _fieldSchema$xAction4.assignedValues) === null || _fieldSchema$xAction5 === void 0 ? void 0 : _fieldSchema$xAction5.values;
+    return (0, _core().createForm)({
+      initialValues: _client2().lodash.cloneDeep(initialValues),
+      values: _client2().lodash.cloneDeep(initialValues)
+    });
+  }, []);
+  const title = t('Assign field values');
+  function onCancel() {
+    setOpen(false);
+  }
+  function onSubmit() {
+    if (!fieldSchema['x-action-settings']) {
+      fieldSchema['x-action-settings'] = {};
+    }
+    if (!fieldSchema['x-action-settings'].assignedValues) {
+      fieldSchema['x-action-settings'].assignedValues = {};
+    }
+    fieldSchema['x-action-settings'].assignedValues.schema = initialSchema;
+    fieldSchema['x-action-settings'].assignedValues.values = form.values;
+    setOpen(false);
+    setTimeout(() => {
+      var _ctx$refresh;
+      (_ctx$refresh = ctx.refresh) === null || _ctx$refresh === void 0 ? void 0 : _ctx$refresh.call(ctx);
+    }, 300);
+  }
+  return _react().default.createElement(_react().default.Fragment, null, _react().default.createElement(_client().SchemaSettings.Item, {
+    onClick: () => setOpen(true)
+  }, title), _react().default.createElement(_antd().Modal, {
+    width: '50%',
+    title: title,
+    open: open,
+    onCancel: onCancel,
+    footer: _react().default.createElement(_antd().Space, null, _react().default.createElement(_antd().Button, {
+      onClick: onCancel
+    }, t('Cancel')), _react().default.createElement(_antd().Button, {
+      type: "primary",
+      onClick: onSubmit
+    }, t('Submit')))
+  }, _react().default.createElement(_client().VariableScopeProvider, {
+    scope: scope
+  }, _react().default.createElement(_react2().FormProvider, {
+    form: form
+  }, _react().default.createElement(_antdV().FormLayout, {
+    layout: 'vertical'
+  }, _react().default.createElement(_antd().Alert, {
+    message: (0, _locale.lang)('Values preset in this form will override user submitted ones when continue or reject.')
+  }), _react().default.createElement("br", null), open && schema && _react().default.createElement(_client().SchemaComponentContext.Provider, {
+    value: _objectSpread(_objectSpread({}, ctx), {}, {
+      refresh() {
+        setInitialSchema(_client2().lodash.get(schema.toJSON(), 'properties.grid'));
+      }
+    })
+  }, _react().default.createElement(_client().SchemaComponent, {
+    schema: schema,
+    components: components
+  })))))));
+}
+function ManualActionDesigner(props) {
+  return _react().default.createElement(_client().GeneralSchemaDesigner, _objectSpread(_objectSpread({}, props), {}, {
+    disableInitializer: true
+  }), _react().default.createElement(_client().Action.Designer.ButtonEditor, null), _react().default.createElement(AssignedFieldValues, null), _react().default.createElement(_client().SchemaSettings.Divider, null), _react().default.createElement(_client().SchemaSettings.Remove, {
+    removeParentsIfNoChildren: true,
+    breakRemoveOn: {
+      'x-component': 'ActionBar'
+    }
+  }));
+}
+function ContinueInitializer(_ref) {
   let action = _ref.action,
     actionProps = _ref.actionProps,
+    insert = _ref.insert,
     props = _objectWithoutProperties(_ref, _excluded);
+  return _react().default.createElement(_client().SchemaInitializer.Item, _objectSpread(_objectSpread({}, props), {}, {
+    onClick: () => {
+      insert({
+        type: 'void',
+        title: props.title,
+        'x-decorator': 'ManualActionStatusProvider',
+        'x-decorator-props': {
+          value: action
+        },
+        'x-component': 'Action',
+        'x-component-props': _objectSpread(_objectSpread({}, actionProps), {}, {
+          useAction: '{{ useSubmit }}'
+        }),
+        'x-designer': 'ManualActionDesigner',
+        'x-action-settings': {}
+      });
+    }
+  }));
+}
+function ActionInitializer(_ref2) {
+  let action = _ref2.action,
+    actionProps = _ref2.actionProps,
+    props = _objectWithoutProperties(_ref2, _excluded2);
   return _react().default.createElement(_client().InitializerWithSwitch, _objectSpread(_objectSpread({}, props), {}, {
     schema: {
       type: 'void',
@@ -166,7 +320,7 @@ function AddActionButton(props) {
       key: _constants.JOB_STATUS.RESOLVED,
       type: 'item',
       title: `{{t("Continue the process", { ns: "${_locale.NAMESPACE}" })}}`,
-      component: ActionInitializer,
+      component: ContinueInitializer,
       action: _constants.JOB_STATUS.RESOLVED,
       actionProps: {
         type: 'primary'
@@ -178,7 +332,7 @@ function AddActionButton(props) {
       component: ActionInitializer,
       action: _constants.JOB_STATUS.REJECTED,
       actionProps: {
-        type: 'danger'
+        danger: true
       }
     }, {
       key: _constants.JOB_STATUS.PENDING,
@@ -260,10 +414,10 @@ function SchemaConfig({
     value: _objectSpread(_objectSpread({}, ctx), {}, {
       designable: !workflow.executed,
       refresh() {
-        var _ctx$refresh;
-        (_ctx$refresh = ctx.refresh) === null || _ctx$refresh === void 0 ? void 0 : _ctx$refresh.call(ctx);
-        const _get = (0, _lodash().get)(schema.toJSON(), 'properties.drawer.properties'),
-          tabs = _get.tabs;
+        var _ctx$refresh2;
+        (_ctx$refresh2 = ctx.refresh) === null || _ctx$refresh2 === void 0 ? void 0 : _ctx$refresh2.call(ctx);
+        const _lodash$get = _client2().lodash.get(schema.toJSON(), 'properties.drawer.properties'),
+          tabs = _lodash$get.tabs;
         const forms = Array.from(manualFormTypes.getValues()).reduce((result, item) => Object.assign(result, item.config.parseFormOptions(tabs)), {});
         form.setValuesIn('forms', forms);
         onChange(tabs.properties);
@@ -286,7 +440,8 @@ function SchemaConfig({
       ActionBarProvider(props) {
         return props.children;
       },
-      SimpleDesigner
+      SimpleDesigner,
+      ManualActionDesigner
     }),
     scope: {
       useSubmit,
@@ -297,12 +452,12 @@ function SchemaConfig({
 function SchemaConfigButton(props) {
   const _useFlowContext3 = (0, _FlowContext.useFlowContext)(),
     workflow = _useFlowContext3.workflow;
-  const _useState = (0, _react().useState)(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    visible = _useState2[0],
-    setVisible = _useState2[1];
-  return _react().default.createElement(_react().default.Fragment, null, _react().default.createElement("div", {
-    className: "ant-btn ant-btn-primary",
+  const _useState7 = (0, _react().useState)(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    visible = _useState8[0],
+    setVisible = _useState8[1];
+  return _react().default.createElement(_react().default.Fragment, null, _react().default.createElement(_antd().Button, {
+    type: "primary",
     onClick: () => setVisible(true)
   }, workflow.executed ? (0, _locale.lang)('View user interface') : (0, _locale.lang)('Configure user interface')), _react().default.createElement(_client().ActionContextProvider, {
     value: {