@nocobase/plugin-workflow 0.11.1-alpha.4 → 0.11.1-alpha.5

package/lib/server/instructions/condition.js

@@ -25,10 +25,10 @@ const calculators = new (_utils().Registry)();
 // built-in functions
 exports.calculators = calculators;
 function equal(a, b) {
-  return a === b;
+  return a == b;
 }
 function notEqual(a, b) {
-  return a !== b;
+  return a != b;
 }
 function gt(a, b) {
   return a > b;
@@ -48,8 +48,8 @@ calculators.register('gt', gt);
 calculators.register('gte', gte);
 calculators.register('lt', lt);
 calculators.register('lte', lte);
-calculators.register('===', equal);
-calculators.register('!==', notEqual);
+calculators.register('==', equal);
+calculators.register('!=', notEqual);
 calculators.register('>', gt);
 calculators.register('>=', gte);
 calculators.register('<', lt);

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.11.1-alpha.4",
+  "version": "0.11.1-alpha.5",
   "license": "AGPL-3.0",
   "main": "./lib/server/index.js",
   "files": [
@@ -27,9 +27,9 @@
   },
   "peerDependencies": {
     "@ant-design/icons": "^5.1.4",
-    "@formily/antd-v5": "1.1.0-beta.4",
-    "@formily/core": "2.2.26",
-    "@formily/react": "2.2.26",
+    "@formily/antd-v5": "^1.1.0",
+    "@formily/core": "^2.2.27",
+    "@formily/react": "^2.2.27",
     "@nocobase/actions": "0.11.0-alpha.1",
     "@nocobase/client": "0.11.0-alpha.1",
     "@nocobase/database": "0.11.0-alpha.1",
@@ -48,8 +48,8 @@
     "winston": "^3.8.2"
   },
   "devDependencies": {
-    "@nocobase/test": "0.11.1-alpha.4",
+    "@nocobase/test": "0.11.1-alpha.5",
     "@types/ejs": "^3.1.1"
   },
-  "gitHead": "d9b5bde913013f1057e1aab49587eb0ad3dcb06e"
+  "gitHead": "1dcfd15a7d95a40b0a2f60e1de19ec574066fb20"
 }

package/src/server/__tests__/instructions/condition.test.ts

@@ -1,7 +1,7 @@
-import { Application } from '@nocobase/server';
 import Database from '@nocobase/database';
+import { Application } from '@nocobase/server';
 import { getApp, sleep } from '..';
