@cloud-app-dev/vidc 1.0.38 → 1.0.39

package/es/WorkerFlow/utils.d.ts

@@ -1,4 +1,6 @@
 import { NodeItem, SubmitFlowItemType } from './interface';
 export declare function getJAVATaskData(data: NodeItem): SubmitFlowItemType[];
+export declare function getNextTaskId(node: NodeItem): string | undefined;
+export declare function getNextNode(node: NodeItem): NodeItem | undefined;
 export declare function filterNoticeNode(data: NodeItem): NodeItem;
 export declare function getUserFormKeys(data: NodeItem): string[];

package/es/WorkerFlow/utils.js

@@ -14,8 +14,8 @@ import _ from 'lodash';
 export function getJAVATaskData(data) {
   var arr = [];
 
-  var fn = function fn(node) {
-    var _a, _b, _c, _d, _e;
+  var fn = function fn(node, _nextNode) {
+    var _a, _b, _c, _d;
 
     if (node.bpmnType === 'userTask') {
       var item = {
@@ -51,12 +51,17 @@ export function getJAVATaskData(data) {
         item.multiVariableName = "assigneeList_".concat(node.id);
       }
 
-      if (((_b = node.childNode) === null || _b === void 0 ? void 0 : _b.bpmnType) === 'userTask' && ((_c = node.childNode) === null || _c === void 0 ? void 0 : _c.type) !== 2) {
-        item.nextTaskId = node.childNode.id;
+      if (((_b = node.childNode) === null || _b === void 0 ? void 0 : _b.bpmnType) === 'userTask') {
+        item.nextTaskId = getNextTaskId(node.childNode);
+      } // 连接条件nextTaskId
+
+
+      if (!node.childNode) {
+        item.nextTaskId = _nextNode === null || _nextNode === void 0 ? void 0 : _nextNode.id;
       }
 
       if (node.form) {
-        item.formAuthority = JSON.stringify((_d = node.form) === null || _d === void 0 ? void 0 : _d.map(function (v) {
+        item.formAuthority = JSON.stringify((_c = node.form) === null || _c === void 0 ? void 0 : _c.map(function (v) {
           return {
             formAuth: v.auth,
             formVariableName: v.name
@@ -64,7 +69,7 @@ export function getJAVATaskData(data) {
         }));
       }
 
-      if (((_e = node.childNode) === null || _e === void 0 ? void 0 : _e.type) === 2) {
+      if (((_d = node.childNode) === null || _d === void 0 ? void 0 : _d.type) === 2) {
         item.copyUserIds = node.childNode.nodeUserList.map(function (v) {
           return v.value;
         });
@@ -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.38",
+  "version": "1.0.39",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",