@cloud-app-dev/vidc 1.0.42 → 1.0.46

package/es/UserSelect/demo.js

@@ -0,0 +1,20 @@
+import "antd/lib/config-provider/style";
+import _ConfigProvider from "antd/lib/config-provider";
+import React from 'react';
+import OrgTree from './index';
+
+function App() {
+  return /*#__PURE__*/React.createElement(_ConfigProvider, {
+    prefixCls: "cloudapp"
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      padding: 20,
+      width: 1000,
+      height: 600
+    }
+  }, /*#__PURE__*/React.createElement(OrgTree, {
+    selectUsers: []
+  })));
+}
+
+export default App;

package/es/UserSelect/index.d.ts

@@ -5,6 +5,10 @@ interface IUserSelectProps {
     selectUsers: UserInfo[];
     onChange?: (users: UserInfo[]) => void;
     className?: string;
+    /**
+     * @description  getUser其他参数
+     */
+    userParams?: any;
 }
 declare const _default: React.ForwardRefExoticComponent<IUserSelectProps & React.RefAttributes<any>>;
 export default _default;

package/es/UserSelect/index.js

@@ -1,4 +1,5 @@
 import _useChangeEffect from "@cloud-app-dev/basic-components/es/useChangeEffect";
+import _treeHelper from "@cloud-app-dev/utils/es/treeHelper";
 import _useHttp2 from "@cloud-app-dev/basic-components/es/useHttp";
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -23,8 +24,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useCallback, useMemo, useState, useImperativeHandle } from 'react';
 import api from '../Api';
-import OrgUserTree from '../OrgUserTree';
-import { treeHelper } from '@cloud-app-dev/utils';
+import TreeMode from '../TreeMode';
 import List from '../List';
 import { uniq, intersectionWith, uniqBy, differenceWith } from 'lodash';
 import "./index.css";
