@nocobase/plugin-workflow 0.10.0-alpha.5 → 0.11.0-alpha.1

package/lib/client/components/RadioWithTooltip.js

@@ -4,37 +4,30 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.RadioWithTooltip = RadioWithTooltip;
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-  _react = function _react() {
-    return data;
-  };
-  return data;
-}
-function _antd() {
-  const data = require("antd");
-  _antd = function _antd() {
+function _icons() {
+  const data = require("@ant-design/icons");
+  _icons = function _icons() {
     return data;
   };
   return data;
 }
-function _icons() {
-  const data = require("@ant-design/icons");
-  _icons = function _icons() {
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
     return data;
   };
   return data;
 }
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
+function _antd() {
+  const data = require("antd");
+  _antd = function _antd() {
     return data;
   };
   return data;
 }
-function _client() {
-  const data = require("@nocobase/client");
-  _client = function _client() {
+function _react() {
+  const data = _interopRequireDefault(require("react"));
+  _react = function _react() {
     return data;
   };
   return data;
@@ -57,7 +50,7 @@ function RadioWithTooltip(props) {
     key: option.value,
     value: option.value
   }, _react().default.createElement("span", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
               & + .anticon {
                 margin-left: 0.25em;
               }

package/lib/client/components/ValueBlock.js

@@ -5,36 +5,29 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ValueBlock = void 0;
 function _react() {
-  const data = _interopRequireDefault(require("react"));
-  _react = function _react() {
-    return data;
-  };
-  return data;
-}
-function _react2() {
   const data = require("@formily/react");
-  _react2 = function _react2() {
+  _react = function _react() {
     return data;
   };
   return data;
 }
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
     return data;
   };
   return data;
 }
-function _client() {
+function _client2() {
   const data = require("@nocobase/utils/client");
-  _client = function _client() {
+  _client2 = function _client2() {
     return data;
   };
   return data;
 }
-function _client2() {
-  const data = require("@nocobase/client");
-  _client2 = function _client2() {
+function _react2() {
+  const data = _interopRequireDefault(require("react"));
+  _react2 = function _react2() {
     return data;
   };
   return data;
@@ -58,7 +51,7 @@ function Initializer(_ref) {
     resultTitle = _ref.resultTitle,
     insert = _ref.insert,
     props = _objectWithoutProperties(_ref, _excluded);
-  return _react().default.createElement(_client2().SchemaInitializer.Item, _objectSpread(_objectSpread({}, props), {}, {
+  return _react2().default.createElement(_client().SchemaInitializer.Item, _objectSpread(_objectSpread({}, props), {}, {
     onClick: () => {
       var _node$title;
       insert({
@@ -89,19 +82,19 @@ function Result({
   dataSource
 }) {
   var _execution$jobs;
-  const field = (0, _react2().useFieldSchema)();
+  const field = (0, _react().useFieldSchema)();
   const _useFlowContext = (0, _FlowContext.useFlowContext)(),
     execution = _useFlowContext.execution;
   if (!execution) {
     return field.title;
   }
-  const result = (0, _client().parse)(dataSource)({
+  const result = (0, _client2().parse)(dataSource)({
     $jobsMapByNodeId: ((_execution$jobs = execution.jobs) !== null && _execution$jobs !== void 0 ? _execution$jobs : []).reduce((map, job) => Object.assign(map, {
       [job.nodeId]: job.result
     }), {})
   });
-  return _react().default.createElement("pre", {
-    className: (0, _css().css)`
+  return _react2().default.createElement("pre", {
+    className: (0, _client().css)`
         margin: 0;
       `
   }, JSON.stringify(result, null, 2));

package/lib/client/components/renderEngineReference.js

@@ -4,13 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.renderEngineReference = void 0;
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
-    return data;
-  };
-  return data;
-}
 function _client() {
   const data = require("@nocobase/client");
   _client = function _client() {
@@ -39,7 +32,7 @@ const renderEngineReference = key => {
     return null;
   }
   return engine.link ? _react().default.createElement(_react().default.Fragment, null, _react().default.createElement("span", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
           &:after {
             content: ':';
           }

package/lib/client/index.d.ts

@@ -1,5 +1,13 @@
-export { triggers } from './triggers';
-export * from './nodes';
-export * from './FlowContext';
 export * from './Branch';
-export { WorkflowProvider as default } from './WorkflowProvider';
+export * from './FlowContext';
+export * from './nodes';
+export { triggers } from './triggers';
+export { useWorkflowVariableOptions } from './variable';
+import { Plugin } from '@nocobase/client';
+export declare class WorkflowPlugin extends Plugin {
+    load(): Promise<void>;
+    addScopes(): void;
+    addComponents(): void;
+    addRoutes(): void;
+}
+export default WorkflowPlugin;

package/lib/client/index.js

@@ -4,30 +4,32 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
-  triggers: true
+  WorkflowPlugin: true,
+  triggers: true,
+  useWorkflowVariableOptions: true
 };
-Object.defineProperty(exports, "default", {
+exports.default = exports.WorkflowPlugin = void 0;
+Object.defineProperty(exports, "triggers", {
   enumerable: true,
   get: function get() {
-    return _WorkflowProvider.WorkflowProvider;
+    return _triggers.triggers;
   }
 });
-Object.defineProperty(exports, "triggers", {
+Object.defineProperty(exports, "useWorkflowVariableOptions", {
   enumerable: true,
   get: function get() {
-    return _triggers.triggers;
+    return _variable.useWorkflowVariableOptions;
   }
 });
-var _triggers = require("./triggers");
-var _nodes = require("./nodes");
-Object.keys(_nodes).forEach(function (key) {
+var _Branch = require("./Branch");
+Object.keys(_Branch).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _nodes[key]) return;
+  if (key in exports && exports[key] === _Branch[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _nodes[key];
+      return _Branch[key];
     }
   });
 });
@@ -43,16 +45,77 @@ Object.keys(_FlowContext).forEach(function (key) {
     }
   });
 });
-var _Branch = require("./Branch");
-Object.keys(_Branch).forEach(function (key) {
+var _nodes = require("./nodes");
+Object.keys(_nodes).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _Branch[key]) return;
+  if (key in exports && exports[key] === _nodes[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _Branch[key];
+      return _nodes[key];
     }
   });
 });
-var _WorkflowProvider = require("./WorkflowProvider");
+var _triggers = require("./triggers");
+var _variable = require("./variable");
+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 _DynamicExpression = require("./components/DynamicExpression");
+var _ExecutionPage = require("./ExecutionPage");
+var _WorkflowTodo = require("./nodes/manual/WorkflowTodo");
+var _WorkflowTodoBlockInitializer = require("./nodes/manual/WorkflowTodoBlockInitializer");
+var _WorkflowPage = require("./WorkflowPage");
+var _WorkflowProvider = require("./WorkflowProvider");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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); }); }; }
+class WorkflowPlugin extends _client().Plugin {
+  load() {
+    var _this = this;
+    return _asyncToGenerator(function* () {
+      _this.addRoutes();
+      _this.addComponents();
+      _this.app.use(_WorkflowProvider.WorkflowProvider);
+    })();
+  }
+  addScopes() {
+    this.app.addScopes({
+      useCollectionDataSource: _client().useCollectionDataSource
+    });
+  }
+  addComponents() {
+    this.app.addComponents({
+      WorkflowPage: _WorkflowPage.WorkflowPage,
+      ExecutionPage: _ExecutionPage.ExecutionPage,
+      WorkflowTodo: _WorkflowTodo.WorkflowTodo,
+      WorkflowTodoBlockInitializer: _WorkflowTodoBlockInitializer.WorkflowTodoBlockInitializer,
+      DynamicExpression: _DynamicExpression.DynamicExpression
+    });
+  }
+  addRoutes() {
+    this.app.router.add('admin.settings.workflow.workflows.id', {
+      path: '/admin/settings/workflow/workflows/:id',
+      element: _react().default.createElement(_WorkflowPage.WorkflowPage, null)
+    });
+    this.app.router.add('admin.settings.workflow.executions.id', {
+      path: '/admin/settings/workflow/executions/:id',
+      element: _react().default.createElement(_ExecutionPage.ExecutionPage, null)
+    });
+  }
+}
+exports.WorkflowPlugin = WorkflowPlugin;
+var _default = WorkflowPlugin;
+exports.default = _default;

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

@@ -67,7 +67,7 @@ declare const _default: {
                                     title: string;
                                     'x-component-props': {
                                         className: string;
-                                        dropdownMatchSelectWidth: boolean;
+                                        popupMatchSelectWidth: boolean;
                                     };
                                     'x-reactions': any[];
                                     type: string;
@@ -171,16 +171,22 @@ declare const _default: {
     components: {
         SchemaComponentContext: React.Context<import("@nocobase/client").ISchemaComponentContext>;
         FilterDynamicComponent: typeof FilterDynamicComponent;
-        FieldsSelect: React.MemoExoticComponent<import("@formily/react").ReactFC<Pick<any, string | number | symbol>>>;
+        FieldsSelect: React.MemoExoticComponent<import("@formily/react").ReactFC<Omit<any, "ref">>>;
         ValueBlock: (() => JSX.Element) & {
             Initializer: (props: any) => JSX.Element;
             Result: (props: any) => JSX.Element;
         };
         AssociatedConfig: typeof AssociatedConfig;
     };
-    useVariables(current: any, { types }: {
+    useVariables({ id, title }: {
+        id: any;
+        title: any;
+    }, { types }: {
         types: any;
-    }): any[];
+    }): {
+        value: string;
+        label: any;
+    };
     useInitializers(node: any): SchemaInitializerItemOptions | null;
 };
 export default _default;

package/lib/client/nodes/aggregate.js

@@ -38,7 +38,6 @@ var _FilterDynamicComponent = require("../components/FilterDynamicComponent");
 var _variable = require("../variable");
 var _FieldsSelect = require("../components/FieldsSelect");
 var _ValueBlock = require("../components/ValueBlock");
-var _ = require(".");
 const _excluded = ["value", "onChange"];
 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; }
@@ -49,8 +48,9 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typ
 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 _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 matchToManyField(field, depth) {
-  return ['hasMany', 'belongsToMany'].includes(field.type) && depth;
+function matchToManyField(field, appends) {
+  const fieldPrefix = `${field.name}.`;
+  return ['hasMany', 'belongsToMany'].includes(field.type) && (appends.includes(field.name) || appends.some(item => item.startsWith(fieldPrefix)));
 }
 function AssociatedConfig(_ref) {
   let value = _ref.value,
@@ -61,7 +61,6 @@ function AssociatedConfig(_ref) {
   const compile = (0, _client().useCompile)();
   const _useCollectionManager = (0, _client().useCollectionManager)(),
     getCollection = _useCollectionManager.getCollection;
-  const current = (0, _.useNodeContext)();
   const options = [_variable.nodesOptions, _variable.triggerOptions].map(item => {
     var _item$useOptions;
     const children = (_item$useOptions = item.useOptions({
@@ -85,7 +84,7 @@ function AssociatedConfig(_ref) {
     p = [...matched[1].trim().split('.').slice(0, -1), fieldName];
   }
   const onSelectChange = (0, _react().useCallback)((path, option) => {
-    if (!(path === null || path === void 0 ? void 0 : path.length)) {
+    if (!(path !== null && path !== void 0 && path.length)) {
       setValuesIn('collection', null);
       onChange({});
       return;
@@ -322,15 +321,19 @@ var _default = {
     ValueBlock: _ValueBlock.ValueBlock,
     AssociatedConfig
   },
-  useVariables(current, {
+  useVariables({
+    id,
+    title
+  }, {
     types
   }) {
     if (types && !types.some(type => type in _variable.BaseTypeSets || Object.values(_variable.BaseTypeSets).some(set => set.has(type)))) {
       return null;
     }
-    return [
-      // { key: '', value: '', label: lang('Calculation result') }
-    ];
+    return {
+      value: `${id}`,
+      label: title
+    };
   },
   useInitializers(node) {
     var _node$title;

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

@@ -1,14 +1,6 @@
 import { SchemaInitializerItemOptions } from '@nocobase/client';
 import React from 'react';
 import { RadioWithTooltip } from '../components/RadioWithTooltip';
-import { useWorkflowVariableOptions } from '../variable';
-declare function useWorkflowVariableEntityOptions(): {
-    label: any;
-    value: any;
-    key: any;
-    children: any;
-    disabled: boolean;
-}[];
 declare const _default: {
     title: string;
     type: string;
@@ -26,7 +18,7 @@ declare const _default: {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
-                options: any[];
+                options: any;
             };
             required: boolean;
             default: string;
@@ -44,9 +36,6 @@ declare const _default: {
             title: string;
             'x-decorator': string;
             'x-component': string;
-            'x-component-props': {
-                scope: string;
-            };
             "x-validator"(value: any, rules: any, { form }: {
                 form: any;
             }): string;
@@ -75,7 +64,7 @@ declare const _default: {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
-                scope: string;
+                changeOnSelect: boolean;
             };
             'x-reactions': {
                 dependencies: string[];
@@ -89,11 +78,11 @@ declare const _default: {
     };
     view: {};
     scope: {
-        useWorkflowVariableOptions: typeof useWorkflowVariableOptions;
-        useWorkflowVariableEntityOptions: typeof useWorkflowVariableEntityOptions;
         renderEngineReference: (key: string) => React.JSX.Element;
     };
     components: {
+        CalculationExpression(props: any): React.JSX.Element;
+        ScopeSelect(props: any): React.JSX.Element;
         CalculationResult({ dataSource }: {
             dataSource: any;
         }): string | React.JSX.Element;
@@ -103,7 +92,13 @@ declare const _default: {
             onChange: any;
         }) => React.JSX.Element;
     };
-    useVariables(current: any, options: any): any[];
+    useVariables({ id, title }: {
+        id: any;
+        title: any;
+    }, options: any): {
+        value: any;
+        label: any;
+    };
     useInitializers(node: any): SchemaInitializerItemOptions;
 };
 export default _default;