@nocobase/plugin-workflow 0.14.0-alpha.6 → 0.14.0-alpha.7

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

@@ -79,6 +79,9 @@ declare const _default: {
                                     title: string;
                                     'x-decorator': string;
                                     'x-component': string;
+                                    'x-component-props': {
+                                        changeOnSelect: boolean;
+                                    };
                                     'x-reactions': {
                                         dependencies: string[];
                                         fulfill: {

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

@@ -1,5 +1,5 @@
-import React from 'react';
 import { ISchema } from '@formily/react';
+import React from 'react';
 import { SchemaInitializerItemOptions } from '@nocobase/client';
 import { JOB_STATUS } from '../../constants';
 type ValueOf<T> = T[keyof T];
@@ -16,7 +16,9 @@ export type FormType = {
 export type ManualFormType = {
     title: string;
     config: {
-        useInitializer: () => SchemaInitializerItemOptions;
+        useInitializer: ({ collections }?: {
+            collections: any[];
+        }) => SchemaInitializerItemOptions;
         initializers?: {
             [key: string]: React.FC;
         };

package/dist/client/variable.d.ts

@@ -20,6 +20,7 @@ export type OptionsOfUseVariableOptions = {
         value?: string;
         children?: string;
     };
+    appends?: string[] | null;
 };
 export declare const defaultFieldNames: {
     readonly label: "label";

package/dist/externalVersion.js

@@ -1,24 +1,24 @@
 module.exports = {
   "@ant-design/icons": "5.1.4",
-  "@nocobase/client": "0.14.0-alpha.6",
+  "@nocobase/client": "0.14.0-alpha.7",
   "antd": "5.8.6",
   "react": "18.2.0",
-  "@nocobase/utils": "0.14.0-alpha.6",
+  "@nocobase/utils": "0.14.0-alpha.7",
   "react-router-dom": "6.14.1",
   "react-i18next": "11.18.6",
   "winston": "3.9.0",
-  "@nocobase/database": "0.14.0-alpha.6",
-  "@nocobase/server": "0.14.0-alpha.6",
-  "@nocobase/logger": "0.14.0-alpha.6",
-  "@nocobase/evaluators": "0.14.0-alpha.6",
+  "@nocobase/database": "0.14.0-alpha.7",
+  "@nocobase/server": "0.14.0-alpha.7",
+  "@nocobase/logger": "0.14.0-alpha.7",
+  "@nocobase/evaluators": "0.14.0-alpha.7",
   "@formily/react": "2.2.27",
   "@formily/core": "2.2.27",
   "@formily/antd-v5": "1.1.0",
   "lodash": "4.17.21",
-  "@nocobase/actions": "0.14.0-alpha.6",
+  "@nocobase/actions": "0.14.0-alpha.7",
   "axios": "0.26.1",
   "sequelize": "6.32.1",
   "@emotion/css": "11.11.2",
   "dayjs": "1.11.9",
-  "@nocobase/resourcer": "0.14.0-alpha.6"
+  "@nocobase/resourcer": "0.14.0-alpha.7"
 };

package/dist/node_modules/cron-parser/package.json

@@ -1 +1 @@
-{"name":"cron-parser","version":"4.4.0","description":"Node.js library for parsing crontab instructions","main":"lib/parser.js","types":"index.d.ts","typesVersions":{"<4.1":{"*":["types/ts3/*"]}},"directories":{"test":"test"},"scripts":{"test:tsd":"tsd","test:unit":"TZ=UTC tap ./test/*.js","test:cover":"TZ=UTC tap --coverage-report=html ./test/*.js","lint":"eslint .","lint:fix":"eslint --fix .","test":"npm run lint && npm run test:unit && npm run test:tsd"},"repository":{"type":"git","url":"https://github.com/harrisiirak/cron-parser.git"},"keywords":["cron","crontab","parser"],"author":"Harri Siirak","contributors":["Nicholas Clawson","Daniel Prentis <daniel@salsitasoft.com>","Renault John Lecoultre","Richard Astbury <richard.astbury@gmail.com>","Meaglin Wasabi <Meaglin.wasabi@gmail.com>","Mike Kusold <hello@mikekusold.com>","Alex Kit <alex.kit@atmajs.com>","Santiago Gimeno <santiago.gimeno@gmail.com>","Daniel <darc.tec@gmail.com>","Christian Steininger <christian.steininger.cs@gmail.com>","Mykola Piskovyi <m.piskovyi@gmail.com>","Brian Vaughn <brian.david.vaughn@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Yasuhiroki <yasuhiroki.duck@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Brendan Warkentin <faazshift@gmail.com>","Charlie Fish <fishcharlie.code@gmail.com>","Ian Graves <ian+diskimage@iangrav.es>","Andy Thompson <me@andytson.com>","Regev Brody <regevbr@gmail.com>"],"license":"MIT","dependencies":{"luxon":"^1.28.0"},"devDependencies":{"eslint":"^8.2.0","sinon":"^10.0.0","tap":"^16.0.1","tsd":"^0.19.0"},"engines":{"node":">=0.8"},"browser":{"fs":false},"tap":{"check-coverage":false},"tsd":{"directory":"test","compilerOptions":{"lib":["es2017","dom"]}},"_lastModified":"2023-09-22T08:39:52.776Z"}
+{"name":"cron-parser","version":"4.4.0","description":"Node.js library for parsing crontab instructions","main":"lib/parser.js","types":"index.d.ts","typesVersions":{"<4.1":{"*":["types/ts3/*"]}},"directories":{"test":"test"},"scripts":{"test:tsd":"tsd","test:unit":"TZ=UTC tap ./test/*.js","test:cover":"TZ=UTC tap --coverage-report=html ./test/*.js","lint":"eslint .","lint:fix":"eslint --fix .","test":"npm run lint && npm run test:unit && npm run test:tsd"},"repository":{"type":"git","url":"https://github.com/harrisiirak/cron-parser.git"},"keywords":["cron","crontab","parser"],"author":"Harri Siirak","contributors":["Nicholas Clawson","Daniel Prentis <daniel@salsitasoft.com>","Renault John Lecoultre","Richard Astbury <richard.astbury@gmail.com>","Meaglin Wasabi <Meaglin.wasabi@gmail.com>","Mike Kusold <hello@mikekusold.com>","Alex Kit <alex.kit@atmajs.com>","Santiago Gimeno <santiago.gimeno@gmail.com>","Daniel <darc.tec@gmail.com>","Christian Steininger <christian.steininger.cs@gmail.com>","Mykola Piskovyi <m.piskovyi@gmail.com>","Brian Vaughn <brian.david.vaughn@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Yasuhiroki <yasuhiroki.duck@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Brendan Warkentin <faazshift@gmail.com>","Charlie Fish <fishcharlie.code@gmail.com>","Ian Graves <ian+diskimage@iangrav.es>","Andy Thompson <me@andytson.com>","Regev Brody <regevbr@gmail.com>"],"license":"MIT","dependencies":{"luxon":"^1.28.0"},"devDependencies":{"eslint":"^8.2.0","sinon":"^10.0.0","tap":"^16.0.1","tsd":"^0.19.0"},"engines":{"node":">=0.8"},"browser":{"fs":false},"tap":{"check-coverage":false},"tsd":{"directory":"test","compilerOptions":{"lib":["es2017","dom"]}},"_lastModified":"2023-10-07T08:33:03.346Z"}

package/dist/node_modules/lru-cache/package.json

@@ -1 +1 @@
-{"name":"lru-cache","description":"A cache object that deletes the least-recently-used items.","version":"8.0.5","author":"Isaac Z. Schlueter <i@izs.me>","keywords":["mru","lru","cache"],"sideEffects":false,"scripts":{"build":"npm run prepare","preprepare":"rm -rf dist","prepare":"tsc -p tsconfig.json && tsc -p tsconfig-esm.json","postprepare":"bash fixup.sh","pretest":"npm run prepare","presnap":"npm run prepare","test":"c8 tap","snap":"c8 tap","preversion":"npm test","postversion":"npm publish","prepublishOnly":"git push origin --follow-tags","format":"prettier --write .","typedoc":"typedoc --tsconfig tsconfig-esm.json ./src/*.ts","benchmark-results-typedoc":"bash scripts/benchmark-results-typedoc.sh","prebenchmark":"npm run prepare","benchmark":"make -C benchmark","preprofile":"npm run prepare","profile":"make -C benchmark profile"},"main":"./dist/cjs/index-cjs.js","module":"./dist/mjs/index.js","types":"./dist/mjs/index.d.ts","exports":{"./min":{"import":{"types":"./dist/mjs/index.d.ts","default":"./dist/mjs/index.min.js"},"require":{"types":"./dist/cjs/index.d.ts","default":"./dist/cjs/index.min.js"}},".":{"import":{"types":"./dist/mjs/index.d.ts","default":"./dist/mjs/index.js"},"require":{"types":"./dist/cjs/index.d.ts","default":"./dist/cjs/index-cjs.js"}}},"repository":"git://github.com/isaacs/node-lru-cache.git","devDependencies":{"@size-limit/preset-small-lib":"^7.0.8","@types/node":"^17.0.31","@types/tap":"^15.0.6","benchmark":"^2.1.4","c8":"^7.11.2","clock-mock":"^1.0.6","esbuild":"^0.17.11","eslint-config-prettier":"^8.5.0","marked":"^4.2.12","mkdirp":"^2.1.5","prettier":"^2.6.2","size-limit":"^7.0.8","tap":"^16.3.4","ts-node":"^10.7.0","tslib":"^2.4.0","typedoc":"^0.23.24","typescript":"^4.6.4"},"license":"ISC","files":["dist"],"engines":{"node":">=16.14"},"prettier":{"semi":false,"printWidth":70,"tabWidth":2,"useTabs":false,"singleQuote":true,"jsxSingleQuote":false,"bracketSameLine":true,"arrowParens":"avoid","endOfLine":"lf"},"tap":{"coverage":false,"node-arg":["--expose-gc","--no-warnings","--loader","ts-node/esm"],"ts":false},"size-limit":[{"path":"./dist/mjs/index.js"}],"_lastModified":"2023-09-22T08:39:52.241Z"}
+{"name":"lru-cache","description":"A cache object that deletes the least-recently-used items.","version":"8.0.5","author":"Isaac Z. Schlueter <i@izs.me>","keywords":["mru","lru","cache"],"sideEffects":false,"scripts":{"build":"npm run prepare","preprepare":"rm -rf dist","prepare":"tsc -p tsconfig.json && tsc -p tsconfig-esm.json","postprepare":"bash fixup.sh","pretest":"npm run prepare","presnap":"npm run prepare","test":"c8 tap","snap":"c8 tap","preversion":"npm test","postversion":"npm publish","prepublishOnly":"git push origin --follow-tags","format":"prettier --write .","typedoc":"typedoc --tsconfig tsconfig-esm.json ./src/*.ts","benchmark-results-typedoc":"bash scripts/benchmark-results-typedoc.sh","prebenchmark":"npm run prepare","benchmark":"make -C benchmark","preprofile":"npm run prepare","profile":"make -C benchmark profile"},"main":"./dist/cjs/index-cjs.js","module":"./dist/mjs/index.js","types":"./dist/mjs/index.d.ts","exports":{"./min":{"import":{"types":"./dist/mjs/index.d.ts","default":"./dist/mjs/index.min.js"},"require":{"types":"./dist/cjs/index.d.ts","default":"./dist/cjs/index.min.js"}},".":{"import":{"types":"./dist/mjs/index.d.ts","default":"./dist/mjs/index.js"},"require":{"types":"./dist/cjs/index.d.ts","default":"./dist/cjs/index-cjs.js"}}},"repository":"git://github.com/isaacs/node-lru-cache.git","devDependencies":{"@size-limit/preset-small-lib":"^7.0.8","@types/node":"^17.0.31","@types/tap":"^15.0.6","benchmark":"^2.1.4","c8":"^7.11.2","clock-mock":"^1.0.6","esbuild":"^0.17.11","eslint-config-prettier":"^8.5.0","marked":"^4.2.12","mkdirp":"^2.1.5","prettier":"^2.6.2","size-limit":"^7.0.8","tap":"^16.3.4","ts-node":"^10.7.0","tslib":"^2.4.0","typedoc":"^0.23.24","typescript":"^4.6.4"},"license":"ISC","files":["dist"],"engines":{"node":">=16.14"},"prettier":{"semi":false,"printWidth":70,"tabWidth":2,"useTabs":false,"singleQuote":true,"jsxSingleQuote":false,"bracketSameLine":true,"arrowParens":"avoid","endOfLine":"lf"},"tap":{"coverage":false,"node-arg":["--expose-gc","--no-warnings","--loader","ts-node/esm"],"ts":false},"size-limit":[{"path":"./dist/mjs/index.js"}],"_lastModified":"2023-10-07T08:33:02.747Z"}

package/dist/server/Processor.d.ts

@@ -38,7 +38,7 @@ export default class Processor {
     findBranchParentNode(node: FlowNodeModel): FlowNodeModel | null;
     findBranchEndNode(node: FlowNodeModel): FlowNodeModel | null;
     findBranchParentJob(job: JobModel, node: FlowNodeModel): JobModel | null;
-    findBranchLastJob(node: FlowNodeModel): JobModel | null;
+    findBranchLastJob(node: FlowNodeModel, job: JobModel): JobModel | null;
     getScope(sourceNodeId: number): {
         $context: any;
         $jobsMapByNodeId: {

package/dist/server/Processor.js

@@ -260,11 +260,18 @@ class Processor {
     }
     return null;
   }
-  findBranchLastJob(node) {
+  findBranchLastJob(node, job) {
+    const allJobs = Array.from(this.jobsMap.values());
+    const branchJobs = [];
     for (let n = this.findBranchEndNode(node); n && n !== node.upstream; n = n.upstream) {
-      const jobs = Array.from(this.jobsMap.values()).filter((item) => item.nodeId === n.id).sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime());
-      if (jobs.length) {
-        return jobs[jobs.length - 1];
+      branchJobs.push(...allJobs.filter((item) => item.nodeId === n.id));
+    }
+    branchJobs.sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime());
+    for (let i = branchJobs.length - 1; i >= 0; i -= 1) {
+      for (let j = branchJobs[i]; j && j.id !== job.id; j = this.jobsMap.get(j.upstreamId)) {
+        if (j.upstreamId === job.id) {
+          return branchJobs[i];
+        }
       }
     }
     return null;

package/dist/server/index.d.ts

@@ -1,4 +1,5 @@
 export * from './constants';
+export type * from './instructions';
 export { Trigger } from './triggers';
 export { default as Processor } from './Processor';
 export { default } from './Plugin';

package/dist/server/instructions/index.d.ts

@@ -1,12 +1,12 @@
 import Plugin from '..';
 import Processor from '../Processor';
 import type { FlowNodeModel } from '../types';
-export type Job = {
+export interface IJob {
     status: number;
     result?: unknown;
     [key: string]: unknown;
-} | null;
-export type InstructionResult = Job | Promise<Job>;
+}
+export type InstructionResult = IJob | Promise<IJob> | null;
 export type Runner = (node: FlowNodeModel, input: any, processor: Processor) => InstructionResult;
 export interface Instruction {
     run: Runner;

package/dist/server/instructions/manual/actions.js

@@ -58,9 +58,17 @@ async function submit(context, next) {
     return context.throw(403);
   }
   const presetValues = processor.getParsedValue(actionItem.values ?? {}, userJob.nodeId, {
+    // @deprecated
     currentUser: currentUser.toJSON(),
+    // @deprecated
     currentRecord: values.result[formKey],
-    currentTime: /* @__PURE__ */ new Date()
+    // @deprecated
+    currentTime: /* @__PURE__ */ new Date(),
+    $user: currentUser.toJSON(),
+    $nForm: values.result[formKey],
+    $nDate: {
+      now: /* @__PURE__ */ new Date()
+    }
   });
   userJob.set({
     status: actionItem.status,

package/dist/server/instructions/parallel.js

@@ -89,7 +89,7 @@ var parallel_default = {
           return previous;
         }
         await processor.run(branch, job);
-        return processor.findBranchLastJob(branch);
+        return processor.findBranchLastJob(branch, job);
       }),
       Promise.resolve()
     );

package/dist/server/triggers/form.js

@@ -23,6 +23,7 @@ module.exports = __toCommonJS(form_exports);
 var import_lodash = require("lodash");
 var import__ = require(".");
 var import_database = require("@nocobase/database");
+var import_utils = require("../utils");
 class FormTrigger extends import__.Trigger {
   constructor(plugin) {
     super(plugin);
@@ -93,7 +94,7 @@ class FormTrigger extends import__.Trigger {
               appends
             });
           }
-          this.plugin.trigger(workflow, { data: payload, user: currentUser });
+          this.plugin.trigger(workflow, { data: (0, import_utils.toJSON)(payload), user: (0, import_utils.toJSON)(currentUser) });
         });
       } else {
         const data = trigger[1] ? (0, import_lodash.get)(values, trigger[1]) : values;

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流",
   "description": "A powerful workflow plugin designed to support business process management and automation.",
   "description.zh-CN": "工作流插件，为业务流程管理和自动化提供支持。",
-  "version": "0.14.0-alpha.6",
+  "version": "0.14.0-alpha.7",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
@@ -42,5 +42,5 @@
     "@nocobase/test": "0.x",
     "@nocobase/utils": "0.x"
   },
-  "gitHead": "7f2858222231c207030b57704a0bb6ebc98e4e45"
+  "gitHead": "dc958417d27ed0753439bcef192be91a03dfc30f"
 }