-import { EXECUTION_STATUS, BRANCH_INDEX } from '../../constants';
+import { BRANCH_INDEX, EXECUTION_STATUS } from '../../constants';
 
 describe('workflow > instructions > condition', () => {
   let app: Application;
@@ -243,51 +243,150 @@ describe('workflow > instructions > condition', () => {
   });
 
   describe('engines', () => {
-    it('default as basic', async () => {
-      const n1 = await workflow.createNode({
-        title: 'condition',
-        type: 'condition',
-        config: {
-          calculation: {
-            calculator: 'equal',
-            operands: [1, '{{$context.data.read}}'],
+    describe('basic', () => {
+      it('default as basic', async () => {
+        const n1 = await workflow.createNode({
+          title: 'condition',
+          type: 'condition',
+          config: {
+            calculation: {
+              calculator: 'equal',
+              operands: [1, '{{$context.data.read}}'],
+            },
           },
-        },
+        });
+
+        const post = await PostRepo.create({ values: { read: 1 } });
+
+        await sleep(500);
+
+        const [execution] = await workflow.getExecutions();
+        expect(execution.status).toEqual(EXECUTION_STATUS.RESOLVED);
+
+        const [job] = await execution.getJobs();
+        expect(job.result).toEqual(true);
       });
 
-      const post = await PostRepo.create({ values: { read: 1 } });
+      it('equal: 0 != null', async () => {
+        const n1 = await workflow.createNode({
+          title: 'condition',
+          type: 'condition',
+          config: {
+            engine: 'basic',
+            calculation: {
+              calculator: 'equal',
+              operands: [0, '{{$context.data.title}}'],
+            },
+            rejectOnFalse: false,
+          },
+        });
+
+        const post = await PostRepo.create({ values: {} });
 
-      await sleep(500);
+        await sleep(500);
 
-      const [execution] = await workflow.getExecutions();
-      expect(execution.status).toEqual(EXECUTION_STATUS.RESOLVED);
+        const [execution] = await workflow.getExecutions();
+        expect(execution.status).toEqual(EXECUTION_STATUS.RESOLVED);
 
-      const [job] = await execution.getJobs();
-      expect(job.result).toEqual(true);
-    });
+        const [job] = await execution.getJobs();
+        expect(job.result).toEqual(false);
+      });
 
-    it('basic engine', async () => {
-      const n1 = await workflow.createNode({
-        title: 'condition',
-        type: 'condition',
-        config: {
-          engine: 'basic',
-          calculation: {
-            calculator: 'equal',
-            operands: [1, '{{$context.data.read}}'],
+      it('equal: 0 == false', async () => {
+        const n1 = await workflow.createNode({
+          title: 'condition',
+          type: 'condition',
+          config: {
+            engine: 'basic',
+            calculation: {
+              calculator: 'equal',
+              operands: [false, '{{$context.data.read}}'],
+            },
           },
-        },
+        });
+
+        const post = await PostRepo.create({ values: {} });
+
+        await sleep(500);
+
+        const [execution] = await workflow.getExecutions();
+        expect(execution.status).toEqual(EXECUTION_STATUS.RESOLVED);
+
+        const [job] = await execution.getJobs();
+        expect(job.result).toEqual(true);
       });
 
-      const post = await PostRepo.create({ values: { read: 1 } });
+      it('equal: number == number', async () => {
+        const n1 = await workflow.createNode({
+          title: 'condition',
+          type: 'condition',
+          config: {
+            engine: 'basic',
+            calculation: {
+              calculator: 'equal',
+              operands: [1, '{{$context.data.read}}'],
+            },
+          },
+        });
 
-      await sleep(500);
+        const post = await PostRepo.create({ values: { read: 1 } });
 
-      const [execution] = await workflow.getExecutions();
-      expect(execution.status).toEqual(EXECUTION_STATUS.RESOLVED);
+        await sleep(500);
 
-      const [job] = await execution.getJobs();
-      expect(job.result).toEqual(true);
+        const [execution] = await workflow.getExecutions();
+        expect(execution.status).toEqual(EXECUTION_STATUS.RESOLVED);
+
+        const [job] = await execution.getJobs();
+        expect(job.result).toEqual(true);
+      });
+
+      it('equal: string == number', async () => {
+        const n1 = await workflow.createNode({
+          title: 'condition',
+          type: 'condition',
+          config: {
+            engine: 'basic',
+            calculation: {
+              calculator: 'equal',
+              operands: ['1', '{{$context.data.read}}'],
+            },
+          },
+        });
+
+        const post = await PostRepo.create({ values: { read: 1 } });
+
+        await sleep(500);
+
+        const [execution] = await workflow.getExecutions();
+        expect(execution.status).toEqual(EXECUTION_STATUS.RESOLVED);
+
+        const [job] = await execution.getJobs();
+        expect(job.result).toEqual(true);
+      });
+
+      it('equal: undefined == null', async () => {
+        const n1 = await workflow.createNode({
+          title: 'condition',
+          type: 'condition',
+          config: {
+            engine: 'basic',
+            calculation: {
+              calculator: 'equal',
+              operands: ['{{$context.data.category.id}}', null],
+            },
+          },
+        });
+
+        const post = await PostRepo.create({ values: {} });
+
+        await sleep(500);
+
+        const [execution] = await workflow.getExecutions();
+        expect(execution.status).toEqual(EXECUTION_STATUS.RESOLVED);
+
+        const [job] = await execution.getJobs();
+        expect(job.result).toEqual(true);
+      });
     });
 
     it('math.js', async () => {

package/src/server/instructions/condition.ts

@@ -11,11 +11,11 @@ export const calculators = new Registry<Comparer>();
 
 // built-in functions
 function equal(a, b) {
-  return a === b;
+  return a == b;
 }
 
 function notEqual(a, b) {
-  return a !== b;
+  return a != b;
 }
 
 function gt(a, b) {
@@ -41,8 +41,8 @@ calculators.register('gte', gte);
 calculators.register('lt', lt);
 calculators.register('lte', lte);
 
-calculators.register('===', equal);
-calculators.register('!==', notEqual);
+calculators.register('==', equal);
+calculators.register('!=', notEqual);
 calculators.register('>', gt);
 calculators.register('>=', gte);
 calculators.register('<', lt);