@nocobase/plugin-workflow 0.14.0-alpha.8 → 0.15.0-alpha.2

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

@@ -1,6 +1,7 @@
 import { SchemaInitializerItemOptions } from '@nocobase/client';
 import React from 'react';
 import { RadioWithTooltip } from '../components/RadioWithTooltip';
+import { WorkflowVariableInput, WorkflowVariableTextArea } from '../variable';
 declare const _default: {
     title: string;
     type: string;
@@ -36,6 +37,9 @@ declare const _default: {
             title: string;
             'x-decorator': string;
             'x-component': string;
+            'x-component-props': {
+                changeOnSelect: boolean;
+            };
             "x-validator"(value: any, rules: any, { form }: {
                 form: any;
             }): string;
@@ -65,6 +69,15 @@ declare const _default: {
             'x-component': string;
             'x-component-props': {
                 changeOnSelect: boolean;
+                variableOptions: {
+                    types: {
+                        type: string;
+                        options: {
+                            collection: string;
+                            entity: boolean;
+                        };
+                    }[];
+                };
             };
             'x-reactions': {
                 dependencies: string[];
@@ -81,8 +94,8 @@ declare const _default: {
         renderEngineReference: (key: string) => React.JSX.Element;
     };
     components: {
-        CalculationExpression(props: any): React.JSX.Element;
-        ScopeSelect(props: any): React.JSX.Element;
+        WorkflowVariableInput: typeof WorkflowVariableInput;
+        WorkflowVariableTextArea: typeof WorkflowVariableTextArea;
         RadioWithTooltip: typeof RadioWithTooltip;
         DynamicConfig: ({ value, onChange }: {
             value: any;

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

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

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { VariableOption, useWorkflowVariableOptions } from '../variable';
+import { VariableOption, WorkflowVariableInput } from '../variable';
 declare const _default: {
     title: string;
     type: string;
@@ -13,7 +13,6 @@ declare const _default: {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
-                scope: string;
                 changeOnSelect: boolean;
                 useTypedConstant: string[];
                 className: string;
@@ -25,10 +24,10 @@ declare const _default: {
     component: ({ data }: {
         data: any;
     }) => React.JSX.Element;
-    scope: {
-        useWorkflowVariableOptions: typeof useWorkflowVariableOptions;
+    scope: {};
+    components: {
+        WorkflowVariableInput: typeof WorkflowVariableInput;
     };
-    components: {};
     useScopeVariables(node: any, options: any): VariableOption[];
 };
 export default _default;

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

@@ -1,5 +1,5 @@
-import { ISchema } from '@formily/react';
 import React from 'react';
+import { ISchema } from '@formily/react';
 import { SchemaInitializerItemOptions } from '@nocobase/client';
 import { JOB_STATUS } from '../../constants';
 type ValueOf<T> = T[keyof T];

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

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { SchemaInitializerItemOptions, useCollectionDataSource } from '@nocobase/client';
 import { FilterDynamicComponent } from '../components/FilterDynamicComponent';
-import { useWorkflowVariableOptions } from '../variable';
+import { WorkflowVariableInput } from '../variable';
 declare const _default: {
     title: string;
     type: string;
@@ -126,7 +126,6 @@ declare const _default: {
                                             'x-decorator': string;
                                             'x-component': string;
                                             'x-component-props': {
-                                                scope: string;
                                                 useTypedConstant: string[];
                                             };
                                             default: number;
@@ -194,7 +193,6 @@ declare const _default: {
     view: {};
     scope: {
         useCollectionDataSource: typeof useCollectionDataSource;
-        useWorkflowVariableOptions: typeof useWorkflowVariableOptions;
         useSortableFields(): {
             value: any;
             label: any;
@@ -208,6 +206,7 @@ declare const _default: {
         };
         FilterDynamicComponent: typeof FilterDynamicComponent;
         SchemaComponentContext: import("react").Context<import("@nocobase/client").ISchemaComponentContext>;
+        WorkflowVariableInput: typeof WorkflowVariableInput;
     };
     useVariables({ key: name, title, config }: {
         key: any;

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

@@ -1,5 +1,4 @@
-import React from 'react';
-import { useWorkflowVariableOptions } from '../variable';
+import { WorkflowVariableInput, WorkflowVariableJSON } from '../variable';
 declare const _default: {
     title: string;
     type: string;
@@ -60,7 +59,6 @@ declare const _default: {
                                 'x-decorator': string;
                                 'x-component': string;
                                 'x-component-props': {
-                                    scope: string;
                                     useTypedConstant: boolean;
                                 };
                             };
@@ -106,7 +104,6 @@ declare const _default: {
                                 'x-decorator': string;
                                 'x-component': string;
                                 'x-component-props': {
-                                    scope: string;
                                     useTypedConstant: boolean;
                                 };
                             };
@@ -163,16 +160,24 @@ declare const _default: {
         };
     };
     view: {};
-    scope: {
-        useWorkflowVariableOptions: typeof useWorkflowVariableOptions;
-    };
+    scope: {};
     components: {
-        ArrayItems: import("@formily/reactive-react").ReactFC<React.HTMLAttributes<HTMLDivElement>> & import("@formily/antd-v5").ArrayBaseMixins & {
-            Item: import("@formily/reactive-react").ReactFC<React.HTMLAttributes<HTMLDivElement> & {
+        ArrayItems: import("@formily/reactive-react").ReactFC<import("react").HTMLAttributes<HTMLDivElement>> & import("@formily/antd-v5").ArrayBaseMixins & {
+            Item: import("@formily/reactive-react").ReactFC<import("react").HTMLAttributes<HTMLDivElement> & {
                 type?: "divide" | "card";
             }>;
         };
-        RequestBody(props: any): React.JSX.Element;
+        WorkflowVariableInput: typeof WorkflowVariableInput;
+        WorkflowVariableJSON: typeof WorkflowVariableJSON;
+    };
+    useVariables({ key, title }: {
+        key: any;
+        title: any;
+    }, { types, fieldNames }: {
+        types: any;
+        fieldNames?: import("@nocobase/client").FieldNames;
+    }): {
+        [x: string]: any;
     };
 };
 export default _default;

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import { WorkflowVariableRawTextArea } from '../variable';
 declare const _default: {
     title: string;
     type: string;
@@ -20,7 +20,16 @@ declare const _default: {
     };
     scope: {};
     components: {
-        SQLInput(props: any): React.JSX.Element;
+        WorkflowVariableRawTextArea: typeof WorkflowVariableRawTextArea;
+    };
+    useVariables({ key, title }: {
+        key: any;
+        title: any;
+    }, { types, fieldNames }: {
+        types: any;
+        fieldNames?: import("@nocobase/client").FieldNames;
+    }): {
+        [x: string]: any;
     };
 };
 export default _default;

package/dist/client/schemas/collection.d.ts

@@ -116,7 +116,6 @@ export declare const pagination: {
                             'x-decorator': string;
                             'x-component': string;
                             'x-component-props': {
-                                scope: string;
                                 useTypedConstant: string[];
                             };
                             default: number;

package/dist/client/triggers/form.d.ts

@@ -44,7 +44,7 @@ declare const _default: {
     useVariables(config: any, options: any): import("../variable").VariableOption[];
     useInitializers(config: any): SchemaInitializerItemOptions | null;
     initializers: {};
-    actionTriggerable: boolean;
+    useActionTriggerable: boolean;
 };
 export default _default;
 export declare function useTriggerWorkflowsActionProps(): {

package/dist/client/triggers/index.d.ts

@@ -19,7 +19,7 @@ export interface Trigger {
     };
     useInitializers?(config: any): SchemaInitializerItemOptions | null;
     initializers?: any;
-    actionTriggerable?: boolean;
+    useActionTriggerable?: boolean | (() => boolean);
 }
 export declare const triggers: any;
 export declare const TriggerConfig: () => React.JSX.Element;

package/dist/client/variable.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export type VariableOption = {
     key?: string;
     value?: string;
@@ -22,6 +23,7 @@ export type OptionsOfUseVariableOptions = {
     };
     appends?: string[] | null;
     depth?: number;
+    current?: any;
 };
 export declare const defaultFieldNames: {
     readonly label: "label";
@@ -58,10 +60,24 @@ export declare const BaseTypeSets: {
     date: Set<string>;
 };
 export declare function useWorkflowVariableOptions(options?: OptionsOfUseVariableOptions): {
-    label: any;
-    value: any;
+    [x: number]: any;
     key: any;
-    children: any;
     disabled: boolean;
 }[];
 export declare function getCollectionFieldOptions(options: any): VariableOption[];
+export declare function WorkflowVariableInput({ variableOptions, ...props }: {
+    [x: string]: any;
+    variableOptions: any;
+}): JSX.Element;
+export declare function WorkflowVariableTextArea({ variableOptions, ...props }: {
+    [x: string]: any;
+    variableOptions: any;
+}): JSX.Element;
+export declare function WorkflowVariableRawTextArea({ variableOptions, ...props }: {
+    [x: string]: any;
+    variableOptions: any;
+}): JSX.Element;
+export declare function WorkflowVariableJSON({ variableOptions, ...props }: {
+    [x: string]: any;
+    variableOptions: any;
+}): JSX.Element;

package/dist/externalVersion.js

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

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-11-01T02:16:46.199Z"}
+{"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-11-13T10:38:31.619Z"}

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-11-01T02:16:45.638Z"}
+{"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-11-13T10:38:31.314Z"}

package/dist/server/triggers/schedule.js

@@ -428,7 +428,7 @@ class ScheduleTrigger extends import__.Trigger {
     workflows.forEach(async (workflow) => {
       const should = await this.shouldCache(workflow, now);
       if (should) {
-        this.plugin.app.logger.info("caching scheduled workflow will run in next minute:", workflow.id);
+        this.plugin.getLogger(workflow.id).info("caching scheduled workflow will run in next minute");
       }
       this.setCache(workflow, !should);
     });

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.8",
+  "version": "0.15.0-alpha.2",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
@@ -41,5 +41,5 @@
     "@nocobase/test": "0.x",
     "@nocobase/utils": "0.x"
   },
-  "gitHead": "59c82fef6e34707802b5841f5ec4d9b3b6b68abb"
+  "gitHead": "2504887cf82935200bf546b28adf2872cab3e452"
 }