@nocobase/plugin-workflow 0.7.0-alpha.58 → 0.7.0-alpha.59

package/lib/collections/workflows.js

@@ -12,57 +12,49 @@ var _default = {
     name: 'key',
     type: 'uid'
   }, {
-    interface: 'string',
     type: 'string',
     name: 'title',
     title: '工作流名称',
     required: true
   }, {
-    interface: 'boolean',
     type: 'boolean',
     name: 'enabled',
     title: '启用',
     defaultValue: false
   }, {
-    interface: 'textarea',
     type: 'text',
     name: 'description',
     title: '描述'
   }, {
-    interface: 'select',
     type: 'string',
     title: '触发方式',
     name: 'type',
     required: true
   }, {
-    interface: 'json',
     type: 'jsonb',
     title: '触发配置',
     name: 'config',
     required: true,
     defaultValue: {}
   }, {
-    interface: 'boolean',
     type: 'boolean',
     title: '使用事务',
     name: 'useTransaction',
     defaultValue: true
   }, {
-    interface: 'linkTo',
     type: 'hasMany',
     name: 'nodes',
     target: 'flow_nodes',
     title: '流程节点'
   }, {
-    interface: 'linkTo',
     type: 'hasMany',
     name: 'executions',
     target: 'executions',
     title: '触发执行'
   }, {
-    type: 'boolean',
+    type: 'integer',
     name: 'executed',
-    defaultValue: false
+    defaultValue: 0
   }, {
     type: 'boolean',
     name: 'current',

package/lib/models/Workflow.d.ts

@@ -11,7 +11,7 @@ export default class WorkflowModel extends Model {
     type: string;
     config: any;
     useTransaction: boolean;
-    executed: boolean;
+    executed: number;
     createdAt: Date;
     updatedAt: Date;
     nodes: FlowNodeModel[];

package/lib/models/Workflow.js

@@ -59,21 +59,20 @@ class WorkflowModel extends _database().Model {
         }, {
           transaction
         });
+        const executed = yield _this.countExecutions({
+          transaction
+        }); // NOTE: not to trigger afterUpdate hook here
+
+        yield _this.update({
+          executed
+        }, {
+          transaction,
+          hooks: false
+        });
         execution.workflow = _this;
         yield execution.start({
           transaction
-        });
-
-        if (!_this.executed) {
-          // NOTE: not to trigger afterUpdate hook here
-          yield _this.update({
-            executed: true
-          }, {
-            transaction,
-            hooks: false
-          });
-        } // @ts-ignore
-
+        }); // @ts-ignore
 
         if (transaction && (!options.transaction || options.transaction.finished)) {
           yield transaction.commit();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-workflow",
-  "version": "0.7.0-alpha.58",
+  "version": "0.7.0-alpha.59",
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "licenses": [
@@ -10,14 +10,14 @@
     }
   ],
   "dependencies": {
-    "@nocobase/actions": "0.7.0-alpha.58",
-    "@nocobase/database": "0.7.0-alpha.58",
-    "@nocobase/server": "0.7.0-alpha.58",
-    "@nocobase/utils": "0.7.0-alpha.58",
+    "@nocobase/actions": "0.7.0-alpha.59",
+    "@nocobase/database": "0.7.0-alpha.59",
+    "@nocobase/server": "0.7.0-alpha.59",
+    "@nocobase/utils": "0.7.0-alpha.59",
     "json-templates": "^4.2.0"
   },
   "devDependencies": {
-    "@nocobase/test": "0.7.0-alpha.58"
+    "@nocobase/test": "0.7.0-alpha.59"
   },
-  "gitHead": "19ee42257edf17804d548ffd5ba9ddff6dc775d1"
+  "gitHead": "c90e5aee4c8257a3ab7ff492e69cb568cccff8b5"
 }