@cloud-app-dev/vidc 1.0.37 → 1.0.38

package/es/WorkerFlow/Form/UserSet.js

@@ -73,6 +73,9 @@ function UserSet(_ref) {
       return cloneDeep(Object.assign(Object.assign({}, old), options));
     });
   }, []);
+  var users = useMemo(function () {
+    return state[state.type];
+  }, [state]);
   var data = useMemo(function () {
     return {
       userType: state.type,
@@ -106,7 +109,7 @@ function UserSet(_ref) {
   })), /*#__PURE__*/React.createElement(Content, {
     type: state.type,
     emptyUsers: state.emptyUsers,
-    users: state[state.type],
+    users: users,
     chargeLevel: state.chargeLevel,
     usersHandType: state.usersHandType,
     onChange: function onChange(options) {
@@ -205,7 +208,7 @@ function UserSelectType3(_ref4) {
       emptyUsers = _ref4.emptyUsers;
   var userList = useMemo(function () {
     return users.filter(function (v) {
-      return v.key === 'userId';
+      return v.key === 'groupId';
     });
   }, [users]);
   return /*#__PURE__*/React.createElement("div", {

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.js

@@ -15,7 +15,7 @@ export function getJAVATaskData(data) {
   var arr = [];
 
   var fn = function fn(node) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
 
     if (node.bpmnType === 'userTask') {
       var item = {
@@ -51,12 +51,12 @@ export function getJAVATaskData(data) {
         item.multiVariableName = "assigneeList_".concat(node.id);
       }
 
-      if (((_b = node.childNode) === null || _b === void 0 ? void 0 : _b.bpmnType) === 'userTask') {
+      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 (node.form) {
-        item.formAuthority = JSON.stringify((_c = node.form) === null || _c === void 0 ? void 0 : _c.map(function (v) {
+        item.formAuthority = JSON.stringify((_d = node.form) === null || _d === void 0 ? void 0 : _d.map(function (v) {
           return {
             formAuth: v.auth,
             formVariableName: v.name
@@ -64,7 +64,7 @@ export function getJAVATaskData(data) {
         }));
       }
 
-      if (((_d = node.childNode) === null || _d === void 0 ? void 0 : _d.type) === 2) {
+      if (((_e = node.childNode) === null || _e === void 0 ? void 0 : _e.type) === 2) {
         item.copyUserIds = node.childNode.nodeUserList.map(function (v) {
           return v.value;
         });

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.38",
   "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.51",
     "@types/chroma-js": "^2.1.3",
     "@types/lodash": "^4.14.172",
     "@umijs/test": "^3.0.5",