@cloud-app-dev/vidc 1.0.37 → 1.0.41

package/es/WorkerFlow/index.js

@@ -1,5 +1,6 @@
 import _useChangeEffect from "@cloud-app-dev/basic-components/es/useChangeEffect";
-import _Modal from "@cloud-app-dev/basic-components/es/Modal";
+import "antd/lib/modal/style";
+import _Modal from "antd/lib/modal";
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -61,6 +62,11 @@ function WorkerFlow(_ref, ref) {
 
   var drawerRef = useRef(null);
 
+  var _Modal$useModal = _Modal.useModal(),
+      _Modal$useModal2 = _slicedToArray(_Modal$useModal, 2),
+      modal = _Modal$useModal2[0],
+      contextHolder = _Modal$useModal2[1];
+
   var updateNode = function updateNode() {
     return setConfig(Object.assign({}, config));
   }; // 链表操作: 几种行为， 添加行为，删除行为，点击行为     pRef.childNode -> node.childNode -> 后继
@@ -117,8 +123,9 @@ function WorkerFlow(_ref, ref) {
       return;
     }
 
+    var title = "\u662F\u5426\u5220\u9664\u8282\u70B9\"".concat(type === NodeTypes.BRANCH ? node.conditionNodes[index].nodeName : node.nodeName, "\"\uFF1F");
     var options = {
-      title: "\u662F\u5426\u5220\u9664\u8282\u70B9\"".concat(type === NodeTypes.BRANCH ? node.conditionNodes[index].nodeName : node.nodeName, "\"\uFF1F"),
+      title: title,
       okText: '确定',
       cancelText: '取消'
     };
@@ -153,7 +160,7 @@ function WorkerFlow(_ref, ref) {
       }));
     };
 
-    _Modal.confirm(Object.assign(Object.assign({}, options), {
+    modal.confirm(Object.assign(Object.assign({}, options), {
       onOk: onOk
     }));
   } // 获取节点
@@ -182,7 +189,7 @@ function WorkerFlow(_ref, ref) {
         node.form = data.form || [];
         node.userType = data.userType;
         node.usersHandType = data.usersHandType;
-        node.owner = data.nodeUserList.map(function (v) {
+        node.owner = data.userType === 4 ? '直属主管' : data.nodeUserList.map(function (v) {
           return v.name;
         }).join('，');
         node.emptyUserList = data.emptyUserList;
@@ -279,7 +286,7 @@ function WorkerFlow(_ref, ref) {
   }), /*#__PURE__*/React.createElement(EndNode, {
     nodeName: "\u6D41\u7A0B\u7ED3\u675F",
     id: endId
-  })))), /*#__PURE__*/React.createElement(RefDrawer, {
+  }))), contextHolder), /*#__PURE__*/React.createElement(RefDrawer, {
     ref: drawerRef
   }));
 }

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,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.37",
+  "version": "1.0.41",
   "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.54",
     "@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! ===================');