@nocobase/plugin-workflow 0.10.1-alpha.1 → 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,7 +171,7 @@ 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;

package/lib/client/nodes/aggregate.js

@@ -84,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;

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

@@ -18,7 +18,7 @@ declare const _default: {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
-                options: any[];
+                options: any;
             };
             required: boolean;
             default: string;

package/lib/client/nodes/calculation.js

@@ -4,16 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
-    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;
@@ -39,9 +32,9 @@ function _client3() {
   };
   return data;
 }
-function _antd2() {
+function _antd() {
   const data = require("antd");
-  _antd2 = function _antd2() {
+  _antd = function _antd() {
     return data;
   };
   return data;
@@ -62,10 +55,10 @@ function _reactI18next() {
 }
 var _FlowContext = require("../FlowContext");
 var _RadioWithTooltip = require("../components/RadioWithTooltip");
+var _ValueBlock = require("../components/ValueBlock");
 var _renderEngineReference = require("../components/renderEngineReference");
 var _locale = require("../locale");
 var _variable = require("../variable");
-var _ValueBlock = require("../components/ValueBlock");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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; }
@@ -98,27 +91,27 @@ const DynamicConfig = ({
       getCollection
     })]
   });
-  return _react().default.createElement(_antd().FormLayout, {
+  return _react().default.createElement(_antdV().FormLayout, {
     layout: "vertical"
-  }, _react().default.createElement(_antd().FormItem, {
+  }, _react().default.createElement(_antdV().FormItem, {
     colon: true,
     label: t('Expression type', {
       ns: _locale.NAMESPACE
     })
-  }, _react().default.createElement(_antd2().Radio.Group, {
-    value: value === false ? false : value || null,
+  }, _react().default.createElement(_antd().Radio.Group, {
+    value: value === false ? false : value || '',
     onChange: ev => {
       _onChange(ev.target.value);
     }
-  }, _react().default.createElement(_antd2().Radio, {
+  }, _react().default.createElement(_antd().Radio, {
     value: false
   }, t('Static', {
     ns: _locale.NAMESPACE
-  })), _react().default.createElement(_antd2().Radio, {
-    value: value || null
+  })), _react().default.createElement(_antd().Radio, {
+    value: value || ''
   }, t('Dynamic', {
     ns: _locale.NAMESPACE
-  })))), value !== false ? _react().default.createElement(_antd().FormItem, {
+  })))), value !== false ? _react().default.createElement(_antdV().FormItem, {
     label: t('Select dynamic expression', {
       ns: _locale.NAMESPACE
     }),
@@ -126,7 +119,7 @@ const DynamicConfig = ({
       ns: _locale.NAMESPACE
     })
   }, _react().default.createElement(_client().Variable.Input, {
-    value: value || null,
+    value: value || '',
     onChange: v => _onChange(v),
     scope: scope
   })) : null);
@@ -262,7 +255,7 @@ var _default = {
         }), {})
       });
       return _react().default.createElement("pre", {
-        className: (0, _css().css)`
+        className: (0, _client().css)`
             margin: 0;
           `
       }, JSON.stringify(result, null, 2));

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

@@ -37,9 +37,7 @@ declare const _default: {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
-                options: [string, import("@nocobase/evaluators/client").Evaluator] | (string | {
-                    label: string;
-                })[];
+                options: unknown;
             };
             required: boolean;
             default: string;

package/lib/client/nodes/condition.js

@@ -11,13 +11,6 @@ function _icons() {
   };
   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() {
@@ -62,9 +55,9 @@ function _reactI18next() {
 }
 var _ = require(".");
 var _Branch = require("../Branch");
-var _FlowContext = require("../FlowContext");
 var _RadioWithTooltip = require("../components/RadioWithTooltip");
 var _renderEngineReference = require("../components/renderEngineReference");
+var _FlowContext = require("../FlowContext");
 var _locale = require("../locale");
 var _style = require("../style");
 var _variable = require("../variable");
@@ -190,7 +183,7 @@ function Calculation({
   const compile = (0, _client().useCompile)();
   const options = (0, _variable.useWorkflowVariableOptions)();
   return _react().default.createElement("fieldset", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
         display: flex;
         gap: 0.5em;
         align-items: center;
@@ -211,7 +204,7 @@ function Calculation({
       calculator: v
     }),
     placeholder: (0, _locale.lang)('Calculator'),
-    dropdownMatchSelectWidth: false
+    popupMatchSelectWidth: false
   }, calculatorGroups.filter(group => Boolean(getGroupCalculators(group.value).length)).map(group => _react().default.createElement(_antd().Select.OptGroup, {
     key: group.value,
     label: compile(group.title)
@@ -242,7 +235,7 @@ function CalculationItem({
     _value$operands = value.operands,
     operands = _value$operands === void 0 ? [] : _value$operands;
   return _react().default.createElement("div", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
         display: flex;
         position: relative;
         margin: 0.5em 0;
@@ -304,7 +297,7 @@ function CalculationGroup({
     }));
   }
   return _react().default.createElement("div", {
-    className: (0, _css().cx)('node-type-condition-group', (0, _css().css)`
+    className: (0, _client().cx)('node-type-condition-group', (0, _client().css)`
           position: relative;
           width: 100%;
           .node-type-condition-group {
@@ -317,7 +310,7 @@ function CalculationGroup({
           }
         `)
   }, _react().default.createElement("div", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
           display: flex;
           align-items: center;
           gap: 0.5em;
@@ -343,7 +336,7 @@ function CalculationGroup({
     onChange: onItemChange.bind(this, i),
     onRemove: () => _onRemove(i)
   }))), _react().default.createElement("div", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
           button {
             padding: 0;
             &:not(:last-child) {
@@ -489,9 +482,9 @@ var _default = {
     return _react().default.createElement(_.NodeDefaultView, {
       data: data
     }, rejectOnFalse ? null : _react().default.createElement("div", {
-      className: (0, _css().cx)(_style.nodeSubtreeClass)
+      className: (0, _client().cx)(_style.nodeSubtreeClass)
     }, _react().default.createElement("div", {
-      className: (0, _css().cx)(_style.branchBlockClass, (0, _css().css)`
+      className: (0, _client().cx)(_style.branchBlockClass, (0, _client().css)`
                   > * > .workflow-branch-lines {
                     > button {
                       display: none;
@@ -507,7 +500,7 @@ var _default = {
       entry: trueEntry,
       branchIndex: 1
     })), _react().default.createElement("div", {
-      className: (0, _css().css)`
+      className: (0, _client().css)`
                 position: relative;
                 height: 2em;
                 overflow: visible;
@@ -517,16 +510,16 @@ var _default = {
                   top: calc(1.5em - 1px);
                   line-height: 1em;
                   color: #999;
-                  background-color: #f0f2f5;
+                  background-color: var(--nb-box-bg);
                   padding: 1px;
                 }
               `
     }, _react().default.createElement("span", {
-      className: (0, _css().css)`
+      className: (0, _client().css)`
                   right: 4em;
                 `
     }, t('No')), _react().default.createElement("span", {
-      className: (0, _css().css)`
+      className: (0, _client().css)`
                   left: 4em;
                 `
     }, t('Yes')))));

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SchemaInitializerItemOptions, useCollectionDataSource } from '@nocobase/client';
 declare const _default: {
     title: string;
@@ -13,7 +14,7 @@ declare const _default: {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
-                dropdownMatchSelectWidth: boolean;
+                popupMatchSelectWidth: boolean;
             };
         };
         params: {
@@ -58,8 +59,8 @@ declare const _default: {
         useCollectionDataSource: typeof useCollectionDataSource;
     };
     components: {
-        CollectionFieldset: import("react").MemoExoticComponent<import("@formily/reactive-react").ReactFC<Pick<any, string | number | symbol>>>;
-        FieldsSelect: import("react").MemoExoticComponent<import("@formily/reactive-react").ReactFC<Pick<any, string | number | symbol>>>;
+        CollectionFieldset: import("react").MemoExoticComponent<import("@formily/reactive-react").ReactFC<Omit<any, "ref">>>;
+        FieldsSelect: import("react").MemoExoticComponent<import("@formily/reactive-react").ReactFC<Omit<any, "ref">>>;
     };
     useVariables({ id, title, config }: {
         id: any;

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

@@ -14,7 +14,7 @@ declare const _default: {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
-                dropdownMatchSelectWidth: boolean;
+                popupMatchSelectWidth: boolean;
             };
         };
         params: {

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

@@ -1,7 +1,7 @@
-import React from 'react';
 import { ISchema } from '@formily/react';
-import { Registry } from '@nocobase/utils/client';
 import { SchemaInitializerItemOptions } from '@nocobase/client';
+import { Registry } from '@nocobase/utils/client';
+import React from 'react';
 import { VariableOption, VariableOptions } from '../variable';
 export interface Instruction {
     title: string;