@cloud-app-dev/vidc 1.0.36 → 1.0.40

package/es/WorkerFlow/utils.js

@@ -14,7 +14,7 @@ import _ from 'lodash';
 export function getJAVATaskData(data) {
   var arr = [];
 
-  var fn = function fn(node) {
+  var fn = function fn(node, _nextNode) {
     var _a, _b, _c, _d;
 
     if (node.bpmnType === 'userTask') {
@@ -52,7 +52,12 @@ export function getJAVATaskData(data) {
       }
 
       if (((_b = node.childNode) === null || _b === void 0 ? void 0 : _b.bpmnType) === 'userTask') {
-        item.nextTaskId = node.childNode.id;
+        item.nextTaskId = getNextTaskId(node.childNode);
+      } // 连接条件nextTaskId
+
+
+      if (!node.childNode) {
+        item.nextTaskId = _nextNode === null || _nextNode === void 0 ? void 0 : _nextNode.id;
       }
 
       if (node.form) {
@@ -73,18 +78,16 @@ export function getJAVATaskData(data) {
       arr.push(item);
     }
 
+    var nextNode = getNextNode(node.childNode);
+
     if (node.conditionNodes) {
       node.conditionNodes.forEach(function (item) {
-        fn(item);
+        fn(item, nextNode);
       });
     }
 
-    if (node.childNode) {
-      if (node.childNode.type === 2 && node.childNode.childNode) {
-        fn(node.childNode.childNode);
-      } else {
-        fn(node.childNode);
-      }
+    if (nextNode) {
+      fn(nextNode, _nextNode);
     }
   };
 
@@ -96,6 +99,28 @@ export function getJAVATaskData(data) {
 
   return arr;
 }
+export function getNextTaskId(node) {
+  if (!node) {
+    return undefined;
+  }
+
+  if (node.type !== 2) {
+    return node.id;
+  } else {
+    return getNextTaskId(node.childNode);
+  }
+}
+export function getNextNode(node) {
+  if (!node) {
+    return undefined;
+  }
+
+  if (node.type !== 2) {
+    return node;
+  } else {
+    return getNextNode(node.childNode);
+  }
+}
 export function filterNoticeNode(data) {
   var newData = _.cloneDeep(data);
 

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "1.0.36",
+  "version": "1.0.40",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -38,7 +38,7 @@
     "rc-queue-anim": "^2.0.0"
   },
   "devDependencies": {
-    "@cloud-app-dev/basic-components": "^1.0.49",
+    "@cloud-app-dev/basic-components": "^1.0.52",
     "@types/chroma-js": "^2.1.3",
     "@types/lodash": "^4.14.172",
     "@umijs/test": "^3.0.5",

package/scripts/entry.js

@@ -17,4 +17,4 @@ function run() {
 
 run();
 
-console.log('entry is init!');
+console.log('================== entry is init! ===================');