@@ -33,7 +33,8 @@ function UserSelect(_ref, ref) {
   var selectUsers = _ref.selectUsers,
       onChange = _ref.onChange,
       _ref$className = _ref.className,
-      className = _ref$className === void 0 ? '' : _ref$className;
+      className = _ref$className === void 0 ? '' : _ref$className,
+      userParams = _ref.userParams;
 
   var _useState = useState({
     keyword1: '',
@@ -55,18 +56,18 @@ function UserSelect(_ref, ref) {
       orgList = _useHttp$data === void 0 ? [] : _useHttp$data;
 
   var treeData = useMemo(function () {
-    return treeHelper.computTreeList(orgList);
+    return _treeHelper.computTreeList(orgList);
   }, [orgList]);
   var selectId = useMemo(function () {
     return state.orgId ? state.orgId : treeData[0] ? treeData[0].id : undefined;
   }, [treeData, state.orgId]);
 
-  var _useHttp3 = _useHttp2(['QueryUserList', selectId], function (_ref2) {
+  var _useHttp3 = _useHttp2(['QueryUserList', selectId, userParams], function (_ref2) {
     var _ref3 = _slicedToArray(_ref2, 2),
         _ = _ref3[0],
         id = _ref3[1];
 
-    return id ? api.getUsers(id) : Promise.resolve();
+    return id ? api.getUsers(id, userParams) : Promise.resolve();
   }),
       _useHttp3$data = _useHttp3.data,
       userList = _useHttp3$data === void 0 ? [] : _useHttp3$data;
@@ -118,9 +119,22 @@ function UserSelect(_ref, ref) {
     }));
   }, [state.selectUsers, state.selectIds]);
 
+  var renderList1 = useMemo(function () {
+    return userList.filter(function (v) {
+      return !state.keyword1 || v.realName.includes(state.keyword1);
+    });
+  }, [userList, state.keyword1]);
+  var renderList2 = useMemo(function () {
+    return state.selectUsers.filter(function (v) {
+      return !state.keyword2 || v.realName.includes(state.keyword2);
+    });
+  }, [state.selectUsers, state.keyword2]);
   return /*#__PURE__*/React.createElement("div", {
     className: "user-select-modal-content ".concat(className)
-  }, /*#__PURE__*/React.createElement(OrgUserTree, {
+  }, /*#__PURE__*/React.createElement(TreeMode, {
+    mode: "Org",
+    title: "\u7EC4\u7EC7\u673A\u6784",
+    inputPlaceholder: "\u8BF7\u8F93\u5165\u540D\u79F0",
     onSelect: function onSelect(ids) {
       return setState(function (old) {
         return Object.assign(Object.assign({}, old), {
@@ -128,16 +142,16 @@ function UserSelect(_ref, ref) {
         });
       });
     },
-    activeKey: selectId
+    selectedKeys: [selectId]
   }), /*#__PURE__*/React.createElement(List, {
     onChecked: onUserChecked1,
-    list: userList,
+    list: renderList1,
     key: userList.length,
     checkedKeys: list1CheckedKeys,
     itemKey: "id",
     itemNameKey: "realName",
     className: "user-source-list",
-    title: "\u4EBA\u5458",
+    title: "\u4EBA\u5458\u5217\u8868",
     onKeywordChange: function onKeywordChange(v) {
       return setState(function (old) {
         return Object.assign(Object.assign({}, old), {
@@ -147,12 +161,12 @@ function UserSelect(_ref, ref) {
     },
     keywords: state.keyword1
   }), /*#__PURE__*/React.createElement(List, {
-    list: state.selectUsers,
+    list: renderList2,
     itemKey: "id",
     itemNameKey: "realName",
     checkedKeys: state.selectIds,
     className: "user-select-list",
-    title: "\u5DF2\u6DFB\u52A0",
+    title: "\u5DF2\u9009\u62E9\u4EBA\u5458",
     onKeywordChange: function onKeywordChange(v) {
       return setState(function (old) {
         return Object.assign(Object.assign({}, old), {

package/es/WorkerFlow/Demo.js

@@ -6,7 +6,8 @@ var form = [{
   label: '处理意见',
   auth: 1,
   name: 'yijian',
-  type: 'string',
+  widgetType: 'SINGLE_SELECTION',
+  required: true,
   options: [{
     label: '有效',
     value: 1

package/es/WorkerFlow/Form/Approver.js

@@ -14,8 +14,8 @@ function ApproverForm(_ref) {
     return (_a = getParentNodeById(config, item.id)) === null || _a === void 0 ? void 0 : _a.bpmnType;
   }, [config, item.id]);
   var includeUserTypes = useMemo(function () {
-    return parentNodeType === 'startEvent' || parentNodeType === 'sequenceFlow' ? [1, 3, 4, 5] : [1, 2, 3, 4, 5];
-  }, []);
+    return parentNodeType === 'startEvent' ? [1, 3] : parentNodeType === 'sequenceFlow' ? [1, 3, 4, 5] : [1, 2, 3, 4, 5];
+  }, [parentNodeType]);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(UserSet, {
     chargeLevel: item.chargeLevel,
     userType: item.userType,

package/es/WorkerFlow/Form/Condition.js

@@ -56,6 +56,9 @@ function ConditionForm(_ref) {
   }, [formItem.name, useConditionFields]);
   var addCondition = useCallback(function () {
     var modal = modalRef.current;
+    var allowForm = form.filter(function (v) {
+      return v.widgetType === 'SINGLE_SELECTION' && v.required;
+    });
 
     var onOk = function onOk() {
       var _a, _b;
@@ -83,7 +86,7 @@ function ConditionForm(_ref) {
     var options = {
       content: /*#__PURE__*/React.createElement(ModalContent, {
         ref: cRef,
-        form: form,
+        form: allowForm,
         value: state.field
       }),
       width: 340,

package/es/WorkerFlow/Form/FormAuth.js

@@ -104,7 +104,7 @@ function FormAuth(_ref) {
           onClick: function onClick() {
             return onFormAuthChange({
               name: item.name,
-              auth: 3
+              auth: 0
             });
           }
         });

package/es/WorkerFlow/Form/GroupSelectModalContent.js

@@ -1,3 +1,4 @@
+import _treeHelper from "@cloud-app-dev/utils/es/treeHelper";
 import _useHttp2 from "@cloud-app-dev/basic-components/es/useHttp";
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -23,9 +24,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useCallback, useMemo, useState, useImperativeHandle } from 'react';
 import api from '../../Api';
 import TreeMode from '../../TreeMode';
-import List from '../../List';
 import { uniq, intersectionWith } from 'lodash';
-import { treeHelper } from '@cloud-app-dev/utils';
 import { formatRenderGroup } from './utils';
 import GroupList from './GroupList';
 
@@ -52,7 +51,7 @@ function GroupSelectModalContent(_ref, ref) {
       orgList = _useHttp$data === void 0 ? [] : _useHttp$data;
 
   var treeData = useMemo(function () {
-    return treeHelper.computTreeList(orgList);
+    return _treeHelper.computTreeList(orgList);
   }, [orgList]);
   var selectId = useMemo(function () {
     return state.orgId ? state.orgId : treeData[0] ? treeData[0].id : undefined;
@@ -112,9 +111,26 @@ function GroupSelectModalContent(_ref, ref) {
       })
     };
   }, [state.selectUsers, state.selectIds]);
+  var nodeUserList = useMemo(function () {
+    return formatRenderGroup(groupList.filter(function (v) {
+      return !state.keyword1 || v.postName.includes(state.keyword1);
+    }).map(function (v) {
+      var orgItem = orgList.find(function (v2) {
+        return v2.id === v.orgId;
+      });
+      return {
+        name: v.postName,
+        value: v.id,
+        key: 'groupId',
+        groupName: orgItem === null || orgItem === void 0 ? void 0 : orgItem.organizationName
+      };
+    }));
+  }, [groupList, orgList, state.keyword1]);
   var renderList = useMemo(function () {
-    return formatRenderGroup(state.selectUsers);
-  }, [state.selectUsers]);
+    return formatRenderGroup(state.selectUsers.filter(function (v) {
+      return !state.keyword2 || v.name.includes(state.keyword2);
+    }));
+  }, [state.selectUsers, state.keyword2]);
   return /*#__PURE__*/React.createElement("div", {
     className: "user-select-modal-content"
   }, /*#__PURE__*/React.createElement(TreeMode, {
@@ -129,14 +145,9 @@ function GroupSelectModalContent(_ref, ref) {
       });
     },
     selectedKeys: [selectId]
-  }), /*#__PURE__*/React.createElement(List, {
-    onChecked: onUserChecked1,
-    list: groupList,
-    key: groupList.length,
+  }), /*#__PURE__*/React.createElement(GroupList, {
+    list: nodeUserList,
     checkedKeys: list1CheckedKeys,
-    itemKey: "id",
-    itemNameKey: "postName",
-    title: "\u5C97\u4F4D",
     onKeywordChange: function onKeywordChange(v) {
       return setState(function (old) {
         return Object.assign(Object.assign({}, old), {
@@ -144,7 +155,8 @@ function GroupSelectModalContent(_ref, ref) {
         });
       });
     },
-    keywords: state.keyword1
+    keywords: state.keyword1,
+    onChecked: onUserChecked1
   }), /*#__PURE__*/React.createElement(GroupList, {
     list: renderList,
     checkedKeys: state.selectIds,

package/es/WorkerFlow/Form/Handle.js

@@ -14,8 +14,8 @@ function HandleForm(_ref) {
     return (_a = getParentNodeById(config, item.id)) === null || _a === void 0 ? void 0 : _a.bpmnType;
   }, [config, item.id]);
   var includeUserTypes = useMemo(function () {
-    return parentNodeType === 'startEvent' || parentNodeType === 'sequenceFlow' ? [1, 3] : [1, 2, 3];
-  }, []);
+    return parentNodeType === 'startEvent' ? [1, 3] : parentNodeType === 'sequenceFlow' ? [1, 3, 4, 5] : [1, 2, 3, 4, 5];
+  }, [parentNodeType]);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(UserSet, {
     chargeLevel: item.chargeLevel,
     userType: item.userType,

package/es/WorkerFlow/Form/Notifier.js

@@ -8,7 +8,8 @@ function NotifierForm(_ref) {
     userType: item.userType,
     nodeUserList: item.nodeUserList,
     onChange: onChange,
-    includeUserTypes: [1]
+    includeUserTypes: [1],
+    nodeType: 2
   }));
 }
 

package/es/WorkerFlow/Form/UserAndGroupSelect.js

@@ -27,6 +27,7 @@ import chroma from 'chroma-js';
 import UserSelectModalContent from './UserSelectModalContent';
 import GroupSelectModalContent from './GroupSelectModalContent';
 import RefModal from '../../RefModal';
+import { formatRenderGroup } from './utils';
 
 function UserAndGroupSelect(_ref) {
   var _this = this;
@@ -97,6 +98,9 @@ function UserAndGroupSelect(_ref) {
       }
     });
   }, [state.userList, state.type]);
+  var renderList = useMemo(function () {
+    return state.type === 'groupId' ? formatRenderGroup(state.userList) : state.userList;
+  }, [state.userList, state.type]);
   useEffect(function () {
     return onChange(state.userList);
   }, [state.userList]);
@@ -108,6 +112,16 @@ function UserAndGroupSelect(_ref) {
       });
     });
   }, []);
+  var onCloseTag = useCallback(function (id) {
+    var list = state.userList.filter(function (v) {
+      return v.value !== id;
+    });
+    setState(function (old) {
+      return Object.assign(Object.assign({}, old), {
+        userList: list
+      });
+    });
+  }, [state.userList]);
   return /*#__PURE__*/React.createElement("div", {
     className: "user-select-component user-and-group-select-component"
   }, /*#__PURE__*/React.createElement("div", {
@@ -135,12 +149,37 @@ function UserAndGroupSelect(_ref) {
     className: "placeholder"
   }, "\u4E0D\u80FD\u8D85\u8FC720\u4E2A")), /*#__PURE__*/React.createElement("div", {
     className: "user-list-wrapper"
-  }, state.userList.map(function (v) {
+  }, state.type === 'userId' ? state.userList.map(function (v) {
     return /*#__PURE__*/React.createElement(_Tag, {
       closable: true,
       key: v.value,
-      color: color
+      color: color,
+      onClose: function onClose() {
+        return onCloseTag(v.value);
+      }
     }, v.name);
+  }) : renderList.map(function (v) {
+    return /*#__PURE__*/React.createElement("div", {
+      key: v[0],
+      style: {
+        marginBottom: 12,
+        fontSize: 'var(--fs)'
+      }
+    }, /*#__PURE__*/React.createElement("div", {
+      style: {
+        paddingBottom: 5,
+        fontWeight: 'bold'
+      }
+    }, v[0]), v[1].map(function (item) {
+      return /*#__PURE__*/React.createElement(_Tag, {
+        closable: true,
+        key: item.value,
+        color: color,
+        onClose: function onClose() {
+          return onCloseTag(item.value);
+        }
+      }, item.name);
+    }));
   })), /*#__PURE__*/React.createElement(RefModal, {
     ref: modalRef
   }));

package/es/WorkerFlow/Form/UserSelectModalContent.js

@@ -98,6 +98,16 @@ var UserSelectModalContent = /*#__PURE__*/forwardRef(function UserSelectModalCon
       })
     };
   }, [state.selectUsers, state.selectIds]);
+  var renderList1 = useMemo(function () {
+    return userList.filter(function (v) {
+      return !state.keyword1 || v.realName.includes(state.keyword1);
+    });
+  }, [state.keyword1, userList]);
+  var renderList2 = useMemo(function () {
+    return state.selectUsers.filter(function (v) {
+      return !state.keyword2 || v.name.includes(state.keyword2);
+    });
+  }, [state.keyword2, state.selectUsers]);
   return /*#__PURE__*/React.createElement("div", {
     className: "user-select-modal-content"
   }, /*#__PURE__*/React.createElement(TreeMode, {
@@ -121,7 +131,7 @@ var UserSelectModalContent = /*#__PURE__*/forwardRef(function UserSelectModalCon
     mode: "Org"
   }), /*#__PURE__*/React.createElement(List, {
     onChecked: onUserChecked1,
-    list: userList,
+    list: renderList1,
     key: userList.length,
     checkedKeys: list1CheckedKeys,
     itemKey: "id",
@@ -137,7 +147,7 @@ var UserSelectModalContent = /*#__PURE__*/forwardRef(function UserSelectModalCon
     },
     keywords: state.keyword1
   }), /*#__PURE__*/React.createElement(List, {
-    list: state.selectUsers,
+    list: renderList2,
     itemKey: "value",
     itemNameKey: "name",
     checkedKeys: state.selectIds,

package/es/WorkerFlow/Form/UserSet.d.ts

@@ -1,4 +1,4 @@
-import { MutipleUserHandleType, NodeUserType, UserSetType } from '../interface';
+import { MutipleUserHandleType, NodeType, NodeUserType, UserSetType } from '../interface';
 interface IUserSetProps {
     userType?: UserSetType;
     nodeUserList?: NodeUserType[];
@@ -7,6 +7,7 @@ interface IUserSetProps {
     onChange: (data: any) => void;
     includeUserTypes?: UserSetType[];
     chargeLevel?: 1 | 2 | 3;
+    nodeType?: NodeType;
 }
-declare function UserSet({ userType, nodeUserList, usersHandType, onChange, emptyUsers, includeUserTypes, chargeLevel }: IUserSetProps): JSX.Element;
+declare function UserSet({ userType, nodeType, nodeUserList, usersHandType, onChange, emptyUsers, includeUserTypes, chargeLevel }: IUserSetProps): JSX.Element;
 export default UserSet;

package/es/WorkerFlow/Form/UserSet.js

@@ -38,10 +38,11 @@ function UserSet(_ref) {
 
   var _ref$userType = _ref.userType,
       userType = _ref$userType === void 0 ? 1 : _ref$userType,
+      nodeType = _ref.nodeType,
       _ref$nodeUserList = _ref.nodeUserList,
       nodeUserList = _ref$nodeUserList === void 0 ? [] : _ref$nodeUserList,
       _ref$usersHandType = _ref.usersHandType,
-      usersHandType = _ref$usersHandType === void 0 ? 1 : _ref$usersHandType,
+      usersHandType = _ref$usersHandType === void 0 ? 2 : _ref$usersHandType,
       onChange = _ref.onChange,
       emptyUsers = _ref.emptyUsers,
       includeUserTypes = _ref.includeUserTypes,
@@ -114,7 +115,8 @@ function UserSet(_ref) {
     usersHandType: state.usersHandType,
     onChange: function onChange(options) {
       return stateChange(options);
-    }
+    },
+    nodeType: nodeType
   })));
 }
 /**
@@ -127,7 +129,8 @@ function UserSelectType1(_ref2) {
       usersHandType = _ref2.usersHandType,
       _onChange = _ref2.onChange,
       type = _ref2.type,
-      emptyUsers = _ref2.emptyUsers;
+      emptyUsers = _ref2.emptyUsers,
+      nodeType = _ref2.nodeType;
   var userList = useMemo(function () {
     return users.filter(function (v) {
       return v.key === 'userId';
@@ -140,7 +143,7 @@ function UserSelectType1(_ref2) {
     onChange: function onChange(users) {
       return _onChange(_defineProperty({}, type, users));
     }
-  }), /*#__PURE__*/React.createElement(UsersHandleType, {
+  }), nodeType !== 2 && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(UsersHandleType, {
     usersHandType: usersHandType,
     onChange: function onChange(value) {
       return _onChange({
@@ -154,7 +157,7 @@ function UserSelectType1(_ref2) {
         emptyUsers: users
       });
     }
-  }));
+  })));
 }
 /**
  * @desc 自选人员

package/es/WorkerFlow/Form/UsersHandleType.js

@@ -7,7 +7,9 @@ function UsersHandleType(_ref) {
   var usersHandType = _ref.usersHandType,
       _onChange = _ref.onChange;
   var options = useMemo(function () {
-    return Object.values(UserHandleTypeOptions);
+    return Object.values(UserHandleTypeOptions).sort(function (a, b) {
+      return b.value - a.value;
+    });
   }, []);
   return /*#__PURE__*/React.createElement("div", {
     className: "users-handle-type-content"

package/es/WorkerFlow/Nodes/Condition.js

@@ -4,6 +4,7 @@ import AddNode from './Add';
 import Render from './Render';
 import { NodeTypes } from './Constants';
 import WFC from '../OperatorContext';
+import TitleElement from './TitleElement';
 
 function CoverLine(_ref) {
   var _ref$first = _ref.first,
@@ -44,17 +45,13 @@ function BranchNode(_ref2) {
     onClick: sortLeft
   }), /*#__PURE__*/React.createElement("div", {
     className: "title-wrapper"
-  }, /*#__PURE__*/React.createElement("span", {
-    className: "editable-title"
-  }, nodeName), /*#__PURE__*/React.createElement(_IconFont, {
-    className: "worker-flow-node-del",
-    type: "icon-MarkNo",
-    style: {
-      color: '#333',
-      right: 5,
-      top: 5
+  }, /*#__PURE__*/React.createElement(TitleElement, {
+    placeholder: "\u8BF7\u8F93\u5165\u6761\u4EF6\u540D\u79F0",
+    onTitleChange: function onTitleChange(v) {
+      return node.nodeName = v;
     },
-    onClick: delBranch
+    delNode: delBranch,
+    nodeName: node.nodeName
   })), !last && /*#__PURE__*/React.createElement("div", {
     className: "sort-right",
     onClick: sortRight

package/es/WorkerFlow/Nodes/TitleElement.js

@@ -48,7 +48,7 @@ function TitleElement(_ref) {
     onTitleChange && onTitleChange(title);
   }, [title]);
 
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_IconFont, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, icon && /*#__PURE__*/React.createElement(_IconFont, {
     type: icon,
     style: {
       paddingRight: 4

package/es/WorkerFlow/index.css

@@ -246,10 +246,18 @@
 }
 .worker-flow-design .auto-judge .title-wrapper .editable-title {
   display: inline-block;
-  max-width: 120px;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
+  margin-right: 10px;
+  height: 20px;
+}
+.worker-flow-design .auto-judge .title-wrapper .editable-title-input {
+  margin-right: 10px;
+  height: 20px;
+}
+.worker-flow-design .auto-judge .title-wrapper .anticon {
+  color: #333;
 }
 .worker-flow-design .auto-judge .content {
   font-size: 14px;
@@ -400,7 +408,9 @@
   top: 30px;
   z-index: 1;
 }
-.auto-judge:hover .editable-title,
+.auto-judge:hover .editable-title {
+  border-bottom: 1px dashed #15bc83;
+}
 .node-wrap-box:hover .editable-title {
   border-bottom: 1px dashed #fff;
 }

package/es/WorkerFlow/interface.d.ts

@@ -15,6 +15,7 @@ export type NodeUserType = {
 export type WorkerFlowFormType = {
   name: string;
   label: string;
+  widgetType: 'SINGLE_TEXT' | 'MULTIPLE_TEXT' | 'SINGLE_SELECTION' | 'MULTIPLE_SELECTION' | 'IMAGE';
   type: string;
   value: string;
   auth?: FormAuthType;
@@ -84,7 +85,7 @@ export type SubmitFlowItemType = {
 export type SubmitData = {
   config: WorkerFlowRequest;
   bpmnBlob: Blob;
-  useFormKeys: string[];
+  useFormKeys: ConditionItemType[];
   taskList: SubmitFlowItemType[];
 };
 

package/es/WorkerFlow/utils.d.ts

@@ -1,6 +1,7 @@
-import { NodeItem, SubmitFlowItemType } from './interface';
+import { ConditionItemType, 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[];
+export declare function getUserFormKeys(data: NodeItem): ConditionItemType[];
+export declare function getFirstUserTask(data: NodeItem): NodeItem | undefined;

package/es/WorkerFlow/utils.js

@@ -13,6 +13,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 import _ from 'lodash';
 import { getNodeById } from './XML/utils';
 export function getJAVATaskData(data) {
+  var _a;
+
   var arr = [];
 
   var fn = function fn(node, _nextNode) {
@@ -100,7 +102,7 @@ export function getJAVATaskData(data) {
   } // 修正最后一个节点的nextid
 
 
-  var lastNextId = arr[arr.length - 1].nextTaskId;
+  var lastNextId = (_a = arr[arr.length - 1]) === null || _a === void 0 ? void 0 : _a.nextTaskId;
 
   if (lastNextId) {
     var lastNode = getNodeById(data, lastNextId);
@@ -167,9 +169,8 @@ export function getUserFormKeys(data) {
 
   var fn = function fn(node) {
     if (node.bpmnType == 'sequenceFlow') {
-      arr.push.apply(arr, _toConsumableArray(node.conditionList.map(function (v) {
-        return v.field;
-      })));
+      console.log(node.conditionList);
+      arr.push.apply(arr, _toConsumableArray(node.conditionList));
     }
 
     if (node.conditionNodes) {
@@ -187,4 +188,11 @@ export function getUserFormKeys(data) {
   return arr.filter(function (v) {
     return !!v;
   });
+}
+export function getFirstUserTask(data) {
+  if (data.bpmnType === 'startEvent') {
+    return data.childNode;
+  }
+
+  return undefined;
 }

package/es/utils.js

@@ -1,7 +1,7 @@
-import { cache } from '@cloud-app-dev/utils';
+import _cache from "@cloud-app-dev/utils/es/cache";
 export var getHeader = function getHeader() {
   return {
-    Authorization: cache.getCache('token', 'session')
+    Authorization: _cache.getCache('token', 'session')
   };
 };
 /**

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "1.0.42",
+  "version": "1.0.46",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -38,7 +38,7 @@
   },
   "devDependencies": {
     "@cloud-app-dev/utils": "^2.0.1",
-    "@cloud-app-dev/basic-components": "^1.0.54",
+    "@cloud-app-dev/basic-components": "^1.0.56",
     "@types/chroma-js": "^2.1.3",
     "@types/lodash": "^4.14.172",
     "@umijs/test": "^3.0.5",