@nocobase/plugin-workflow 1.6.14 → 1.6.16

package/dist/client/triggers/schedule/RepeatField.d.ts

@@ -7,7 +7,8 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import React from 'react';
-export declare function RepeatField({ value, onChange }: {
+export declare function RepeatField({ value, onChange, disabled }: {
     value?: any;
     onChange: any;
+    disabled: any;
 }): React.JSX.Element;

package/dist/externalVersion.js

@@ -11,24 +11,24 @@ module.exports = {
   "react": "18.2.0",
   "@formily/core": "2.3.0",
   "@formily/react": "2.3.0",
-  "@nocobase/client": "1.6.14",
-  "@nocobase/utils": "1.6.14",
+  "@nocobase/client": "1.6.16",
+  "@nocobase/utils": "1.6.16",
   "antd": "5.12.8",
   "@ant-design/icons": "5.6.1",
   "react-router-dom": "6.28.1",
   "react-i18next": "11.18.6",
   "lodash": "4.17.21",
   "sequelize": "6.35.2",
-  "@nocobase/database": "1.6.14",
-  "@nocobase/server": "1.6.14",
-  "@nocobase/data-source-manager": "1.6.14",
-  "@nocobase/logger": "1.6.14",
-  "@nocobase/evaluators": "1.6.14",
+  "@nocobase/database": "1.6.16",
+  "@nocobase/server": "1.6.16",
+  "@nocobase/data-source-manager": "1.6.16",
+  "@nocobase/logger": "1.6.16",
+  "@nocobase/evaluators": "1.6.16",
   "@formily/antd-v5": "1.1.9",
   "@formily/reactive": "2.3.0",
   "@formily/shared": "2.3.2",
-  "@nocobase/actions": "1.6.14",
+  "@nocobase/actions": "1.6.16",
   "dayjs": "1.11.10",
-  "@nocobase/plugin-workflow-test": "1.6.14",
-  "@nocobase/test": "1.6.14"
+  "@nocobase/plugin-workflow-test": "1.6.16",
+  "@nocobase/test": "1.6.16"
 };

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":"2025-03-29T03:59:33.890Z"}
+{"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":"2025-04-03T07:52:03.107Z"}

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":"2025-03-29T03:59:33.536Z"}
+{"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":"2025-04-03T07:52:02.728Z"}

package/dist/server/Plugin.js

@@ -317,11 +317,14 @@ class PluginWorkflowServer extends import_server.Plugin {
       const prev = workflow.previous();
       if (prev.config) {
         trigger.off({ ...workflow.get(), ...prev });
+        this.getLogger(workflow.id).info(`toggle OFF workflow ${workflow.id} based on configuration before updated`);
       }
       trigger.on(workflow);
+      this.getLogger(workflow.id).info(`toggle ON workflow ${workflow.id}`);
       this.enabledCache.set(workflow.id, workflow);
     } else {
       trigger.off(workflow);
+      this.getLogger(workflow.id).info(`toggle OFF workflow ${workflow.id}`);
       this.enabledCache.delete(workflow.id);
     }
     if (!silent) {

package/dist/server/triggers/ScheduleTrigger/DateFieldScheduleTrigger.d.ts

@@ -27,9 +27,11 @@ export default class DateFieldScheduleTrigger {
     private timer;
     private cache;
     cacheCycle: number;
+    onAfterStart: () => void;
+    onBeforeStop: () => void;
     constructor(workflow: Plugin);
-    reload(): Promise<void>;
-    inspect(workflows: WorkflowModel[]): void;
+    reload(): void;
+    inspect(workflow: WorkflowModel): Promise<void>;
     loadRecordsToSchedule({ id, config: { collection, limit, startsOn, repeat, endsOn }, allExecuted }: WorkflowModel, currentDate: Date): Promise<import("@nocobase/database").Model<any, any>[]>;
     getRecordNextTime(workflow: WorkflowModel, record: any, nextSecond?: boolean): any;
     schedule(workflow: WorkflowModel, record: any, nextTime: any, toggle?: boolean, options?: {}): Promise<void>;

package/dist/server/triggers/ScheduleTrigger/DateFieldScheduleTrigger.js

@@ -99,44 +99,49 @@ function getHookId(workflow, type) {
 class DateFieldScheduleTrigger {
   constructor(workflow) {
     this.workflow = workflow;
-    workflow.app.on("afterStart", async () => {
-      if (this.timer) {
-        return;
-      }
-      this.timer = setInterval(() => this.reload(), this.cacheCycle);
-      this.reload();
-    });
-    workflow.app.on("beforeStop", () => {
-      if (this.timer) {
-        clearInterval(this.timer);
-      }
-      for (const [key, timer] of this.cache.entries()) {
-        clearTimeout(timer);
-        this.cache.delete(key);
-      }
-    });
+    workflow.app.on("afterStart", this.onAfterStart);
+    workflow.app.on("beforeStop", this.onBeforeStop);
   }
   events = /* @__PURE__ */ new Map();
   timer = null;
   cache = /* @__PURE__ */ new Map();
   // caching workflows in range, default to 5min
   cacheCycle = 3e5;
-  async reload() {
+  onAfterStart = () => {
+    if (this.timer) {
+      return;
+    }
+    this.timer = setInterval(() => this.reload(), this.cacheCycle);
+    this.reload();
+  };
+  onBeforeStop = () => {
+    if (this.timer) {
+      clearInterval(this.timer);
+    }
+    for (const [key, timer] of this.cache.entries()) {
+      clearTimeout(timer);
+      this.cache.delete(key);
+    }
+  };
+  reload() {
+    for (const [key, timer] of this.cache.entries()) {
+      clearTimeout(timer);
+      this.cache.delete(key);
+    }
     const workflows = Array.from(this.workflow.enabledCache.values()).filter(
       (item) => item.type === "schedule" && item.config.mode === import_utils.SCHEDULE_MODE.DATE_FIELD
     );
-    this.cache = /* @__PURE__ */ new Map();
-    this.inspect(workflows);
+    workflows.forEach((workflow) => {
+      this.inspect(workflow);
+    });
   }
-  inspect(workflows) {
+  async inspect(workflow) {
     const now = /* @__PURE__ */ new Date();
-    workflows.forEach(async (workflow) => {
-      const records = await this.loadRecordsToSchedule(workflow, now);
-      this.workflow.getLogger(workflow.id).info(`[Schedule on date field] ${records.length} records to schedule`);
-      records.forEach((record) => {
-        const nextTime = this.getRecordNextTime(workflow, record);
-        this.schedule(workflow, record, nextTime, Boolean(nextTime));
-      });
+    const records = await this.loadRecordsToSchedule(workflow, now);
+    this.workflow.getLogger(workflow.id).info(`[Schedule on date field] ${records.length} records to schedule`);
+    records.forEach((record) => {
+      const nextTime = this.getRecordNextTime(workflow, record);
+      this.schedule(workflow, record, nextTime, Boolean(nextTime));
     });
   }
   // 1. startsOn in range -> yes
@@ -210,8 +215,6 @@ class DateFieldScheduleTrigger {
                 [import_database.Op.gte]: new Date(endTimestamp)
               }
             });
-          } else {
-            this.workflow.getLogger(id).warn(`[Schedule on date field] "endsOn.field" is not configured`);
           }
         }
       }
@@ -333,7 +336,7 @@ class DateFieldScheduleTrigger {
     }
   }
   on(workflow) {
-    this.inspect([workflow]);
+    this.inspect(workflow);
     const { collection } = workflow.config;
     const [dataSourceName, collectionName] = (0, import_data_source_manager.parseCollectionName)(collection);
     const event = `${collectionName}.afterSaveWithAssociations`;

package/dist/server/triggers/ScheduleTrigger/StaticScheduleTrigger.d.ts

@@ -11,8 +11,10 @@ import { WorkflowModel } from '../../types';
 export default class StaticScheduleTrigger {
     workflow: Plugin;
     private timers;
+    onAfterStart: () => void;
+    onBeforeStop: () => void;
     constructor(workflow: Plugin);
-    inspect(workflows: WorkflowModel[]): void;
+    inspect(workflow: WorkflowModel): void;
     getNextTime({ config, allExecuted }: WorkflowModel, currentDate: Date, nextSecond?: boolean): number;
     schedule(workflow: WorkflowModel, nextTime: number, toggle?: boolean): void;
     trigger(workflow: WorkflowModel, time: number): Promise<void>;

package/dist/server/triggers/ScheduleTrigger/StaticScheduleTrigger.js

@@ -45,30 +45,32 @@ const MAX_SAFE_INTERVAL = 2147483647;
 class StaticScheduleTrigger {
   constructor(workflow) {
     this.workflow = workflow;
-    workflow.app.on("afterStart", async () => {
-      const workflows = Array.from(this.workflow.enabledCache.values()).filter(
-        (item) => item.type === "schedule" && item.config.mode === import_utils.SCHEDULE_MODE.STATIC
-      );
-      this.inspect(workflows);
-    });
-    workflow.app.on("beforeStop", () => {
-      for (const timer of this.timers.values()) {
-        clearInterval(timer);
-      }
-    });
+    workflow.app.on("afterStart", this.onAfterStart);
+    workflow.app.on("beforeStop", this.onBeforeStop);
   }
   timers = /* @__PURE__ */ new Map();
-  inspect(workflows) {
-    const now = /* @__PURE__ */ new Date();
+  onAfterStart = () => {
+    const workflows = Array.from(this.workflow.enabledCache.values()).filter(
+      (item) => item.type === "schedule" && item.config.mode === import_utils.SCHEDULE_MODE.STATIC
+    );
     workflows.forEach((workflow) => {
-      const nextTime = this.getNextTime(workflow, now);
-      if (nextTime) {
-        this.workflow.getLogger(workflow.id).info(`caching scheduled workflow will run at: ${new Date(nextTime).toISOString()}`);
-      } else {
-        this.workflow.getLogger(workflow.id).info("workflow will not be scheduled");
-      }
-      this.schedule(workflow, nextTime, nextTime >= now.getTime());
+      this.inspect(workflow);
     });
+  };
+  onBeforeStop = () => {
+    for (const timer of this.timers.values()) {
+      clearInterval(timer);
+    }
+  };
+  inspect(workflow) {
+    const now = /* @__PURE__ */ new Date();
+    const nextTime = this.getNextTime(workflow, now);
+    if (nextTime) {
+      this.workflow.getLogger(workflow.id).info(`caching scheduled workflow will run at: ${new Date(nextTime).toISOString()}`);
+    } else {
+      this.workflow.getLogger(workflow.id).info("workflow will not be scheduled");
+    }
+    this.schedule(workflow, nextTime, nextTime >= now.getTime());
   }
   getNextTime({ config, allExecuted }, currentDate, nextSecond = false) {
     if (config.limit && allExecuted >= config.limit) {
@@ -144,7 +146,7 @@ class StaticScheduleTrigger {
     }
   }
   on(workflow) {
-    this.inspect([workflow]);
+    this.inspect(workflow);
   }
   off(workflow) {
     this.schedule(workflow, null, false);

package/package.json

@@ -4,13 +4,13 @@
   "displayName.zh-CN": "工作流",
   "description": "A powerful BPM tool that provides foundational support for business automation, with the capability to extend unlimited triggers and nodes.",
   "description.zh-CN": "一个强大的 BPM 工具，为业务自动化提供基础支持，并且可任意扩展更多的触发器和节点。",
-  "version": "1.6.14",
+  "version": "1.6.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/workflow",
   "dependencies": {
-    "@nocobase/plugin-workflow-test": "1.6.14"
+    "@nocobase/plugin-workflow-test": "1.6.16"
   },
   "devDependencies": {
     "@ant-design/icons": "5.x",
@@ -44,7 +44,7 @@
     "@nocobase/test": "1.x",
     "@nocobase/utils": "1.x"
   },
-  "gitHead": "cfcd27a4e9d15873fc0d5f1bfa6e8b8711eea3fb",
+  "gitHead": "ce982faa1c9411285e1432faf9bc897c663914b3",
   "keywords": [
     "Workflow"
   ]